[rtems commit] Remove (Moved to git.rtems.org/data/git/rtems-crossrpms.git) .

Ralf Corsepius ralf at rtems.org
Fri Feb 17 14:54:33 UTC 2012


Module:    rtems
Branch:    master
Commit:    d6f6dfaa3d90e9c62f4c93ffbda5568de29a1d0f
Changeset: http://git.rtems.org/rtems/commit/?id=d6f6dfaa3d90e9c62f4c93ffbda5568de29a1d0f

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Fri Feb 17 15:52:53 2012 +0100

Remove (Moved to git.rtems.org/data/git/rtems-crossrpms.git).

---

 contrib/crossrpms/AUTHORS                          |    9 -
 contrib/crossrpms/COPYING                          |  340 --
 contrib/crossrpms/ChangeLog                        |  138 -
 contrib/crossrpms/Makefile.am                      |   28 -
 contrib/crossrpms/NEWS                             |   19 -
 contrib/crossrpms/README                           |   18 -
 contrib/crossrpms/TODO                             |   22 -
 contrib/crossrpms/acinclude.m4                     |   20 -
 contrib/crossrpms/autotools/Makefile.am            |   13 -
 contrib/crossrpms/autotools/autoconf-sources.add   |    4 -
 contrib/crossrpms/autotools/autoconf.add           |  102 -
 contrib/crossrpms/autotools/autoconf.am            |   21 -
 contrib/crossrpms/autotools/automake-sources.add   |    3 -
 contrib/crossrpms/autotools/automake.add           |   91 -
 contrib/crossrpms/autotools/automake.am            |   21 -
 .../crossrpms/autotools/rtems-4.11-autoconf.spec   |  202 -
 .../crossrpms/autotools/rtems-4.11-automake.spec   |  189 -
 contrib/crossrpms/autotools/target-autoconf.add    |   23 -
 contrib/crossrpms/autotools/target-automake.add    |   27 -
 contrib/crossrpms/binutils/base-binutils.add       |   52 -
 contrib/crossrpms/binutils/binutils.add            |   40 -
 contrib/crossrpms/binutils/build.add               |   29 -
 contrib/crossrpms/binutils/install.add             |   53 -
 contrib/crossrpms/binutils/prep.add                |    8 -
 contrib/crossrpms/binutils/rpm-install.add         |   32 -
 contrib/crossrpms/binutils/target-binutils.add     |   31 -
 contrib/crossrpms/bootstrap                        |    2 -
 contrib/crossrpms/common/clean.add                 |    3 -
 contrib/crossrpms/common/common.add                |   49 -
 contrib/crossrpms/configure.ac                     |  178 -
 contrib/crossrpms/cpukit/build.add                 |   16 -
 contrib/crossrpms/cpukit/cpukit.add                |   24 -
 contrib/crossrpms/cpukit/install.add               |   11 -
 contrib/crossrpms/cpukit/prep.add                  |    6 -
 contrib/crossrpms/cpukit/rpm-install.add           |   49 -
 contrib/crossrpms/cpukit/target-cpukit.add         |    9 -
 contrib/crossrpms/cygwin/Makefile.am               |    3 -
 contrib/crossrpms/cygwin/binutils.am               |   31 -
 contrib/crossrpms/cygwin/cloog_ppl.am              |   21 -
 contrib/crossrpms/cygwin/cygwin.am                 |   21 -
 contrib/crossrpms/cygwin/expat.am                  |   21 -
 contrib/crossrpms/cygwin/gcc-prep.add              |    9 -
 contrib/crossrpms/cygwin/gcc.am                    |   40 -
 contrib/crossrpms/cygwin/gmp.am                    |   21 -
 contrib/crossrpms/cygwin/i686/Makefile.am          |   68 -
 contrib/crossrpms/cygwin/i686/binutils-sources.add |    1 -
 contrib/crossrpms/cygwin/i686/cloog-ppl.add        |   41 -
 contrib/crossrpms/cygwin/i686/expat.add            |   40 -
 contrib/crossrpms/cygwin/i686/gcc-sources.add      |   42 -
 contrib/crossrpms/cygwin/i686/gmp.add              |   41 -
 .../cygwin/i686/i686-pc-cygwin-binutils.spec       |  171 -
 .../cygwin/i686/i686-pc-cygwin-cloog-ppl.spec      |  144 -
 .../cygwin/i686/i686-pc-cygwin-expat.spec          |  143 -
 .../crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec  |  706 ---
 .../crossrpms/cygwin/i686/i686-pc-cygwin-gmp.spec  |  144 -
 .../crossrpms/cygwin/i686/i686-pc-cygwin-libs.spec |  142 -
 .../crossrpms/cygwin/i686/i686-pc-cygwin-mpc.spec  |  145 -
 .../crossrpms/cygwin/i686/i686-pc-cygwin-mpfr.spec |  144 -
 .../cygwin/i686/i686-pc-cygwin-ncurses.spec        |  153 -
 .../cygwin/i686/i686-pc-cygwin-readline.spec       |  142 -
 .../cygwin/i686/i686-pc-cygwin-termcap.spec        |  139 -
 .../cygwin/i686/i686-pc-cygwin-terminfo.spec       |  139 -
 .../cygwin/i686/i686-pc-cygwin-w32api.spec         |  153 -
 .../crossrpms/cygwin/i686/i686-pc-cygwin-zlib.spec |  144 -
 contrib/crossrpms/cygwin/i686/libs.add             |   34 -
 contrib/crossrpms/cygwin/i686/mpc.add              |   42 -
 contrib/crossrpms/cygwin/i686/mpfr.add             |   41 -
 contrib/crossrpms/cygwin/i686/ncurses.add          |   50 -
 contrib/crossrpms/cygwin/i686/readline.add         |   39 -
 contrib/crossrpms/cygwin/i686/target-cloog-ppl.add |    6 -
 contrib/crossrpms/cygwin/i686/target-expat.add     |    6 -
 contrib/crossrpms/cygwin/i686/target-gmp.add       |    6 -
 contrib/crossrpms/cygwin/i686/target-libs.add      |   11 -
 contrib/crossrpms/cygwin/i686/target-mpc.add       |    6 -
 contrib/crossrpms/cygwin/i686/target-mpfr.add      |    6 -
 contrib/crossrpms/cygwin/i686/target-ncurses.add   |    6 -
 contrib/crossrpms/cygwin/i686/target-readline.add  |    6 -
 contrib/crossrpms/cygwin/i686/target-termcap.add   |    6 -
 contrib/crossrpms/cygwin/i686/target-terminfo.add  |    6 -
 contrib/crossrpms/cygwin/i686/target-w32api.add    |   19 -
 contrib/crossrpms/cygwin/i686/target-zlib.add      |    6 -
 contrib/crossrpms/cygwin/i686/termcap.add          |   36 -
 contrib/crossrpms/cygwin/i686/terminfo.add         |   36 -
 contrib/crossrpms/cygwin/i686/w32api.add           |   37 -
 contrib/crossrpms/cygwin/i686/zlib.add             |   41 -
 contrib/crossrpms/cygwin/mpc.am                    |   22 -
 contrib/crossrpms/cygwin/mpfr.am                   |   22 -
 contrib/crossrpms/cygwin/ncurses.am                |   21 -
 contrib/crossrpms/cygwin/readline.am               |   21 -
 contrib/crossrpms/cygwin/termcap.am                |   21 -
 contrib/crossrpms/cygwin/terminfo.am               |   21 -
 contrib/crossrpms/cygwin/w32api.am                 |   21 -
 contrib/crossrpms/cygwin/zlib.am                   |   21 -
 contrib/crossrpms/freebsd6.4/Makefile.am           |    3 -
 contrib/crossrpms/freebsd6.4/binutils.am           |   30 -
 contrib/crossrpms/freebsd6.4/gcc.am                |   42 -
 contrib/crossrpms/freebsd6.4/i586/Makefile.am      |   23 -
 .../crossrpms/freebsd6.4/i586/binutils-sources.add |    2 -
 contrib/crossrpms/freebsd6.4/i586/gcc-sources.add  |   37 -
 .../i586/i586-pc-freebsd6.4-binutils.spec          |  170 -
 .../freebsd6.4/i586/i586-pc-freebsd6.4-gcc.spec    |  798 ---
 .../freebsd6.4/i586/i586-pc-freebsd6.4-libs.spec   |  202 -
 contrib/crossrpms/freebsd6.4/i586/libs.add         |   94 -
 contrib/crossrpms/freebsd6.4/i586/target-libs.add  |   11 -
 contrib/crossrpms/freebsd6.4/libs.am               |   18 -
 contrib/crossrpms/freebsd7.3/Makefile.am           |    3 -
 contrib/crossrpms/freebsd7.3/binutils.am           |   30 -
 contrib/crossrpms/freebsd7.3/gcc.am                |   42 -
 contrib/crossrpms/freebsd7.3/i586/Makefile.am      |   23 -
 .../crossrpms/freebsd7.3/i586/binutils-sources.add |    2 -
 contrib/crossrpms/freebsd7.3/i586/gcc-sources.add  |   37 -
 .../i586/i586-pc-freebsd7.3-binutils.spec          |  170 -
 .../freebsd7.3/i586/i586-pc-freebsd7.3-gcc.spec    |  798 ---
 .../freebsd7.3/i586/i586-pc-freebsd7.3-libs.spec   |  206 -
 contrib/crossrpms/freebsd7.3/i586/libs.add         |   98 -
 contrib/crossrpms/freebsd7.3/i586/target-libs.add  |   11 -
 contrib/crossrpms/freebsd7.3/libs.am               |   18 -
 contrib/crossrpms/freebsd8.2/Makefile.am           |    3 -
 contrib/crossrpms/freebsd8.2/binutils.am           |   30 -
 contrib/crossrpms/freebsd8.2/gcc.am                |   42 -
 contrib/crossrpms/freebsd8.2/i586/Makefile.am      |   23 -
 .../crossrpms/freebsd8.2/i586/binutils-sources.add |    2 -
 contrib/crossrpms/freebsd8.2/i586/gcc-sources.add  |   37 -
 .../i586/i586-pc-freebsd8.2-binutils.spec          |  170 -
 .../freebsd8.2/i586/i586-pc-freebsd8.2-gcc.spec    |  798 ---
 .../freebsd8.2/i586/i586-pc-freebsd8.2-libs.spec   |  211 -
 contrib/crossrpms/freebsd8.2/i586/libs.add         |  103 -
 contrib/crossrpms/freebsd8.2/i586/target-libs.add  |   11 -
 contrib/crossrpms/freebsd8.2/libs.am               |   18 -
 contrib/crossrpms/freebsd8.2/x86_64/Makefile.am    |   23 -
 .../x86_64/amd64-pc-freebsd8.2-binutils.spec       |  170 -
 .../freebsd8.2/x86_64/amd64-pc-freebsd8.2-gcc.spec |  798 ---
 .../x86_64/amd64-pc-freebsd8.2-libs.spec           |  215 -
 .../freebsd8.2/x86_64/binutils-sources.add         |    2 -
 .../crossrpms/freebsd8.2/x86_64/gcc-sources.add    |   37 -
 contrib/crossrpms/freebsd8.2/x86_64/libs.add       |  107 -
 .../crossrpms/freebsd8.2/x86_64/target-libs.add    |   11 -
 contrib/crossrpms/gcc/base-gcc.add                 |   56 -
 contrib/crossrpms/gcc/base-gcj.add                 |   55 -
 contrib/crossrpms/gcc/base-gfortran.add            |   38 -
 contrib/crossrpms/gcc/base-gnat.add                |   40 -
 contrib/crossrpms/gcc/base-go.add                  |   38 -
 contrib/crossrpms/gcc/base-newlib.add              |   41 -
 contrib/crossrpms/gcc/build.add                    |   79 -
 contrib/crossrpms/gcc/gccnewlib.add                |  257 -
 contrib/crossrpms/gcc/install.add                  |  185 -
 contrib/crossrpms/gcc/prep.add                     |   93 -
 contrib/crossrpms/gcc/rpm-install.add              |   73 -
 contrib/crossrpms/gcc/target-c++.add               |   65 -
 contrib/crossrpms/gcc/target-gcc.add               |   84 -
 contrib/crossrpms/gcc/target-gcj.add               |   57 -
 contrib/crossrpms/gcc/target-gfortran.add          |   60 -
 contrib/crossrpms/gcc/target-gnat.add              |   42 -
 contrib/crossrpms/gcc/target-go.add                |   41 -
 contrib/crossrpms/gcc/target-newlib.add            |   26 -
 contrib/crossrpms/gcc/target-objc.add              |   49 -
 contrib/crossrpms/gdb/base-gdb.add                 |   43 -
 contrib/crossrpms/gdb/build.add                    |   33 -
 contrib/crossrpms/gdb/gdb.add                      |   97 -
 contrib/crossrpms/gdb/install.add                  |   54 -
 contrib/crossrpms/gdb/prep.add                     |   10 -
 contrib/crossrpms/gdb/rpm-install.add              |   32 -
 contrib/crossrpms/gdb/target-gdb.add               |   26 -
 contrib/crossrpms/mingw32/Makefile.am              |    3 -
 contrib/crossrpms/mingw32/gmp.am                   |   21 -
 contrib/crossrpms/mingw32/i686/Makefile.am         |   63 -
 contrib/crossrpms/mingw32/i686/gmp.add             |   66 -
 .../i686/i686-pc-mingw32-binutils-helper.spec      |   25 -
 .../i686/i686-pc-mingw32-binutils-helper.spec.in   |   25 -
 .../i686/i686-pc-mingw32-curses-helper.spec        |   26 -
 .../i686/i686-pc-mingw32-curses-helper.spec.in     |   26 -
 .../mingw32/i686/i686-pc-mingw32-expat-helper.spec |   26 -
 .../i686/i686-pc-mingw32-expat-helper.spec.in      |   26 -
 .../mingw32/i686/i686-pc-mingw32-gcc-helper.spec   |   25 -
 .../i686/i686-pc-mingw32-gcc-helper.spec.in        |   25 -
 .../mingw32/i686/i686-pc-mingw32-gmp.spec          |  167 -
 .../mingw32/i686/i686-pc-mingw32-libs-helper.spec  |   25 -
 .../i686/i686-pc-mingw32-libs-helper.spec.in       |   25 -
 .../mingw32/i686/i686-pc-mingw32-mpc.spec          |  170 -
 .../mingw32/i686/i686-pc-mingw32-mpfr.spec         |  171 -
 .../i686/i686-pc-mingw32-readline-helper.spec      |   26 -
 .../i686/i686-pc-mingw32-readline-helper.spec.in   |   26 -
 .../i686/i686-pc-mingw32-termcap-helper.spec       |   26 -
 .../i686/i686-pc-mingw32-termcap-helper.spec.in    |   26 -
 .../i686/i686-pc-mingw32-w32api-helper.spec        |   25 -
 .../i686/i686-pc-mingw32-w32api-helper.spec.in     |   25 -
 .../mingw32/i686/i686-pc-mingw32-zlib-helper.spec  |   26 -
 .../i686/i686-pc-mingw32-zlib-helper.spec.in       |   26 -
 contrib/crossrpms/mingw32/i686/mpc.add             |   69 -
 contrib/crossrpms/mingw32/i686/mpfr.add            |   69 -
 contrib/crossrpms/mingw32/i686/target-gmp.add      |    4 -
 contrib/crossrpms/mingw32/i686/target-mpc.add      |    4 -
 contrib/crossrpms/mingw32/i686/target-mpfr.add     |    5 -
 contrib/crossrpms/mingw32/mpc.am                   |   21 -
 contrib/crossrpms/mingw32/mpfr.am                  |   22 -
 contrib/crossrpms/mkspec.am                        |   17 -
 contrib/crossrpms/netbsd5.1/Makefile.am            |    4 -
 contrib/crossrpms/netbsd5.1/binutils.am            |   30 -
 contrib/crossrpms/netbsd5.1/gcc.am                 |   40 -
 contrib/crossrpms/netbsd5.1/i386/Makefile.am       |   23 -
 .../crossrpms/netbsd5.1/i386/binutils-sources.add  |    2 -
 contrib/crossrpms/netbsd5.1/i386/gcc-sources.add   |   37 -
 .../i386/i386-pc-netbsdelf5.1-binutils.spec        |  170 -
 .../netbsd5.1/i386/i386-pc-netbsdelf5.1-gcc.spec   |  798 ---
 .../netbsd5.1/i386/i386-pc-netbsdelf5.1-libs.spec  |  163 -
 contrib/crossrpms/netbsd5.1/i386/libs.add          |   55 -
 contrib/crossrpms/netbsd5.1/i386/target-libs.add   |   11 -
 contrib/crossrpms/netbsd5.1/libs.am                |   18 -
 contrib/crossrpms/netbsd5.1/x86_64/Makefile.am     |   23 -
 .../x86_64/amd64-pc-netbsdelf5.1-binutils.spec     |  170 -
 .../x86_64/amd64-pc-netbsdelf5.1-gcc.spec          |  798 ---
 .../x86_64/amd64-pc-netbsdelf5.1-libs.spec         |  163 -
 .../netbsd5.1/x86_64/binutils-sources.add          |    2 -
 contrib/crossrpms/netbsd5.1/x86_64/gcc-sources.add |   37 -
 contrib/crossrpms/netbsd5.1/x86_64/libs.add        |   55 -
 contrib/crossrpms/netbsd5.1/x86_64/target-libs.add |   11 -
 .../binutils-2.17.50-cygwin-20060817-1.diff        |   24 -
 .../patches/binutils-2.21-rtems4.11-20110107.diff  |   75 -
 contrib/crossrpms/patches/cygwin-gcc-3.4.4-3.diff  |   12 -
 .../patches/gcc-core-4.5.3-rtems4.11-20110426.diff |  447 --
 .../patches/gcc-core-4.5.3-rtems4.11-20110905.diff |  486 --
 .../patches/gcc-core-4.6.1-rtems4.11-20110715.diff |  507 --
 .../patches/gcc-core-4.6.1-rtems4.11-20110825.diff |  579 --
 .../patches/gcc-core-4.6.2-rtems4.11-20111028.diff |  559 --
 .../patches/gcc-core-4.6.2-rtems4.11-20111124.diff |  582 --
 .../patches/gcc-g++-4.5.3-rtems4.11-20110426.diff  | 5887 ------------------
 .../patches/gcc-g++-4.5.3-rtems4.11-20110905.diff  | 5887 ------------------
 .../patches/gdb-7.2-rtems4.11-20100903.diff        |  532 --
 .../patches/gdb-7.2-rtems4.11-20100907.diff        |  595 --
 .../patches/gdb-7.3.1-rtems4.11-20110905.diff      |  586 --
 .../patches/gdb-7.3.91-rtems4.11-20111213.diff     |  417 --
 .../patches/newlib-1.19.0-rtems4.11-20110724.diff  | 5988 ------------------
 .../patches/newlib-1.19.0-rtems4.11-20110826.diff  | 6311 -------------------
 .../patches/newlib-1.19.0-rtems4.11-20111006.diff  | 6336 --------------------
 contrib/crossrpms/rtems4.11/Makefile.am            |   20 -
 contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am   |   33 -
 .../rtems4.11/arm-eabi/binutils-sources.add        |    4 -
 .../rtems4.11/arm-eabi/cpukit-sources.add          |    1 -
 .../crossrpms/rtems4.11/arm-eabi/gcc-sources.add   |   41 -
 .../crossrpms/rtems4.11/arm-eabi/gdb-sources.add   |   12 -
 .../rtems-4.11-arm-rtemseabi4.11-binutils.spec     |  270 -
 .../rtems-4.11-arm-rtemseabi4.11-cpukit.spec       |  157 -
 .../arm-eabi/rtems-4.11-arm-rtemseabi4.11-gcc.spec |  897 ---
 .../arm-eabi/rtems-4.11-arm-rtemseabi4.11-gdb.spec |  298 -
 contrib/crossrpms/rtems4.11/arm/Makefile.am        |   34 -
 .../crossrpms/rtems4.11/arm/binutils-sources.add   |    4 -
 contrib/crossrpms/rtems4.11/arm/cpukit-sources.add |    1 -
 contrib/crossrpms/rtems4.11/arm/gcc-sources.add    |   41 -
 contrib/crossrpms/rtems4.11/arm/gdb-sources.add    |   12 -
 .../arm/rtems-4.11-arm-rtems4.11-binutils.spec     |  270 -
 .../arm/rtems-4.11-arm-rtems4.11-cpukit.spec       |  157 -
 .../arm/rtems-4.11-arm-rtems4.11-gcc.spec          |  897 ---
 .../arm/rtems-4.11-arm-rtems4.11-gdb.spec          |  298 -
 contrib/crossrpms/rtems4.11/avr/Makefile.am        |   33 -
 .../crossrpms/rtems4.11/avr/binutils-sources.add   |    4 -
 contrib/crossrpms/rtems4.11/avr/cpukit-sources.add |    1 -
 contrib/crossrpms/rtems4.11/avr/gcc-sources.add    |   41 -
 contrib/crossrpms/rtems4.11/avr/gdb-sources.add    |   12 -
 .../avr/rtems-4.11-avr-rtems4.11-binutils.spec     |  270 -
 .../avr/rtems-4.11-avr-rtems4.11-cpukit.spec       |  157 -
 .../avr/rtems-4.11-avr-rtems4.11-gcc.spec          |  823 ---
 .../avr/rtems-4.11-avr-rtems4.11-gdb.spec          |  298 -
 contrib/crossrpms/rtems4.11/bfin/Makefile.am       |   33 -
 .../crossrpms/rtems4.11/bfin/binutils-sources.add  |    4 -
 .../crossrpms/rtems4.11/bfin/cpukit-sources.add    |    1 -
 contrib/crossrpms/rtems4.11/bfin/gcc-sources.add   |   41 -
 contrib/crossrpms/rtems4.11/bfin/gdb-sources.add   |   23 -
 .../bfin/rtems-4.11-bfin-rtems4.11-binutils.spec   |  270 -
 .../bfin/rtems-4.11-bfin-rtems4.11-cpukit.spec     |  157 -
 .../bfin/rtems-4.11-bfin-rtems4.11-gcc.spec        |  896 ---
 .../bfin/rtems-4.11-bfin-rtems4.11-gdb.spec        |  309 -
 contrib/crossrpms/rtems4.11/binutils.am            |   31 -
 contrib/crossrpms/rtems4.11/cpukit-prep.add        |    1 -
 contrib/crossrpms/rtems4.11/cpukit.am              |   35 -
 contrib/crossrpms/rtems4.11/gcc-prep.add           |    2 -
 contrib/crossrpms/rtems4.11/gcc.am                 |   49 -
 contrib/crossrpms/rtems4.11/gdb.am                 |   31 -
 contrib/crossrpms/rtems4.11/h8300/Makefile.am      |   33 -
 .../crossrpms/rtems4.11/h8300/binutils-sources.add |    4 -
 .../crossrpms/rtems4.11/h8300/cpukit-sources.add   |    1 -
 contrib/crossrpms/rtems4.11/h8300/gcc-sources.add  |   41 -
 contrib/crossrpms/rtems4.11/h8300/gdb-sources.add  |   12 -
 .../h8300/rtems-4.11-h8300-rtems4.11-binutils.spec |  270 -
 .../h8300/rtems-4.11-h8300-rtems4.11-cpukit.spec   |  157 -
 .../h8300/rtems-4.11-h8300-rtems4.11-gcc.spec      |  897 ---
 .../h8300/rtems-4.11-h8300-rtems4.11-gdb.spec      |  302 -
 contrib/crossrpms/rtems4.11/i386/Makefile.am       |   33 -
 .../crossrpms/rtems4.11/i386/binutils-sources.add  |    4 -
 .../crossrpms/rtems4.11/i386/cpukit-sources.add    |    1 -
 contrib/crossrpms/rtems4.11/i386/gcc-sources.add   |   50 -
 contrib/crossrpms/rtems4.11/i386/gdb-sources.add   |   12 -
 .../i386/rtems-4.11-i386-rtems4.11-binutils.spec   |  270 -
 .../i386/rtems-4.11-i386-rtems4.11-cpukit.spec     |  157 -
 .../i386/rtems-4.11-i386-rtems4.11-gcc.spec        |  897 ---
 .../i386/rtems-4.11-i386-rtems4.11-gdb.spec        |  298 -
 contrib/crossrpms/rtems4.11/lm32/Makefile.am       |   33 -
 .../crossrpms/rtems4.11/lm32/binutils-sources.add  |    4 -
 .../crossrpms/rtems4.11/lm32/cpukit-sources.add    |    1 -
 contrib/crossrpms/rtems4.11/lm32/gcc-sources.add   |   41 -
 contrib/crossrpms/rtems4.11/lm32/gdb-sources.add   |   12 -
 .../lm32/rtems-4.11-lm32-rtems4.11-binutils.spec   |  270 -
 .../lm32/rtems-4.11-lm32-rtems4.11-gcc.spec        |  897 ---
 .../lm32/rtems-4.11-lm32-rtems4.11-gdb.spec        |  302 -
 contrib/crossrpms/rtems4.11/m32c/Makefile.am       |   33 -
 .../crossrpms/rtems4.11/m32c/binutils-sources.add  |    4 -
 .../crossrpms/rtems4.11/m32c/cpukit-sources.add    |    1 -
 contrib/crossrpms/rtems4.11/m32c/gcc-sources.add   |   41 -
 contrib/crossrpms/rtems4.11/m32c/gdb-sources.add   |   12 -
 .../m32c/rtems-4.11-m32c-rtems4.11-binutils.spec   |  270 -
 .../m32c/rtems-4.11-m32c-rtems4.11-cpukit.spec     |  157 -
 .../m32c/rtems-4.11-m32c-rtems4.11-gcc.spec        |  824 ---
 .../m32c/rtems-4.11-m32c-rtems4.11-gdb.spec        |  302 -
 contrib/crossrpms/rtems4.11/m32r/Makefile.am       |   33 -
 .../crossrpms/rtems4.11/m32r/binutils-sources.add  |    4 -
 .../crossrpms/rtems4.11/m32r/cpukit-sources.add    |    1 -
 contrib/crossrpms/rtems4.11/m32r/gcc-sources.add   |   41 -
 contrib/crossrpms/rtems4.11/m32r/gdb-sources.add   |   12 -
 .../m32r/rtems-4.11-m32r-rtems4.11-binutils.spec   |  270 -
 .../m32r/rtems-4.11-m32r-rtems4.11-cpukit.spec     |  157 -
 .../m32r/rtems-4.11-m32r-rtems4.11-gcc.spec        |  824 ---
 .../m32r/rtems-4.11-m32r-rtems4.11-gdb.spec        |  298 -
 contrib/crossrpms/rtems4.11/m68k/Makefile.am       |   33 -
 .../crossrpms/rtems4.11/m68k/binutils-sources.add  |    4 -
 .../crossrpms/rtems4.11/m68k/cpukit-sources.add    |    1 -
 contrib/crossrpms/rtems4.11/m68k/gcc-sources.add   |   41 -
 contrib/crossrpms/rtems4.11/m68k/gdb-sources.add   |   12 -
 .../m68k/rtems-4.11-m68k-rtems4.11-binutils.spec   |  270 -
 .../m68k/rtems-4.11-m68k-rtems4.11-cpukit.spec     |  157 -
 .../m68k/rtems-4.11-m68k-rtems4.11-gcc.spec        |  897 ---
 .../m68k/rtems-4.11-m68k-rtems4.11-gdb.spec        |  298 -
 contrib/crossrpms/rtems4.11/mips/Makefile.am       |   33 -
 .../crossrpms/rtems4.11/mips/binutils-sources.add  |    4 -
 .../crossrpms/rtems4.11/mips/cpukit-sources.add    |    1 -
 contrib/crossrpms/rtems4.11/mips/gcc-sources.add   |   41 -
 contrib/crossrpms/rtems4.11/mips/gdb-sources.add   |   12 -
 .../mips/rtems-4.11-mips-rtems4.11-binutils.spec   |  270 -
 .../mips/rtems-4.11-mips-rtems4.11-cpukit.spec     |  157 -
 .../mips/rtems-4.11-mips-rtems4.11-gcc.spec        |  897 ---
 .../mips/rtems-4.11-mips-rtems4.11-gdb.spec        |  298 -
 contrib/crossrpms/rtems4.11/mipstx39/Makefile.am   |   13 -
 .../crossrpms/rtems4.11/mipstx39/gdb-sources.add   |   12 -
 .../rtems-4.11-mipstx39-rtems4.11-gdb.spec         |  302 -
 contrib/crossrpms/rtems4.11/powerpc/Makefile.am    |   33 -
 .../rtems4.11/powerpc/binutils-sources.add         |    4 -
 .../crossrpms/rtems4.11/powerpc/cpukit-sources.add |    1 -
 .../crossrpms/rtems4.11/powerpc/gcc-sources.add    |   41 -
 .../crossrpms/rtems4.11/powerpc/gdb-sources.add    |   12 -
 .../rtems-4.11-powerpc-rtems4.11-binutils.spec     |  270 -
 .../rtems-4.11-powerpc-rtems4.11-cpukit.spec       |  157 -
 .../powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec  |  897 ---
 .../powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec  |  304 -
 contrib/crossrpms/rtems4.11/sh/Makefile.am         |   33 -
 .../crossrpms/rtems4.11/sh/binutils-sources.add    |    4 -
 contrib/crossrpms/rtems4.11/sh/cpukit-sources.add  |    1 -
 contrib/crossrpms/rtems4.11/sh/gcc-sources.add     |   41 -
 contrib/crossrpms/rtems4.11/sh/gdb-sources.add     |   12 -
 .../sh/rtems-4.11-sh-rtems4.11-binutils.spec       |  270 -
 .../sh/rtems-4.11-sh-rtems4.11-cpukit.spec         |  157 -
 .../rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec  |  897 ---
 .../rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec  |  298 -
 contrib/crossrpms/rtems4.11/sparc/Makefile.am      |   33 -
 .../crossrpms/rtems4.11/sparc/binutils-sources.add |    4 -
 .../crossrpms/rtems4.11/sparc/cpukit-sources.add   |    1 -
 contrib/crossrpms/rtems4.11/sparc/gcc-sources.add  |   41 -
 contrib/crossrpms/rtems4.11/sparc/gdb-sources.add  |   12 -
 .../sparc/rtems-4.11-sparc-rtems4.11-binutils.spec |  270 -
 .../sparc/rtems-4.11-sparc-rtems4.11-cpukit.spec   |  157 -
 .../sparc/rtems-4.11-sparc-rtems4.11-gcc.spec      |  897 ---
 .../sparc/rtems-4.11-sparc-rtems4.11-gdb.spec      |  302 -
 contrib/crossrpms/rtems4.11/sparc64/Makefile.am    |   33 -
 .../rtems4.11/sparc64/binutils-sources.add         |    4 -
 .../crossrpms/rtems4.11/sparc64/cpukit-sources.add |    1 -
 .../crossrpms/rtems4.11/sparc64/gcc-sources.add    |   41 -
 .../crossrpms/rtems4.11/sparc64/gdb-sources.add    |   12 -
 .../rtems-4.11-sparc64-rtems4.11-binutils.spec     |  270 -
 .../sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec  |  897 ---
 .../sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec  |  298 -
 contrib/crossrpms/solaris2.7/Makefile.am           |    3 -
 contrib/crossrpms/solaris2.7/binutils.am           |   30 -
 contrib/crossrpms/solaris2.7/gcc.am                |   42 -
 contrib/crossrpms/solaris2.7/libs.am               |   18 -
 contrib/crossrpms/solaris2.7/sparc/Makefile.am     |   23 -
 .../solaris2.7/sparc/binutils-sources.add          |    2 -
 contrib/crossrpms/solaris2.7/sparc/gcc-sources.add |   33 -
 contrib/crossrpms/solaris2.7/sparc/libs.add        |   38 -
 .../sparc/sparc-sun-solaris2.7-binutils.spec       |  171 -
 .../solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec |  628 --
 .../sparc/sparc-sun-solaris2.7-libs.spec           |  146 -
 contrib/crossrpms/solaris2.7/sparc/target-libs.add |   11 -
 contrib/crossrpms/specstrip                        |  257 -
 390 files changed, 0 insertions(+), 79724 deletions(-)

diff --git a/contrib/crossrpms/AUTHORS b/contrib/crossrpms/AUTHORS
deleted file mode 100644
index db8ac59..0000000
--- a/contrib/crossrpms/AUTHORS
+++ /dev/null
@@ -1,9 +0,0 @@
-Ralf Corsépius	<ralf.corsepius at rtems.org>
-
-Chris Johns	<chrisj at rtems.org>
-	- Testing.
-	- Bugfixes.
-	- mingw32.
-
-Joel Sherrill	<joel at oarcorp.com>
-	- Testing.
diff --git a/contrib/crossrpms/COPYING b/contrib/crossrpms/COPYING
deleted file mode 100644
index 623b625..0000000
--- a/contrib/crossrpms/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-

-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-

-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-

-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-

-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/contrib/crossrpms/ChangeLog b/contrib/crossrpms/ChangeLog
deleted file mode 100644
index 05d2b08..0000000
--- a/contrib/crossrpms/ChangeLog
+++ /dev/null
@@ -1,138 +0,0 @@
-2011-02-02	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* configure.ac: Require autoconf-2.68, automake-1.11.1.
-
-2008-09-25	Joel Sherrill <joel.sherrill at oarcorp.com>
-
-	* rtems4.10/sparc/Makefile.am: Bump RTEMS CPU Kit version.
-	* patches/gcc-ada-4.3.2-rtems4.10-20080910.diff: New file.
-	* patches/gcc-ada-4.2.0-rtems4.8-20070705.diff: Removed.
-
-2007-12-17	Chris Johns <chrisj at rtems.org>
-
-	* rtems4.8/.cvsignore, rtems4.8/arm/.cvsignore,
-	rtems4.8/avr/.cvsignore, rtems4.8/bfin/.cvsignore,
-	rtems4.8/h8300/.cvsignore, rtems4.8/i386/.cvsignore,
-	rtems4.8/m68k/.cvsignore, rtems4.8/mips/.cvsignore,
-	rtems4.8/mipstx39/.cvsignore, rtems4.8/powerpc/.cvsignore,
-	rtems4.8/sh/.cvsignore, rtems4.8/sparc/.cvsignore,
-	rtems4.8/tic4x/.cvsignore: New.
-
-2006-12-02	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* configure.ac: New BUG-REPORT address.
-
-2006-11-19	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* autotools/Makefile.am, autotools/autoconf.add:
-	Upgrade to autoconf-2.61.
-
-2006-11-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* patches/gcc-core-4.2-20061114-rtems4.8-20061115.diff: New.
-	* patches/newlib-1.14.0-bfinrtems-20060810a.diff: Remove (Obsolete).
-	* patches/gcc-4.1.1-bfinrtems-20060810a.diff: Remove (Obsolete).
-	* rtems-4.8/bfin/Makefile.am, rtems-4.8/bin/gcc-sources.add:
-	GCC_REL=4. Upgrade to gcc-core-4.2-20061114-rtems4.8-20061115.diff.
-
-2006-10-27	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* configure.ac, Makefile.am: Remove rtems4.7.
-	* rtems4.7: Remove (Development now in rtems-4-7-branch only).
-
-2006-10-27	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* patches/newlib-1.14.0-rtems4.8-20061027.diff: New.
-	* patches/newlib-1.14.0-rtems-20061026.diff: Remove (broken).
-
-2006-10-26	Joel Sherrill <joel at OARcorp.com>
-
-	* patches/newlib-1.14.0-rtems-20061026.diff: New file.
-
-2006-10-22	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* Makefile.am, configure.ac: Add rtems-4.8.
-
-2006-10-16	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* configure.ac: Set RTEMS_API to 4.8.
-
-2006-10-16	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* autotools/Makefile.am, autotools/automake.add: Update to
-	automake-1.10.
-
-2006-08-23	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* rtems4.7/arm/gcc-sources.add, rtems4.7/h8300/gcc-sources.add,
-	rtems4.7/i386/gcc-sources.add, rtems4.7/m68k/gcc-sources.add,
-	rtems4.7/mips/gcc-sources.add, rtems4.7/powerpc/gcc-sources.add
-	rtems4.7/sh/gcc-sources.add, rtems4.7/sparc/gcc-sources.add
-	rtems4.7/tic4x/gcc-sources.add: Add gcc-4.0.3.
-
-2006-08-23	Ralf Corsépius <ralf.corsepius at rtems.org>
-
-	* gcc/build.add: Revert --disable-libssp etc. hacks.
-
-2006-08-22	Chris Johns <chrisj at rtems.org>
-
-        * rtems4.7/avr/gcc-sources.add: Add the 4.0.3 patch.
-	* patches/gcc-core-4.0.3-rtems-20060822.diff:
-	The .exe for the versioned execuable for MinGW.
-	
-2006-08-21	Joel Sherrill <joel at OARcorp.com>
-
-	* rtems4.7/h8300/binutils-sources.add,
-	rtems4.7/m68k/binutils-sources.add: Add h8300 _tinydata patch and
-	bump patch for targets needing it.
-	* patches/binutils-2.17-rtems-20060815.diff: New file.
-
-2006-08-11	Joel Sherrill <joel at oarcorp.com>
-
-	* configure.ac, gcc/build.add, gcc/target-gcc.add: Add bfin target
-	prior to merge. Add ability to disable libssp and libstdcxx-pch which
-	apparently are required to build the Blackfin port.
-	* patches/binutils-2.17-rtems-bfin-20060810.diff,
-	patches/gcc-4.1.1-bfinrtems-20060810a.diff,
-	patches/gdb-6.5-bfinrtems-20060810a.diff,
-	patches/newlib-1.14.0-bfinrtems-20060810a.diff,
-	rtems4.7/bfin/.cvsignore, rtems4.7/bfin/Makefile.am,
-	rtems4.7/bfin/binutils-sources.add, rtems4.7/bfin/gcc-sources.add,
-	rtems4.7/bfin/gdb-sources.add: New files.
-
-2006-08-09	Joel Sherrill <joel at OARcorp.com>
-
-	* .cvsignore: Add INSTALL.
-
-2006-07-19  Chris Johns  <chrisj at rtems.org>
-
-        * patches/gcc-core-4.1.1-rtems-20060720.diff:
-        Added patch to fix GCC bug PR28400.
-
-2006-07-13	Joel Sherrill <joel at oarcorp.com>
-
-	* configure.ac, rtems4.7/Makefile.am, rtems4.7/arm/Makefile.am,
-	rtems4.7/arm/gdb-sources.add, rtems4.7/avr/Makefile.am,
-	rtems4.7/avr/gdb-sources.add, rtems4.7/h8300/Makefile.am,
-	rtems4.7/h8300/gdb-sources.add, rtems4.7/i386/Makefile.am,
-	rtems4.7/i386/gdb-sources.add, rtems4.7/m68k/Makefile.am,
-	rtems4.7/m68k/gdb-sources.add, rtems4.7/mips/Makefile.am,
-	rtems4.7/mips/gdb-sources.add, rtems4.7/powerpc/Makefile.am,
-	rtems4.7/powerpc/gdb-sources.add, rtems4.7/sh/Makefile.am,
-	rtems4.7/sh/gdb-sources.add, rtems4.7/sparc/Makefile.am,
-	rtems4.7/sparc/gdb-sources.add, rtems4.7/tic4x/gdb-sources.add:
-	Updated to gdb 6.5
-	* patches/gdb-6.5-rtems-20060713.diff, rtems4.7/mipstx39/.cvsignore,
-	rtems4.7/mipstx39/Makefile.am, rtems4.7/mipstx39/gdb-sources.add: New files.
-
-2006-07-12	Joel Sherrill <joel at oarcorp.com>
-
-	* rtems4.7/arm/gdb-sources.add, rtems4.7/avr/gdb-sources.add,
-	rtems4.7/h8300/gdb-sources.add, rtems4.7/i386/gdb-sources.add,
-	rtems4.7/m68k/gdb-sources.add, rtems4.7/mips/gdb-sources.add,
-	rtems4.7/powerpc/gdb-sources.add, rtems4.7/sh/gdb-sources.add,
-	rtems4.7/sparc/gdb-sources.add, rtems4.7/tic4x/gdb-sources.add:
-	Update gdb to use newer patch. This lets sparc build simulator and
-	mips build at all.
-	* patches/gdb-6.4-rtems-20060712.diff: New file.
-
diff --git a/contrib/crossrpms/Makefile.am b/contrib/crossrpms/Makefile.am
deleted file mode 100644
index f517c98..0000000
--- a/contrib/crossrpms/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-##
-## $Id$
-##
-
-EXTRA_DIST =
-
-SUBDIRS = @HOST_SUBDIRS@ @TARGET_SUBDIRS@
-
-DIST_SUBDIRS  = cygwin
-DIST_SUBDIRS += freebsd6.4
-DIST_SUBDIRS += freebsd7.3
-DIST_SUBDIRS += freebsd8.2
-DIST_SUBDIRS += mingw32
-DIST_SUBDIRS += netbsd5.1
-DIST_SUBDIRS += solaris2.7
-DIST_SUBDIRS += rtems4.11
-
-DIST_SUBDIRS += autotools
-
-EXTRA_DIST += specstrip
-EXTRA_DIST += $(srcdir)/patches/*.diff
-
-install-patches:
-	@rpmsourcedir=`rpm --eval '%_sourcedir'`; \
-	for f in $(srcdir)/patches/*.diff; do \
-	  echo "$(INSTALL_DATA) $$f $$rpmsourcedir"; \
-	  $(INSTALL_DATA) $$f $$rpmsourcedir; \
-	done
diff --git a/contrib/crossrpms/NEWS b/contrib/crossrpms/NEWS
deleted file mode 100644
index 4ddc981..0000000
--- a/contrib/crossrpms/NEWS
+++ /dev/null
@@ -1,19 +0,0 @@
-2006-07-24	Add provisory/preliminary autotools support.
-
-2006-07-23	Rename "*-base-*" packages into <tool>-common.
-		Rename GCC's "*-<lang>" packages into "*-gcc-<lang>".
-		Many small directory ownership fixes.
-		Build all GCC packages with --enable-threads.
-
-2006-07-10	Completely reworked and restructurized.
-
-2006-03-10	Add preliminary rtems-gdb specs.
-		(Immature, incomplete, needs further testing).
-
-2006-03-09	Add fortran and objc to GCC's default languages for freebsd5.2,
-		freebsd6.0 and solaris.
-
-2006-03-02	Pass --enable-sysroot to non-rtems binutils (Required by
-		GCC-4.1 sys-root'ed toolchains).
-
-2006-02-25	Put this package under the GPL.
diff --git a/contrib/crossrpms/README b/contrib/crossrpms/README
deleted file mode 100644
index 3235b73..0000000
--- a/contrib/crossrpms/README
+++ /dev/null
@@ -1,18 +0,0 @@
-
-    Copyright (C) 2006	Ralf Corsépius, Ulm, Germany <ralf.corsepius at rtems.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 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
-
-
diff --git a/contrib/crossrpms/TODO b/contrib/crossrpms/TODO
deleted file mode 100644
index d2748bd..0000000
--- a/contrib/crossrpms/TODO
+++ /dev/null
@@ -1,22 +0,0 @@
-* Improve autotools support:
-- Problem: The autotools packages conflict with OS provided packages
-  for --prefix=/usr.
-
-* Improve info files treatment:
-- Problem: Infos are not target canonicalized. Therefore, installing them to 
-  /usr or /usr/local is likely to conflict with vendor provided infos rsp.
-  locally installed packages. Additionally, installing to /usr/local is
-  completely out of our control.
-- Current approach: Install infos/provide base packages only for
-  $prefix ==/opt/rtems* or if user is forcing them with --enable-infos
-- Consider to canonicalize the infos (How?). Probably better be done by
-  upstream.
-
-* Ada:
-- Consider to remove it (Lack of multilibs renders it unusable for rtems
-  toolchains).
-- Consider to add support for non-multilib'ed toolchains.
-
-* gcc/build.add: Use --languages=fortran instead of f95 for gcc >= 4.1
-  (--languages=f95 is deprecated in gcc >= 4.1)
-
diff --git a/contrib/crossrpms/acinclude.m4 b/contrib/crossrpms/acinclude.m4
deleted file mode 100644
index 28ad8d5..0000000
--- a/contrib/crossrpms/acinclude.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-# RTEMS_CANONICAL_SPLIT(THING)
-# --------------------------
-# Generate the variables THING, THING_{alias cpu vendor os}.
-m4_define([RTEMS_CANONICAL_SPLIT],
-[case $ac_cv_$1 in
-*-*-*) ;;
-*) AC_MSG_ERROR([invalid value of canonical $1]);;
-esac
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_$1
-shift
-$1_cpu=$[1]
-$1_vendor=$[2]
-shift; shift
-[# Remember, the first character of IFS is used to create $]*,
-# except with old shells:
-$1_os=$[*]
-IFS=$ac_save_IFS
-case $$1_os in *\ *) $1_os=`echo "$$1_os" | sed 's/ /-/g'`;; esac
-])# RTEMS_CANONICAL_SPLIT
diff --git a/contrib/crossrpms/autotools/Makefile.am b/contrib/crossrpms/autotools/Makefile.am
deleted file mode 100644
index 5d9cdbd..0000000
--- a/contrib/crossrpms/autotools/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/mkspec.am
-
-AUTOCONF_VERS = 2.68
-AUTOCONF_RPMREL = 4
-include ./autoconf.am
-
-AUTOMAKE_VERS = 1.11.1b
-AUTOMAKE_RPMREL = 1
-include ./automake.am
diff --git a/contrib/crossrpms/autotools/autoconf-sources.add b/contrib/crossrpms/autotools/autoconf-sources.add
deleted file mode 100644
index 826a6b8..0000000
--- a/contrib/crossrpms/autotools/autoconf-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.%{?el5:bz2}%{!?el5:xz}
-
-
-
diff --git a/contrib/crossrpms/autotools/autoconf.add b/contrib/crossrpms/autotools/autoconf.add
deleted file mode 100644
index eaca5b0..0000000
--- a/contrib/crossrpms/autotools/autoconf.add
+++ /dev/null
@@ -1,102 +0,0 @@
-%define srcvers	@AUTOCONF_VERS@
-%define rpmvers %{expand:%(echo "@AUTOCONF_VERS@" | tr - _ )}
-
-%if "%{_prefix}" != "/usr"
-%define name			@rpmprefix at autoconf
-%else
-%define name			autoconf
-%endif
-
-# --with alltests	enable all tests
-%bcond_with		alltests
-
-Name:		%{name}
-License:	GPL
-URL:		http://www.gnu.org/software/autoconf
-Group:		Development/Tools
-Version:	%{rpmvers}
-Release:	@AUTOCONF_RPMREL@
-Summary:	Tool for automatically generating GNU style Makefile.in's
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-BuildRequires: 	perl m4 gawk emacs
-%if "%{version}" >= "2.62"
-BuildRequires:  m4 >= 1.4.5
-%endif
-Requires:     	m4 gawk
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
- at SOURCES@
-
-# remove bogus Autoconf perl dependencies and provides
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Autom4te::
-%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Autom4te::
-
-%description
-GNU's Autoconf is a tool for configuring source code and Makefiles.
-Using Autoconf, programmers can create portable and configurable
-packages, since the person building the package is allowed to
-specify various configuration options.
-You should install Autoconf if you are developing software and you'd
-like to use it to create shell scripts which will configure your
-source code packages.
-Note that the Autoconf package is not required for the end user who
-may be configuring software with an Autoconf-generated script;
-Autoconf is only required for the generation of the scripts, not
-their use.
-
-%prep
-%setup -q -n autoconf-%{srcvers}
-%{?PATCH0:%patch0 -p1}
-
-%if !%{defined fedora}
-# Work around rpm inserting bogus perl-module deps
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-    sed -e '/^perl(Autom4te/d'
-EOF
-%global __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov
-chmod +x %{__perl_provides}
-
-cat << \EOF > %{name}-requ
-#!/bin/sh
-%{__perl_requires} $* |\
-    sed -e '/^perl(Autom4te/d'
-EOF
-%global __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ
-chmod +x %{__perl_requires}
-%endif
-
-%build
-./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
-  --bindir=%{_bindir} --datadir=%{_datadir}
-make
-
-%check
-%if "%{_build}" == "%{_host}"
-%if "%{srcvers}" == "2.68"
-# test 199 fails sporadically
-# test 205 fails deterministically
-TESTSUITEFLAGS='-198 200-204 206-'
-%endif
-
-make check %{!?with_alltests:TESTSUITEFLAGS="${TESTSUITEFLAGS}"}
-%endif
-
-%install
-rm -rf "${RPM_BUILD_ROOT}"
-make DESTDIR=${RPM_BUILD_ROOT} install
-
-# Create this directory to prevent the corresponding line
-# in %%files below to fail
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp
-
-# RTEMS's standards.info comes from binutils
-rm -f $RPM_BUILD_ROOT%{_infodir}/standards.info*
-
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-touch $RPM_BUILD_ROOT%{_infodir}/dir
-
diff --git a/contrib/crossrpms/autotools/autoconf.am b/contrib/crossrpms/autotools/autoconf.am
deleted file mode 100644
index 8e0d714..0000000
--- a/contrib/crossrpms/autotools/autoconf.am
+++ /dev/null
@@ -1,21 +0,0 @@
-AUTOCONF_SUBPACKAGES = $(top_srcdir)/common/common.add
-AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/autoconf.add
-AUTOCONF_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-AUTOCONF_SUBPACKAGES += $(top_srcdir)/common/clean.add
-AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/target-autoconf.add
-
-autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in $(srcdir)/autoconf-sources.add
-	cat $(AUTOCONF_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/autoconf-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]AUTOCONF_VERS[@]/$(AUTOCONF_VERS)/" \
-	  -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)%{?dist}/" > $@
-CLEANFILES += autoconf.spec.in
-
-
- at rpmprefix@autoconf.spec: autoconf.spec.in
-	$(MKSPEC) autoconf.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix at autoconf.spec
-noinst_DATA += @rpmprefix at autoconf.spec
-
-EXTRA_DIST += $(AUTOCONF_SUBPACKAGES)
diff --git a/contrib/crossrpms/autotools/automake-sources.add b/contrib/crossrpms/autotools/automake-sources.add
deleted file mode 100644
index a3ceed3..0000000
--- a/contrib/crossrpms/autotools/automake-sources.add
+++ /dev/null
@@ -1,3 +0,0 @@
-# Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
-Source0: ftp://alpha.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
-
diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add
deleted file mode 100644
index 7e500fe..0000000
--- a/contrib/crossrpms/autotools/automake.add
+++ /dev/null
@@ -1,91 +0,0 @@
-%define rpmvers @AUTOMAKE_VERS@
-%define srcvers	@AUTOMAKE_VERS@
-%define amvers  1.11
-
-%if "%{_prefix}" != "/usr"
-%define name			@rpmprefix at automake
-%define requirements		@rpmprefix at autoconf >= 2.61
-%else
-%define name			automake
-%define requirements		autoconf >= 2.61
-%endif
-
-Name:		%{name}
-URL:		http://sources.redhat.com/automake
-License:	GPL
-Group:		Development/Tools
-Version:	%{rpmvers}
-Release:	@AUTOMAKE_RPMREL@
-Summary:	Tool for automatically generating GNU style Makefile.in's
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-BuildRequires:  %{requirements} perl
-Requires:     	%{requirements}
-Requires(post):	/sbin/install-info
-Requires(preun):/sbin/install-info
-
- at SOURCES@
-
-# remove bogus Automake perl dependencies and provides
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake::
-%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake::
-
-%description
-Automake is a tool for automatically generating "Makefile.in"s from
-files called "Makefile.am". "Makefile.am" is basically a series of
-"make" macro definitions (with rules being thrown in occasionally).
-The generated "Makefile.in"s are compatible to the GNU Makefile
-standards.
-
-%prep
-%setup -q -n automake-%{srcvers}
-%{?PATCH0:%patch0 -p1}
-
-%if !%{defined fedora}
-# Work around rpm inserting bogus perl-module deps
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-    sed -e '/^perl(Automake/d'
-EOF
-%global __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
-chmod +x %{__perl_provides}
-
-cat << \EOF > %{name}-requ
-#!/bin/sh
-%{__perl_requires} $* |\
-    sed -e '/^perl(Automake/d'
-EOF
-%global __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
-chmod +x %{__perl_requires}
-%endif
-
-%build
-PATH=%{_bindir}:$PATH
-case %_host in
-*-mingw32)
-# MinGW ships obsolete perl-5.6.1, which doesn't support threads
-  echo am_cv_prog_PERL_ithreads=no > config.cache
-  ;;
-esac
-
-# Don't use %%configure, it replaces config.sub/config.guess with the 
-# outdated versions bundled with rpm.
-./configure -C --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
-  --bindir=%{_bindir} --datadir=%{_datadir} \
-  --docdir=%{_datadir}/automake-%{amvers}/doc
-make
-
-%install
-rm -rf "$RPM_BUILD_ROOT"
-make DESTDIR=${RPM_BUILD_ROOT} install
-
-%if "%{_prefix}" != "/usr"
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
-echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist
-%endif
-
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-touch $RPM_BUILD_ROOT%{_infodir}/dir
-
diff --git a/contrib/crossrpms/autotools/automake.am b/contrib/crossrpms/autotools/automake.am
deleted file mode 100644
index 87c0567..0000000
--- a/contrib/crossrpms/autotools/automake.am
+++ /dev/null
@@ -1,21 +0,0 @@
-AUTOMAKE_SUBPACKAGES = $(top_srcdir)/common/common.add
-AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/automake.add
-AUTOMAKE_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-AUTOMAKE_SUBPACKAGES += $(top_srcdir)/common/clean.add
-AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add
-
-automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.am $(srcdir)/automake-sources.add
-	cat $(AUTOMAKE_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/automake-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/g" \
-	  -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)%{?dist}/g" > $@
-CLEANFILES += automake.spec.in
-
-
- at rpmprefix@automake.spec: automake.spec.in
-	$(MKSPEC) automake.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix at automake.spec
-noinst_DATA += @rpmprefix at automake.spec
-
-EXTRA_DIST += $(AUTOMAKE_SUBPACKAGES)
diff --git a/contrib/crossrpms/autotools/rtems-4.11-autoconf.spec b/contrib/crossrpms/autotools/rtems-4.11-autoconf.spec
deleted file mode 100644
index b87275a..0000000
--- a/contrib/crossrpms/autotools/rtems-4.11-autoconf.spec
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define srcvers	2.68
-%define rpmvers %{expand:%(echo "2.68" | tr - _ )}
-
-%define name			rtems-4.11-autoconf
-
-# --with alltests	enable all tests
-%bcond_with		alltests
-
-Name:		%{name}
-License:	GPL
-URL:		http://www.gnu.org/software/autoconf
-Group:		Development/Tools
-Version:	%{rpmvers}
-Release:	4%{?dist}
-Summary:	Tool for automatically generating GNU style Makefile.in's
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-BuildRequires: 	perl m4 gawk emacs
-%if "%{version}" >= "2.62"
-BuildRequires:  m4 >= 1.4.5
-%endif
-Requires:     	m4 gawk
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.%{?el5:bz2}%{!?el5:xz}
-
-
-
-
-# remove bogus Autoconf perl dependencies and provides
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Autom4te::
-%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Autom4te::
-
-%description
-GNU's Autoconf is a tool for configuring source code and Makefiles.
-Using Autoconf, programmers can create portable and configurable
-packages, since the person building the package is allowed to
-specify various configuration options.
-You should install Autoconf if you are developing software and you'd
-like to use it to create shell scripts which will configure your
-source code packages.
-Note that the Autoconf package is not required for the end user who
-may be configuring software with an Autoconf-generated script;
-Autoconf is only required for the generation of the scripts, not
-their use.
-
-%prep
-%setup -q -n autoconf-%{srcvers}
-%{?PATCH0:%patch0 -p1}
-
-%if !%{defined fedora}
-# Work around rpm inserting bogus perl-module deps
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-    sed -e '/^perl(Autom4te/d'
-EOF
-%global __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov
-chmod +x %{__perl_provides}
-
-cat << \EOF > %{name}-requ
-#!/bin/sh
-%{__perl_requires} $* |\
-    sed -e '/^perl(Autom4te/d'
-EOF
-%global __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ
-chmod +x %{__perl_requires}
-%endif
-
-%build
-./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
-  --bindir=%{_bindir} --datadir=%{_datadir}
-make
-
-%check
-%if "%{_build}" == "%{_host}"
-%if "%{srcvers}" == "2.68"
-# test 199 fails sporadically
-# test 205 fails deterministically
-TESTSUITEFLAGS='-198 200-204 206-'
-%endif
-
-make check %{!?with_alltests:TESTSUITEFLAGS="${TESTSUITEFLAGS}"}
-%endif
-
-%install
-rm -rf "${RPM_BUILD_ROOT}"
-make DESTDIR=${RPM_BUILD_ROOT} install
-
-# Create this directory to prevent the corresponding line
-# in %%files below to fail
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp
-
-# RTEMS's standards.info comes from binutils
-rm -f $RPM_BUILD_ROOT%{_infodir}/standards.info*
-
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/install-info  --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz ||:
-
-%preun
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz ||:
-fi   
-
-%files
-%defattr(-,root,root)
-# %doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%dir %{_bindir}
-%{_bindir}/*
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-
-%{_infodir}/autoconf.info*
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/*
-%dir %{_datadir}
-%{_datadir}/autoconf
-%exclude %{_datadir}/emacs/site-lisp
diff --git a/contrib/crossrpms/autotools/rtems-4.11-automake.spec b/contrib/crossrpms/autotools/rtems-4.11-automake.spec
deleted file mode 100644
index f516156..0000000
--- a/contrib/crossrpms/autotools/rtems-4.11-automake.spec
+++ /dev/null
@@ -1,189 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define rpmvers 1.11.1b
-%define srcvers	1.11.1b
-%define amvers  1.11
-
-%define name			rtems-4.11-automake
-%define requirements		rtems-4.11-autoconf >= 2.61
-
-Name:		%{name}
-URL:		http://sources.redhat.com/automake
-License:	GPL
-Group:		Development/Tools
-Version:	%{rpmvers}
-Release:	1%{?dist}
-Summary:	Tool for automatically generating GNU style Makefile.in's
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-BuildRequires:  %{requirements} perl
-Requires:     	%{requirements}
-Requires(post):	/sbin/install-info
-Requires(preun):/sbin/install-info
-
-# Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
-Source0: ftp://alpha.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
-
-
-# remove bogus Automake perl dependencies and provides
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake::
-%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake::
-
-%description
-Automake is a tool for automatically generating "Makefile.in"s from
-files called "Makefile.am". "Makefile.am" is basically a series of
-"make" macro definitions (with rules being thrown in occasionally).
-The generated "Makefile.in"s are compatible to the GNU Makefile
-standards.
-
-%prep
-%setup -q -n automake-%{srcvers}
-%{?PATCH0:%patch0 -p1}
-
-%if !%{defined fedora}
-# Work around rpm inserting bogus perl-module deps
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-    sed -e '/^perl(Automake/d'
-EOF
-%global __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
-chmod +x %{__perl_provides}
-
-cat << \EOF > %{name}-requ
-#!/bin/sh
-%{__perl_requires} $* |\
-    sed -e '/^perl(Automake/d'
-EOF
-%global __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
-chmod +x %{__perl_requires}
-%endif
-
-%build
-PATH=%{_bindir}:$PATH
-case %_host in
-*-mingw32)
-# MinGW ships obsolete perl-5.6.1, which doesn't support threads
-  echo am_cv_prog_PERL_ithreads=no > config.cache
-  ;;
-esac
-
-# Don't use %%configure, it replaces config.sub/config.guess with the 
-# outdated versions bundled with rpm.
-./configure -C --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
-  --bindir=%{_bindir} --datadir=%{_datadir} \
-  --docdir=%{_datadir}/automake-%{amvers}/doc
-make
-
-%install
-rm -rf "$RPM_BUILD_ROOT"
-make DESTDIR=${RPM_BUILD_ROOT} install
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
-echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist
-
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%post 
-/sbin/install-info  --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||:
-
-%preun
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||:
-fi
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%dir %{_bindir}
-%{_bindir}/aclocal*
-%{_bindir}/automake*
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/automake.info*.gz
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/*
-%dir %{_datadir}
-%{_datadir}/aclocal
-%{_datadir}/aclocal-%{amvers}
-%{_datadir}/automake-%{amvers}
-
diff --git a/contrib/crossrpms/autotools/target-autoconf.add b/contrib/crossrpms/autotools/target-autoconf.add
deleted file mode 100644
index e8d8508..0000000
--- a/contrib/crossrpms/autotools/target-autoconf.add
+++ /dev/null
@@ -1,23 +0,0 @@
-%post
-/sbin/install-info  --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz ||:
-
-%preun
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz ||:
-fi   
-
-%files
-%defattr(-,root,root)
-# %doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%sysdir %{_bindir}
-%{_bindir}/*
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-
-%{_infodir}/autoconf.info*
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/*
-%sysdir %{_datadir}
-%{_datadir}/autoconf
-%exclude %{_datadir}/emacs/site-lisp
diff --git a/contrib/crossrpms/autotools/target-automake.add b/contrib/crossrpms/autotools/target-automake.add
deleted file mode 100644
index 4658da4..0000000
--- a/contrib/crossrpms/autotools/target-automake.add
+++ /dev/null
@@ -1,27 +0,0 @@
-%post 
-/sbin/install-info  --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||:
-
-%preun
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||:
-fi
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%sysdir %{_bindir}
-%{_bindir}/aclocal*
-%{_bindir}/automake*
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/automake.info*.gz
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/*
-%sysdir %{_datadir}
-%if "%{_prefix}" != "/usr"
-%{_datadir}/aclocal
-%endif
-%{_datadir}/aclocal-%{amvers}
-%{_datadir}/automake-%{amvers}
-
diff --git a/contrib/crossrpms/binutils/base-binutils.add b/contrib/crossrpms/binutils/base-binutils.add
deleted file mode 100644
index 9507c0b..0000000
--- a/contrib/crossrpms/binutils/base-binutils.add
+++ /dev/null
@@ -1,52 +0,0 @@
-%if %build_infos
-# ==============================================================
-# @rpmprefix at binutils-common
-# ==============================================================
-%package -n @rpmprefix at binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n @rpmprefix at binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n @rpmprefix at binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n @rpmprefix at binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n @rpmprefix at binutils-common
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%sysdir %{_prefix}/share
-%sysdir %{_prefix}/share/locale
-%endif
-
diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add
deleted file mode 100644
index f1ca500..0000000
--- a/contrib/crossrpms/binutils/binutils.add
+++ /dev/null
@@ -1,40 +0,0 @@
-%define binutils_pkgvers @BINUTILS_PKGVERS@
-%define binutils_version @BINUTILS_VERS@
-%define binutils_rpmvers %{expand:%(echo "@BINUTILS_VERS@" | tr - _ )}
-
-Name:		@rpmprefix@@tool_target at -binutils
-Summary:	Binutils for target @tool_target@
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	@BINUTILS_RPMREL@
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-%if %build_infos
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%else
-%if "@tool_target@" == "i686-pc-cygwin"
-BuildRequires:	texinfo >= 4.2
-%endif
-%endif
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-%if %build_infos
-
-Requires:	@rpmprefix at binutils-common
-%endif
-
- at SOURCES@
-
-%description
-Cross binutils for target @tool_target@
diff --git a/contrib/crossrpms/binutils/build.add b/contrib/crossrpms/binutils/build.add
deleted file mode 100644
index 16cb5bb..0000000
--- a/contrib/crossrpms/binutils/build.add
+++ /dev/null
@@ -1,29 +0,0 @@
-%build
-%if "%{_prefix}" != "/usr"
-  export PATH="%{_bindir}:${PATH}"
-%endif
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=@tool_target@ \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --with-sysroot=%{_prefix}/@tool_target@/sys-root \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-%if %build_infos
-  make info
-%endif
-  cd ..
-
diff --git a/contrib/crossrpms/binutils/install.add b/contrib/crossrpms/binutils/install.add
deleted file mode 100644
index d31d839..0000000
--- a/contrib/crossrpms/binutils/install.add
+++ /dev/null
@@ -1,53 +0,0 @@
-%install
-%if "%{_prefix}" != "/usr"
-  export PATH="%{_bindir}:${PATH}"
-%endif
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-%if %build_infos
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-%endif
-
-%if %build_infos
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-%else
-# Conflict with a native binutils' infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-%endif
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target at -dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target at -dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target at -nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target at -nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target at -windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target at -windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target at -windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target at -windmc*
-  fi
-
-  cd ..
-
diff --git a/contrib/crossrpms/binutils/prep.add b/contrib/crossrpms/binutils/prep.add
deleted file mode 100644
index 3f2f719..0000000
--- a/contrib/crossrpms/binutils/prep.add
+++ /dev/null
@@ -1,8 +0,0 @@
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
diff --git a/contrib/crossrpms/binutils/rpm-install.add b/contrib/crossrpms/binutils/rpm-install.add
deleted file mode 100644
index 07efd8f..0000000
--- a/contrib/crossrpms/binutils/rpm-install.add
+++ /dev/null
@@ -1,32 +0,0 @@
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-%if "%{_prefix}" != "/usr"
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-%endif
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-%if "%{_prefix}" != "/usr"
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-%endif
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
diff --git a/contrib/crossrpms/binutils/target-binutils.add b/contrib/crossrpms/binutils/target-binutils.add
deleted file mode 100644
index 4ffce14..0000000
--- a/contrib/crossrpms/binutils/target-binutils.add
+++ /dev/null
@@ -1,31 +0,0 @@
-# ==============================================================
-# @tool_target at -binutils
-# ==============================================================
-# %package -n @rpmprefix@@tool_target at -binutils
-# Summary:      rtems binutils for @tool_target@
-# Group: Development/Tools
-# %if %build_infos
-# Requires: @rpmprefix at binutils-common
-# %endif
-
-%description -n @rpmprefix@@tool_target at -binutils
-GNU binutils targetting @tool_target at .
-
-%files -n @rpmprefix@@tool_target at -binutils
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_datarootdir}
-
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/@tool_target at -*.1*
-
-%sysdir %{_bindir}
-%{_bindir}/@tool_target at -*
-
-%dir %{_exec_prefix}/@tool_target@
-%dir %{_exec_prefix}/@tool_target@/bin
-%{_exec_prefix}/@tool_target@/bin/*
-
-%dir %{_exec_prefix}/@tool_target@/lib
-%{_exec_prefix}/@tool_target@/lib/ldscripts
diff --git a/contrib/crossrpms/bootstrap b/contrib/crossrpms/bootstrap
deleted file mode 100755
index 378696c..0000000
--- a/contrib/crossrpms/bootstrap
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-autoreconf -fis
diff --git a/contrib/crossrpms/common/clean.add b/contrib/crossrpms/common/clean.add
deleted file mode 100644
index 4765590..0000000
--- a/contrib/crossrpms/common/clean.add
+++ /dev/null
@@ -1,3 +0,0 @@
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
diff --git a/contrib/crossrpms/common/common.add b/contrib/crossrpms/common/common.add
deleted file mode 100644
index e354c73..0000000
--- a/contrib/crossrpms/common/common.add
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%if "%{_prefix}" != "/usr"
-%define _prefix                 @_prefix@
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-%endif
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
diff --git a/contrib/crossrpms/configure.ac b/contrib/crossrpms/configure.ac
deleted file mode 100644
index 37c5411..0000000
--- a/contrib/crossrpms/configure.ac
+++ /dev/null
@@ -1,178 +0,0 @@
-## $Id$
-
-m4_define([RTEMS_API],[4.11])
-
-AC_PREREQ([2.68])
-AC_INIT([crossrpms],[0.20110310.0],[http://www.rtems.org/bugzilla])
-AC_CONFIG_SRCDIR([binutils/binutils.add])
-AC_CONFIG_AUX_DIR(.)
-
-AC_CANONICAL_HOST
-
-AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
-
-AM_INIT_AUTOMAKE([1.11.1])
-
-AC_ARG_ENABLE([targets],
-  AS_HELP_STRING([--enable-targets=<targets>],[build for targets <targets>]),
-  [targets="$enable_targets"],
-  [targets=rtems]
-)
-
-case $targets in
-rtems )
-  savdir=`pwd`
-  cd $srcdir
-  targets=
-  for d in rtems*/*/Makefile.am; do
-      o=`echo $d | sed -e 's,/.*,,'`
-      a=`echo $d | sed -e 's,/Makefile\.am,,;s,.*/,,'`
-      targets="$targets $a-$o"
-  done
-  cd $savdir
-  ;;
-all )
-  savdir=`pwd`
-  cd $srcdir
-  targets=
-  for d in rtems*/*/Makefile.am; do
-      o=`echo $d | sed -e 's,/.*,,'`
-      a=`echo $d | sed -e 's,/Makefile\.am,,;s,.*/,,'`
-      targets="$targets $a-$o"
-  done
-  for d in freebsd*/*/Makefile.am \
-    netbsd*/*/Makefile.am \
-    cygwin*/*/Makefile.am \
-    mingw*/*/Makefile.am; \
-  do
-      o=`echo $d | sed -e 's,/.*,,'`
-      a=`echo $d | sed -e 's,/Makefile\.am,,;s,.*/,,'`
-      targets="$targets $a-pc-$o"
-  done
-  for d in solaris*/*/Makefile.am; \
-  do
-      o=`echo $d | sed -e 's,/.*,,'`
-      a=`echo $d | sed -e 's,/Makefile\.am,,;s,.*/,,'`
-      targets="$targets $a-sun-$o"
-  done
-  cd $savdir
-  ;;
-esac
-
-case "$prefix" in
-/usr)
-  sysdirpattern="/%sysdir/d"
-  rpmprefix=
-  host_subdirs=
-  ;;
-/usr/local)
-  sysdirpattern="/%sysdir/d"
-  rpmprefix="local-"
-  host_subdirs=autotools
-  ;;
-/opt/rtems)
-  sysdirpattern="s/^%sysdir/%dir/g"
-  rpmprefix="rtems-"
-  host_subdirs=autotools
-  ;;
-NONE|${ac_default_prefix}) # Default prefix
-  sysdirpattern="s/^%sysdir/%dir/g"
-  rpmprefix="[rtems-]RTEMS_API[-]"
-  host_subdirs=autotools
-  ;;
-*)
-  sysdirpattern="s/^%sysdir/%dir/g"
-  rpmprefix="custom-"
-  host_subdirs=autotools
-  ;;
-esac
-AC_SUBST(sysdirpattern)
-AC_SUBST(HOST_SUBDIRS,$host_subdirs)
-
-AC_ARG_ENABLE([rpmprefix],
-[  --enable-rpmprefix=<rpmprefix>      prefix rpms],[
-  case "$enable_rpmprefix" in
-  yes) # ignore, use default
-    ;;
-  no) rpmprefix=
-    ;;
-  *) # presume user knows what he is doing
-    rpmprefix=$enable_rpmprefix;;
-  esac
-])
-AC_SUBST(rpmprefix)
-
-SPECSTRIP_OPTS=
-
-AC_ARG_ENABLE([infos],
-[  --enable-infos                      enable building infos],[
-  case "$enable_infos" in
-  yes)
-    SPECSTRIP_OPTS="$SPECSTRIP_OPTS --enable-infos";;
-  no)
-    SPECSTRIP_OPTS="$SPECSTRIP_OPTS --disable-infos";;
-  *)
-    AC_MSG_ERROR([Invalid argument to --enable-infos])
-  esac
-])
-AC_SUBST(SPECSTRIP_OPTS)
-
-for f in $targets; do
-ac_cv_mytarget=`$SHELL "$ac_aux_dir/config.sub" $f` ||
-  AC_MSG_ERROR([$SHELL $ac_aux_dir/config.sub $f failed])
-  RTEMS_CANONICAL_SPLIT(mytarget)
-
-  AS_IF([test -d $srcdir/$mytarget_os/$mytarget_cpu],[
-    target_subdirs="$target_subdirs $mytarget_os/$mytarget_cpu"],[
-    AC_MSG_WARN([ignoring unsupported target $f])
-    ])
-done
-AC_SUBST(TARGET_SUBDIRS,$target_subdirs)
-AC_SUBST(rtems_api,RTEMS_API)
-
-AC_CONFIG_FILES([Makefile])
-
-AC_CONFIG_FILES([cygwin/Makefile])
-AC_CONFIG_FILES([cygwin/i686/Makefile])
-
-AC_CONFIG_FILES([mingw32/Makefile])
-AC_CONFIG_FILES([mingw32/i686/Makefile])
-
-AC_CONFIG_FILES([solaris2.7/Makefile])
-AC_CONFIG_FILES([solaris2.7/sparc/Makefile])
-
-AC_CONFIG_FILES([freebsd6.4/Makefile])
-AC_CONFIG_FILES([freebsd6.4/i586/Makefile])
-
-AC_CONFIG_FILES([freebsd7.3/Makefile])
-AC_CONFIG_FILES([freebsd7.3/i586/Makefile])
-
-AC_CONFIG_FILES([freebsd8.2/Makefile])
-AC_CONFIG_FILES([freebsd8.2/i586/Makefile])
-AC_CONFIG_FILES([freebsd8.2/x86_64/Makefile])
-
-AC_CONFIG_FILES([netbsd5.1/Makefile])
-AC_CONFIG_FILES([netbsd5.1/i386/Makefile])
-AC_CONFIG_FILES([netbsd5.1/x86_64/Makefile])
-
-AC_CONFIG_FILES([rtems4.11/Makefile])
-AC_CONFIG_FILES([rtems4.11/arm/Makefile])
-AC_CONFIG_FILES([rtems4.11/arm-eabi/Makefile])
-AC_CONFIG_FILES([rtems4.11/avr/Makefile])
-AC_CONFIG_FILES([rtems4.11/bfin/Makefile])
-AC_CONFIG_FILES([rtems4.11/h8300/Makefile])
-AC_CONFIG_FILES([rtems4.11/i386/Makefile])
-AC_CONFIG_FILES([rtems4.11/lm32/Makefile])
-AC_CONFIG_FILES([rtems4.11/m32c/Makefile])
-AC_CONFIG_FILES([rtems4.11/m32r/Makefile])
-AC_CONFIG_FILES([rtems4.11/m68k/Makefile])
-AC_CONFIG_FILES([rtems4.11/mips/Makefile])
-AC_CONFIG_FILES([rtems4.11/mipstx39/Makefile])
-AC_CONFIG_FILES([rtems4.11/powerpc/Makefile])
-AC_CONFIG_FILES([rtems4.11/sh/Makefile])
-AC_CONFIG_FILES([rtems4.11/sparc/Makefile])
-AC_CONFIG_FILES([rtems4.11/sparc64/Makefile])
-
-AC_CONFIG_FILES([autotools/Makefile])
-
-AC_OUTPUT
diff --git a/contrib/crossrpms/cpukit/build.add b/contrib/crossrpms/cpukit/build.add
deleted file mode 100644
index cd42b08..0000000
--- a/contrib/crossrpms/cpukit/build.add
+++ /dev/null
@@ -1,16 +0,0 @@
-%build
-%if "%{_prefix}" != "/usr"
-  export PATH="%{_bindir}:${PATH}"
-%endif
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=@tool_target@ \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
diff --git a/contrib/crossrpms/cpukit/cpukit.add b/contrib/crossrpms/cpukit/cpukit.add
deleted file mode 100644
index f63b1c7..0000000
--- a/contrib/crossrpms/cpukit/cpukit.add
+++ /dev/null
@@ -1,24 +0,0 @@
-
-%define cpukit_pkgvers @CPUKIT_PKGVERS@
-%define cpukit_version @CPUKIT_VERS@
-%define cpukit_rpmvers %{expand:%(echo "@CPUKIT_PKGVERS@" | tr - . )}
-
-Name:         	@rpmprefix@@tool_target at -cpukit
-Summary:      	@tool_target@ cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	@CPUKIT_RPMREL@
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	@rpmprefix@@tool_target at -gcc
-
- at SOURCES@
-
-%description
-RTEMS cpukit for @tool_target at .
diff --git a/contrib/crossrpms/cpukit/install.add b/contrib/crossrpms/cpukit/install.add
deleted file mode 100644
index 8c83a4c..0000000
--- a/contrib/crossrpms/cpukit/install.add
+++ /dev/null
@@ -1,11 +0,0 @@
-%install
-  rm -rf $RPM_BUILD_ROOT
-%if "%{_prefix}" != "/usr"
-  export PATH="%{_bindir}:${PATH}"
-%endif
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
diff --git a/contrib/crossrpms/cpukit/prep.add b/contrib/crossrpms/cpukit/prep.add
deleted file mode 100644
index 8c2e43c..0000000
--- a/contrib/crossrpms/cpukit/prep.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
- at PREP@
diff --git a/contrib/crossrpms/cpukit/rpm-install.add b/contrib/crossrpms/cpukit/rpm-install.add
deleted file mode 100644
index 6121fae..0000000
--- a/contrib/crossrpms/cpukit/rpm-install.add
+++ /dev/null
@@ -1,49 +0,0 @@
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-%if "%{_prefix}" != "/usr"
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-%endif
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-%if "%{_prefix}" != "/usr"
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-%endif
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/@tool_target@/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/@tool_target@/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
diff --git a/contrib/crossrpms/cpukit/target-cpukit.add b/contrib/crossrpms/cpukit/target-cpukit.add
deleted file mode 100644
index 79b873d..0000000
--- a/contrib/crossrpms/cpukit/target-cpukit.add
+++ /dev/null
@@ -1,9 +0,0 @@
-%description -n @rpmprefix@@tool_target at -cpukit
-RTEMS cpukit for target @tool_target at .
-
-%files -n @rpmprefix@@tool_target at -cpukit
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%{_prefix}/@tool_target@
-# Violates the FHS
-%exclude %{_prefix}/make
\ No newline at end of file
diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am
deleted file mode 100644
index cc27914..0000000
--- a/contrib/crossrpms/cygwin/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-SUBDIRS = i686
diff --git a/contrib/crossrpms/cygwin/binutils.am b/contrib/crossrpms/cygwin/binutils.am
deleted file mode 100644
index f480431..0000000
--- a/contrib/crossrpms/cygwin/binutils.am
+++ /dev/null
@@ -1,31 +0,0 @@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_OPTS =
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add $(srcdir)/../binutils.am
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  | $(MKSPEC0) \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \
-	  > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
- at rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
-EXTRA_DIST += $(BINUTILS_SUBPACKAGES)
diff --git a/contrib/crossrpms/cygwin/cloog_ppl.am b/contrib/crossrpms/cygwin/cloog_ppl.am
deleted file mode 100644
index c27381c..0000000
--- a/contrib/crossrpms/cygwin/cloog_ppl.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-cloog-ppl.add
-EXTRA_DIST += cloog-ppl.add
-
-CLOOG_PPL_SUBPACKAGES = $(top_srcdir)/common/common.add
-CLOOG_PPL_SUBPACKAGES += $(srcdir)/cloog-ppl.add
-CLOOG_PPL_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-CLOOG_PPL_SUBPACKAGES += $(top_srcdir)/common/clean.add
-CLOOG_PPL_SUBPACKAGES += $(srcdir)/target-cloog-ppl.add
-
-$(TARGET)-cloog-ppl.spec.in: $(CLOOG_PPL_SUBPACKAGES) Makefile.am
-	cat $(CLOOG_PPL_SUBPACKAGES) | sed \
-	  -e "s/[@]CLOOG_PPL_VERS[@]/$(CLOOG_PPL_VERS)/g" \
-	  -e "s/[@]CLOOG_PPL_RPMREL[@]/$(CLOOG_PPL_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{cloog_ppl_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-cloog-ppl.spec.in
-CLEANFILES += $(TARGET)-cloog-ppl.spec.in
-	                      
- at rpmprefix@$(TARGET)-cloog-ppl.spec: $(TARGET)-cloog-ppl.spec.in
-	$(MKSPEC) $(TARGET)-cloog-ppl.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-cloog-ppl.spec
-noinst_DATA += @rpmprefix@$(TARGET)-cloog-ppl.spec
diff --git a/contrib/crossrpms/cygwin/cygwin.am b/contrib/crossrpms/cygwin/cygwin.am
deleted file mode 100644
index 6c0473a..0000000
--- a/contrib/crossrpms/cygwin/cygwin.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += libs.add
-EXTRA_DIST += target-libs.add
-
-LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add
-LIBS_SUBPACKAGES += $(srcdir)/libs.add
-LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-LIBS_SUBPACKAGES += $(srcdir)/target-libs.add
-
-$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
-	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s/[@]CYGWIN_VERS[@]/$(CYGWIN_VERS)/g" \
-	  -e "s/[@]CYGWIN_RPMREL[@]/$(CYGWIN_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{cygwin_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-libs.spec.in
-CLEANFILES += $(TARGET)-libs.spec.in
-	                      
- at rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
-	$(MKSPEC) $(TARGET)-libs.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
-noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
diff --git a/contrib/crossrpms/cygwin/expat.am b/contrib/crossrpms/cygwin/expat.am
deleted file mode 100644
index 3c9ae5d..0000000
--- a/contrib/crossrpms/cygwin/expat.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-expat.add
-EXTRA_DIST += expat.add
-
-EXPAT_SUBPACKAGES = $(top_srcdir)/common/common.add
-EXPAT_SUBPACKAGES += $(srcdir)/expat.add
-EXPAT_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-EXPAT_SUBPACKAGES += $(top_srcdir)/common/clean.add
-EXPAT_SUBPACKAGES += $(srcdir)/target-expat.add
-
-$(TARGET)-expat.spec.in: $(EXPAT_SUBPACKAGES) Makefile.am
-	cat $(EXPAT_SUBPACKAGES) | sed \
-	  -e "s/[@]EXPAT_VERS[@]/$(EXPAT_VERS)/g" \
-	  -e "s/[@]EXPAT_RPMREL[@]/$(EXPAT_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{expat_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-expat.spec.in
-CLEANFILES += $(TARGET)-expat.spec.in
-	                      
- at rpmprefix@$(TARGET)-expat.spec: $(TARGET)-expat.spec.in
-	$(MKSPEC) $(TARGET)-expat.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-expat.spec
-noinst_DATA += @rpmprefix@$(TARGET)-expat.spec
diff --git a/contrib/crossrpms/cygwin/gcc-prep.add b/contrib/crossrpms/cygwin/gcc-prep.add
deleted file mode 100644
index f428311..0000000
--- a/contrib/crossrpms/cygwin/gcc-prep.add
+++ /dev/null
@@ -1,9 +0,0 @@
-# cygwin patches can't be directly applied through rpm
-cd gcc-%{gcc_pkgvers}
-%if "%{gcc_version}" < "4.0"
-patch -p1 -t < %{PATCH70} || true
-%else
-patch -p2 -t < %{PATCH70} || true
-%endif
-%{?PATCH71:patch -p1 < %{PATCH71}}
-cd ..
diff --git a/contrib/crossrpms/cygwin/gcc.am b/contrib/crossrpms/cygwin/gcc.am
deleted file mode 100644
index 51b12a6..0000000
--- a/contrib/crossrpms/cygwin/gcc.am
+++ /dev/null
@@ -1,40 +0,0 @@
-EXTRA_DIST += $(srcdir)/../gcc-prep.add
-EXTRA_DIST += $(srcdir)/gcc-sources.add
-
-GCC_OPTS =
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
-	cat $(GCC_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/^BuildRequ.*[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "s,[@]tool_target[@]-w32api-sys-root, at tool_target@-w32api," \
-	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
- at rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
-	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
-
-EXTRA_DIST += $(GCC_SUBPACKAGES)
diff --git a/contrib/crossrpms/cygwin/gmp.am b/contrib/crossrpms/cygwin/gmp.am
deleted file mode 100644
index ab5a542..0000000
--- a/contrib/crossrpms/cygwin/gmp.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-gmp.add
-EXTRA_DIST += gmp.add
-
-GMP_SUBPACKAGES = $(top_srcdir)/common/common.add
-GMP_SUBPACKAGES += $(srcdir)/gmp.add
-GMP_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GMP_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GMP_SUBPACKAGES += $(srcdir)/target-gmp.add
-
-$(TARGET)-gmp.spec.in: $(GMP_SUBPACKAGES) Makefile.am
-	cat $(GMP_SUBPACKAGES) | sed \
-	  -e "s/[@]GMP_VERS[@]/$(GMP_VERS)/g" \
-	  -e "s/[@]GMP_RPMREL[@]/$(GMP_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{gmp_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-gmp.spec.in
-CLEANFILES += $(TARGET)-gmp.spec.in
-	                      
- at rpmprefix@$(TARGET)-gmp.spec: $(TARGET)-gmp.spec.in
-	$(MKSPEC) $(TARGET)-gmp.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gmp.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gmp.spec
diff --git a/contrib/crossrpms/cygwin/i686/Makefile.am b/contrib/crossrpms/cygwin/i686/Makefile.am
deleted file mode 100644
index 790b429..0000000
--- a/contrib/crossrpms/cygwin/i686/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id$
-
-TARGET = i686-pc-cygwin
-
-include $(top_srcdir)/mkspec.am
-
-CYGWIN_VERS = 1.7.9-1
-CYGWIN_RPMREL = 0.20110427.0%{?dist}
-include ../cygwin.am
-
-CLOOG_PPL_VERS = 0.15.7-1
-CLOOG_PPL_RPMREL = 0.20100204.0%{?dist}
-include ../cloog_ppl.am
-
-W32API_VERS = 3.17-2
-W32API_RPMREL = 0.20110427.0%{?dist}
-include ../w32api.am
-
-NCURSES_VERS = 5.7-18
-NCURSES_RPMREL = 0.20100204.0%{?dist}
-include ../ncurses.am
-
-EXPAT_VERS = 2.0.1-1
-EXPAT_RPMREL = 0.20090903.0%{?dist}
-include ../expat.am
-
-READLINE_VERS = 6.1.2-2
-READLINE_RPMREL = 0.20111214.0%{?dist}
-include ../readline.am
-
-TERMCAP_VERS = 20050421-1
-TERMCAP_RPMREL = 0.20090827.0%{?dist}
-include ../termcap.am
-
-TERMINFO_VERS = 5.7_20091114-14
-TERMINFO_RPMREL = 0.20100726.0%{?dist}
-include ../terminfo.am
-
-ZLIB_VERS = 1.2.5-1
-ZLIB_RPMREL = 0.20110427.0%{?dist}
-include ../zlib.am
-
-GMP_VERS = 4.3.1-3
-GMP_RPMREL = 0.20100204.0%{?dist}
-include ../gmp.am
-
-MPC_VERS = 0.8-1
-MPC_RPMREL = 0.20100322.0%{?dist}
-include ../mpc.am
-
-MPFR_VERS = 2.4.1-4
-MPFR_RPMREL = 0.20100204.0%{?dist}
-include ../mpfr.am
-
-# Cygwin's binutils' versioning is bizarre
-# Check bfd/configure for the real version number
-BINUTILS_VERS = 2.20.51-2
-BINUTILS_PKGVERS = 2.20.51-2
-BINUTILS_RPMREL = 0.20110427.0
-include ../binutils.am
-BINUTILS_OPTS += --disable-infos
-
-GCC_VERS = 3.4.4
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20110310.0
-include ../gcc.am
-GCC_OPTS += --languages=c,cxx
-GCC_OPTS += --disable-infos
diff --git a/contrib/crossrpms/cygwin/i686/binutils-sources.add b/contrib/crossrpms/cygwin/i686/binutils-sources.add
deleted file mode 100644
index 199ea93..0000000
--- a/contrib/crossrpms/cygwin/i686/binutils-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0:	ftp://cygwin.com/pub/cygwin/release/binutils/binutils-%{binutils_pkgvers}-src.tar.bz2
diff --git a/contrib/crossrpms/cygwin/i686/cloog-ppl.add b/contrib/crossrpms/cygwin/i686/cloog-ppl.add
deleted file mode 100644
index 54b69ca..0000000
--- a/contrib/crossrpms/cygwin/i686/cloog-ppl.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%define cloog_ppl_version @CLOOG_PPL_VERS@
-%define cloog_ppl_rpmvers %{expand:%(echo @CLOOG_PPL_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -cloog-ppl
-Release:      @CLOOG_PPL_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%cloog_ppl_rpmvers
-Summary:      	Cygwin cloog-ppl Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/cloog-ppl-%{cloog_ppl_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/libcloog0/libcloog0-%{cloog_ppl_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/libcloog-devel/libcloog-devel-%{cloog_ppl_version}.tar.bz2
-
-Provides:	@rpmprefix@@tool_target at -cloog-ppl = %{version}-%{release}
-Provides:       @rpmprefix@@tool_target at -cloog-ppl-devel = %{version}-%{release}
-
-%description
-Cygwin cloog-ppl libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE0})
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE1})
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/cygwin/i686/expat.add b/contrib/crossrpms/cygwin/i686/expat.add
deleted file mode 100644
index 1f3ac1c..0000000
--- a/contrib/crossrpms/cygwin/i686/expat.add
+++ /dev/null
@@ -1,40 +0,0 @@
-%define expat_version @EXPAT_VERS@
-%define expat_rpmvers %{expand:%(echo @EXPAT_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -expat
-Release:      @EXPAT_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%expat_rpmvers
-Summary:      	Cygwin expat Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/expat/expat-%{expat_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/expat/libexpat1/libexpat1-%{expat_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/expat/libexpat1-devel/libexpat1-devel-%{expat_version}.tar.bz2
-
-Provides:       @rpmprefix@@tool_target at -expat-devel = %{version}-%{release}
-
-%description
-Cygwin expat libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  (cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE0})
-  (cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE1})
-  (cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/cygwin/i686/gcc-sources.add b/contrib/crossrpms/cygwin/i686/gcc-sources.add
deleted file mode 100644
index 02fc112..0000000
--- a/contrib/crossrpms/cygwin/i686/gcc-sources.add
+++ /dev/null
@@ -1,42 +0,0 @@
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
- at PATCH0@
-
-%if %build_cxx
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
- at PATCH1@
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
- at PATCH2@
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
- at PATCH3@
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
- at PATCH4@
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
- at PATCH5@
-%endif
-
-%if "%{gcc_version}" == "3.4.4"
-# Cygwin patch extracted from
-# ftp://sourceware.org/pub/cygwin/release/gcc/gcc-3.4.4-3-src.tar.bz2
-Patch70: gcc-3.4.4-3.patch
-
-Patch71: cygwin-gcc-3.4.4-3.diff
-%endif
-%if "%{gcc_version}" == "4.3.4"
-# Cygwin patch extracted from
-# ftp://sourceware.org/pub/cygwin/release/gcc4/gcc4-4.3.4-3-src.tar.bz2
-Patch70: gcc4-4.3.4-3.src.patch
-
-Patch71: cygwin-gcc4-4.3.4-3.diff
-%endif
diff --git a/contrib/crossrpms/cygwin/i686/gmp.add b/contrib/crossrpms/cygwin/i686/gmp.add
deleted file mode 100644
index 8092c09..0000000
--- a/contrib/crossrpms/cygwin/i686/gmp.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%define gmp_version @GMP_VERS@
-%define gmp_rpmvers %{expand:%(echo @GMP_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -gmp
-Release:      @GMP_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%gmp_rpmvers
-Summary:      	Cygwin gmp Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/gmp/gmp-%{gmp_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/gmp/libgmp3/libgmp3-%{gmp_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/gmp/libgmp-devel/libgmp-devel-%{gmp_version}.tar.bz2
-
-Provides:	@rpmprefix@@tool_target at -gmp-devel = %{version}-%{release}
-
-%description
-Cygwin gmp libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  ( cd @tool_target@/sys-root; %{__tar} xvjf %{SOURCE0})
-  ( cd @tool_target@/sys-root; %{__tar} xvjf %{SOURCE1})
-  ( cd @tool_target@/sys-root; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec
deleted file mode 100644
index 6adfe47..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.20.51-2
-%define binutils_version 2.20.51-2
-%define binutils_rpmvers %{expand:%(echo "2.20.51-2" | tr - _ )}
-
-Name:		i686-pc-cygwin-binutils
-Summary:	Binutils for target i686-pc-cygwin
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	0.20110427.0%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/binutils/binutils-%{binutils_pkgvers}-src.tar.bz2
-
-%description
-Cross binutils for target i686-pc-cygwin
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=i686-pc-cygwin \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --with-sysroot=%{_prefix}/i686-pc-cygwin/sys-root \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-
-# Conflict with a native binutils' infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i686-pc-cygwin-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i686-pc-cygwin-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i686-pc-cygwin-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i686-pc-cygwin-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i686-pc-cygwin-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i686-pc-cygwin-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i686-pc-cygwin-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i686-pc-cygwin-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i686-pc-cygwin-binutils
-# ==============================================================
-# %package -n i686-pc-cygwin-binutils
-# Summary:      rtems binutils for i686-pc-cygwin
-# Group: Development/Tools
-# %if %build_infos
-# Requires: binutils-common
-# %endif
-
-%description -n i686-pc-cygwin-binutils
-GNU binutils targetting i686-pc-cygwin.
-
-%files -n i686-pc-cygwin-binutils
-%defattr(-,root,root)
-
-%{_mandir}/man1/i686-pc-cygwin-*.1*
-
-%{_bindir}/i686-pc-cygwin-*
-
-%dir %{_exec_prefix}/i686-pc-cygwin
-%dir %{_exec_prefix}/i686-pc-cygwin/bin
-%{_exec_prefix}/i686-pc-cygwin/bin/*
-
-%dir %{_exec_prefix}/i686-pc-cygwin/lib
-%{_exec_prefix}/i686-pc-cygwin/lib/ldscripts
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
deleted file mode 100644
index 8f88ae1..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define cloog_ppl_version 0.15.7-1
-%define cloog_ppl_rpmvers %{expand:%(echo 0.15.7-1 | tr - _)} 
-
-Name:         i686-pc-cygwin-cloog-ppl
-Release:      0.20100204.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%cloog_ppl_rpmvers
-Summary:      	Cygwin cloog-ppl Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/cloog-ppl-%{cloog_ppl_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/libcloog0/libcloog0-%{cloog_ppl_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/libcloog-devel/libcloog-devel-%{cloog_ppl_version}.tar.bz2
-
-Provides:	i686-pc-cygwin-cloog-ppl = %{version}-%{release}
-Provides:       i686-pc-cygwin-cloog-ppl-devel = %{version}-%{release}
-
-%description
-Cygwin cloog-ppl libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE0})
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE1})
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{cloog_ppl_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{cloog_ppl_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cloog_ppl_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{cloog_ppl_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{cloog_ppl_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cloog_ppl_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-expat.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-expat.spec
deleted file mode 100644
index 5cf4fcf..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-expat.spec
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define expat_version 2.0.1-1
-%define expat_rpmvers %{expand:%(echo 2.0.1-1 | tr - _)} 
-
-Name:         i686-pc-cygwin-expat
-Release:      0.20090903.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%expat_rpmvers
-Summary:      	Cygwin expat Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/expat/expat-%{expat_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/expat/libexpat1/libexpat1-%{expat_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/expat/libexpat1-devel/libexpat1-devel-%{expat_version}.tar.bz2
-
-Provides:       i686-pc-cygwin-expat-devel = %{version}-%{release}
-
-%description
-Cygwin expat libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  (cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE0})
-  (cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE1})
-  (cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{expat_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{expat_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{expat_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{expat_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{expat_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{expat_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec
deleted file mode 100644
index 9151715..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec
+++ /dev/null
@@ -1,706 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 3.4.4
-%define gcc_version 3.4.4
-%define gcc_rpmvers %{expand:%(echo "3.4.4" | tr - _ )}
-
-
-Name:         	i686-pc-cygwin-gcc
-Summary:      	i686-pc-cygwin gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	0.20110310.0%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse11_2}
-%global mpc_provided 0.7
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  i686-pc-cygwin-gcc = %{gcc_rpmvers}
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-BuildRequires:	flex bison
-%endif
-
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	i686-pc-cygwin-binutils
-BuildRequires:	i686-pc-cygwin-sys-root
-
-Requires:	i686-pc-cygwin-binutils
-Requires:	i686-pc-cygwin-sys-root
-Requires:	i686-pc-cygwin-w32api
-Requires:	i686-pc-cygwin-gcc-libgcc = %{gcc_rpmvers}-%{release}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	0}
-
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	1}
-
-
-%if "%{gcc_version}" == "3.4.4"
-# Cygwin patch extracted from
-# ftp://sourceware.org/pub/cygwin/release/gcc/gcc-3.4.4-3-src.tar.bz2
-Patch70: gcc-3.4.4-3.patch
-
-Patch71: cygwin-gcc-3.4.4-3.diff
-%endif
-%if "%{gcc_version}" == "4.3.4"
-# Cygwin patch extracted from
-# ftp://sourceware.org/pub/cygwin/release/gcc4/gcc4-4.3.4-3-src.tar.bz2
-Patch70: gcc4-4.3.4-3.src.patch
-
-Patch71: cygwin-gcc4-4.3.4-3.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for i686-pc-cygwin.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%setup -q -T -D -n %{name}-%{version} -a1
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-# cygwin patches can't be directly applied through rpm
-cd gcc-%{gcc_pkgvers}
-%if "%{gcc_version}" < "4.0"
-patch -p1 -t < %{PATCH70} || true
-%else
-patch -p2 -t < %{PATCH70} || true
-%endif
-%{?PATCH71:patch -p1 < %{PATCH71}}
-cd ..
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=i686-pc-cygwin \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    --with-sysroot=%{_exec_prefix}/i686-pc-cygwin/sys-root \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-languages="$languages" $optargs
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i686-pc-cygwin-c++filt%{_exeext}
-
-
-# Conflict with a native GCC's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# Conflict with a native GCC's man pages
-  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i686-pc-cygwin-i686-pc-cygwin-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/i686-pc-cygwin/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/i686-pc-cygwin/include/bits
-  fi
-
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-%if ! %{with pygdb}
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-%endif
-
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-
-  TGTDIR="%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/i686-pc-cygwin/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i686-pc-cygwin-gcc
-# ==============================================================
-# %package -n i686-pc-cygwin-gcc
-# Summary:        GNU cc compiler for i686-pc-cygwin
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       i686-pc-cygwin-binutils
-# License:	GPL
-
-# %if %build_infos
-# Requires:      gcc-common
-# %endif
-
-%description -n i686-pc-cygwin-gcc
-GNU cc compiler for i686-pc-cygwin.
-
-# ==============================================================
-# i686-pc-cygwin-gcc-libgcc
-# ==============================================================
-%package -n i686-pc-cygwin-gcc-libgcc
-Summary:        libgcc for i686-pc-cygwin-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i686-pc-cygwin-gcc-libgcc
-libgcc i686-pc-cygwin-gcc.
-
-
-%files -n i686-pc-cygwin-gcc
-%defattr(-,root,root)
-
-%{_mandir}/man1/i686-pc-cygwin-gcc.1*
-%{_mandir}/man1/i686-pc-cygwin-cpp.1*
-%{_mandir}/man1/i686-pc-cygwin-gcov.1*
-
-%{_bindir}/i686-pc-cygwin-cpp%{_exeext}
-%{_bindir}/i686-pc-cygwin-gcc%{_exeext}
-%{_bindir}/i686-pc-cygwin-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/i686-pc-cygwin-gcov%{_exeext}
-%{_bindir}/i686-pc-cygwin-gccbug
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i686-pc-cygwin
-%dir %{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}
-%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n i686-pc-cygwin-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i686-pc-cygwin
-%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# i686-pc-cygwin-gcc-c++
-# ==============================================================
-%package -n i686-pc-cygwin-gcc-c++
-Summary:	GCC c++ compiler for i686-pc-cygwin
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       i686-pc-cygwin-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  i686-pc-cygwin-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       i686-pc-cygwin-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n i686-pc-cygwin-gcc-c++
-GCC c++ compiler for i686-pc-cygwin.
-
-
-%package -n i686-pc-cygwin-gcc-libstdc++
-Summary:	libstdc++ for i686-pc-cygwin
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i686-pc-cygwin-gcc-libstdc++
-%{summary}
-
-
-%files -n i686-pc-cygwin-gcc-c++
-%defattr(-,root,root)
-
-%{_mandir}/man1/i686-pc-cygwin-g++.1*
-
-%{_bindir}/i686-pc-cygwin-c++%{_exeext}
-%{_bindir}/i686-pc-cygwin-g++%{_exeext}
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i686-pc-cygwin
-%dir %{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}
-%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n i686-pc-cygwin-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i686-pc-cygwin
-%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include
-%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include/c++
-
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gmp.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gmp.spec
deleted file mode 100644
index 5377361..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gmp.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gmp_version 4.3.1-3
-%define gmp_rpmvers %{expand:%(echo 4.3.1-3 | tr - _)} 
-
-Name:         i686-pc-cygwin-gmp
-Release:      0.20100204.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%gmp_rpmvers
-Summary:      	Cygwin gmp Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/gmp/gmp-%{gmp_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/gmp/libgmp3/libgmp3-%{gmp_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/gmp/libgmp-devel/libgmp-devel-%{gmp_version}.tar.bz2
-
-Provides:	i686-pc-cygwin-gmp-devel = %{version}-%{release}
-
-%description
-Cygwin gmp libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  ( cd i686-pc-cygwin/sys-root; %{__tar} xvjf %{SOURCE0})
-  ( cd i686-pc-cygwin/sys-root; %{__tar} xvjf %{SOURCE1})
-  ( cd i686-pc-cygwin/sys-root; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-libs.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-libs.spec
deleted file mode 100644
index d84d0d4..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-libs.spec
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define cygwin_version 1.7.9-1
-%define cygwin_rpmvers %{expand:%(echo 1.7.9-1 | tr - _)} 
-
-Name:         i686-pc-cygwin
-Release:      0.20110427.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%cygwin_rpmvers
-Summary:      	i686-pc-cygwin libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/cygwin/cygwin-%{cygwin_version}.tar.bz2
-
-%description
-i686-pc-cygwin libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  %{__tar} cf - usr/lib usr/include | ( cd i686-pc-cygwin/sys-root ; %{__tar} xf -)
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{cygwin_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{cygwin_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cygwin_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{cygwin_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{cygwin_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cygwin_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%package sys-root
-Group: Development/Tools
-Summary: i686-pc-cygwin target files for gcc >= 3.4
-
-%description sys-root
-i686-pc-cygwin target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpc.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpc.spec
deleted file mode 100644
index 3f37ec4..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpc.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define mpc_version 0.8-1
-%define mpc_rpmvers %{expand:%(echo 0.8-1 | tr - _)} 
-
-Name:         i686-pc-cygwin-mpc
-Release:      0.20100322.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%mpc_rpmvers
-Summary:      	Cygwin mpc Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/mpclib/mpclib-%{mpc_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/mpclib/libmpc1/libmpc1-%{mpc_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/mpclib/libmpc-devel/libmpc-devel-%{mpc_version}.tar.bz2
-
-Provides:       i686-pc-cygwin-mpc-devel = %{version}-%{release}
-Provides:	i686-pc-cygwin-libmpc = %{version}-%{release}
-Provides:       i686-pc-cygwin-libmpc-devel = %{version}-%{release}
-
-%description
-Cygwin cloog-ppl libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE0})
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE1})
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{mpc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{mpc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{mpc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{mpc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{mpc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{mpc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpfr.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpfr.spec
deleted file mode 100644
index bd8b69a..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpfr.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define mpfr_version 2.4.1-4
-%define mpfr_rpmvers %{expand:%(echo 2.4.1-4 | tr - _)} 
-
-Name:         i686-pc-cygwin-mpfr
-Release:      0.20100204.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%mpfr_rpmvers
-Summary:      	Cygwin mpfr Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/mpfr/mpfr-%{mpfr_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/mpfr/libmpfr1/libmpfr1-%{mpfr_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/mpfr/libmpfr-devel/libmpfr-devel-%{mpfr_version}.tar.bz2
-
-Provides:	i686-pc-cygwin-mpfr-devel = %{version}-%{release}
-
-%description
-Cygwin mpfr libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  ( cd i686-pc-cygwin/sys-root; %{__tar} xvjf %{SOURCE0})
-  ( cd i686-pc-cygwin/sys-root; %{__tar} xvjf %{SOURCE1})
-  ( cd i686-pc-cygwin/sys-root; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-ncurses.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-ncurses.spec
deleted file mode 100644
index f7737ce..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-ncurses.spec
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define ncurses_version 5.7-18
-%define ncurses_rpmvers %{expand:%(echo 5.7-18 | tr - _)} 
-
-Name:         i686-pc-cygwin-ncurses
-Release:      0.20100204.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%ncurses_rpmvers
-Summary:      	Cygwin ncurses Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/ncurses/ncurses-%{ncurses_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses10/libncurses10-%{ncurses_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses-devel/libncurses-devel-%{ncurses_version}.tar.bz2
-
-BuildRequires:  i686-pc-cygwin-terminfo
-
-Provides:	i686-pc-cygwin-libncurses-devel = %{version}-%{release}
-Provides:       i686-pc-cygwin-ncurses-devel = %{version}-%{release}
-Requires:       i686-pc-cygwin-terminfo
-
-%description
-Cygwin ncurses libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE0})
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE1})
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-  sed \
-    -e "s,^prefix=.*$,prefix=$RPM_BUILD_ROOT%{_prefix}/i686-pc-cygwin/sys-root/usr," \
-  < i686-pc-cygwin/sys-root/etc/postinstall/libncurses-devel.sh \
-  > postinst.sh
-
-  /bin/sh -x ./postinst.sh
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{ncurses_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{ncurses_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{ncurses_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{ncurses_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{ncurses_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{ncurses_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-readline.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-readline.spec
deleted file mode 100644
index 1db15b8..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-readline.spec
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define readline_version 6.1.2-2
-%define readline_rpmvers %{expand:%(echo 6.1.2-2 | tr - _)} 
-
-Name:         i686-pc-cygwin-readline
-Release:      0.20111214.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%readline_rpmvers
-Summary:      	Cygwin readline Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/readline/readline-%{readline_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/readline/libreadline7/libreadline7-%{readline_version}.tar.bz2
-
-Requires:	i686-pc-cygwin-libncurses-devel
-Provides:       i686-pc-cygwin-readline-devel = %{version}-%{release}
-
-%description
-Cygwin readline libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE0})
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE1})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{readline_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{readline_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{readline_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{readline_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{readline_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{readline_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-termcap.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-termcap.spec
deleted file mode 100644
index 2be46d2..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-termcap.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define termcap_version 20050421-1
-%define termcap_rpmvers %{expand:%(echo 20050421-1 | tr - _)} 
-
-Name:         i686-pc-cygwin-termcap
-Release:      0.20090827.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%termcap_rpmvers
-Summary:      	Cygwin termcap Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/termcap/termcap-%{termcap_version}.tar.bz2
-
-Provides:       i686-pc-cygwin-termcap-devel = %{version}-%{release}
-
-%description
-Cygwin termcap libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE0})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{termcap_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{termcap_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{termcap_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{termcap_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{termcap_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{termcap_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-terminfo.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-terminfo.spec
deleted file mode 100644
index 47495a1..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-terminfo.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define terminfo_version 5.7_20091114-14
-%define terminfo_rpmvers %{expand:%(echo 5.7_20091114-14 | tr - _)} 
-
-Name:         i686-pc-cygwin-terminfo
-Release:      0.20100726.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%terminfo_rpmvers
-Summary:      	Cygwin terminfo Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/terminfo/terminfo-%{terminfo_version}.tar.bz2
-
-Provides:       i686-pc-cygwin-terminfo-devel = %{version}-%{release}
-
-%description
-Cygwin terminfo libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE0})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{terminfo_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{terminfo_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{terminfo_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{terminfo_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{terminfo_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{terminfo_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-w32api.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-w32api.spec
deleted file mode 100644
index 639a72f..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-w32api.spec
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define w32api_version 3.17-2
-%define w32api_rpmvers %{expand:%(echo 3.17-2 | tr - _)} 
-
-Name:         i686-pc-cygwin-w32api
-Release:      0.20110427.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%w32api_rpmvers
-Summary:      	Cygwin w32api Libraries
-
-Source0:	ftp://sources.redhat.com/pub/cygwin/release/w32api/w32api-%{w32api_version}.tar.bz2
-
-%description
-Cygwin w32api libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  mkdir -p i686-pc-cygwin
-  cp -a usr/lib usr/include i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  %{__tar} cf - usr/lib usr/include | ( cd i686-pc-cygwin/sys-root ; %{__tar} xf -)
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{w32api_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{w32api_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{w32api_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/lib
-%{_prefix}/i686-pc-cygwin/include
-
-%package sys-root
-Group: Development/Tools
-Summary: i686-pc-cygwin target files for gcc >= 3.4
-
-%description sys-root
-i686-pc-cygwin target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-zlib.spec b/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-zlib.spec
deleted file mode 100644
index 743ed06..0000000
--- a/contrib/crossrpms/cygwin/i686/i686-pc-cygwin-zlib.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define zlib_version 1.2.5-1
-%define zlib_rpmvers %{expand:%(echo 1.2.5-1 | tr - _)} 
-
-Name:         i686-pc-cygwin-zlib
-Release:      0.20110427.0%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%zlib_rpmvers
-Summary:      	Cygwin zlib Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/zlib/zlib-%{zlib_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/zlib/zlib-devel/zlib-devel-%{zlib_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/zlib/zlib0/zlib0-%{zlib_version}.tar.bz2
-
-Provides:       i686-pc-cygwin-zlib-devel = %{version}-%{release}
-
-%description
-Cygwin zlib libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf i686-pc-cygwin
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i686-pc-cygwin/sys-root
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE0})
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE1})
-  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{zlib_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{zlib_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{zlib_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{zlib_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{zlib_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{zlib_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/libs.add b/contrib/crossrpms/cygwin/i686/libs.add
deleted file mode 100644
index 3db0d20..0000000
--- a/contrib/crossrpms/cygwin/i686/libs.add
+++ /dev/null
@@ -1,34 +0,0 @@
-%define cygwin_version @CYGWIN_VERS@
-%define cygwin_rpmvers %{expand:%(echo @CYGWIN_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target@
-Release:      @CYGWIN_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%cygwin_rpmvers
-Summary:      	@tool_target@ libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/cygwin/cygwin-%{cygwin_version}.tar.bz2
-
-%description
- at tool_target@ libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  %{__tar} cf - usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/cygwin/i686/mpc.add b/contrib/crossrpms/cygwin/i686/mpc.add
deleted file mode 100644
index 6caa690..0000000
--- a/contrib/crossrpms/cygwin/i686/mpc.add
+++ /dev/null
@@ -1,42 +0,0 @@
-%define mpc_version @MPC_VERS@
-%define mpc_rpmvers %{expand:%(echo @MPC_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -mpc
-Release:      @MPC_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%mpc_rpmvers
-Summary:      	Cygwin mpc Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/mpclib/mpclib-%{mpc_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/mpclib/libmpc1/libmpc1-%{mpc_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/mpclib/libmpc-devel/libmpc-devel-%{mpc_version}.tar.bz2
-
-Provides:       @rpmprefix@@tool_target at -mpc-devel = %{version}-%{release}
-Provides:	@rpmprefix@@tool_target at -libmpc = %{version}-%{release}
-Provides:       @rpmprefix@@tool_target at -libmpc-devel = %{version}-%{release}
-
-%description
-Cygwin cloog-ppl libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE0})
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE1})
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/cygwin/i686/mpfr.add b/contrib/crossrpms/cygwin/i686/mpfr.add
deleted file mode 100644
index 3887892..0000000
--- a/contrib/crossrpms/cygwin/i686/mpfr.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%define mpfr_version @MPFR_VERS@
-%define mpfr_rpmvers %{expand:%(echo @MPFR_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -mpfr
-Release:      @MPFR_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%mpfr_rpmvers
-Summary:      	Cygwin mpfr Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/mpfr/mpfr-%{mpfr_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/mpfr/libmpfr1/libmpfr1-%{mpfr_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/mpfr/libmpfr-devel/libmpfr-devel-%{mpfr_version}.tar.bz2
-
-Provides:	@rpmprefix@@tool_target at -mpfr-devel = %{version}-%{release}
-
-%description
-Cygwin mpfr libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  ( cd @tool_target@/sys-root; %{__tar} xvjf %{SOURCE0})
-  ( cd @tool_target@/sys-root; %{__tar} xvjf %{SOURCE1})
-  ( cd @tool_target@/sys-root; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
-
diff --git a/contrib/crossrpms/cygwin/i686/ncurses.add b/contrib/crossrpms/cygwin/i686/ncurses.add
deleted file mode 100644
index 43e4fc0..0000000
--- a/contrib/crossrpms/cygwin/i686/ncurses.add
+++ /dev/null
@@ -1,50 +0,0 @@
-%define ncurses_version @NCURSES_VERS@
-%define ncurses_rpmvers %{expand:%(echo @NCURSES_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -ncurses
-Release:      @NCURSES_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%ncurses_rpmvers
-Summary:      	Cygwin ncurses Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/ncurses/ncurses-%{ncurses_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses10/libncurses10-%{ncurses_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses-devel/libncurses-devel-%{ncurses_version}.tar.bz2
-
-BuildRequires:  @rpmprefix@@tool_target at -terminfo
-
-Provides:	@rpmprefix@@tool_target at -libncurses-devel = %{version}-%{release}
-Provides:       @rpmprefix@@tool_target at -ncurses-devel = %{version}-%{release}
-Requires:       @rpmprefix@@tool_target at -terminfo
-
-%description
-Cygwin ncurses libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE0})
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE1})
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
-  sed \
-    -e "s,^prefix=.*$,prefix=$RPM_BUILD_ROOT%{_prefix}/@tool_target@/sys-root/usr," \
-  < @tool_target@/sys-root/etc/postinstall/libncurses-devel.sh \
-  > postinst.sh
-
-  /bin/sh -x ./postinst.sh
diff --git a/contrib/crossrpms/cygwin/i686/readline.add b/contrib/crossrpms/cygwin/i686/readline.add
deleted file mode 100644
index 7d61194..0000000
--- a/contrib/crossrpms/cygwin/i686/readline.add
+++ /dev/null
@@ -1,39 +0,0 @@
-%define readline_version @READLINE_VERS@
-%define readline_rpmvers %{expand:%(echo @READLINE_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -readline
-Release:      @READLINE_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%readline_rpmvers
-Summary:      	Cygwin readline Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/readline/readline-%{readline_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/readline/libreadline7/libreadline7-%{readline_version}.tar.bz2
-
-Requires:	@rpmprefix@@tool_target at -libncurses-devel
-Provides:       @rpmprefix@@tool_target at -readline-devel = %{version}-%{release}
-
-%description
-Cygwin readline libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE0})
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE1})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/cygwin/i686/target-cloog-ppl.add b/contrib/crossrpms/cygwin/i686/target-cloog-ppl.add
deleted file mode 100644
index 693e50e..0000000
--- a/contrib/crossrpms/cygwin/i686/target-cloog-ppl.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/target-expat.add b/contrib/crossrpms/cygwin/i686/target-expat.add
deleted file mode 100644
index 693e50e..0000000
--- a/contrib/crossrpms/cygwin/i686/target-expat.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/target-gmp.add b/contrib/crossrpms/cygwin/i686/target-gmp.add
deleted file mode 100644
index 693e50e..0000000
--- a/contrib/crossrpms/cygwin/i686/target-gmp.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/target-libs.add b/contrib/crossrpms/cygwin/i686/target-libs.add
deleted file mode 100644
index 0550fc7..0000000
--- a/contrib/crossrpms/cygwin/i686/target-libs.add
+++ /dev/null
@@ -1,11 +0,0 @@
-%package sys-root
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc >= 3.4
-
-%description sys-root
- at tool_target@ target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
diff --git a/contrib/crossrpms/cygwin/i686/target-mpc.add b/contrib/crossrpms/cygwin/i686/target-mpc.add
deleted file mode 100644
index 693e50e..0000000
--- a/contrib/crossrpms/cygwin/i686/target-mpc.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/target-mpfr.add b/contrib/crossrpms/cygwin/i686/target-mpfr.add
deleted file mode 100644
index 693e50e..0000000
--- a/contrib/crossrpms/cygwin/i686/target-mpfr.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/target-ncurses.add b/contrib/crossrpms/cygwin/i686/target-ncurses.add
deleted file mode 100644
index 693e50e..0000000
--- a/contrib/crossrpms/cygwin/i686/target-ncurses.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/target-readline.add b/contrib/crossrpms/cygwin/i686/target-readline.add
deleted file mode 100644
index 693e50e..0000000
--- a/contrib/crossrpms/cygwin/i686/target-readline.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/target-termcap.add b/contrib/crossrpms/cygwin/i686/target-termcap.add
deleted file mode 100644
index 693e50e..0000000
--- a/contrib/crossrpms/cygwin/i686/target-termcap.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/target-terminfo.add b/contrib/crossrpms/cygwin/i686/target-terminfo.add
deleted file mode 100644
index 693e50e..0000000
--- a/contrib/crossrpms/cygwin/i686/target-terminfo.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/target-w32api.add b/contrib/crossrpms/cygwin/i686/target-w32api.add
deleted file mode 100644
index d5039f0..0000000
--- a/contrib/crossrpms/cygwin/i686/target-w32api.add
+++ /dev/null
@@ -1,19 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/lib
-%{_prefix}/@tool_target@/include
-
-%package sys-root
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc >= 3.4
-
-%description sys-root
- at tool_target@ target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/target-zlib.add b/contrib/crossrpms/cygwin/i686/target-zlib.add
deleted file mode 100644
index 693e50e..0000000
--- a/contrib/crossrpms/cygwin/i686/target-zlib.add
+++ /dev/null
@@ -1,6 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
-
-
diff --git a/contrib/crossrpms/cygwin/i686/termcap.add b/contrib/crossrpms/cygwin/i686/termcap.add
deleted file mode 100644
index c258ee6..0000000
--- a/contrib/crossrpms/cygwin/i686/termcap.add
+++ /dev/null
@@ -1,36 +0,0 @@
-%define termcap_version @TERMCAP_VERS@
-%define termcap_rpmvers %{expand:%(echo @TERMCAP_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -termcap
-Release:      @TERMCAP_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%termcap_rpmvers
-Summary:      	Cygwin termcap Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/termcap/termcap-%{termcap_version}.tar.bz2
-
-Provides:       @rpmprefix@@tool_target at -termcap-devel = %{version}-%{release}
-
-%description
-Cygwin termcap libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE0})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/cygwin/i686/terminfo.add b/contrib/crossrpms/cygwin/i686/terminfo.add
deleted file mode 100644
index 127668c..0000000
--- a/contrib/crossrpms/cygwin/i686/terminfo.add
+++ /dev/null
@@ -1,36 +0,0 @@
-%define terminfo_version @TERMINFO_VERS@
-%define terminfo_rpmvers %{expand:%(echo @TERMINFO_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -terminfo
-Release:      @TERMINFO_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%terminfo_rpmvers
-Summary:      	Cygwin terminfo Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/terminfo/terminfo-%{terminfo_version}.tar.bz2
-
-Provides:       @rpmprefix@@tool_target at -terminfo-devel = %{version}-%{release}
-
-%description
-Cygwin terminfo libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE0})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/cygwin/i686/w32api.add b/contrib/crossrpms/cygwin/i686/w32api.add
deleted file mode 100644
index 84561c9..0000000
--- a/contrib/crossrpms/cygwin/i686/w32api.add
+++ /dev/null
@@ -1,37 +0,0 @@
-%define w32api_version @W32API_VERS@
-%define w32api_rpmvers %{expand:%(echo @W32API_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -w32api
-Release:      @W32API_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%w32api_rpmvers
-Summary:      	Cygwin w32api Libraries
-
-Source0:	ftp://sources.redhat.com/pub/cygwin/release/w32api/w32api-%{w32api_version}.tar.bz2
-
-%description
-Cygwin w32api libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  mkdir -p @tool_target@
-  cp -a usr/lib usr/include @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  %{__tar} cf - usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/cygwin/i686/zlib.add b/contrib/crossrpms/cygwin/i686/zlib.add
deleted file mode 100644
index c85a2e1..0000000
--- a/contrib/crossrpms/cygwin/i686/zlib.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%define zlib_version @ZLIB_VERS@
-%define zlib_rpmvers %{expand:%(echo @ZLIB_VERS@ | tr - _)} 
-
-Name:         @rpmprefix@@tool_target at -zlib
-Release:      @ZLIB_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%zlib_rpmvers
-Summary:      	Cygwin zlib Libraries
-
-Source0:	ftp://cygwin.com/pub/cygwin/release/zlib/zlib-%{zlib_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/zlib/zlib-devel/zlib-devel-%{zlib_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/zlib/zlib0/zlib0-%{zlib_version}.tar.bz2
-
-Provides:       @rpmprefix@@tool_target at -zlib-devel = %{version}-%{release}
-
-%description
-Cygwin zlib libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE0})
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE1})
-  ( cd @tool_target@/sys-root ; %{__tar} xvjf %{SOURCE2})
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
-
diff --git a/contrib/crossrpms/cygwin/mpc.am b/contrib/crossrpms/cygwin/mpc.am
deleted file mode 100644
index d8a6bad..0000000
--- a/contrib/crossrpms/cygwin/mpc.am
+++ /dev/null
@@ -1,22 +0,0 @@
-EXTRA_DIST += target-mpc.add
-EXTRA_DIST += mpc.add
-
-MPC_SUBPACKAGES = $(top_srcdir)/common/common.add
-MPC_SUBPACKAGES += $(srcdir)/mpc.add
-MPC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-MPC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-MPC_SUBPACKAGES += $(srcdir)/target-mpc.add
-
-$(TARGET)-mpc.spec.in: $(MPC_SUBPACKAGES) Makefile.am $(srcdir)/../mpc.am
-	cat $(MPC_SUBPACKAGES) | sed \
-	  -e "s/[@]MPC_VERS[@]/$(MPC_VERS)/g" \
-	  -e "s/[@]MPC_RPMREL[@]/$(MPC_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{mpc_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-mpc.spec.in
-CLEANFILES += $(TARGET)-mpc.spec.in
-	                      
- at rpmprefix@$(TARGET)-mpc.spec: $(TARGET)-mpc.spec.in
-	$(MKSPEC) $(TARGET)-mpc.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-mpc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-mpc.spec
-
diff --git a/contrib/crossrpms/cygwin/mpfr.am b/contrib/crossrpms/cygwin/mpfr.am
deleted file mode 100644
index 1f9e76e..0000000
--- a/contrib/crossrpms/cygwin/mpfr.am
+++ /dev/null
@@ -1,22 +0,0 @@
-EXTRA_DIST += target-mpfr.add
-EXTRA_DIST += mpfr.add
-
-MPFR_SUBPACKAGES = $(top_srcdir)/common/common.add
-MPFR_SUBPACKAGES += $(srcdir)/mpfr.add
-MPFR_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-MPFR_SUBPACKAGES += $(top_srcdir)/common/clean.add
-MPFR_SUBPACKAGES += $(srcdir)/target-mpfr.add
-
-$(TARGET)-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am $(srcdir)/../mpfr.am
-	cat $(MPFR_SUBPACKAGES) | sed \
-	  -e "s/[@]MPFR_VERS[@]/$(MPFR_VERS)/g" \
-	  -e "s/[@]MPFR_RPMREL[@]/$(MPFR_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{mpfr_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-mpfr.spec.in
-CLEANFILES += $(TARGET)-mpfr.spec.in
-	                      
- at rpmprefix@$(TARGET)-mpfr.spec: $(TARGET)-mpfr.spec.in
-	$(MKSPEC) $(TARGET)-mpfr.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-mpfr.spec
-noinst_DATA += @rpmprefix@$(TARGET)-mpfr.spec
-
diff --git a/contrib/crossrpms/cygwin/ncurses.am b/contrib/crossrpms/cygwin/ncurses.am
deleted file mode 100644
index 32c83f0..0000000
--- a/contrib/crossrpms/cygwin/ncurses.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-ncurses.add
-EXTRA_DIST += ncurses.add
-
-NCURSES_SUBPACKAGES = $(top_srcdir)/common/common.add
-NCURSES_SUBPACKAGES += $(srcdir)/ncurses.add
-NCURSES_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-NCURSES_SUBPACKAGES += $(top_srcdir)/common/clean.add
-NCURSES_SUBPACKAGES += $(srcdir)/target-ncurses.add
-
-$(TARGET)-ncurses.spec.in: $(NCURSES_SUBPACKAGES) Makefile.am
-	cat $(NCURSES_SUBPACKAGES) | sed \
-	  -e "s/[@]NCURSES_VERS[@]/$(NCURSES_VERS)/g" \
-	  -e "s/[@]NCURSES_RPMREL[@]/$(NCURSES_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{ncurses_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-ncurses.spec.in
-CLEANFILES += $(TARGET)-ncurses.spec.in
-	                      
- at rpmprefix@$(TARGET)-ncurses.spec: $(TARGET)-ncurses.spec.in
-	$(MKSPEC) $(TARGET)-ncurses.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-ncurses.spec
-noinst_DATA += @rpmprefix@$(TARGET)-ncurses.spec
diff --git a/contrib/crossrpms/cygwin/readline.am b/contrib/crossrpms/cygwin/readline.am
deleted file mode 100644
index 585535f..0000000
--- a/contrib/crossrpms/cygwin/readline.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-readline.add
-EXTRA_DIST += readline.add
-
-READLINE_SUBPACKAGES = $(top_srcdir)/common/common.add
-READLINE_SUBPACKAGES += $(srcdir)/readline.add
-READLINE_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-READLINE_SUBPACKAGES += $(top_srcdir)/common/clean.add
-READLINE_SUBPACKAGES += $(srcdir)/target-readline.add
-
-$(TARGET)-readline.spec.in: $(READLINE_SUBPACKAGES) Makefile.am
-	cat $(READLINE_SUBPACKAGES) | sed \
-	  -e "s/[@]READLINE_VERS[@]/$(READLINE_VERS)/g" \
-	  -e "s/[@]READLINE_RPMREL[@]/$(READLINE_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{readline_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-readline.spec.in
-CLEANFILES += $(TARGET)-readline.spec.in
-	                      
- at rpmprefix@$(TARGET)-readline.spec: $(TARGET)-readline.spec.in
-	$(MKSPEC) $(TARGET)-readline.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-readline.spec
-noinst_DATA += @rpmprefix@$(TARGET)-readline.spec
diff --git a/contrib/crossrpms/cygwin/termcap.am b/contrib/crossrpms/cygwin/termcap.am
deleted file mode 100644
index d63fa28..0000000
--- a/contrib/crossrpms/cygwin/termcap.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-termcap.add
-EXTRA_DIST += termcap.add
-
-TERMCAP_SUBPACKAGES = $(top_srcdir)/common/common.add
-TERMCAP_SUBPACKAGES += $(srcdir)/termcap.add
-TERMCAP_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-TERMCAP_SUBPACKAGES += $(top_srcdir)/common/clean.add
-TERMCAP_SUBPACKAGES += $(srcdir)/target-termcap.add
-
-$(TARGET)-termcap.spec.in: $(TERMCAP_SUBPACKAGES) Makefile.am
-	cat $(TERMCAP_SUBPACKAGES) | sed \
-	  -e "s/[@]TERMCAP_VERS[@]/$(TERMCAP_VERS)/g" \
-	  -e "s/[@]TERMCAP_RPMREL[@]/$(TERMCAP_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{termcap_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-termcap.spec.in
-CLEANFILES += $(TARGET)-termcap.spec.in
-	                      
- at rpmprefix@$(TARGET)-termcap.spec: $(TARGET)-termcap.spec.in
-	$(MKSPEC) $(TARGET)-termcap.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-termcap.spec
-noinst_DATA += @rpmprefix@$(TARGET)-termcap.spec
diff --git a/contrib/crossrpms/cygwin/terminfo.am b/contrib/crossrpms/cygwin/terminfo.am
deleted file mode 100644
index 249e31e..0000000
--- a/contrib/crossrpms/cygwin/terminfo.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-terminfo.add
-EXTRA_DIST += terminfo.add
-
-TERMINFO_SUBPACKAGES = $(top_srcdir)/common/common.add
-TERMINFO_SUBPACKAGES += $(srcdir)/terminfo.add
-TERMINFO_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-TERMINFO_SUBPACKAGES += $(top_srcdir)/common/clean.add
-TERMINFO_SUBPACKAGES += $(srcdir)/target-terminfo.add
-
-$(TARGET)-terminfo.spec.in: $(TERMINFO_SUBPACKAGES) Makefile.am
-	cat $(TERMINFO_SUBPACKAGES) | sed \
-	  -e "s/[@]TERMINFO_VERS[@]/$(TERMINFO_VERS)/g" \
-	  -e "s/[@]TERMINFO_RPMREL[@]/$(TERMINFO_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{terminfo_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-terminfo.spec.in
-CLEANFILES += $(TARGET)-terminfo.spec.in
-	                      
- at rpmprefix@$(TARGET)-terminfo.spec: $(TARGET)-terminfo.spec.in
-	$(MKSPEC) $(TARGET)-terminfo.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-terminfo.spec
-noinst_DATA += @rpmprefix@$(TARGET)-terminfo.spec
diff --git a/contrib/crossrpms/cygwin/w32api.am b/contrib/crossrpms/cygwin/w32api.am
deleted file mode 100644
index 6f024ef..0000000
--- a/contrib/crossrpms/cygwin/w32api.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-w32api.add
-EXTRA_DIST += w32api.add
-
-W32API_SUBPACKAGES = $(top_srcdir)/common/common.add
-W32API_SUBPACKAGES += $(srcdir)/w32api.add
-W32API_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-W32API_SUBPACKAGES += $(top_srcdir)/common/clean.add
-W32API_SUBPACKAGES += $(srcdir)/target-w32api.add
-
-$(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) Makefile.am
-	cat $(W32API_SUBPACKAGES) | sed \
-	  -e "s/[@]W32API_VERS[@]/$(W32API_VERS)/g" \
-	  -e "s/[@]W32API_RPMREL[@]/$(W32API_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{w32api_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-w32api.spec.in
-CLEANFILES += $(TARGET)-w32api.spec.in
-	                      
- at rpmprefix@$(TARGET)-w32api.spec: $(TARGET)-w32api.spec.in
-	$(MKSPEC) $(TARGET)-w32api.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-w32api.spec
-noinst_DATA += @rpmprefix@$(TARGET)-w32api.spec
diff --git a/contrib/crossrpms/cygwin/zlib.am b/contrib/crossrpms/cygwin/zlib.am
deleted file mode 100644
index 3f773bf..0000000
--- a/contrib/crossrpms/cygwin/zlib.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-zlib.add
-EXTRA_DIST += zlib.add
-
-ZLIB_SUBPACKAGES = $(top_srcdir)/common/common.add
-ZLIB_SUBPACKAGES += $(srcdir)/zlib.add
-ZLIB_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-ZLIB_SUBPACKAGES += $(top_srcdir)/common/clean.add
-ZLIB_SUBPACKAGES += $(srcdir)/target-zlib.add
-
-$(TARGET)-zlib.spec.in: $(ZLIB_SUBPACKAGES) Makefile.am
-	cat $(ZLIB_SUBPACKAGES) | sed \
-	  -e "s/[@]ZLIB_VERS[@]/$(ZLIB_VERS)/g" \
-	  -e "s/[@]ZLIB_RPMREL[@]/$(ZLIB_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{zlib_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-zlib.spec.in
-CLEANFILES += $(TARGET)-zlib.spec.in
-	                      
- at rpmprefix@$(TARGET)-zlib.spec: $(TARGET)-zlib.spec.in
-	$(MKSPEC) $(TARGET)-zlib.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-zlib.spec
-noinst_DATA += @rpmprefix@$(TARGET)-zlib.spec
diff --git a/contrib/crossrpms/freebsd6.4/Makefile.am b/contrib/crossrpms/freebsd6.4/Makefile.am
deleted file mode 100644
index 184ab63..0000000
--- a/contrib/crossrpms/freebsd6.4/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-SUBDIRS = i586
diff --git a/contrib/crossrpms/freebsd6.4/binutils.am b/contrib/crossrpms/freebsd6.4/binutils.am
deleted file mode 100644
index 60b6a26..0000000
--- a/contrib/crossrpms/freebsd6.4/binutils.am
+++ /dev/null
@@ -1,30 +0,0 @@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_OPTS =
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \
-	  | $(MKSPEC0) > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
- at rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
-EXTRA_DIST += $(BINUTILS_SUBPACKAGES)
diff --git a/contrib/crossrpms/freebsd6.4/gcc-prep.add b/contrib/crossrpms/freebsd6.4/gcc-prep.add
deleted file mode 100644
index e69de29..0000000
diff --git a/contrib/crossrpms/freebsd6.4/gcc.am b/contrib/crossrpms/freebsd6.4/gcc.am
deleted file mode 100644
index 466d72e..0000000
--- a/contrib/crossrpms/freebsd6.4/gcc.am
+++ /dev/null
@@ -1,42 +0,0 @@
-EXTRA_DIST += $(srcdir)/../gcc-prep.add
-EXTRA_DIST += $(srcdir)/gcc-sources.add
-
-GCC_OPTS =
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
-	cat $(GCC_SUBPACKAGES) \
-	  | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  | sed \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "/--with-newlib/d" \
-	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
- at rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
-	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
-
-EXTRA_DIST += $(GCC_SUBPACKAGES)
diff --git a/contrib/crossrpms/freebsd6.4/i586/Makefile.am b/contrib/crossrpms/freebsd6.4/i586/Makefile.am
deleted file mode 100644
index 3cb00b6..0000000
--- a/contrib/crossrpms/freebsd6.4/i586/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-TARGET = i586-pc-freebsd6.4
-
-include $(top_srcdir)/mkspec.am
-
-FREEBSD_VERS = 6.4
-FREEBSD_RPMREL = 0.20090827.1
-EXTRA_DIST += libs.add
-EXTRA_DIST += target-libs.add
-include ../libs.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 0.20111122.0
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.5.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20111116.0
-include ../gcc.am
-GCC_OPTS += --languages=cxx,fortran,objc
diff --git a/contrib/crossrpms/freebsd6.4/i586/binutils-sources.add b/contrib/crossrpms/freebsd6.4/i586/binutils-sources.add
deleted file mode 100644
index e458c6f..0000000
--- a/contrib/crossrpms/freebsd6.4/i586/binutils-sources.add
+++ /dev/null
@@ -1,2 +0,0 @@
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
- at PATCH0@
diff --git a/contrib/crossrpms/freebsd6.4/i586/gcc-sources.add b/contrib/crossrpms/freebsd6.4/i586/gcc-sources.add
deleted file mode 100644
index 18c9848..0000000
--- a/contrib/crossrpms/freebsd6.4/i586/gcc-sources.add
+++ /dev/null
@@ -1,37 +0,0 @@
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-%if %build_cxx
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
- at PATCH2@
-%{?_without_sources:NoSource:	2}
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
- at PATCH3@
-%{?_without_sources:NoSource:	3}
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
- at PATCH4@
-%{?_without_sources:NoSource:	4}
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
- at PATCH5@
-%{?_without_sources:NoSource:	5}
-%endif
diff --git a/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-binutils.spec b/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-binutils.spec
deleted file mode 100644
index 9b5f754..0000000
--- a/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-binutils.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		i586-pc-freebsd6.4-binutils
-Summary:	Binutils for target i586-pc-freebsd6.4
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	0.20111122.0%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-
-%description
-Cross binutils for target i586-pc-freebsd6.4
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=i586-pc-freebsd6.4 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --with-sysroot=%{_prefix}/i586-pc-freebsd6.4/sys-root \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-
-# Conflict with a native binutils' infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd6.4-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd6.4-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd6.4-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd6.4-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd6.4-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd6.4-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd6.4-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd6.4-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i586-pc-freebsd6.4-binutils
-# ==============================================================
-# %package -n i586-pc-freebsd6.4-binutils
-# Summary:      rtems binutils for i586-pc-freebsd6.4
-# Group: Development/Tools
-# %if %build_infos
-# Requires: binutils-common
-# %endif
-
-%description -n i586-pc-freebsd6.4-binutils
-GNU binutils targetting i586-pc-freebsd6.4.
-
-%files -n i586-pc-freebsd6.4-binutils
-%defattr(-,root,root)
-
-%{_mandir}/man1/i586-pc-freebsd6.4-*.1*
-
-%{_bindir}/i586-pc-freebsd6.4-*
-
-%dir %{_exec_prefix}/i586-pc-freebsd6.4
-%dir %{_exec_prefix}/i586-pc-freebsd6.4/bin
-%{_exec_prefix}/i586-pc-freebsd6.4/bin/*
-
-%dir %{_exec_prefix}/i586-pc-freebsd6.4/lib
-%{_exec_prefix}/i586-pc-freebsd6.4/lib/ldscripts
-
diff --git a/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-gcc.spec b/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-gcc.spec
deleted file mode 100644
index c667cb0..0000000
--- a/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-gcc.spec
+++ /dev/null
@@ -1,798 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.5.2
-%define gcc_version 4.5.2
-%define gcc_rpmvers %{expand:%(echo "4.5.2" | tr - _ )}
-
-
-Name:         	i586-pc-freebsd6.4-gcc
-Summary:      	i586-pc-freebsd6.4 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	0.20111116.0%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%define gmp_required		4.1
-%define mpfr_required		2.2.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  i586-pc-freebsd6.4-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	i586-pc-freebsd6.4-binutils
-BuildRequires:	i586-pc-freebsd6.4-sys-root
-
-Requires:	i586-pc-freebsd6.4-binutils
-Requires:	i586-pc-freebsd6.4-sys-root
-Requires:	i586-pc-freebsd6.4-gcc-libgcc = %{gcc_rpmvers}-%{release}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	2}
-
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	5}
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for i586-pc-freebsd6.4.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-%{?SOURCE2:%setup -q -T -D -n %{name}-%{version} -a2}
-%{?PATCH2:%patch2 -p0}
-
-
-
-%{?SOURCE5:%setup -q -T -D -n %{name}-%{version} -a5}
-%{?PATCH5:%patch5 -p0}
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  languages="$languages,fortran"
-  languages="$languages,objc"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=i586-pc-freebsd6.4 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    --with-sysroot=%{_exec_prefix}/i586-pc-freebsd6.4/sys-root \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i586-pc-freebsd6.4-c++filt%{_exeext}
-
-
-# Conflict with a native GCC's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# Conflict with a native GCC's man pages
-  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i586-pc-freebsd6.4-i586-pc-freebsd6.4-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/i586-pc-freebsd6.4/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/i586-pc-freebsd6.4/include/bits
-  fi
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/i586-pc-freebsd6.4/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd6.4/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd6.4/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd6.4/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd6.4/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i586-pc-freebsd6.4-gcc
-# ==============================================================
-# %package -n i586-pc-freebsd6.4-gcc
-# Summary:        GNU cc compiler for i586-pc-freebsd6.4
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       i586-pc-freebsd6.4-binutils
-# License:	GPL
-
-# %if %build_infos
-# Requires:      gcc-common
-# %endif
-
-%description -n i586-pc-freebsd6.4-gcc
-GNU cc compiler for i586-pc-freebsd6.4.
-
-# ==============================================================
-# i586-pc-freebsd6.4-gcc-libgcc
-# ==============================================================
-%package -n i586-pc-freebsd6.4-gcc-libgcc
-Summary:        libgcc for i586-pc-freebsd6.4-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd6.4-gcc-libgcc
-libgcc i586-pc-freebsd6.4-gcc.
-
-
-%files -n i586-pc-freebsd6.4-gcc
-%defattr(-,root,root)
-
-%{_mandir}/man1/i586-pc-freebsd6.4-gcc.1*
-%{_mandir}/man1/i586-pc-freebsd6.4-cpp.1*
-%{_mandir}/man1/i586-pc-freebsd6.4-gcov.1*
-
-%{_bindir}/i586-pc-freebsd6.4-cpp%{_exeext}
-%{_bindir}/i586-pc-freebsd6.4-gcc%{_exeext}
-%{_bindir}/i586-pc-freebsd6.4-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/i586-pc-freebsd6.4-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/i586-pc-freebsd6.4-gccbug
-%endif
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd6.4
-%dir %{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n i586-pc-freebsd6.4-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# i586-pc-freebsd6.4-gcc-c++
-# ==============================================================
-%package -n i586-pc-freebsd6.4-gcc-c++
-Summary:	GCC c++ compiler for i586-pc-freebsd6.4
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       i586-pc-freebsd6.4-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  i586-pc-freebsd6.4-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       i586-pc-freebsd6.4-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n i586-pc-freebsd6.4-gcc-c++
-GCC c++ compiler for i586-pc-freebsd6.4.
-
-
-%package -n i586-pc-freebsd6.4-gcc-libstdc++
-Summary:	libstdc++ for i586-pc-freebsd6.4
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd6.4-gcc-libstdc++
-%{summary}
-
-
-%files -n i586-pc-freebsd6.4-gcc-c++
-%defattr(-,root,root)
-
-%{_mandir}/man1/i586-pc-freebsd6.4-g++.1*
-
-%{_bindir}/i586-pc-freebsd6.4-c++%{_exeext}
-%{_bindir}/i586-pc-freebsd6.4-g++%{_exeext}
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd6.4
-%dir %{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n i586-pc-freebsd6.4-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/include
-%{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/include/c++
-
-# ==============================================================
-# i586-pc-freebsd6.4-gcc-gfortran
-# ==============================================================
-%package -n i586-pc-freebsd6.4-gcc-gfortran
-Summary:	Fortran 95 support for i586-pc-freebsd6.4-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       i586-pc-freebsd6.4-gcc = %{gcc_rpmvers}-%{release}
-Requires:       i586-pc-freebsd6.4-gcc-libgfortran = %{gcc_rpmvers}-%{release}
-
-%description -n i586-pc-freebsd6.4-gcc-gfortran
-GCC fortran compiler for i586-pc-freebsd6.4.
-
-%files -n i586-pc-freebsd6.4-gcc-gfortran
-%defattr(-,root,root)
-%{_bindir}/i586-pc-freebsd6.4-gfortran%{_exeext}
-
-%{_mandir}/man1/i586-pc-freebsd6.4-gfortran.1*
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd6.4
-%dir %{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/f951%{_exeext}
-
-# ==============================================================
-# i586-pc-freebsd6.4-gcc-libgfortran
-# ==============================================================
-%package -n i586-pc-freebsd6.4-gcc-libgfortran
-Summary:	Fortran 95 support libraries for i586-pc-freebsd6.4-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd6.4-gcc-libgfortran
-%{summary}
-
-%files -n i586-pc-freebsd6.4-gcc-libgfortran -f build/files.gfortran
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}
-%if "%{gcc_version}" >= "4.2.0"
-%{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/finclude
-%endif
-
-# ==============================================================
-# i586-pc-freebsd6.4-gcc-objc
-# ==============================================================
-%package -n i586-pc-freebsd6.4-gcc-objc
-Summary:        Objective C support for i586-pc-freebsd6.4-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       i586-pc-freebsd6.4-gcc = %{gcc_rpmvers}-%{release}
-Requires:       i586-pc-freebsd6.4-gcc-libobjc = %{gcc_rpmvers}-%{release}
-
-%description -n i586-pc-freebsd6.4-gcc-objc
-GCC objc compiler for i586-pc-freebsd6.4.
-
-%files -n i586-pc-freebsd6.4-gcc-objc
-%defattr(-,root,root)
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd6.4
-%dir %{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/cc1obj%{_exeext}
-
-# ==============================================================
-# i586-pc-freebsd6.4-gcc-libobjc
-# ==============================================================
-%package -n i586-pc-freebsd6.4-gcc-libobjc
-Summary:        Objective C support for i586-pc-freebsd6.4-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd6.4-gcc-libobjc
-Support libraries for GCC's objc compiler for i586-pc-freebsd6.4.
-
-%files -n i586-pc-freebsd6.4-gcc-libobjc -f build/files.objc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/include
-%{_gcclibdir}/gcc/i586-pc-freebsd6.4/%{gcc_version}/include/objc
-
diff --git a/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-libs.spec b/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-libs.spec
deleted file mode 100644
index af2e089..0000000
--- a/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-libs.spec
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define freebsd_version 6.4
-%define freebsd_rpmvers %{expand:%(echo 6.4 | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		i586-pc-freebsd6.4
-Release:	0.20090827.1%{?dist}
-License:	FreeBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%freebsd_rpmvers
-Summary:      	i586-pc-freebsd6.4 Libraries
-
-Source0:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.aa
-Source1:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ab
-Source2:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ac
-Source3:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ad
-Source4:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ae
-Source5:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.af
-Source6:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ag
-Source7:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ah
-Source8:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ai
-Source9:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.aj
-Source10: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ak
-Source11: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.al
-Source12: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.am
-Source13: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.an
-Source14: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ao
-Source15: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ap
-Source16: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.aq
-Source17: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ar
-Source18: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.as
-Source19: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.at
-Source20: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.au
-Source21: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.av
-Source22: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.aw
-Source23: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ax
-Source24: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ay
-Source25: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.az
-Source26: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.ba
-Source27: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.bb
-Source28: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.bc
-Source29: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.bd
-Source30: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.4-RELEASE/base/base.be
-
-%description
-i586-pc-freebsd6.4 libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-  cat \
- %SOURCE0 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 \
- %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 \
- %SOURCE10 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE14 \
- %SOURCE15 %SOURCE16 %SOURCE17 %SOURCE18 %SOURCE19 \
- %SOURCE20 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE24 \
- %SOURCE25 %SOURCE26 %SOURCE27 %SOURCE28 %SOURCE29 \
- %SOURCE30 \
- | %{__tar} --unlink -pxzf - ./lib ./usr/lib ./usr/include %{?el5:||:}
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i586-pc-freebsd6.4/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd i586-pc-freebsd6.4/sys-root ; %{__tar} xf -)
-
-  pushd i586-pc-freebsd6.4/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i586-pc-freebsd6.4 $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd6.4/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd6.4/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd6.4/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd6.4/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%package sys-root
-Group: Development/Tools
-Summary: i586-pc-freebsd6.4 target files for gcc >= 3.4
-
-%description sys-root
-i586-pc-freebsd6.4 target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/i586-pc-freebsd6.4
-%{_prefix}/i586-pc-freebsd6.4/sys-root
diff --git a/contrib/crossrpms/freebsd6.4/i586/libs.add b/contrib/crossrpms/freebsd6.4/i586/libs.add
deleted file mode 100644
index d3cce7e..0000000
--- a/contrib/crossrpms/freebsd6.4/i586/libs.add
+++ /dev/null
@@ -1,94 +0,0 @@
-%define freebsd_version @FREEBSD_VERS@
-%define freebsd_rpmvers %{expand:%(echo @FREEBSD_VERS@ | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		@rpmprefix@@tool_target@
-Release:	@FREEBSD_RPMREL@
-License:	FreeBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%freebsd_rpmvers
-Summary:      	@tool_target@ Libraries
-
-Source0:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aa
-Source1:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ab
-Source2:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ac
-Source3:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ad
-Source4:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ae
-Source5:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.af
-Source6:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ag
-Source7:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ah
-Source8:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ai
-Source9:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aj
-Source10: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ak
-Source11: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.al
-Source12: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.am
-Source13: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.an
-Source14: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ao
-Source15: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ap
-Source16: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aq
-Source17: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ar
-Source18: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.as
-Source19: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.at
-Source20: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.au
-Source21: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.av
-Source22: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aw
-Source23: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ax
-Source24: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ay
-Source25: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.az
-Source26: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ba
-Source27: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bb
-Source28: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bc
-Source29: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bd
-Source30: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.be
-
-%description
- at tool_target@ libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-  cat \
- %SOURCE0 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 \
- %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 \
- %SOURCE10 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE14 \
- %SOURCE15 %SOURCE16 %SOURCE17 %SOURCE18 %SOURCE19 \
- %SOURCE20 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE24 \
- %SOURCE25 %SOURCE26 %SOURCE27 %SOURCE28 %SOURCE29 \
- %SOURCE30 \
- | %{__tar} --unlink -pxzf - ./lib ./usr/lib ./usr/include %{?el5:||:}
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
-
-  pushd @tool_target@/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/freebsd6.4/i586/target-libs.add b/contrib/crossrpms/freebsd6.4/i586/target-libs.add
deleted file mode 100644
index 0550fc7..0000000
--- a/contrib/crossrpms/freebsd6.4/i586/target-libs.add
+++ /dev/null
@@ -1,11 +0,0 @@
-%package sys-root
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc >= 3.4
-
-%description sys-root
- at tool_target@ target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
diff --git a/contrib/crossrpms/freebsd6.4/libs.am b/contrib/crossrpms/freebsd6.4/libs.am
deleted file mode 100644
index a44fe58..0000000
--- a/contrib/crossrpms/freebsd6.4/libs.am
+++ /dev/null
@@ -1,18 +0,0 @@
-LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add
-LIBS_SUBPACKAGES += $(srcdir)/libs.add
-LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-LIBS_SUBPACKAGES += $(srcdir)/target-libs.add
-
-$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
-	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
-	  -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)%{?dist}/g" \
-	  -e "s,%{gcc_rpmvers},%{freebsd_rpmvers},g" \
-	> $(TARGET)-libs.spec.in
-CLEANFILES += $(TARGET)-libs.spec.in
-	                      
- at rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
-	$(MKSPEC) $(TARGET)-libs.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
-noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
diff --git a/contrib/crossrpms/freebsd7.3/Makefile.am b/contrib/crossrpms/freebsd7.3/Makefile.am
deleted file mode 100644
index 184ab63..0000000
--- a/contrib/crossrpms/freebsd7.3/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-SUBDIRS = i586
diff --git a/contrib/crossrpms/freebsd7.3/binutils.am b/contrib/crossrpms/freebsd7.3/binutils.am
deleted file mode 100644
index 60b6a26..0000000
--- a/contrib/crossrpms/freebsd7.3/binutils.am
+++ /dev/null
@@ -1,30 +0,0 @@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_OPTS =
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \
-	  | $(MKSPEC0) > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
- at rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
-EXTRA_DIST += $(BINUTILS_SUBPACKAGES)
diff --git a/contrib/crossrpms/freebsd7.3/gcc-prep.add b/contrib/crossrpms/freebsd7.3/gcc-prep.add
deleted file mode 100644
index e69de29..0000000
diff --git a/contrib/crossrpms/freebsd7.3/gcc.am b/contrib/crossrpms/freebsd7.3/gcc.am
deleted file mode 100644
index 466d72e..0000000
--- a/contrib/crossrpms/freebsd7.3/gcc.am
+++ /dev/null
@@ -1,42 +0,0 @@
-EXTRA_DIST += $(srcdir)/../gcc-prep.add
-EXTRA_DIST += $(srcdir)/gcc-sources.add
-
-GCC_OPTS =
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
-	cat $(GCC_SUBPACKAGES) \
-	  | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  | sed \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "/--with-newlib/d" \
-	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
- at rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
-	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
-
-EXTRA_DIST += $(GCC_SUBPACKAGES)
diff --git a/contrib/crossrpms/freebsd7.3/i586/Makefile.am b/contrib/crossrpms/freebsd7.3/i586/Makefile.am
deleted file mode 100644
index ff1ab92..0000000
--- a/contrib/crossrpms/freebsd7.3/i586/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-TARGET = i586-pc-freebsd7.3
-
-include $(top_srcdir)/mkspec.am
-
-FREEBSD_VERS = 7.3
-FREEBSD_RPMREL = 0.20100416.1
-EXTRA_DIST += libs.add
-EXTRA_DIST += target-libs.add
-include ../libs.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 0.20111122.0
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.5.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20111116.0
-include ../gcc.am
-GCC_OPTS += --languages=cxx,fortran,objc
diff --git a/contrib/crossrpms/freebsd7.3/i586/binutils-sources.add b/contrib/crossrpms/freebsd7.3/i586/binutils-sources.add
deleted file mode 100644
index e458c6f..0000000
--- a/contrib/crossrpms/freebsd7.3/i586/binutils-sources.add
+++ /dev/null
@@ -1,2 +0,0 @@
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
- at PATCH0@
diff --git a/contrib/crossrpms/freebsd7.3/i586/gcc-sources.add b/contrib/crossrpms/freebsd7.3/i586/gcc-sources.add
deleted file mode 100644
index 18c9848..0000000
--- a/contrib/crossrpms/freebsd7.3/i586/gcc-sources.add
+++ /dev/null
@@ -1,37 +0,0 @@
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-%if %build_cxx
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
- at PATCH2@
-%{?_without_sources:NoSource:	2}
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
- at PATCH3@
-%{?_without_sources:NoSource:	3}
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
- at PATCH4@
-%{?_without_sources:NoSource:	4}
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
- at PATCH5@
-%{?_without_sources:NoSource:	5}
-%endif
diff --git a/contrib/crossrpms/freebsd7.3/i586/i586-pc-freebsd7.3-binutils.spec b/contrib/crossrpms/freebsd7.3/i586/i586-pc-freebsd7.3-binutils.spec
deleted file mode 100644
index 5157c07..0000000
--- a/contrib/crossrpms/freebsd7.3/i586/i586-pc-freebsd7.3-binutils.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		i586-pc-freebsd7.3-binutils
-Summary:	Binutils for target i586-pc-freebsd7.3
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	0.20111122.0%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-
-%description
-Cross binutils for target i586-pc-freebsd7.3
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=i586-pc-freebsd7.3 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --with-sysroot=%{_prefix}/i586-pc-freebsd7.3/sys-root \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-
-# Conflict with a native binutils' infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd7.3-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd7.3-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd7.3-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd7.3-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd7.3-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd7.3-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd7.3-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd7.3-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i586-pc-freebsd7.3-binutils
-# ==============================================================
-# %package -n i586-pc-freebsd7.3-binutils
-# Summary:      rtems binutils for i586-pc-freebsd7.3
-# Group: Development/Tools
-# %if %build_infos
-# Requires: binutils-common
-# %endif
-
-%description -n i586-pc-freebsd7.3-binutils
-GNU binutils targetting i586-pc-freebsd7.3.
-
-%files -n i586-pc-freebsd7.3-binutils
-%defattr(-,root,root)
-
-%{_mandir}/man1/i586-pc-freebsd7.3-*.1*
-
-%{_bindir}/i586-pc-freebsd7.3-*
-
-%dir %{_exec_prefix}/i586-pc-freebsd7.3
-%dir %{_exec_prefix}/i586-pc-freebsd7.3/bin
-%{_exec_prefix}/i586-pc-freebsd7.3/bin/*
-
-%dir %{_exec_prefix}/i586-pc-freebsd7.3/lib
-%{_exec_prefix}/i586-pc-freebsd7.3/lib/ldscripts
-
diff --git a/contrib/crossrpms/freebsd7.3/i586/i586-pc-freebsd7.3-gcc.spec b/contrib/crossrpms/freebsd7.3/i586/i586-pc-freebsd7.3-gcc.spec
deleted file mode 100644
index 09cf14e..0000000
--- a/contrib/crossrpms/freebsd7.3/i586/i586-pc-freebsd7.3-gcc.spec
+++ /dev/null
@@ -1,798 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.5.2
-%define gcc_version 4.5.2
-%define gcc_rpmvers %{expand:%(echo "4.5.2" | tr - _ )}
-
-
-Name:         	i586-pc-freebsd7.3-gcc
-Summary:      	i586-pc-freebsd7.3 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	0.20111116.0%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%define gmp_required		4.1
-%define mpfr_required		2.2.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  i586-pc-freebsd7.3-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	i586-pc-freebsd7.3-binutils
-BuildRequires:	i586-pc-freebsd7.3-sys-root
-
-Requires:	i586-pc-freebsd7.3-binutils
-Requires:	i586-pc-freebsd7.3-sys-root
-Requires:	i586-pc-freebsd7.3-gcc-libgcc = %{gcc_rpmvers}-%{release}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	2}
-
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	5}
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for i586-pc-freebsd7.3.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-%{?SOURCE2:%setup -q -T -D -n %{name}-%{version} -a2}
-%{?PATCH2:%patch2 -p0}
-
-
-
-%{?SOURCE5:%setup -q -T -D -n %{name}-%{version} -a5}
-%{?PATCH5:%patch5 -p0}
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  languages="$languages,fortran"
-  languages="$languages,objc"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=i586-pc-freebsd7.3 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    --with-sysroot=%{_exec_prefix}/i586-pc-freebsd7.3/sys-root \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i586-pc-freebsd7.3-c++filt%{_exeext}
-
-
-# Conflict with a native GCC's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# Conflict with a native GCC's man pages
-  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i586-pc-freebsd7.3-i586-pc-freebsd7.3-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/i586-pc-freebsd7.3/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/i586-pc-freebsd7.3/include/bits
-  fi
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/i586-pc-freebsd7.3/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd7.3/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd7.3/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd7.3/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd7.3/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i586-pc-freebsd7.3-gcc
-# ==============================================================
-# %package -n i586-pc-freebsd7.3-gcc
-# Summary:        GNU cc compiler for i586-pc-freebsd7.3
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       i586-pc-freebsd7.3-binutils
-# License:	GPL
-
-# %if %build_infos
-# Requires:      gcc-common
-# %endif
-
-%description -n i586-pc-freebsd7.3-gcc
-GNU cc compiler for i586-pc-freebsd7.3.
-
-# ==============================================================
-# i586-pc-freebsd7.3-gcc-libgcc
-# ==============================================================
-%package -n i586-pc-freebsd7.3-gcc-libgcc
-Summary:        libgcc for i586-pc-freebsd7.3-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd7.3-gcc-libgcc
-libgcc i586-pc-freebsd7.3-gcc.
-
-
-%files -n i586-pc-freebsd7.3-gcc
-%defattr(-,root,root)
-
-%{_mandir}/man1/i586-pc-freebsd7.3-gcc.1*
-%{_mandir}/man1/i586-pc-freebsd7.3-cpp.1*
-%{_mandir}/man1/i586-pc-freebsd7.3-gcov.1*
-
-%{_bindir}/i586-pc-freebsd7.3-cpp%{_exeext}
-%{_bindir}/i586-pc-freebsd7.3-gcc%{_exeext}
-%{_bindir}/i586-pc-freebsd7.3-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/i586-pc-freebsd7.3-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/i586-pc-freebsd7.3-gccbug
-%endif
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd7.3
-%dir %{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n i586-pc-freebsd7.3-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# i586-pc-freebsd7.3-gcc-c++
-# ==============================================================
-%package -n i586-pc-freebsd7.3-gcc-c++
-Summary:	GCC c++ compiler for i586-pc-freebsd7.3
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       i586-pc-freebsd7.3-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  i586-pc-freebsd7.3-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       i586-pc-freebsd7.3-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n i586-pc-freebsd7.3-gcc-c++
-GCC c++ compiler for i586-pc-freebsd7.3.
-
-
-%package -n i586-pc-freebsd7.3-gcc-libstdc++
-Summary:	libstdc++ for i586-pc-freebsd7.3
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd7.3-gcc-libstdc++
-%{summary}
-
-
-%files -n i586-pc-freebsd7.3-gcc-c++
-%defattr(-,root,root)
-
-%{_mandir}/man1/i586-pc-freebsd7.3-g++.1*
-
-%{_bindir}/i586-pc-freebsd7.3-c++%{_exeext}
-%{_bindir}/i586-pc-freebsd7.3-g++%{_exeext}
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd7.3
-%dir %{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n i586-pc-freebsd7.3-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/include
-%{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/include/c++
-
-# ==============================================================
-# i586-pc-freebsd7.3-gcc-gfortran
-# ==============================================================
-%package -n i586-pc-freebsd7.3-gcc-gfortran
-Summary:	Fortran 95 support for i586-pc-freebsd7.3-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       i586-pc-freebsd7.3-gcc = %{gcc_rpmvers}-%{release}
-Requires:       i586-pc-freebsd7.3-gcc-libgfortran = %{gcc_rpmvers}-%{release}
-
-%description -n i586-pc-freebsd7.3-gcc-gfortran
-GCC fortran compiler for i586-pc-freebsd7.3.
-
-%files -n i586-pc-freebsd7.3-gcc-gfortran
-%defattr(-,root,root)
-%{_bindir}/i586-pc-freebsd7.3-gfortran%{_exeext}
-
-%{_mandir}/man1/i586-pc-freebsd7.3-gfortran.1*
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd7.3
-%dir %{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/f951%{_exeext}
-
-# ==============================================================
-# i586-pc-freebsd7.3-gcc-libgfortran
-# ==============================================================
-%package -n i586-pc-freebsd7.3-gcc-libgfortran
-Summary:	Fortran 95 support libraries for i586-pc-freebsd7.3-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd7.3-gcc-libgfortran
-%{summary}
-
-%files -n i586-pc-freebsd7.3-gcc-libgfortran -f build/files.gfortran
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}
-%if "%{gcc_version}" >= "4.2.0"
-%{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/finclude
-%endif
-
-# ==============================================================
-# i586-pc-freebsd7.3-gcc-objc
-# ==============================================================
-%package -n i586-pc-freebsd7.3-gcc-objc
-Summary:        Objective C support for i586-pc-freebsd7.3-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       i586-pc-freebsd7.3-gcc = %{gcc_rpmvers}-%{release}
-Requires:       i586-pc-freebsd7.3-gcc-libobjc = %{gcc_rpmvers}-%{release}
-
-%description -n i586-pc-freebsd7.3-gcc-objc
-GCC objc compiler for i586-pc-freebsd7.3.
-
-%files -n i586-pc-freebsd7.3-gcc-objc
-%defattr(-,root,root)
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd7.3
-%dir %{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/cc1obj%{_exeext}
-
-# ==============================================================
-# i586-pc-freebsd7.3-gcc-libobjc
-# ==============================================================
-%package -n i586-pc-freebsd7.3-gcc-libobjc
-Summary:        Objective C support for i586-pc-freebsd7.3-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd7.3-gcc-libobjc
-Support libraries for GCC's objc compiler for i586-pc-freebsd7.3.
-
-%files -n i586-pc-freebsd7.3-gcc-libobjc -f build/files.objc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/include
-%{_gcclibdir}/gcc/i586-pc-freebsd7.3/%{gcc_version}/include/objc
-
diff --git a/contrib/crossrpms/freebsd7.3/i586/i586-pc-freebsd7.3-libs.spec b/contrib/crossrpms/freebsd7.3/i586/i586-pc-freebsd7.3-libs.spec
deleted file mode 100644
index a69bcb2..0000000
--- a/contrib/crossrpms/freebsd7.3/i586/i586-pc-freebsd7.3-libs.spec
+++ /dev/null
@@ -1,206 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define freebsd_version 7.3
-%define freebsd_rpmvers %{expand:%(echo 7.3 | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		i586-pc-freebsd7.3
-Release:	0.20100416.1%{?dist}
-License:	FreeBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%freebsd_rpmvers
-Summary:      	i586-pc-freebsd7.3 Libraries
-
-Source0:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.aa
-Source1:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ab
-Source2:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ac
-Source3:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ad
-Source4:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ae
-Source5:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.af
-Source6:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ag
-Source7:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ah
-Source8:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ai
-Source9:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.aj
-Source10: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ak
-Source11: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.al
-Source12: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.am
-Source13: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.an
-Source14: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ao
-Source15: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ap
-Source16: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.aq
-Source17: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ar
-Source18: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.as
-Source19: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.at
-Source20: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.au
-Source21: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.av
-Source22: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.aw
-Source23: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ax
-Source24: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ay
-Source25: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.az
-Source26: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.ba
-Source27: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.bb
-Source28: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.bc
-Source29: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.bd
-Source30: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.be
-Source31: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.bf
-Source32: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.bg
-Source33: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.bh
-Source34: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/7.3-RELEASE/base/base.bi
-
-%description
-i586-pc-freebsd7.3 libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-  cat \
- %SOURCE0 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 \
- %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 \
- %SOURCE10 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE14 \
- %SOURCE15 %SOURCE16 %SOURCE17 %SOURCE18 %SOURCE19 \
- %SOURCE20 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE24 \
- %SOURCE25 %SOURCE26 %SOURCE27 %SOURCE28 %SOURCE29 \
- %SOURCE30 %SOURCE31 %SOURCE32 %SOURCE33 %SOURCE34 \
- | %{__tar} --unlink -pxzf - ./lib ./usr/lib ./usr/include %{?el5:||:}
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i586-pc-freebsd7.3/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd i586-pc-freebsd7.3/sys-root ; %{__tar} xf -)
-
-  pushd i586-pc-freebsd7.3/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i586-pc-freebsd7.3 $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd7.3/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd7.3/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd7.3/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd7.3/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%package sys-root
-Group: Development/Tools
-Summary: i586-pc-freebsd7.3 target files for gcc >= 3.4
-
-%description sys-root
-i586-pc-freebsd7.3 target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/i586-pc-freebsd7.3
-%{_prefix}/i586-pc-freebsd7.3/sys-root
diff --git a/contrib/crossrpms/freebsd7.3/i586/libs.add b/contrib/crossrpms/freebsd7.3/i586/libs.add
deleted file mode 100644
index 9049057..0000000
--- a/contrib/crossrpms/freebsd7.3/i586/libs.add
+++ /dev/null
@@ -1,98 +0,0 @@
-%define freebsd_version @FREEBSD_VERS@
-%define freebsd_rpmvers %{expand:%(echo @FREEBSD_VERS@ | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		@rpmprefix@@tool_target@
-Release:	@FREEBSD_RPMREL@
-License:	FreeBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%freebsd_rpmvers
-Summary:      	@tool_target@ Libraries
-
-Source0:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aa
-Source1:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ab
-Source2:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ac
-Source3:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ad
-Source4:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ae
-Source5:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.af
-Source6:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ag
-Source7:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ah
-Source8:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ai
-Source9:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aj
-Source10: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ak
-Source11: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.al
-Source12: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.am
-Source13: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.an
-Source14: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ao
-Source15: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ap
-Source16: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aq
-Source17: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ar
-Source18: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.as
-Source19: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.at
-Source20: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.au
-Source21: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.av
-Source22: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aw
-Source23: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ax
-Source24: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ay
-Source25: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.az
-Source26: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ba
-Source27: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bb
-Source28: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bc
-Source29: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bd
-Source30: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.be
-Source31: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bf
-Source32: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bg
-Source33: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bh
-Source34: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bi
-
-%description
- at tool_target@ libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-  cat \
- %SOURCE0 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 \
- %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 \
- %SOURCE10 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE14 \
- %SOURCE15 %SOURCE16 %SOURCE17 %SOURCE18 %SOURCE19 \
- %SOURCE20 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE24 \
- %SOURCE25 %SOURCE26 %SOURCE27 %SOURCE28 %SOURCE29 \
- %SOURCE30 %SOURCE31 %SOURCE32 %SOURCE33 %SOURCE34 \
- | %{__tar} --unlink -pxzf - ./lib ./usr/lib ./usr/include %{?el5:||:}
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
-
-  pushd @tool_target@/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/freebsd7.3/i586/target-libs.add b/contrib/crossrpms/freebsd7.3/i586/target-libs.add
deleted file mode 100644
index 0550fc7..0000000
--- a/contrib/crossrpms/freebsd7.3/i586/target-libs.add
+++ /dev/null
@@ -1,11 +0,0 @@
-%package sys-root
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc >= 3.4
-
-%description sys-root
- at tool_target@ target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
diff --git a/contrib/crossrpms/freebsd7.3/libs.am b/contrib/crossrpms/freebsd7.3/libs.am
deleted file mode 100644
index a44fe58..0000000
--- a/contrib/crossrpms/freebsd7.3/libs.am
+++ /dev/null
@@ -1,18 +0,0 @@
-LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add
-LIBS_SUBPACKAGES += $(srcdir)/libs.add
-LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-LIBS_SUBPACKAGES += $(srcdir)/target-libs.add
-
-$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
-	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
-	  -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)%{?dist}/g" \
-	  -e "s,%{gcc_rpmvers},%{freebsd_rpmvers},g" \
-	> $(TARGET)-libs.spec.in
-CLEANFILES += $(TARGET)-libs.spec.in
-	                      
- at rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
-	$(MKSPEC) $(TARGET)-libs.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
-noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
diff --git a/contrib/crossrpms/freebsd8.2/Makefile.am b/contrib/crossrpms/freebsd8.2/Makefile.am
deleted file mode 100644
index 5727166..0000000
--- a/contrib/crossrpms/freebsd8.2/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-SUBDIRS = i586 x86_64
diff --git a/contrib/crossrpms/freebsd8.2/binutils.am b/contrib/crossrpms/freebsd8.2/binutils.am
deleted file mode 100644
index 60b6a26..0000000
--- a/contrib/crossrpms/freebsd8.2/binutils.am
+++ /dev/null
@@ -1,30 +0,0 @@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_OPTS =
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \
-	  | $(MKSPEC0) > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
- at rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
-EXTRA_DIST += $(BINUTILS_SUBPACKAGES)
diff --git a/contrib/crossrpms/freebsd8.2/gcc-prep.add b/contrib/crossrpms/freebsd8.2/gcc-prep.add
deleted file mode 100644
index e69de29..0000000
diff --git a/contrib/crossrpms/freebsd8.2/gcc.am b/contrib/crossrpms/freebsd8.2/gcc.am
deleted file mode 100644
index 466d72e..0000000
--- a/contrib/crossrpms/freebsd8.2/gcc.am
+++ /dev/null
@@ -1,42 +0,0 @@
-EXTRA_DIST += $(srcdir)/../gcc-prep.add
-EXTRA_DIST += $(srcdir)/gcc-sources.add
-
-GCC_OPTS =
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
-	cat $(GCC_SUBPACKAGES) \
-	  | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  | sed \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "/--with-newlib/d" \
-	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
- at rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
-	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
-
-EXTRA_DIST += $(GCC_SUBPACKAGES)
diff --git a/contrib/crossrpms/freebsd8.2/i586/Makefile.am b/contrib/crossrpms/freebsd8.2/i586/Makefile.am
deleted file mode 100644
index ccd35d4..0000000
--- a/contrib/crossrpms/freebsd8.2/i586/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-TARGET = i586-pc-freebsd8.2
-
-include $(top_srcdir)/mkspec.am
-
-FREEBSD_VERS = 8.2
-FREEBSD_RPMREL = 0.20110227.0
-EXTRA_DIST += libs.add
-EXTRA_DIST += target-libs.add
-include ../libs.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 0.20111122.0
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.5.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20111116.0
-include ../gcc.am
-GCC_OPTS += --languages=cxx,fortran,objc
diff --git a/contrib/crossrpms/freebsd8.2/i586/binutils-sources.add b/contrib/crossrpms/freebsd8.2/i586/binutils-sources.add
deleted file mode 100644
index e458c6f..0000000
--- a/contrib/crossrpms/freebsd8.2/i586/binutils-sources.add
+++ /dev/null
@@ -1,2 +0,0 @@
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
- at PATCH0@
diff --git a/contrib/crossrpms/freebsd8.2/i586/gcc-sources.add b/contrib/crossrpms/freebsd8.2/i586/gcc-sources.add
deleted file mode 100644
index 18c9848..0000000
--- a/contrib/crossrpms/freebsd8.2/i586/gcc-sources.add
+++ /dev/null
@@ -1,37 +0,0 @@
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-%if %build_cxx
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
- at PATCH2@
-%{?_without_sources:NoSource:	2}
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
- at PATCH3@
-%{?_without_sources:NoSource:	3}
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
- at PATCH4@
-%{?_without_sources:NoSource:	4}
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
- at PATCH5@
-%{?_without_sources:NoSource:	5}
-%endif
diff --git a/contrib/crossrpms/freebsd8.2/i586/i586-pc-freebsd8.2-binutils.spec b/contrib/crossrpms/freebsd8.2/i586/i586-pc-freebsd8.2-binutils.spec
deleted file mode 100644
index 069264b..0000000
--- a/contrib/crossrpms/freebsd8.2/i586/i586-pc-freebsd8.2-binutils.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		i586-pc-freebsd8.2-binutils
-Summary:	Binutils for target i586-pc-freebsd8.2
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	0.20111122.0%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-
-%description
-Cross binutils for target i586-pc-freebsd8.2
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=i586-pc-freebsd8.2 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --with-sysroot=%{_prefix}/i586-pc-freebsd8.2/sys-root \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-
-# Conflict with a native binutils' infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd8.2-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd8.2-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd8.2-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd8.2-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd8.2-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd8.2-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i586-pc-freebsd8.2-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i586-pc-freebsd8.2-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i586-pc-freebsd8.2-binutils
-# ==============================================================
-# %package -n i586-pc-freebsd8.2-binutils
-# Summary:      rtems binutils for i586-pc-freebsd8.2
-# Group: Development/Tools
-# %if %build_infos
-# Requires: binutils-common
-# %endif
-
-%description -n i586-pc-freebsd8.2-binutils
-GNU binutils targetting i586-pc-freebsd8.2.
-
-%files -n i586-pc-freebsd8.2-binutils
-%defattr(-,root,root)
-
-%{_mandir}/man1/i586-pc-freebsd8.2-*.1*
-
-%{_bindir}/i586-pc-freebsd8.2-*
-
-%dir %{_exec_prefix}/i586-pc-freebsd8.2
-%dir %{_exec_prefix}/i586-pc-freebsd8.2/bin
-%{_exec_prefix}/i586-pc-freebsd8.2/bin/*
-
-%dir %{_exec_prefix}/i586-pc-freebsd8.2/lib
-%{_exec_prefix}/i586-pc-freebsd8.2/lib/ldscripts
-
diff --git a/contrib/crossrpms/freebsd8.2/i586/i586-pc-freebsd8.2-gcc.spec b/contrib/crossrpms/freebsd8.2/i586/i586-pc-freebsd8.2-gcc.spec
deleted file mode 100644
index eba9d13..0000000
--- a/contrib/crossrpms/freebsd8.2/i586/i586-pc-freebsd8.2-gcc.spec
+++ /dev/null
@@ -1,798 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.5.2
-%define gcc_version 4.5.2
-%define gcc_rpmvers %{expand:%(echo "4.5.2" | tr - _ )}
-
-
-Name:         	i586-pc-freebsd8.2-gcc
-Summary:      	i586-pc-freebsd8.2 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	0.20111116.0%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%define gmp_required		4.1
-%define mpfr_required		2.2.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  i586-pc-freebsd8.2-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	i586-pc-freebsd8.2-binutils
-BuildRequires:	i586-pc-freebsd8.2-sys-root
-
-Requires:	i586-pc-freebsd8.2-binutils
-Requires:	i586-pc-freebsd8.2-sys-root
-Requires:	i586-pc-freebsd8.2-gcc-libgcc = %{gcc_rpmvers}-%{release}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	2}
-
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	5}
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for i586-pc-freebsd8.2.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-%{?SOURCE2:%setup -q -T -D -n %{name}-%{version} -a2}
-%{?PATCH2:%patch2 -p0}
-
-
-
-%{?SOURCE5:%setup -q -T -D -n %{name}-%{version} -a5}
-%{?PATCH5:%patch5 -p0}
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  languages="$languages,fortran"
-  languages="$languages,objc"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=i586-pc-freebsd8.2 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    --with-sysroot=%{_exec_prefix}/i586-pc-freebsd8.2/sys-root \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i586-pc-freebsd8.2-c++filt%{_exeext}
-
-
-# Conflict with a native GCC's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# Conflict with a native GCC's man pages
-  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i586-pc-freebsd8.2-i586-pc-freebsd8.2-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/i586-pc-freebsd8.2/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/i586-pc-freebsd8.2/include/bits
-  fi
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/i586-pc-freebsd8.2/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd8.2/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd8.2/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd8.2/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd8.2/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i586-pc-freebsd8.2-gcc
-# ==============================================================
-# %package -n i586-pc-freebsd8.2-gcc
-# Summary:        GNU cc compiler for i586-pc-freebsd8.2
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       i586-pc-freebsd8.2-binutils
-# License:	GPL
-
-# %if %build_infos
-# Requires:      gcc-common
-# %endif
-
-%description -n i586-pc-freebsd8.2-gcc
-GNU cc compiler for i586-pc-freebsd8.2.
-
-# ==============================================================
-# i586-pc-freebsd8.2-gcc-libgcc
-# ==============================================================
-%package -n i586-pc-freebsd8.2-gcc-libgcc
-Summary:        libgcc for i586-pc-freebsd8.2-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd8.2-gcc-libgcc
-libgcc i586-pc-freebsd8.2-gcc.
-
-
-%files -n i586-pc-freebsd8.2-gcc
-%defattr(-,root,root)
-
-%{_mandir}/man1/i586-pc-freebsd8.2-gcc.1*
-%{_mandir}/man1/i586-pc-freebsd8.2-cpp.1*
-%{_mandir}/man1/i586-pc-freebsd8.2-gcov.1*
-
-%{_bindir}/i586-pc-freebsd8.2-cpp%{_exeext}
-%{_bindir}/i586-pc-freebsd8.2-gcc%{_exeext}
-%{_bindir}/i586-pc-freebsd8.2-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/i586-pc-freebsd8.2-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/i586-pc-freebsd8.2-gccbug
-%endif
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd8.2
-%dir %{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n i586-pc-freebsd8.2-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# i586-pc-freebsd8.2-gcc-c++
-# ==============================================================
-%package -n i586-pc-freebsd8.2-gcc-c++
-Summary:	GCC c++ compiler for i586-pc-freebsd8.2
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       i586-pc-freebsd8.2-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  i586-pc-freebsd8.2-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       i586-pc-freebsd8.2-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n i586-pc-freebsd8.2-gcc-c++
-GCC c++ compiler for i586-pc-freebsd8.2.
-
-
-%package -n i586-pc-freebsd8.2-gcc-libstdc++
-Summary:	libstdc++ for i586-pc-freebsd8.2
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd8.2-gcc-libstdc++
-%{summary}
-
-
-%files -n i586-pc-freebsd8.2-gcc-c++
-%defattr(-,root,root)
-
-%{_mandir}/man1/i586-pc-freebsd8.2-g++.1*
-
-%{_bindir}/i586-pc-freebsd8.2-c++%{_exeext}
-%{_bindir}/i586-pc-freebsd8.2-g++%{_exeext}
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd8.2
-%dir %{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n i586-pc-freebsd8.2-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/include
-%{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/include/c++
-
-# ==============================================================
-# i586-pc-freebsd8.2-gcc-gfortran
-# ==============================================================
-%package -n i586-pc-freebsd8.2-gcc-gfortran
-Summary:	Fortran 95 support for i586-pc-freebsd8.2-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       i586-pc-freebsd8.2-gcc = %{gcc_rpmvers}-%{release}
-Requires:       i586-pc-freebsd8.2-gcc-libgfortran = %{gcc_rpmvers}-%{release}
-
-%description -n i586-pc-freebsd8.2-gcc-gfortran
-GCC fortran compiler for i586-pc-freebsd8.2.
-
-%files -n i586-pc-freebsd8.2-gcc-gfortran
-%defattr(-,root,root)
-%{_bindir}/i586-pc-freebsd8.2-gfortran%{_exeext}
-
-%{_mandir}/man1/i586-pc-freebsd8.2-gfortran.1*
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd8.2
-%dir %{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/f951%{_exeext}
-
-# ==============================================================
-# i586-pc-freebsd8.2-gcc-libgfortran
-# ==============================================================
-%package -n i586-pc-freebsd8.2-gcc-libgfortran
-Summary:	Fortran 95 support libraries for i586-pc-freebsd8.2-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd8.2-gcc-libgfortran
-%{summary}
-
-%files -n i586-pc-freebsd8.2-gcc-libgfortran -f build/files.gfortran
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}
-%if "%{gcc_version}" >= "4.2.0"
-%{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/finclude
-%endif
-
-# ==============================================================
-# i586-pc-freebsd8.2-gcc-objc
-# ==============================================================
-%package -n i586-pc-freebsd8.2-gcc-objc
-Summary:        Objective C support for i586-pc-freebsd8.2-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       i586-pc-freebsd8.2-gcc = %{gcc_rpmvers}-%{release}
-Requires:       i586-pc-freebsd8.2-gcc-libobjc = %{gcc_rpmvers}-%{release}
-
-%description -n i586-pc-freebsd8.2-gcc-objc
-GCC objc compiler for i586-pc-freebsd8.2.
-
-%files -n i586-pc-freebsd8.2-gcc-objc
-%defattr(-,root,root)
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i586-pc-freebsd8.2
-%dir %{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}
-%{_libexecdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/cc1obj%{_exeext}
-
-# ==============================================================
-# i586-pc-freebsd8.2-gcc-libobjc
-# ==============================================================
-%package -n i586-pc-freebsd8.2-gcc-libobjc
-Summary:        Objective C support for i586-pc-freebsd8.2-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i586-pc-freebsd8.2-gcc-libobjc
-Support libraries for GCC's objc compiler for i586-pc-freebsd8.2.
-
-%files -n i586-pc-freebsd8.2-gcc-libobjc -f build/files.objc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/include
-%{_gcclibdir}/gcc/i586-pc-freebsd8.2/%{gcc_version}/include/objc
-
diff --git a/contrib/crossrpms/freebsd8.2/i586/i586-pc-freebsd8.2-libs.spec b/contrib/crossrpms/freebsd8.2/i586/i586-pc-freebsd8.2-libs.spec
deleted file mode 100644
index 727f008..0000000
--- a/contrib/crossrpms/freebsd8.2/i586/i586-pc-freebsd8.2-libs.spec
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define freebsd_version 8.2
-%define freebsd_rpmvers %{expand:%(echo 8.2 | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		i586-pc-freebsd8.2
-Release:	0.20110227.0%{?dist}
-License:	FreeBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%freebsd_rpmvers
-Summary:      	i586-pc-freebsd8.2 Libraries
-
-Source0:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.aa
-Source1:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ab
-Source2:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ac
-Source3:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ad
-Source4:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ae
-Source5:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.af
-Source6:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ag
-Source7:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ah
-Source8:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ai
-Source9:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.aj
-Source10: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ak
-Source11: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.al
-Source12: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.am
-Source13: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.an
-Source14: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ao
-Source15: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ap
-Source16: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.aq
-Source17: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ar
-Source18: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.as
-Source19: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.at
-Source20: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.au
-Source21: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.av
-Source22: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.aw
-Source23: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ax
-Source24: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ay
-Source25: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.az
-Source26: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ba
-Source27: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bb
-Source28: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bc
-Source29: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bd
-Source30: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.be
-Source31: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bf
-Source32: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bg
-Source33: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bh
-Source34: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bi
-Source35: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bj
-Source36: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bk
-Source37: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bl
-Source38: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bm
-
-%description
-i586-pc-freebsd8.2 libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-  cat \
- %SOURCE0 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 \
- %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 \
- %SOURCE10 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE14 \
- %SOURCE15 %SOURCE16 %SOURCE17 %SOURCE18 %SOURCE19 \
- %SOURCE20 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE24 \
- %SOURCE25 %SOURCE26 %SOURCE27 %SOURCE28 %SOURCE29 \
- %SOURCE30 %SOURCE31 %SOURCE32 %SOURCE33 %SOURCE34 \
- %SOURCE35 %SOURCE36 %SOURCE37 %SOURCE38 \
- | %{__tar} --unlink -pxzf - ./lib ./usr/lib ./usr/include %{?el5:||:}
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i586-pc-freebsd8.2/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd i586-pc-freebsd8.2/sys-root ; %{__tar} xf -)
-
-  pushd i586-pc-freebsd8.2/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i586-pc-freebsd8.2 $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd8.2/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd8.2/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd8.2/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd8.2/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%package sys-root
-Group: Development/Tools
-Summary: i586-pc-freebsd8.2 target files for gcc >= 3.4
-
-%description sys-root
-i586-pc-freebsd8.2 target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/i586-pc-freebsd8.2
-%{_prefix}/i586-pc-freebsd8.2/sys-root
diff --git a/contrib/crossrpms/freebsd8.2/i586/libs.add b/contrib/crossrpms/freebsd8.2/i586/libs.add
deleted file mode 100644
index 7f18e3e..0000000
--- a/contrib/crossrpms/freebsd8.2/i586/libs.add
+++ /dev/null
@@ -1,103 +0,0 @@
-%define freebsd_version @FREEBSD_VERS@
-%define freebsd_rpmvers %{expand:%(echo @FREEBSD_VERS@ | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		@rpmprefix@@tool_target@
-Release:	@FREEBSD_RPMREL@
-License:	FreeBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%freebsd_rpmvers
-Summary:      	@tool_target@ Libraries
-
-Source0:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aa
-Source1:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ab
-Source2:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ac
-Source3:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ad
-Source4:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ae
-Source5:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.af
-Source6:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ag
-Source7:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ah
-Source8:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ai
-Source9:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aj
-Source10: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ak
-Source11: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.al
-Source12: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.am
-Source13: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.an
-Source14: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ao
-Source15: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ap
-Source16: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aq
-Source17: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ar
-Source18: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.as
-Source19: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.at
-Source20: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.au
-Source21: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.av
-Source22: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aw
-Source23: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ax
-Source24: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ay
-Source25: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.az
-Source26: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ba
-Source27: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bb
-Source28: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bc
-Source29: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bd
-Source30: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.be
-Source31: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bf
-Source32: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bg
-Source33: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bh
-Source34: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bi
-Source35: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bj
-Source36: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bk
-Source37: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bl
-Source38: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bm
-
-%description
- at tool_target@ libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-  cat \
- %SOURCE0 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 \
- %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 \
- %SOURCE10 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE14 \
- %SOURCE15 %SOURCE16 %SOURCE17 %SOURCE18 %SOURCE19 \
- %SOURCE20 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE24 \
- %SOURCE25 %SOURCE26 %SOURCE27 %SOURCE28 %SOURCE29 \
- %SOURCE30 %SOURCE31 %SOURCE32 %SOURCE33 %SOURCE34 \
- %SOURCE35 %SOURCE36 %SOURCE37 %SOURCE38 \
- | %{__tar} --unlink -pxzf - ./lib ./usr/lib ./usr/include %{?el5:||:}
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
-
-  pushd @tool_target@/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/freebsd8.2/i586/target-libs.add b/contrib/crossrpms/freebsd8.2/i586/target-libs.add
deleted file mode 100644
index 0550fc7..0000000
--- a/contrib/crossrpms/freebsd8.2/i586/target-libs.add
+++ /dev/null
@@ -1,11 +0,0 @@
-%package sys-root
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc >= 3.4
-
-%description sys-root
- at tool_target@ target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
diff --git a/contrib/crossrpms/freebsd8.2/libs.am b/contrib/crossrpms/freebsd8.2/libs.am
deleted file mode 100644
index a44fe58..0000000
--- a/contrib/crossrpms/freebsd8.2/libs.am
+++ /dev/null
@@ -1,18 +0,0 @@
-LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add
-LIBS_SUBPACKAGES += $(srcdir)/libs.add
-LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-LIBS_SUBPACKAGES += $(srcdir)/target-libs.add
-
-$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
-	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
-	  -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)%{?dist}/g" \
-	  -e "s,%{gcc_rpmvers},%{freebsd_rpmvers},g" \
-	> $(TARGET)-libs.spec.in
-CLEANFILES += $(TARGET)-libs.spec.in
-	                      
- at rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
-	$(MKSPEC) $(TARGET)-libs.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
-noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
diff --git a/contrib/crossrpms/freebsd8.2/x86_64/Makefile.am b/contrib/crossrpms/freebsd8.2/x86_64/Makefile.am
deleted file mode 100644
index 52e5f21..0000000
--- a/contrib/crossrpms/freebsd8.2/x86_64/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-TARGET = amd64-pc-freebsd8.2
-
-include $(top_srcdir)/mkspec.am
-
-FREEBSD_VERS = 8.2
-FREEBSD_RPMREL = 0.20110227.0
-EXTRA_DIST += libs.add
-EXTRA_DIST += target-libs.add
-include ../libs.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 0.20111122.0
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.5.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20111116.0
-include ../gcc.am
-GCC_OPTS += --languages=cxx,fortran,objc
diff --git a/contrib/crossrpms/freebsd8.2/x86_64/amd64-pc-freebsd8.2-binutils.spec b/contrib/crossrpms/freebsd8.2/x86_64/amd64-pc-freebsd8.2-binutils.spec
deleted file mode 100644
index 2a39367..0000000
--- a/contrib/crossrpms/freebsd8.2/x86_64/amd64-pc-freebsd8.2-binutils.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		amd64-pc-freebsd8.2-binutils
-Summary:	Binutils for target amd64-pc-freebsd8.2
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	0.20111122.0%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-
-%description
-Cross binutils for target amd64-pc-freebsd8.2
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=amd64-pc-freebsd8.2 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --with-sysroot=%{_prefix}/amd64-pc-freebsd8.2/sys-root \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-
-# Conflict with a native binutils' infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/amd64-pc-freebsd8.2-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/amd64-pc-freebsd8.2-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/amd64-pc-freebsd8.2-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/amd64-pc-freebsd8.2-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/amd64-pc-freebsd8.2-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/amd64-pc-freebsd8.2-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/amd64-pc-freebsd8.2-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/amd64-pc-freebsd8.2-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# amd64-pc-freebsd8.2-binutils
-# ==============================================================
-# %package -n amd64-pc-freebsd8.2-binutils
-# Summary:      rtems binutils for amd64-pc-freebsd8.2
-# Group: Development/Tools
-# %if %build_infos
-# Requires: binutils-common
-# %endif
-
-%description -n amd64-pc-freebsd8.2-binutils
-GNU binutils targetting amd64-pc-freebsd8.2.
-
-%files -n amd64-pc-freebsd8.2-binutils
-%defattr(-,root,root)
-
-%{_mandir}/man1/amd64-pc-freebsd8.2-*.1*
-
-%{_bindir}/amd64-pc-freebsd8.2-*
-
-%dir %{_exec_prefix}/amd64-pc-freebsd8.2
-%dir %{_exec_prefix}/amd64-pc-freebsd8.2/bin
-%{_exec_prefix}/amd64-pc-freebsd8.2/bin/*
-
-%dir %{_exec_prefix}/amd64-pc-freebsd8.2/lib
-%{_exec_prefix}/amd64-pc-freebsd8.2/lib/ldscripts
-
diff --git a/contrib/crossrpms/freebsd8.2/x86_64/amd64-pc-freebsd8.2-gcc.spec b/contrib/crossrpms/freebsd8.2/x86_64/amd64-pc-freebsd8.2-gcc.spec
deleted file mode 100644
index 438d704..0000000
--- a/contrib/crossrpms/freebsd8.2/x86_64/amd64-pc-freebsd8.2-gcc.spec
+++ /dev/null
@@ -1,798 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.5.2
-%define gcc_version 4.5.2
-%define gcc_rpmvers %{expand:%(echo "4.5.2" | tr - _ )}
-
-
-Name:         	amd64-pc-freebsd8.2-gcc
-Summary:      	amd64-pc-freebsd8.2 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	0.20111116.0%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%define gmp_required		4.1
-%define mpfr_required		2.2.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  amd64-pc-freebsd8.2-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	amd64-pc-freebsd8.2-binutils
-BuildRequires:	amd64-pc-freebsd8.2-sys-root
-
-Requires:	amd64-pc-freebsd8.2-binutils
-Requires:	amd64-pc-freebsd8.2-sys-root
-Requires:	amd64-pc-freebsd8.2-gcc-libgcc = %{gcc_rpmvers}-%{release}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	2}
-
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	5}
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for amd64-pc-freebsd8.2.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-%{?SOURCE2:%setup -q -T -D -n %{name}-%{version} -a2}
-%{?PATCH2:%patch2 -p0}
-
-
-
-%{?SOURCE5:%setup -q -T -D -n %{name}-%{version} -a5}
-%{?PATCH5:%patch5 -p0}
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  languages="$languages,fortran"
-  languages="$languages,objc"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=amd64-pc-freebsd8.2 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    --with-sysroot=%{_exec_prefix}/amd64-pc-freebsd8.2/sys-root \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/amd64-pc-freebsd8.2-c++filt%{_exeext}
-
-
-# Conflict with a native GCC's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# Conflict with a native GCC's man pages
-  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/amd64-pc-freebsd8.2-amd64-pc-freebsd8.2-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/amd64-pc-freebsd8.2/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/amd64-pc-freebsd8.2/include/bits
-  fi
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/amd64-pc-freebsd8.2/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/amd64-pc-freebsd8.2/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/amd64-pc-freebsd8.2/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# amd64-pc-freebsd8.2-gcc
-# ==============================================================
-# %package -n amd64-pc-freebsd8.2-gcc
-# Summary:        GNU cc compiler for amd64-pc-freebsd8.2
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       amd64-pc-freebsd8.2-binutils
-# License:	GPL
-
-# %if %build_infos
-# Requires:      gcc-common
-# %endif
-
-%description -n amd64-pc-freebsd8.2-gcc
-GNU cc compiler for amd64-pc-freebsd8.2.
-
-# ==============================================================
-# amd64-pc-freebsd8.2-gcc-libgcc
-# ==============================================================
-%package -n amd64-pc-freebsd8.2-gcc-libgcc
-Summary:        libgcc for amd64-pc-freebsd8.2-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n amd64-pc-freebsd8.2-gcc-libgcc
-libgcc amd64-pc-freebsd8.2-gcc.
-
-
-%files -n amd64-pc-freebsd8.2-gcc
-%defattr(-,root,root)
-
-%{_mandir}/man1/amd64-pc-freebsd8.2-gcc.1*
-%{_mandir}/man1/amd64-pc-freebsd8.2-cpp.1*
-%{_mandir}/man1/amd64-pc-freebsd8.2-gcov.1*
-
-%{_bindir}/amd64-pc-freebsd8.2-cpp%{_exeext}
-%{_bindir}/amd64-pc-freebsd8.2-gcc%{_exeext}
-%{_bindir}/amd64-pc-freebsd8.2-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/amd64-pc-freebsd8.2-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/amd64-pc-freebsd8.2-gccbug
-%endif
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/amd64-pc-freebsd8.2
-%dir %{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}
-%{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n amd64-pc-freebsd8.2-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# amd64-pc-freebsd8.2-gcc-c++
-# ==============================================================
-%package -n amd64-pc-freebsd8.2-gcc-c++
-Summary:	GCC c++ compiler for amd64-pc-freebsd8.2
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       amd64-pc-freebsd8.2-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  amd64-pc-freebsd8.2-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       amd64-pc-freebsd8.2-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n amd64-pc-freebsd8.2-gcc-c++
-GCC c++ compiler for amd64-pc-freebsd8.2.
-
-
-%package -n amd64-pc-freebsd8.2-gcc-libstdc++
-Summary:	libstdc++ for amd64-pc-freebsd8.2
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n amd64-pc-freebsd8.2-gcc-libstdc++
-%{summary}
-
-
-%files -n amd64-pc-freebsd8.2-gcc-c++
-%defattr(-,root,root)
-
-%{_mandir}/man1/amd64-pc-freebsd8.2-g++.1*
-
-%{_bindir}/amd64-pc-freebsd8.2-c++%{_exeext}
-%{_bindir}/amd64-pc-freebsd8.2-g++%{_exeext}
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/amd64-pc-freebsd8.2
-%dir %{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}
-%{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n amd64-pc-freebsd8.2-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/include
-%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/include/c++
-
-# ==============================================================
-# amd64-pc-freebsd8.2-gcc-gfortran
-# ==============================================================
-%package -n amd64-pc-freebsd8.2-gcc-gfortran
-Summary:	Fortran 95 support for amd64-pc-freebsd8.2-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       amd64-pc-freebsd8.2-gcc = %{gcc_rpmvers}-%{release}
-Requires:       amd64-pc-freebsd8.2-gcc-libgfortran = %{gcc_rpmvers}-%{release}
-
-%description -n amd64-pc-freebsd8.2-gcc-gfortran
-GCC fortran compiler for amd64-pc-freebsd8.2.
-
-%files -n amd64-pc-freebsd8.2-gcc-gfortran
-%defattr(-,root,root)
-%{_bindir}/amd64-pc-freebsd8.2-gfortran%{_exeext}
-
-%{_mandir}/man1/amd64-pc-freebsd8.2-gfortran.1*
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/amd64-pc-freebsd8.2
-%dir %{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}
-%{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/f951%{_exeext}
-
-# ==============================================================
-# amd64-pc-freebsd8.2-gcc-libgfortran
-# ==============================================================
-%package -n amd64-pc-freebsd8.2-gcc-libgfortran
-Summary:	Fortran 95 support libraries for amd64-pc-freebsd8.2-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n amd64-pc-freebsd8.2-gcc-libgfortran
-%{summary}
-
-%files -n amd64-pc-freebsd8.2-gcc-libgfortran -f build/files.gfortran
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}
-%if "%{gcc_version}" >= "4.2.0"
-%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/finclude
-%endif
-
-# ==============================================================
-# amd64-pc-freebsd8.2-gcc-objc
-# ==============================================================
-%package -n amd64-pc-freebsd8.2-gcc-objc
-Summary:        Objective C support for amd64-pc-freebsd8.2-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       amd64-pc-freebsd8.2-gcc = %{gcc_rpmvers}-%{release}
-Requires:       amd64-pc-freebsd8.2-gcc-libobjc = %{gcc_rpmvers}-%{release}
-
-%description -n amd64-pc-freebsd8.2-gcc-objc
-GCC objc compiler for amd64-pc-freebsd8.2.
-
-%files -n amd64-pc-freebsd8.2-gcc-objc
-%defattr(-,root,root)
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/amd64-pc-freebsd8.2
-%dir %{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}
-%{_libexecdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/cc1obj%{_exeext}
-
-# ==============================================================
-# amd64-pc-freebsd8.2-gcc-libobjc
-# ==============================================================
-%package -n amd64-pc-freebsd8.2-gcc-libobjc
-Summary:        Objective C support for amd64-pc-freebsd8.2-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n amd64-pc-freebsd8.2-gcc-libobjc
-Support libraries for GCC's objc compiler for amd64-pc-freebsd8.2.
-
-%files -n amd64-pc-freebsd8.2-gcc-libobjc -f build/files.objc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}
-%dir %{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/include
-%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/%{gcc_version}/include/objc
-
diff --git a/contrib/crossrpms/freebsd8.2/x86_64/amd64-pc-freebsd8.2-libs.spec b/contrib/crossrpms/freebsd8.2/x86_64/amd64-pc-freebsd8.2-libs.spec
deleted file mode 100644
index f815655..0000000
--- a/contrib/crossrpms/freebsd8.2/x86_64/amd64-pc-freebsd8.2-libs.spec
+++ /dev/null
@@ -1,215 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define freebsd_version 8.2
-%define freebsd_rpmvers %{expand:%(echo 8.2 | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		amd64-pc-freebsd8.2
-Release:	0.20110227.0%{?dist}
-License:	FreeBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%freebsd_rpmvers
-Summary:      	amd64-pc-freebsd8.2 Libraries
-
-Source0:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.aa
-Source1:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ab
-Source2:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ac
-Source3:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ad
-Source4:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ae
-Source5:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.af
-Source6:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ag
-Source7:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ah
-Source8:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ai
-Source9:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.aj
-Source10: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ak
-Source11: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.al
-Source12: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.am
-Source13: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.an
-Source14: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ao
-Source15: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ap
-Source16: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.aq
-Source17: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ar
-Source18: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.as
-Source19: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.at
-Source20: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.au
-Source21: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.av
-Source22: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.aw
-Source23: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ax
-Source24: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ay
-Source25: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.az
-Source26: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.ba
-Source27: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bb
-Source28: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bc
-Source29: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bd
-Source30: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.be
-Source31: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bf
-Source32: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bg
-Source33: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bh
-Source34: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bi
-Source35: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bj
-Source36: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bk
-Source37: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bl
-Source38: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bm
-Source39: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bn
-Source40: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bo
-Source41: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/8.2-RELEASE/base/base.bp
-
-%description
-amd64-pc-freebsd8.2 libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-  cat \
- %SOURCE0 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 \
- %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 \
- %SOURCE10 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE14 \
- %SOURCE15 %SOURCE16 %SOURCE17 %SOURCE18 %SOURCE19 \
- %SOURCE20 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE24 \
- %SOURCE25 %SOURCE26 %SOURCE27 %SOURCE28 %SOURCE29 \
- %SOURCE30 %SOURCE31 %SOURCE32 %SOURCE33 %SOURCE34 \
- %SOURCE35 %SOURCE36 %SOURCE37 %SOURCE38 %SOURCE39 \
- %SOURCE40 %SOURCE41 \
- | %{__tar} --unlink -pxzf - ./lib ./usr/lib ./usr/include %{?el5:||:}
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p amd64-pc-freebsd8.2/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd amd64-pc-freebsd8.2/sys-root ; %{__tar} xf -)
-
-  pushd amd64-pc-freebsd8.2/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a amd64-pc-freebsd8.2 $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/amd64-pc-freebsd8.2/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/amd64-pc-freebsd8.2/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/amd64-pc-freebsd8.2/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%package sys-root
-Group: Development/Tools
-Summary: amd64-pc-freebsd8.2 target files for gcc >= 3.4
-
-%description sys-root
-amd64-pc-freebsd8.2 target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/amd64-pc-freebsd8.2
-%{_prefix}/amd64-pc-freebsd8.2/sys-root
diff --git a/contrib/crossrpms/freebsd8.2/x86_64/binutils-sources.add b/contrib/crossrpms/freebsd8.2/x86_64/binutils-sources.add
deleted file mode 100644
index e458c6f..0000000
--- a/contrib/crossrpms/freebsd8.2/x86_64/binutils-sources.add
+++ /dev/null
@@ -1,2 +0,0 @@
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
- at PATCH0@
diff --git a/contrib/crossrpms/freebsd8.2/x86_64/gcc-sources.add b/contrib/crossrpms/freebsd8.2/x86_64/gcc-sources.add
deleted file mode 100644
index 18c9848..0000000
--- a/contrib/crossrpms/freebsd8.2/x86_64/gcc-sources.add
+++ /dev/null
@@ -1,37 +0,0 @@
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-%if %build_cxx
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
- at PATCH2@
-%{?_without_sources:NoSource:	2}
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
- at PATCH3@
-%{?_without_sources:NoSource:	3}
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
- at PATCH4@
-%{?_without_sources:NoSource:	4}
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
- at PATCH5@
-%{?_without_sources:NoSource:	5}
-%endif
diff --git a/contrib/crossrpms/freebsd8.2/x86_64/libs.add b/contrib/crossrpms/freebsd8.2/x86_64/libs.add
deleted file mode 100644
index c65af3b..0000000
--- a/contrib/crossrpms/freebsd8.2/x86_64/libs.add
+++ /dev/null
@@ -1,107 +0,0 @@
-%define freebsd_version @FREEBSD_VERS@
-%define freebsd_rpmvers %{expand:%(echo @FREEBSD_VERS@ | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		@rpmprefix@@tool_target@
-Release:	@FREEBSD_RPMREL@
-License:	FreeBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%freebsd_rpmvers
-Summary:      	@tool_target@ Libraries
-
-Source0:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aa
-Source1:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ab
-Source2:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ac
-Source3:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ad
-Source4:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ae
-Source5:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.af
-Source6:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ag
-Source7:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ah
-Source8:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ai
-Source9:  ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aj
-Source10: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ak
-Source11: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.al
-Source12: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.am
-Source13: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.an
-Source14: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ao
-Source15: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ap
-Source16: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aq
-Source17: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ar
-Source18: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.as
-Source19: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.at
-Source20: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.au
-Source21: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.av
-Source22: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.aw
-Source23: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ax
-Source24: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ay
-Source25: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.az
-Source26: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.ba
-Source27: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bb
-Source28: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bc
-Source29: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bd
-Source30: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.be
-Source31: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bf
-Source32: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bg
-Source33: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bh
-Source34: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bi
-Source35: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bj
-Source36: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bk
-Source37: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bl
-Source38: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bm
-Source39: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bn
-Source40: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bo
-Source41: ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/@FREEBSD_VERS@-RELEASE/base/base.bp
-
-%description
- at tool_target@ libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-  cat \
- %SOURCE0 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 \
- %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 \
- %SOURCE10 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE14 \
- %SOURCE15 %SOURCE16 %SOURCE17 %SOURCE18 %SOURCE19 \
- %SOURCE20 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE24 \
- %SOURCE25 %SOURCE26 %SOURCE27 %SOURCE28 %SOURCE29 \
- %SOURCE30 %SOURCE31 %SOURCE32 %SOURCE33 %SOURCE34 \
- %SOURCE35 %SOURCE36 %SOURCE37 %SOURCE38 %SOURCE39 \
- %SOURCE40 %SOURCE41 \
- | %{__tar} --unlink -pxzf - ./lib ./usr/lib ./usr/include %{?el5:||:}
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
-
-  pushd @tool_target@/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/freebsd8.2/x86_64/target-libs.add b/contrib/crossrpms/freebsd8.2/x86_64/target-libs.add
deleted file mode 100644
index 0550fc7..0000000
--- a/contrib/crossrpms/freebsd8.2/x86_64/target-libs.add
+++ /dev/null
@@ -1,11 +0,0 @@
-%package sys-root
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc >= 3.4
-
-%description sys-root
- at tool_target@ target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
diff --git a/contrib/crossrpms/gcc/base-gcc.add b/contrib/crossrpms/gcc/base-gcc.add
deleted file mode 100644
index 4119209..0000000
--- a/contrib/crossrpms/gcc/base-gcc.add
+++ /dev/null
@@ -1,56 +0,0 @@
-%if %build_infos
-# ==============================================================
-# @rpmprefix at gcc-common
-# ==============================================================
-%package -n @rpmprefix at gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n @rpmprefix at gcc-common
-GCC files that are shared by all targets.
-
-%files -n @rpmprefix at gcc-common
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_prefix}/share
-
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n @rpmprefix at gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n @rpmprefix at gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-%endif
diff --git a/contrib/crossrpms/gcc/base-gcj.add b/contrib/crossrpms/gcc/base-gcj.add
deleted file mode 100644
index fe8aed9..0000000
--- a/contrib/crossrpms/gcc/base-gcj.add
+++ /dev/null
@@ -1,55 +0,0 @@
-%if %build_infos
-%if %build_gcj
-# ==============================================================
-# @rpmprefix at gcc-gcj-common
-# ==============================================================
-%package -n @rpmprefix at gcc-gcj-common
-Summary:        Base package for rtems gcc/java compiler (gcj)
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n @rpmprefix at gcc-gcj-common
-RTEMS is an open source operating system for embedded systems.
-
-This is the files for gcc/java (gcj) that are shared by all targets.
-
-%files -n @rpmprefix at gcc-gcj-common
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_prefix}/share
-
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gcj.info*
-%{_infodir}/fastjar.info*
-
-%if "%{gcc_version}" < "4.0"
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/gcjh.1*
-%{_mandir}/man1/jv-scan.1*
-%{_mandir}/man1/jcf-dump.1*
-%{_mandir}/man1/gij.1*
-%{_mandir}/man1/jv-convert.1*
-%{_mandir}/man1/rmic.1*
-%{_mandir}/man1/rmiregistry.1*
-%{_mandir}/man1/jar.1*
-%{_mandir}/man1/grepjar.1*
-%endif
-
-%post -n @rpmprefix at gcc-gcj-common
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcj.info* || :
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
-
-%preun -n @rpmprefix at gcc-gcj-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcj.info* || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
-fi
-
-%endif
-%endif
diff --git a/contrib/crossrpms/gcc/base-gfortran.add b/contrib/crossrpms/gcc/base-gfortran.add
deleted file mode 100644
index 993f763..0000000
--- a/contrib/crossrpms/gcc/base-gfortran.add
+++ /dev/null
@@ -1,38 +0,0 @@
-%if %build_infos
-%if %build_fortran
-# ==============================================================
-# @rpmprefix at gcc-gfortran-common
-# ==============================================================
-%package -n @rpmprefix at gcc-gfortran-common
-Summary:	Base package for RTEMS gcc/gfortran compiler
-Group:          Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n @rpmprefix at gcc-gfortran-common
-RTEMS is an open source operating system for embedded systems.
-
-This is the files for gcc/gfortran that are shared by all targets.
-
-%files -n @rpmprefix at gcc-gfortran-common
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_prefix}/share
-
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gfortran.info*.gz
-
-%post -n @rpmprefix at gcc-gfortran-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :
-
-%preun -n @rpmprefix at gcc-gfortran-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :
-fi
-
-%endif
-%endif
diff --git a/contrib/crossrpms/gcc/base-gnat.add b/contrib/crossrpms/gcc/base-gnat.add
deleted file mode 100644
index 71dc5cc..0000000
--- a/contrib/crossrpms/gcc/base-gnat.add
+++ /dev/null
@@ -1,40 +0,0 @@
-%if %build_infos
-%if %build_gnat
-# ==============================================================
-# @rpmprefix at gcc-gnat-common
-# ==============================================================
-%package -n @rpmprefix at gcc-gnat-common
-Summary:	Base package for RTEMS gcc/gnat compiler
-Group: 		Development/Tools
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n @rpmprefix at gcc-gnat-common
-RTEMS is an open source operating system for embedded systems.
-
-This is the gcc/gnat tools for the gcc/gnat compiler
-
-%files -n @rpmprefix at gcc-gnat-common
-%defattr(-,root,root)
-%sysdir %{_bindir}
-%{_bindir}/vxaddr2line%{_exeext}
-
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gnat*
-
-%post -n @rpmprefix at gcc-gnat-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz || :
-
-%preun -n @rpmprefix at gcc-gnat-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz || :
-fi
-%endif
-%endif
diff --git a/contrib/crossrpms/gcc/base-go.add b/contrib/crossrpms/gcc/base-go.add
deleted file mode 100644
index 1654db8..0000000
--- a/contrib/crossrpms/gcc/base-go.add
+++ /dev/null
@@ -1,38 +0,0 @@
-%if %build_infos
-%if %build_go
-# ==============================================================
-# @rpmprefix at gcc-go-common
-# ==============================================================
-%package -n @rpmprefix at gcc-go-common
-Summary:        Base package for rtems gcc/go compiler (go)
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n @rpmprefix at gcc-go-common
-RTEMS is an open source operating system for embedded systems.
-
-This is the files for gcc/go (go) that are shared by all targets.
-
-%files -n @rpmprefix at gcc-go-common
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_prefix}/share
-
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gccgo.info*
-
-%post -n @rpmprefix at gcc-go-common
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccgo.info* || :
-
-%preun -n @rpmprefix at gcc-go-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccgo.info* || :
-fi
-
-%endif
-%endif
diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add
deleted file mode 100644
index 8dbe5aa..0000000
--- a/contrib/crossrpms/gcc/base-newlib.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if %build_infos
-%if %build_newlib
-# ==============================================================
-# @rpmprefix at newlib-common
-# ==============================================================
-%package -n @rpmprefix at newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        @NEWLIB_RPMREL@
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n @rpmprefix at newlib-common
-newlib files that are shared by all targets.
-
-%files -n @rpmprefix at newlib-common
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_prefix}/share
-
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n @rpmprefix at newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n @rpmprefix at newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
-%endif
-%endif
diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add
deleted file mode 100644
index cedaf4a..0000000
--- a/contrib/crossrpms/gcc/build.add
+++ /dev/null
@@ -1,79 +0,0 @@
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-%if %build_cxx
-  languages="$languages,c++"
-%endif
-%if %build_fortran
-  languages="$languages,fortran"
-%endif
-%if %build_gcj
-  languages="$languages,java"
-%endif
-%if %build_go
-  languages="$languages,go"
-%endif
-%if %build_objc
-  languages="$languages,objc"
-%endif
-%if %build_gnat
-  languages="$languages,ada"
-%endif
-%if "%{_prefix}" != "/usr"
-  export PATH="%{_bindir}:${PATH}"
-%endif
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=@tool_target@ \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    --with-sysroot=%{_exec_prefix}/@tool_target@/sys-root \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-%if %build_newlib
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-%endif
-%if %build_libgcj
-    --enable-libgcj \
-%endif
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-%if %build_infos
-  make info
-%endif
-  cd ..
-
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add
deleted file mode 100644
index 62b5676..0000000
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ /dev/null
@@ -1,257 +0,0 @@
-
-%define gcc_pkgvers @GCC_PKGVERS@
-%define gcc_version @GCC_VERS@
-%define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )}
-
-%if %build_newlib
-%define newlib_pkgvers		@NEWLIB_PKGVERS@
-%define newlib_version		@NEWLIB_VERS@
-%endif
-
-Name:         	@rpmprefix@@tool_target at -gcc
-Summary:      	@tool_target@ gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	@GCC_RPMREL@
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%if %build_fortran
-%define gmp_required		4.1
-%define mpfr_required		2.2.1
-%endif
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	@rpmprefix@@tool_target at -binutils
-BuildRequires:	@rpmprefix@@tool_target at -sys-root
-BuildRequires:	@rpmprefix@@tool_target at -w32api-sys-root
-
-%if %build_infos
-Requires:	@rpmprefix at gcc-common
-%endif
-Requires:	@rpmprefix@@tool_target at -binutils
-Requires:	@rpmprefix@@tool_target at -sys-root
-Requires:	@rpmprefix@@tool_target at -w32api-sys-root
-Requires:	@rpmprefix@@tool_target at -gcc-libgcc = %{gcc_rpmvers}-%{release}
-%if %build_newlib
-Requires:	@rpmprefix@@tool_target at -newlib = %{newlib_version}- at NEWLIB_RPMREL@
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%if %build_gcj
-BuildRequires:	zlib-devel
-%endif
-%endif
-%if %build_gnat
-# Building gnat requires gnat
-BuildRequires:	gcc-gnat
-BuildRequires:	@rpmprefix@@tool_target at -newlib < %{newlib_version}- at NEWLIB_RPMREL@
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
- at SOURCES@
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for @tool_target at .
-
diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add
deleted file mode 100644
index e379341..0000000
--- a/contrib/crossrpms/gcc/install.add
+++ /dev/null
@@ -1,185 +0,0 @@
-%install
-%if "%{_prefix}" != "/usr"
-  export PATH="%{_bindir}:${PATH}"
-%endif
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-%if %build_newlib
-  cd build/@tool_target@/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-%endif
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target at -c++filt%{_exeext}
-
-%if %build_gnat
-  # Seemingly a VAX tool. Not meaningful, here.
-  rm -f $RPM_BUILD_ROOT%{_bindir}/vxaddr2line%{_exeext}
-%endif
-
-%if %build_infos
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-%else
-# Conflict with a native GCC's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# Conflict with a native GCC's man pages
-  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
-%endif
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target at -@tool_target at -gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits
-  fi
-
-%if %build_newlib
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%endif
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-%if %build_go
-%if "%{gcc_version}" == "4.6.0"
-  # Bug in gcc == 4.6.0: Installs gccgo under bogus name
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48411
-  rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target at -@tool_target at -gccgo%{_exeext}
-%endif
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-%if %build_newlib
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/@tool_target@/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-%endif
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-%if %build_go
-# Collect /go subdirs
-  TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \. ) echo "${TGTDIR}/go" >> build/files.go ;;
-    *)   echo "${TGTDIR}/$i/go" >> build/files.go ;;
-    esac
-  done
-
-%endif
-  TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/@tool_target@/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add
deleted file mode 100644
index d159fdd..0000000
--- a/contrib/crossrpms/gcc/prep.add
+++ /dev/null
@@ -1,93 +0,0 @@
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%if %build_cxx
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-%endif
-
-%if %build_fortran
-%{?SOURCE2:%setup -q -T -D -n %{name}-%{version} -a2}
-%{?PATCH2:%patch2 -p0}
-%endif
-
-%if %build_gcj
-%{?SOURCE3:%setup -q -T -D -n %{name}-%{version} -a3}
-%{?PATCH3:%patch3 -p0}
-%endif
-
-%if %build_gnat
-%{?SOURCE4:%setup -q -T -D -n %{name}-%{version} -a4}
-%{?PATCH4:%patch4 -p0}
-%endif
-
-%if %build_objc
-%{?SOURCE5:%setup -q -T -D -n %{name}-%{version} -a5}
-%{?PATCH5:%patch5 -p0}
-%endif
-
-%if %build_go
-%{?SOURCE6:%setup -q -T -D -n %{name}-%{version} -a6}
-%{?PATCH6:%patch6 -p0}
-
-%endif
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%if %build_newlib
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-%endif
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
- at PREP@
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
diff --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add
deleted file mode 100644
index e1b456d..0000000
--- a/contrib/crossrpms/gcc/rpm-install.add
+++ /dev/null
@@ -1,73 +0,0 @@
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-%if "%{_prefix}" != "/usr"
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-%endif
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-%if "%{_prefix}" != "/usr"
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-%endif
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add
deleted file mode 100644
index f8fce19..0000000
--- a/contrib/crossrpms/gcc/target-c++.add
+++ /dev/null
@@ -1,65 +0,0 @@
-%if %build_cxx
-# ==============================================================
-# @rpmprefix@@tool_target at -gcc-c++
-# ==============================================================
-%package -n @rpmprefix@@tool_target at -gcc-c++
-Summary:	GCC c++ compiler for @tool_target@
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       @rpmprefix@@tool_target at -gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  @rpmprefix@@tool_target at -gcc-c++ = %{gcc_rpmvers}
-%endif
-
-%if %build_infos
-Requires:       @rpmprefix at gcc-common
-%endif
-Requires:       @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
-
-%description -n @rpmprefix@@tool_target at -gcc-c++
-GCC c++ compiler for @tool_target at .
-
-
-%package -n @rpmprefix@@tool_target at -gcc-libstdc++
-Summary:	libstdc++ for @tool_target@
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n @rpmprefix@@tool_target at -gcc-libstdc++
-%{summary}
-
-
-%files -n @rpmprefix@@tool_target at -gcc-c++
-%defattr(-,root,root)
-%sysdir %{_prefix}
-
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/@tool_target at -g++.1*
-
-%sysdir %{_bindir}
-%{_bindir}/@tool_target at -c++%{_exeext}
-%{_bindir}/@tool_target at -g++%{_exeext}
-
-%sysdir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/@tool_target@
-%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n @rpmprefix@@tool_target at -gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/@tool_target@
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
-%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/c++
-%endif
-
diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add
deleted file mode 100644
index afd3379..0000000
--- a/contrib/crossrpms/gcc/target-gcc.add
+++ /dev/null
@@ -1,84 +0,0 @@
-# ==============================================================
-# @rpmprefix@@tool_target at -gcc
-# ==============================================================
-# %package -n @rpmprefix@@tool_target at -gcc
-# Summary:        GNU cc compiler for @tool_target@
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       @rpmprefix@@tool_target at -binutils
-# Requires:       @rpmprefix@@tool_target at -newlib = %{newlib_version}- at NEWLIB_RPMREL@
-# License:	GPL
-
-# %if %build_infos
-# Requires:      @rpmprefix at gcc-common
-# %endif
-
-%description -n @rpmprefix@@tool_target at -gcc
-GNU cc compiler for @tool_target at .
-
-# ==============================================================
-# @rpmprefix@@tool_target at -gcc-libgcc
-# ==============================================================
-%package -n @rpmprefix@@tool_target at -gcc-libgcc
-Summary:        libgcc for @tool_target at -gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       @rpmprefix@@tool_target at -newlib = %{newlib_version}- at NEWLIB_RPMREL@
-License:	GPL
-
-%description -n @rpmprefix@@tool_target at -gcc-libgcc
-libgcc @tool_target at -gcc.
-
-
-%files -n @rpmprefix@@tool_target at -gcc
-%defattr(-,root,root)
-%sysdir %{_prefix}
-
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/@tool_target at -gcc.1*
-%{_mandir}/man1/@tool_target at -cpp.1*
-%{_mandir}/man1/@tool_target at -gcov.1*
-
-%sysdir %{_bindir}
-%{_bindir}/@tool_target at -cpp%{_exeext}
-%{_bindir}/@tool_target at -gcc%{_exeext}
-%{_bindir}/@tool_target at -gcc-%{gcc_version}%{_exeext}
-%{_bindir}/@tool_target at -gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/@tool_target at -gccbug
-%endif
-
-%sysdir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/@tool_target@
-%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n @rpmprefix@@tool_target at -gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/@tool_target@
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%if "@tool_target@" != "bfin-rtems at rtems_api@"
-%if "@tool_target@" != "avr-rtems at rtems_api@"
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/ssp
-%endif
-%endif
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed
-%endif
-
diff --git a/contrib/crossrpms/gcc/target-gcj.add b/contrib/crossrpms/gcc/target-gcj.add
deleted file mode 100644
index 0ea7735..0000000
--- a/contrib/crossrpms/gcc/target-gcj.add
+++ /dev/null
@@ -1,57 +0,0 @@
-%if %build_gcj
-# ==============================================================
-# @rpmprefix@@tool_target at -gcj
-# ==============================================================
-%package -n @rpmprefix@@tool_target at -gcc-gcj
-Summary:        Java support (gcj) for @tool_target at -gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-%if %build_infos
-Requires:       @rpmprefix at gcc-gcj-common
-%endif
-Requires:       @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
-
-%description -n @rpmprefix@@tool_target at -gcc-gcj
-RTEMS is an open source operating system for embedded systems.
-
-This is the gcc/java compiler for @tool_target@
-
-%files -n @rpmprefix@@tool_target at -gcc-gcj -f build/files.gcj
-%defattr(-,root,root)
-%sysdir %{_bindir}
-%{_bindir}/@tool_target at -gcj%{_exeext}
-%{_bindir}/@tool_target at -jcf-dump%{_exeext}
-%{_bindir}/@tool_target at -jv-scan%{_exeext}
-%{_bindir}/@tool_target at -gcjh%{_exeext}
-%{_bindir}/@tool_target at -*jar%{_exeext}
-
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/@tool_target at -*jar.1*
-%{_mandir}/man1/@tool_target at -gcj*.1*
-%{_mandir}/man1/@tool_target at -jv-*.1*
-%{_mandir}/man1/@tool_target at -jcf-dump.1*
-%{_mandir}/man1/@tool_target at -gij.1*
-
-%if "%{gcc_version}" >= "4.0"
-%{_mandir}/man1/@tool_target at -grmi*.1*
-%else
-%{_mandir}/man1/@tool_target at -rmi*.1*
-%endif
-
-%sysdir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/@tool_target@
-%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jc1%{_exeext}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jvgenmain%{_exeext}
-
-%sysdir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/@tool_target@
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
-
-%endif
-
diff --git a/contrib/crossrpms/gcc/target-gfortran.add b/contrib/crossrpms/gcc/target-gfortran.add
deleted file mode 100644
index 81d5d48..0000000
--- a/contrib/crossrpms/gcc/target-gfortran.add
+++ /dev/null
@@ -1,60 +0,0 @@
-%if %build_fortran
-# ==============================================================
-# @rpmprefix@@tool_target at -gcc-gfortran
-# ==============================================================
-%package -n @rpmprefix@@tool_target at -gcc-gfortran
-Summary:	Fortran 95 support for @tool_target at -gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-%if %build_infos
-Requires:       @rpmprefix at gcc-gfortran-common
-%endif
-Requires:       @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
-Requires:       @rpmprefix@@tool_target at -gcc-libgfortran = %{gcc_rpmvers}-%{release}
-
-%description -n @rpmprefix@@tool_target at -gcc-gfortran
-GCC fortran compiler for @tool_target at .
-
-%files -n @rpmprefix@@tool_target at -gcc-gfortran
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_bindir}
-%{_bindir}/@tool_target at -gfortran%{_exeext}
-
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/@tool_target at -gfortran.1*
-
-%sysdir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/@tool_target@
-%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/f951%{_exeext}
-
-# ==============================================================
-# @rpmprefix@@tool_target at -gcc-libgfortran
-# ==============================================================
-%package -n @rpmprefix@@tool_target at -gcc-libgfortran
-Summary:	Fortran 95 support libraries for @tool_target at -gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n @rpmprefix@@tool_target at -gcc-libgfortran
-%{summary}
-
-%files -n @rpmprefix@@tool_target at -gcc-libgfortran -f build/files.gfortran
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/@tool_target@
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
-%if "%{gcc_version}" >= "4.2.0"
-%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/finclude
-%endif
-%endif
-
diff --git a/contrib/crossrpms/gcc/target-gnat.add b/contrib/crossrpms/gcc/target-gnat.add
deleted file mode 100644
index 3e034a5..0000000
--- a/contrib/crossrpms/gcc/target-gnat.add
+++ /dev/null
@@ -1,42 +0,0 @@
-%if %build_gnat
-# ==============================================================
-# @rpmprefix@@tool_target at -gnat
-# ==============================================================
-%package -n @rpmprefix@@tool_target at -gcc-gnat
-Summary:        Ada support for for @tool_target at -gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-%if %_build_infos
-Requires:       @rpmprefix at gcc-gnat-common
-%endif
-Requires:       @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
-
-%description -n @rpmprefix@@tool_target at -gcc-gnat
-RTEMS is an open source operating system for embedded systems.
-
-This is the gcc/gnat compiler for @tool_target at .
-
-%files -n @rpmprefix@@tool_target at -gcc-gnat
-%defattr(-,root,root)
-%sysdir %{_prefix}
-
-%sysdir %{_bindir}
-%{_bindir}/@tool_target at -gnat*
-%{_bindir}/@tool_target at -gprmake%{_exeext}
-
-%sysdir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/@tool_target@
-%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/gnat1%{_exeext}
-
-%sysdir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/@tool_target@
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
-%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adalib
-%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adainclude
-%endif
-
diff --git a/contrib/crossrpms/gcc/target-go.add b/contrib/crossrpms/gcc/target-go.add
deleted file mode 100644
index 928bd30..0000000
--- a/contrib/crossrpms/gcc/target-go.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if %build_go
-# ==============================================================
-# @rpmprefix@@tool_target at -go
-# ==============================================================
-%package -n @rpmprefix@@tool_target at -gcc-go
-Summary:        Go support (go) for @tool_target at -gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-%if %build_infos
-Requires:       @rpmprefix at gcc-go-common
-%endif
-Requires:       @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
-
-%description -n @rpmprefix@@tool_target at -gcc-go
-RTEMS is an open source operating system for embedded systems.
-
-This is the gcc/go compiler for @tool_target@
-
-%files -n @rpmprefix@@tool_target at -gcc-go -f build/files.go
-%defattr(-,root,root)
-%sysdir %{_bindir}
-%{_bindir}/@tool_target at -gccgo%{_exeext}
-
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/@tool_target at -gccgo*.1*
-
-%sysdir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/@tool_target@
-%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/go1%{_exeext}
-
-%sysdir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/@tool_target@
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
-
-%endif
diff --git a/contrib/crossrpms/gcc/target-newlib.add b/contrib/crossrpms/gcc/target-newlib.add
deleted file mode 100644
index 50efe08..0000000
--- a/contrib/crossrpms/gcc/target-newlib.add
+++ /dev/null
@@ -1,26 +0,0 @@
-%if %build_newlib
-# ==============================================================
-# @rpmprefix@@tool_target at -newlib
-# ==============================================================
-%package -n @rpmprefix@@tool_target at -newlib
-Summary:      	C Library (newlib) for @tool_target@
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        @NEWLIB_RPMREL@
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%if %build_infos
-Requires:	@rpmprefix at newlib-common
-%endif
-
-%description -n @rpmprefix@@tool_target at -newlib
-Newlib C Library for @tool_target at .
-
-%files -n @rpmprefix@@tool_target at -newlib -f build/files.newlib
-%defattr(-,root,root)
-%sysdir %{_exec_prefix}
-%dir %{_exec_prefix}/@tool_target@
-%{_exec_prefix}/@tool_target@/include
-
-%endif
diff --git a/contrib/crossrpms/gcc/target-objc.add b/contrib/crossrpms/gcc/target-objc.add
deleted file mode 100644
index 41a5e81..0000000
--- a/contrib/crossrpms/gcc/target-objc.add
+++ /dev/null
@@ -1,49 +0,0 @@
-%if %build_objc
-# ==============================================================
-# @rpmprefix@@tool_target at -gcc-objc
-# ==============================================================
-%package -n @rpmprefix@@tool_target at -gcc-objc
-Summary:        Objective C support for @tool_target at -gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
-Requires:       @rpmprefix@@tool_target at -gcc-libobjc = %{gcc_rpmvers}-%{release}
-
-%description -n @rpmprefix@@tool_target at -gcc-objc
-GCC objc compiler for @tool_target at .
-
-%files -n @rpmprefix@@tool_target at -gcc-objc
-%defattr(-,root,root)
-%sysdir %{_exec_prefix}
-%sysdir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/@tool_target@
-%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
-%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1obj%{_exeext}
-
-# ==============================================================
-# @rpmprefix@@tool_target at -gcc-libobjc
-# ==============================================================
-%package -n @rpmprefix@@tool_target at -gcc-libobjc
-Summary:        Objective C support for @tool_target at -gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n @rpmprefix@@tool_target at -gcc-libobjc
-Support libraries for GCC's objc compiler for @tool_target at .
-
-%files -n @rpmprefix@@tool_target at -gcc-libobjc -f build/files.objc
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/@tool_target@
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
-%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
-%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc
-%endif
-
diff --git a/contrib/crossrpms/gdb/base-gdb.add b/contrib/crossrpms/gdb/base-gdb.add
deleted file mode 100644
index 658f8a3..0000000
--- a/contrib/crossrpms/gdb/base-gdb.add
+++ /dev/null
@@ -1,43 +0,0 @@
-%if %build_infos
-# ==============================================================
-# @rpmprefix at gdb-common
-# ==============================================================
-%package -n @rpmprefix at gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n @rpmprefix at gdb-common
-
-GDB files shared by all targets.
-
-%post -n @rpmprefix at gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n @rpmprefix at gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n @rpmprefix at gdb-common
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_prefix}/share
-
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
-%endif
diff --git a/contrib/crossrpms/gdb/build.add b/contrib/crossrpms/gdb/build.add
deleted file mode 100644
index ba4478d..0000000
--- a/contrib/crossrpms/gdb/build.add
+++ /dev/null
@@ -1,33 +0,0 @@
-%build
-%if "%{_prefix}" != "/usr"
-  export PATH="%{_bindir}:${PATH}"
-%endif
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=@tool_target@ \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/@tool_target at -gdb \
-    --with-sysroot=%{_prefix}/@tool_target@/sys-root \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-%if %build_infos
-  make info
-%endif
-  cd ..
-
diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add
deleted file mode 100644
index 5c30ef7..0000000
--- a/contrib/crossrpms/gdb/gdb.add
+++ /dev/null
@@ -1,97 +0,0 @@
-%define gdb_version @GDB_VERS@
-%define gdb_rpmvers %{expand:%(echo @GDB_VERS@ | tr - _)} 
-
-Name:		@rpmprefix@@tool_target at -gdb
-Summary:	Gdb for target @tool_target@
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	@GDB_RPMREL@
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-%if "@tool_target@" == "powerpc-rtems at rtems_api@"
-%if "%{_build}" != "%{_host}"
-# psim doesn't support Cdn-X
-%global build_sim --disable-sim
-%else
-%global build_sim --enable-sim --enable-sim-trace
-%endif
-%endif
-%if "@tool_target@" == "sparc-rtems at rtems_api@"
-%ifos mingw mingw32
-# Mingw lacks functions required by the sparc simulator
-%define build_sim --disable-sim
-%endif
-%endif
-%if "@tool_target@" == "h8300-rtems at rtems_api@"
-%ifos mingw mingw32
-# Mingw lacks functions required by the h8300 simulator
-%define build_sim --disable-sim
-%endif
-%endif
-%if "@tool_target@" == "m32c-rtems at rtems_api@"
-%ifos mingw mingw32
-# Mingw lacks functions required by the m32c simulator
-%define build_sim --disable-sim
-%endif
-%endif
-%if "@tool_target@" == "lm32-rtems at rtems_api@"
-%ifos mingw mingw32
-# Mingw lacks functions required by the lm32 simulator
-%define build_sim --disable-sim
-%endif
-%endif
-%if "@tool_target@" == "mipstx39-rtems at rtems_api@"
-%ifos mingw mingw32
-# Mingw lacks functions required by the mipstx39 simulator
-%define build_sim --disable-sim
-%endif
-%endif
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-%if %build_infos
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	@rpmprefix at gdb-common
-
-%endif
- at SOURCES@
-
-%description
-GDB for target @tool_target@
diff --git a/contrib/crossrpms/gdb/install.add b/contrib/crossrpms/gdb/install.add
deleted file mode 100644
index 09991c4..0000000
--- a/contrib/crossrpms/gdb/install.add
+++ /dev/null
@@ -1,54 +0,0 @@
-%install
-%if "%{_prefix}" != "/usr"
-  export PATH="%{_bindir}:${PATH}"
-%endif
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-%if %build_infos
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-%else
-# Conflict with a native gdb's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-%endif
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib at tool_target@-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/@tool_target at -gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/@tool_target at -gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/@tool_target at -gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
diff --git a/contrib/crossrpms/gdb/prep.add b/contrib/crossrpms/gdb/prep.add
deleted file mode 100644
index 02b65d6..0000000
--- a/contrib/crossrpms/gdb/prep.add
+++ /dev/null
@@ -1,10 +0,0 @@
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
diff --git a/contrib/crossrpms/gdb/rpm-install.add b/contrib/crossrpms/gdb/rpm-install.add
deleted file mode 100644
index 07efd8f..0000000
--- a/contrib/crossrpms/gdb/rpm-install.add
+++ /dev/null
@@ -1,32 +0,0 @@
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-%if "%{_prefix}" != "/usr"
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-%endif
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-%if "%{_prefix}" != "/usr"
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-%endif
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
diff --git a/contrib/crossrpms/gdb/target-gdb.add b/contrib/crossrpms/gdb/target-gdb.add
deleted file mode 100644
index 88789ad..0000000
--- a/contrib/crossrpms/gdb/target-gdb.add
+++ /dev/null
@@ -1,26 +0,0 @@
-# ==============================================================
-# @tool_target at -gdb
-# ==============================================================
-# %package -n @rpmprefix@@tool_target at -gdb
-# Summary:      rtems gdb for @tool_target@
-# Group: Development/Tools
-# %if %build_infos
-# Requires: @rpmprefix at gdb-common
-# %endif
-
-%description -n @rpmprefix@@tool_target at -gdb
-GNU gdb targetting @tool_target at .
-
-%files -n @rpmprefix@@tool_target at -gdb
-%defattr(-,root,root)
-%sysdir %{_prefix}
-%sysdir %{_prefix}/share
-%{?with_python:%{_datadir}/@tool_target at -gdb}
-
-%sysdir %{_mandir}
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/@tool_target at -*.1*
-
-%sysdir %{_bindir}
-%{_bindir}/@tool_target at -*
-
diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am
deleted file mode 100644
index cc27914..0000000
--- a/contrib/crossrpms/mingw32/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-SUBDIRS = i686
diff --git a/contrib/crossrpms/mingw32/gmp.am b/contrib/crossrpms/mingw32/gmp.am
deleted file mode 100644
index 58ef35f..0000000
--- a/contrib/crossrpms/mingw32/gmp.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-gmp.add
-EXTRA_DIST += gmp.add
-
-GMP_SUBPACKAGES = $(top_srcdir)/common/common.add
-GMP_SUBPACKAGES += $(srcdir)/gmp.add
-GMP_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GMP_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GMP_SUBPACKAGES += $(srcdir)/target-gmp.add
-
-$(TARGET)-gmp.spec.in: $(GMP_SUBPACKAGES) Makefile.am
-	cat $(GMP_SUBPACKAGES) | sed \
-	  -e "s/[@]GMP_VERS[@]/$(GMP_VERS)/g" \
-	  -e "s/[@]GMP_RPMREL[@]/$(GMP_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{gmp_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-gmp.spec.in
-CLEANFILES += $(TARGET)-gmp.spec.in
-
- at rpmprefix@$(TARGET)-gmp.spec: $(TARGET)-gmp.spec.in
-	$(MKSPEC) $(TARGET)-gmp.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gmp.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gmp.spec
diff --git a/contrib/crossrpms/mingw32/i686/Makefile.am b/contrib/crossrpms/mingw32/i686/Makefile.am
deleted file mode 100644
index 1d6df8d..0000000
--- a/contrib/crossrpms/mingw32/i686/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id$
-
-TARGET = i686-pc-mingw32
-
-include $(top_srcdir)/mkspec.am
-
-GMP_VERS = 4.3.2
-GMP_RPMREL = 0.20100319.1%{?dist}
-include ../gmp.am
-
-MPC_VERS = 0.8.1
-MPC_RPMREL = 0.20100319.1%{?dist}
-include ../mpc.am
-
-MPFR_VERS = 2.4.2
-MPFR_RPMREL = 0.20100813.1%{?dist}
-include ../mpfr.am
-
- at rpmprefix@$(TARGET)-binutils-helper.spec: $(TARGET)-binutils-helper.spec.in  
-	$(MKSPEC) $(TARGET)-binutils-helper.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils-helper.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils-helper.spec
-
- at rpmprefix@$(TARGET)-curses-helper.spec: $(TARGET)-curses-helper.spec.in  
-	$(MKSPEC) $(TARGET)-curses-helper.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-curses-helper.spec
-noinst_DATA += @rpmprefix@$(TARGET)-curses-helper.spec
-
- at rpmprefix@$(TARGET)-expat-helper.spec: $(TARGET)-expat-helper.spec.in  
-	$(MKSPEC) $(TARGET)-expat-helper.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-expat-helper.spec
-noinst_DATA += @rpmprefix@$(TARGET)-expat-helper.spec
-
- at rpmprefix@$(TARGET)-gcc-helper.spec: $(TARGET)-gcc-helper.spec.in  
-	$(MKSPEC) $(TARGET)-gcc-helper.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc-helper.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc-helper.spec
-
- at rpmprefix@$(TARGET)-libs-helper.spec: $(TARGET)-libs-helper.spec.in  
-	$(MKSPEC) $(TARGET)-libs-helper.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-libs-helper.spec
-noinst_DATA += @rpmprefix@$(TARGET)-libs-helper.spec
-
- at rpmprefix@$(TARGET)-readline-helper.spec: $(TARGET)-readline-helper.spec.in  
-	$(MKSPEC) $(TARGET)-readline-helper.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-readline-helper.spec
-noinst_DATA += @rpmprefix@$(TARGET)-readline-helper.spec
-
- at rpmprefix@$(TARGET)-termcap-helper.spec: $(TARGET)-termcap-helper.spec.in  
-	$(MKSPEC) $(TARGET)-termcap-helper.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-termcap-helper.spec
-noinst_DATA += @rpmprefix@$(TARGET)-termcap-helper.spec
-
- at rpmprefix@$(TARGET)-w32api-helper.spec: $(TARGET)-w32api-helper.spec.in  
-	$(MKSPEC) $(TARGET)-w32api-helper.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-w32api-helper.spec
-noinst_DATA += @rpmprefix@$(TARGET)-w32api-helper.spec
-
- at rpmprefix@$(TARGET)-zlib-helper.spec: $(TARGET)-zlib-helper.spec.in  
-	$(MKSPEC) $(TARGET)-zlib-helper.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-zlib-helper.spec
-noinst_DATA += @rpmprefix@$(TARGET)-zlib-helper.spec
-
diff --git a/contrib/crossrpms/mingw32/i686/gmp.add b/contrib/crossrpms/mingw32/i686/gmp.add
deleted file mode 100644
index 1790d2c..0000000
--- a/contrib/crossrpms/mingw32/i686/gmp.add
+++ /dev/null
@@ -1,66 +0,0 @@
-%define gmp_version @GMP_VERS@
-%define gmp_rpmvers %{expand:%(echo @GMP_VERS@ | tr - _)} 
-%define debug_package %{nil}
-
-Name:         @rpmprefix@@tool_target at -gmp
-Release:      @GMP_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%gmp_rpmvers
-Summary:      	MinGW gmp Libraries
-
-Source0:	ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
-Provides:	@rpmprefix@@tool_target at -gmp-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-
-BuildRequires:  m4
-BuildRequires:	@rpmprefix at i686-pc-mingw32-gcc
-
-%description
-MinGW gmp libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../gmp-%{gmp_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=@tool_target@ \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-binutils-helper.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-binutils-helper.spec
deleted file mode 100644
index cebe960..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-binutils-helper.spec
+++ /dev/null
@@ -1,25 +0,0 @@
-Name:           i686-pc-mingw32-binutils-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS binutils helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-binutils
-Requires:       mingw32-binutils
-Provides:	i686-pc-mingw32-binutils
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-binutils-helper.spec.in b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-binutils-helper.spec.in
deleted file mode 100644
index 1085587..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-binutils-helper.spec.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Name:           @rpmprefix at i686-pc-mingw32-binutils-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS binutils helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-binutils
-Requires:       mingw32-binutils
-Provides:	@rpmprefix at i686-pc-mingw32-binutils
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-curses-helper.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-curses-helper.spec
deleted file mode 100644
index cd10347..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-curses-helper.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           i686-pc-mingw32-curses-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 curses libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-pdcurses
-Requires:       mingw32-pdcurses
-Provides:	i686-pc-mingw32-ncurses
-Provides:	i686-pc-mingw32-ncurses-devel
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-curses-helper.spec.in b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-curses-helper.spec.in
deleted file mode 100644
index eae4095..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-curses-helper.spec.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           @rpmprefix at i686-pc-mingw32-curses-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 curses libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-pdcurses
-Requires:       mingw32-pdcurses
-Provides:	@rpmprefix at i686-pc-mingw32-ncurses
-Provides:	@rpmprefix at i686-pc-mingw32-ncurses-devel
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-expat-helper.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-expat-helper.spec
deleted file mode 100644
index ee42d85..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-expat-helper.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           i686-pc-mingw32-expat-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 expat libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-expat
-Requires:       mingw32-expat
-Provides:	i686-pc-mingw32-expat
-Provides:	i686-pc-mingw32-expat-devel
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-expat-helper.spec.in b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-expat-helper.spec.in
deleted file mode 100644
index 19aa7f7..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-expat-helper.spec.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           @rpmprefix at i686-pc-mingw32-expat-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 expat libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-expat
-Requires:       mingw32-expat
-Provides:	@rpmprefix at i686-pc-mingw32-expat
-Provides:	@rpmprefix at i686-pc-mingw32-expat-devel
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gcc-helper.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gcc-helper.spec
deleted file mode 100644
index 8a984c4..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gcc-helper.spec
+++ /dev/null
@@ -1,25 +0,0 @@
-Name:           i686-pc-mingw32-gcc-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS gcc helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-gcc
-Requires:       mingw32-gcc
-Provides:	i686-pc-mingw32-gcc
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gcc-helper.spec.in b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gcc-helper.spec.in
deleted file mode 100644
index b6f124d..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gcc-helper.spec.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Name:           @rpmprefix at i686-pc-mingw32-gcc-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS gcc helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-gcc
-Requires:       mingw32-gcc
-Provides:	@rpmprefix at i686-pc-mingw32-gcc
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec
deleted file mode 100644
index 3a41736..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-gmp.spec
+++ /dev/null
@@ -1,167 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gmp_version 4.3.2
-%define gmp_rpmvers %{expand:%(echo 4.3.2 | tr - _)} 
-%define debug_package %{nil}
-
-Name:         i686-pc-mingw32-gmp
-Release:      0.20100319.1%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%gmp_rpmvers
-Summary:      	MinGW gmp Libraries
-
-Source0:	ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
-Provides:	i686-pc-mingw32-gmp-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-
-BuildRequires:  m4
-BuildRequires:	i686-pc-mingw32-gcc
-
-%description
-MinGW gmp libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../gmp-%{gmp_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=i686-pc-mingw32 \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-libs-helper.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-libs-helper.spec
deleted file mode 100644
index 9be6359..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-libs-helper.spec
+++ /dev/null
@@ -1,25 +0,0 @@
-Name:           i686-pc-mingw32-libs-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 runtime libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-runtime
-Requires:       mingw32-runtime
-Provides:	i686-pc-mingw32-libs
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-libs-helper.spec.in b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-libs-helper.spec.in
deleted file mode 100644
index 7500ffe..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-libs-helper.spec.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Name:           @rpmprefix at i686-pc-mingw32-libs-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 runtime libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-runtime
-Requires:       mingw32-runtime
-Provides:	@rpmprefix at i686-pc-mingw32-libs
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-mpc.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-mpc.spec
deleted file mode 100644
index 9dd6fa3..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-mpc.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define mpc_version 0.8.1
-%define mpc_rpmvers %{expand:%(echo 0.8.1 | tr - _)} 
-%define debug_package %{nil}
-
-Name:         i686-pc-mingw32-mpc
-Release:      0.20100319.1%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%mpc_rpmvers
-Summary:      	MinGW mpc Libraries
-
-Source0:	ftp://ftp.gnu.org/gnu/mpc/mpc-%{mpc_version}.tar.gz
-
-Provides:	i686-pc-mingw32-mpc-devel = %{version}-%{release}
-Provides:	i686-pc-mingw32-libmpc-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-
-BuildRequires:  m4
-BuildRequires:  i686-pc-mingw32-gmp-devel
-BuildRequires:  i686-pc-mingw32-mpfr-devel
-BuildRequires:	i686-pc-mingw32-gcc
-
-%description
-MinGW mpc libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../mpc-%{mpc_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=i686-pc-mingw32 \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{mpc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{mpc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{mpc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{mpc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{mpc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{mpc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-mpfr.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-mpfr.spec
deleted file mode 100644
index 83f32c6..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-mpfr.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define mpfr_version 2.4.2
-%define mpfr_rpmvers %{expand:%(echo 2.4.2 | tr - _)} 
-%define debug_package %{nil}
-
-Name:         i686-pc-mingw32-mpfr
-Release:      0.20100813.1%{?dist}
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%mpfr_rpmvers
-Summary:      	MinGW MPFR Libraries
-
-Source0:	http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-
-Provides:	i686-pc-mingw32-mpfr-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-%if 0%{?fedora} >= 9
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-%else
-%define _mingw32_sysroot %{_prefix}/i686-pc-mingw32/sys-root
-%endif
-
-BuildRequires:	i686-pc-mingw32-gcc
-BuildRequires:	i686-pc-mingw32-gmp-devel
-
-%description
-MinGW MPFR libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../mpfr-%{mpfr_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=i686-pc-mingw32 \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-mingw32/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-mingw32/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
-
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-readline-helper.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-readline-helper.spec
deleted file mode 100644
index 9c176a3..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-readline-helper.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           i686-pc-mingw32-readline-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 readline libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-readline
-Requires:       mingw32-readline
-Provides:	i686-pc-mingw32-readline
-Provides:	i686-pc-mingw32-readline-devel
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-readline-helper.spec.in b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-readline-helper.spec.in
deleted file mode 100644
index b9f43c9..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-readline-helper.spec.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           @rpmprefix at i686-pc-mingw32-readline-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 readline libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-readline
-Requires:       mingw32-readline
-Provides:	@rpmprefix at i686-pc-mingw32-readline
-Provides:	@rpmprefix at i686-pc-mingw32-readline-devel
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-termcap-helper.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-termcap-helper.spec
deleted file mode 100644
index 0171404..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-termcap-helper.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           i686-pc-mingw32-termcap-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 termcap libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-termcap
-Requires:       mingw32-termcap
-Provides:	i686-pc-mingw32-termcap
-Provides:	i686-pc-mingw32-termcap-devel
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-termcap-helper.spec.in b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-termcap-helper.spec.in
deleted file mode 100644
index 6252413..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-termcap-helper.spec.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           @rpmprefix at i686-pc-mingw32-termcap-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 termcap libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-termcap
-Requires:       mingw32-termcap
-Provides:	@rpmprefix at i686-pc-mingw32-termcap
-Provides:	@rpmprefix at i686-pc-mingw32-termcap-devel
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-w32api-helper.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-w32api-helper.spec
deleted file mode 100644
index 1c8461b..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-w32api-helper.spec
+++ /dev/null
@@ -1,25 +0,0 @@
-Name:           i686-pc-mingw32-w32api-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 runtime libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-w32api
-Requires:       mingw32-w32api
-Provides:	i686-pc-mingw32-w32api
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-w32api-helper.spec.in b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-w32api-helper.spec.in
deleted file mode 100644
index 8298780..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-w32api-helper.spec.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Name:           @rpmprefix at i686-pc-mingw32-w32api-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 runtime libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-w32api
-Requires:       mingw32-w32api
-Provides:	@rpmprefix at i686-pc-mingw32-w32api
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-zlib-helper.spec b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-zlib-helper.spec
deleted file mode 100644
index d43335f..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-zlib-helper.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           i686-pc-mingw32-zlib-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 zlib libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-zlib
-Requires:       mingw32-zlib
-Provides:	i686-pc-mingw32-zlib
-Provides:	i686-pc-mingw32-zlib-devel
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-zlib-helper.spec.in b/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-zlib-helper.spec.in
deleted file mode 100644
index e8cc2a8..0000000
--- a/contrib/crossrpms/mingw32/i686/i686-pc-mingw32-zlib-helper.spec.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           @rpmprefix at i686-pc-mingw32-zlib-helper
-Version:        0.20090717.0
-Release:        1%{?dist}
-Summary:        RTEMS mingw32 zlib libs helper
-
-Group:          Development
-License:        GPLv3+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:  mingw32-zlib
-Requires:       mingw32-zlib
-Provides:	@rpmprefix at i686-pc-mingw32-zlib
-Provides:	@rpmprefix at i686-pc-mingw32-zlib-devel
-
-%description
-%{summary}
-
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%build
-
-%files
-
-%changelog
diff --git a/contrib/crossrpms/mingw32/i686/mpc.add b/contrib/crossrpms/mingw32/i686/mpc.add
deleted file mode 100644
index d7bb544..0000000
--- a/contrib/crossrpms/mingw32/i686/mpc.add
+++ /dev/null
@@ -1,69 +0,0 @@
-%define mpc_version @MPC_VERS@
-%define mpc_rpmvers %{expand:%(echo @MPC_VERS@ | tr - _)} 
-%define debug_package %{nil}
-
-Name:         @rpmprefix@@tool_target at -mpc
-Release:      @MPC_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%mpc_rpmvers
-Summary:      	MinGW mpc Libraries
-
-Source0:	ftp://ftp.gnu.org/gnu/mpc/mpc-%{mpc_version}.tar.gz
-
-Provides:	@rpmprefix@@tool_target at -mpc-devel = %{version}-%{release}
-Provides:	@rpmprefix@@tool_target at -libmpc-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-
-BuildRequires:  m4
-BuildRequires:  @rpmprefix at i686-pc-mingw32-gmp-devel
-BuildRequires:  @rpmprefix at i686-pc-mingw32-mpfr-devel
-BuildRequires:	@rpmprefix at i686-pc-mingw32-gcc
-
-%description
-MinGW mpc libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../mpc-%{mpc_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=@tool_target@ \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
diff --git a/contrib/crossrpms/mingw32/i686/mpfr.add b/contrib/crossrpms/mingw32/i686/mpfr.add
deleted file mode 100644
index 7d7aec6..0000000
--- a/contrib/crossrpms/mingw32/i686/mpfr.add
+++ /dev/null
@@ -1,69 +0,0 @@
-%define mpfr_version @MPFR_VERS@
-%define mpfr_rpmvers %{expand:%(echo @MPFR_VERS@ | tr - _)} 
-%define debug_package %{nil}
-
-Name:         @rpmprefix@@tool_target at -mpfr
-Release:      @MPFR_RPMREL@
-License:      GPL
-Group:        Development/Tools
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Version:      	%mpfr_rpmvers
-Summary:      	MinGW MPFR Libraries
-
-Source0:	http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-
-Provides:	@rpmprefix@@tool_target at -mpfr-devel = %{version}-%{release}
-
-%define _mingw32_target          i686-pc-mingw32
-%if 0%{?fedora} >= 9
-# Fedora ships a mingw toolchain installed to /usr
-%define _mingw32_sysroot /usr/%{_mingw32_target}/sys-root
-%else
-%define _mingw32_sysroot %{_prefix}/@tool_target@/sys-root
-%endif
-
-BuildRequires:	@rpmprefix at i686-pc-mingw32-gcc
-BuildRequires:	@rpmprefix at i686-pc-mingw32-gmp-devel
-
-%description
-MinGW MPFR libraries.
-
-%prep
-%setup -c -q
-
-%build
-  %if "%{_prefix}" != "/usr"
-    export PATH="%{_bindir}:${PATH}"
-  %endif
-
-  mkdir -p build
-
-  cd build
-
-  ../mpfr-%{mpfr_version}/configure \
-    --prefix=%{_mingw32_sysroot}/mingw \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_mingw32_sysroot}/mingw \
-    --includedir=%{_mingw32_sysroot}/mingw/include \
-    --libdir=%{_mingw32_sysroot}/mingw/lib \
-    --libexecdir=%{_mingw32_sysroot}/mingw/libexec \
-    --mandir=%{_mingw32_sysroot}/mingw/share/man \
-    --infodir=%{_mingw32_sysroot}/mingw/share/info \
-    --datadir=%{_mingw32_sysroot}/mingw/share \
-    --build=%_build --host=@tool_target@ \
-    --enable-static \
-    --disable-shared
-
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  cd ..
diff --git a/contrib/crossrpms/mingw32/i686/target-gmp.add b/contrib/crossrpms/mingw32/i686/target-gmp.add
deleted file mode 100644
index 9bfb8f3..0000000
--- a/contrib/crossrpms/mingw32/i686/target-gmp.add
+++ /dev/null
@@ -1,4 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
diff --git a/contrib/crossrpms/mingw32/i686/target-mpc.add b/contrib/crossrpms/mingw32/i686/target-mpc.add
deleted file mode 100644
index 9bfb8f3..0000000
--- a/contrib/crossrpms/mingw32/i686/target-mpc.add
+++ /dev/null
@@ -1,4 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
diff --git a/contrib/crossrpms/mingw32/i686/target-mpfr.add b/contrib/crossrpms/mingw32/i686/target-mpfr.add
deleted file mode 100644
index f056292..0000000
--- a/contrib/crossrpms/mingw32/i686/target-mpfr.add
+++ /dev/null
@@ -1,5 +0,0 @@
-%files
-%defattr(-,root,root,-)
-%{_mingw32_sysroot}/mingw
-%exclude %{_mingw32_sysroot}/mingw/share/info/dir
-
diff --git a/contrib/crossrpms/mingw32/mpc.am b/contrib/crossrpms/mingw32/mpc.am
deleted file mode 100644
index 791dffd..0000000
--- a/contrib/crossrpms/mingw32/mpc.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST += target-mpc.add
-EXTRA_DIST += mpc.add
-
-MPC_SUBPACKAGES = $(top_srcdir)/common/common.add
-MPC_SUBPACKAGES += $(srcdir)/mpc.add
-MPC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-MPC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-MPC_SUBPACKAGES += $(srcdir)/target-mpc.add
-
-$(TARGET)-mpc.spec.in: $(MPC_SUBPACKAGES) Makefile.am
-	cat $(MPC_SUBPACKAGES) | sed \
-	  -e "s/[@]MPC_VERS[@]/$(MPC_VERS)/g" \
-	  -e "s/[@]MPC_RPMREL[@]/$(MPC_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{mpc_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-mpc.spec.in
-CLEANFILES += $(TARGET)-mpc.spec.in
-
- at rpmprefix@$(TARGET)-mpc.spec: $(TARGET)-mpc.spec.in
-	$(MKSPEC) $(TARGET)-mpc.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-mpc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-mpc.spec
diff --git a/contrib/crossrpms/mingw32/mpfr.am b/contrib/crossrpms/mingw32/mpfr.am
deleted file mode 100644
index 73ef84b..0000000
--- a/contrib/crossrpms/mingw32/mpfr.am
+++ /dev/null
@@ -1,22 +0,0 @@
-EXTRA_DIST += target-mpfr.add
-EXTRA_DIST += mpfr.add
-
-MPFR_SUBPACKAGES = $(top_srcdir)/common/common.add
-MPFR_SUBPACKAGES += $(srcdir)/mpfr.add
-MPFR_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-MPFR_SUBPACKAGES += $(top_srcdir)/common/clean.add
-MPFR_SUBPACKAGES += $(srcdir)/target-mpfr.add
-
-$(TARGET)-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am
-	cat $(MPFR_SUBPACKAGES) | sed \
-	  -e "s/[@]MPFR_VERS[@]/$(MPFR_VERS)/g" \
-	  -e "s/[@]MPFR_RPMREL[@]/$(MPFR_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{mpfr_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-mpfr.spec.in
-CLEANFILES += $(TARGET)-mpfr.spec.in
-
- at rpmprefix@$(TARGET)-mpfr.spec: $(TARGET)-mpfr.spec.in
-	$(MKSPEC) $(TARGET)-mpfr.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-mpfr.spec
-noinst_DATA += @rpmprefix@$(TARGET)-mpfr.spec
-
diff --git a/contrib/crossrpms/mkspec.am b/contrib/crossrpms/mkspec.am
deleted file mode 100644
index b251a19..0000000
--- a/contrib/crossrpms/mkspec.am
+++ /dev/null
@@ -1,17 +0,0 @@
-noinst_DATA =
-CLEANFILES =
-EXTRA_DIST =
-
-SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
-
-MKSPEC = sed \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "/^%package -n [@]rpmprefix[@][@]tool_target[@]-gcc/d" \
-	  -e "@sysdirpattern@" \
-	  -e "/[@]PATCH/d"
-
-MKSPEC0 = sed \
-	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]rtems_api[@]/$(rtems_api)/g"
diff --git a/contrib/crossrpms/netbsd5.1/Makefile.am b/contrib/crossrpms/netbsd5.1/Makefile.am
deleted file mode 100644
index b5d211b..0000000
--- a/contrib/crossrpms/netbsd5.1/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-SUBDIRS = i386 x86_64
-
diff --git a/contrib/crossrpms/netbsd5.1/binutils.am b/contrib/crossrpms/netbsd5.1/binutils.am
deleted file mode 100644
index 7b4ee14..0000000
--- a/contrib/crossrpms/netbsd5.1/binutils.am
+++ /dev/null
@@ -1,30 +0,0 @@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_OPTS =
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add $(srcdir)/../binutils.am
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \
-	  | $(MKSPEC0) > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
- at rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
-EXTRA_DIST += $(BINUTILS_SUBPACKAGES)
diff --git a/contrib/crossrpms/netbsd5.1/gcc-prep.add b/contrib/crossrpms/netbsd5.1/gcc-prep.add
deleted file mode 100644
index e69de29..0000000
diff --git a/contrib/crossrpms/netbsd5.1/gcc.am b/contrib/crossrpms/netbsd5.1/gcc.am
deleted file mode 100644
index e6e3611..0000000
--- a/contrib/crossrpms/netbsd5.1/gcc.am
+++ /dev/null
@@ -1,40 +0,0 @@
-EXTRA_DIST += $(srcdir)/../gcc-prep.add
-EXTRA_DIST += $(srcdir)/gcc-sources.add
-
-GCC_OPTS =
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
-	cat $(GCC_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "/--with-newlib/d" \
-	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
- at rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
-	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
-
-EXTRA_DIST += $(GCC_SUBPACKAGES)
diff --git a/contrib/crossrpms/netbsd5.1/i386/Makefile.am b/contrib/crossrpms/netbsd5.1/i386/Makefile.am
deleted file mode 100644
index d6cbdc3..0000000
--- a/contrib/crossrpms/netbsd5.1/i386/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-TARGET = i386-pc-netbsdelf5.1
-
-include $(top_srcdir)/mkspec.am
-
-NETBSD_VERS = 5.1
-NETBSD_RPMREL = 0.20110320.0
-EXTRA_DIST += libs.add
-EXTRA_DIST += target-libs.add
-include ../libs.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 0.20111122.0
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.5.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20111116.0
-include ../gcc.am
-GCC_OPTS += --languages=c,cxx,fortran,objc
diff --git a/contrib/crossrpms/netbsd5.1/i386/binutils-sources.add b/contrib/crossrpms/netbsd5.1/i386/binutils-sources.add
deleted file mode 100644
index e458c6f..0000000
--- a/contrib/crossrpms/netbsd5.1/i386/binutils-sources.add
+++ /dev/null
@@ -1,2 +0,0 @@
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
- at PATCH0@
diff --git a/contrib/crossrpms/netbsd5.1/i386/gcc-sources.add b/contrib/crossrpms/netbsd5.1/i386/gcc-sources.add
deleted file mode 100644
index 18c9848..0000000
--- a/contrib/crossrpms/netbsd5.1/i386/gcc-sources.add
+++ /dev/null
@@ -1,37 +0,0 @@
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-%if %build_cxx
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
- at PATCH2@
-%{?_without_sources:NoSource:	2}
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
- at PATCH3@
-%{?_without_sources:NoSource:	3}
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
- at PATCH4@
-%{?_without_sources:NoSource:	4}
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
- at PATCH5@
-%{?_without_sources:NoSource:	5}
-%endif
diff --git a/contrib/crossrpms/netbsd5.1/i386/i386-pc-netbsdelf5.1-binutils.spec b/contrib/crossrpms/netbsd5.1/i386/i386-pc-netbsdelf5.1-binutils.spec
deleted file mode 100644
index c3dbdf5..0000000
--- a/contrib/crossrpms/netbsd5.1/i386/i386-pc-netbsdelf5.1-binutils.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		i386-pc-netbsdelf5.1-binutils
-Summary:	Binutils for target i386-pc-netbsdelf5.1
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	0.20111122.0%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-
-%description
-Cross binutils for target i386-pc-netbsdelf5.1
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=i386-pc-netbsdelf5.1 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --with-sysroot=%{_prefix}/i386-pc-netbsdelf5.1/sys-root \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-
-# Conflict with a native binutils' infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-pc-netbsdelf5.1-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-pc-netbsdelf5.1-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-pc-netbsdelf5.1-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-pc-netbsdelf5.1-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-pc-netbsdelf5.1-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-pc-netbsdelf5.1-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-pc-netbsdelf5.1-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-pc-netbsdelf5.1-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i386-pc-netbsdelf5.1-binutils
-# ==============================================================
-# %package -n i386-pc-netbsdelf5.1-binutils
-# Summary:      rtems binutils for i386-pc-netbsdelf5.1
-# Group: Development/Tools
-# %if %build_infos
-# Requires: binutils-common
-# %endif
-
-%description -n i386-pc-netbsdelf5.1-binutils
-GNU binutils targetting i386-pc-netbsdelf5.1.
-
-%files -n i386-pc-netbsdelf5.1-binutils
-%defattr(-,root,root)
-
-%{_mandir}/man1/i386-pc-netbsdelf5.1-*.1*
-
-%{_bindir}/i386-pc-netbsdelf5.1-*
-
-%dir %{_exec_prefix}/i386-pc-netbsdelf5.1
-%dir %{_exec_prefix}/i386-pc-netbsdelf5.1/bin
-%{_exec_prefix}/i386-pc-netbsdelf5.1/bin/*
-
-%dir %{_exec_prefix}/i386-pc-netbsdelf5.1/lib
-%{_exec_prefix}/i386-pc-netbsdelf5.1/lib/ldscripts
-
diff --git a/contrib/crossrpms/netbsd5.1/i386/i386-pc-netbsdelf5.1-gcc.spec b/contrib/crossrpms/netbsd5.1/i386/i386-pc-netbsdelf5.1-gcc.spec
deleted file mode 100644
index 15683aa..0000000
--- a/contrib/crossrpms/netbsd5.1/i386/i386-pc-netbsdelf5.1-gcc.spec
+++ /dev/null
@@ -1,798 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.5.2
-%define gcc_version 4.5.2
-%define gcc_rpmvers %{expand:%(echo "4.5.2" | tr - _ )}
-
-
-Name:         	i386-pc-netbsdelf5.1-gcc
-Summary:      	i386-pc-netbsdelf5.1 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	0.20111116.0%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%define gmp_required		4.1
-%define mpfr_required		2.2.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  i386-pc-netbsdelf5.1-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	i386-pc-netbsdelf5.1-binutils
-BuildRequires:	i386-pc-netbsdelf5.1-sys-root
-
-Requires:	i386-pc-netbsdelf5.1-binutils
-Requires:	i386-pc-netbsdelf5.1-sys-root
-Requires:	i386-pc-netbsdelf5.1-gcc-libgcc = %{gcc_rpmvers}-%{release}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	2}
-
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	5}
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for i386-pc-netbsdelf5.1.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-%{?SOURCE2:%setup -q -T -D -n %{name}-%{version} -a2}
-%{?PATCH2:%patch2 -p0}
-
-
-
-%{?SOURCE5:%setup -q -T -D -n %{name}-%{version} -a5}
-%{?PATCH5:%patch5 -p0}
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  languages="$languages,fortran"
-  languages="$languages,objc"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=i386-pc-netbsdelf5.1 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    --with-sysroot=%{_exec_prefix}/i386-pc-netbsdelf5.1/sys-root \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i386-pc-netbsdelf5.1-c++filt%{_exeext}
-
-
-# Conflict with a native GCC's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# Conflict with a native GCC's man pages
-  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i386-pc-netbsdelf5.1-i386-pc-netbsdelf5.1-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/i386-pc-netbsdelf5.1/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/i386-pc-netbsdelf5.1/include/bits
-  fi
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/i386-pc-netbsdelf5.1/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-pc-netbsdelf5.1/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-pc-netbsdelf5.1/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i386-pc-netbsdelf5.1-gcc
-# ==============================================================
-# %package -n i386-pc-netbsdelf5.1-gcc
-# Summary:        GNU cc compiler for i386-pc-netbsdelf5.1
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       i386-pc-netbsdelf5.1-binutils
-# License:	GPL
-
-# %if %build_infos
-# Requires:      gcc-common
-# %endif
-
-%description -n i386-pc-netbsdelf5.1-gcc
-GNU cc compiler for i386-pc-netbsdelf5.1.
-
-# ==============================================================
-# i386-pc-netbsdelf5.1-gcc-libgcc
-# ==============================================================
-%package -n i386-pc-netbsdelf5.1-gcc-libgcc
-Summary:        libgcc for i386-pc-netbsdelf5.1-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i386-pc-netbsdelf5.1-gcc-libgcc
-libgcc i386-pc-netbsdelf5.1-gcc.
-
-
-%files -n i386-pc-netbsdelf5.1-gcc
-%defattr(-,root,root)
-
-%{_mandir}/man1/i386-pc-netbsdelf5.1-gcc.1*
-%{_mandir}/man1/i386-pc-netbsdelf5.1-cpp.1*
-%{_mandir}/man1/i386-pc-netbsdelf5.1-gcov.1*
-
-%{_bindir}/i386-pc-netbsdelf5.1-cpp%{_exeext}
-%{_bindir}/i386-pc-netbsdelf5.1-gcc%{_exeext}
-%{_bindir}/i386-pc-netbsdelf5.1-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/i386-pc-netbsdelf5.1-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/i386-pc-netbsdelf5.1-gccbug
-%endif
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i386-pc-netbsdelf5.1
-%dir %{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}
-%{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n i386-pc-netbsdelf5.1-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# i386-pc-netbsdelf5.1-gcc-c++
-# ==============================================================
-%package -n i386-pc-netbsdelf5.1-gcc-c++
-Summary:	GCC c++ compiler for i386-pc-netbsdelf5.1
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       i386-pc-netbsdelf5.1-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  i386-pc-netbsdelf5.1-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       i386-pc-netbsdelf5.1-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n i386-pc-netbsdelf5.1-gcc-c++
-GCC c++ compiler for i386-pc-netbsdelf5.1.
-
-
-%package -n i386-pc-netbsdelf5.1-gcc-libstdc++
-Summary:	libstdc++ for i386-pc-netbsdelf5.1
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i386-pc-netbsdelf5.1-gcc-libstdc++
-%{summary}
-
-
-%files -n i386-pc-netbsdelf5.1-gcc-c++
-%defattr(-,root,root)
-
-%{_mandir}/man1/i386-pc-netbsdelf5.1-g++.1*
-
-%{_bindir}/i386-pc-netbsdelf5.1-c++%{_exeext}
-%{_bindir}/i386-pc-netbsdelf5.1-g++%{_exeext}
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i386-pc-netbsdelf5.1
-%dir %{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}
-%{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n i386-pc-netbsdelf5.1-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/include
-%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/include/c++
-
-# ==============================================================
-# i386-pc-netbsdelf5.1-gcc-gfortran
-# ==============================================================
-%package -n i386-pc-netbsdelf5.1-gcc-gfortran
-Summary:	Fortran 95 support for i386-pc-netbsdelf5.1-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       i386-pc-netbsdelf5.1-gcc = %{gcc_rpmvers}-%{release}
-Requires:       i386-pc-netbsdelf5.1-gcc-libgfortran = %{gcc_rpmvers}-%{release}
-
-%description -n i386-pc-netbsdelf5.1-gcc-gfortran
-GCC fortran compiler for i386-pc-netbsdelf5.1.
-
-%files -n i386-pc-netbsdelf5.1-gcc-gfortran
-%defattr(-,root,root)
-%{_bindir}/i386-pc-netbsdelf5.1-gfortran%{_exeext}
-
-%{_mandir}/man1/i386-pc-netbsdelf5.1-gfortran.1*
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i386-pc-netbsdelf5.1
-%dir %{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}
-%{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/f951%{_exeext}
-
-# ==============================================================
-# i386-pc-netbsdelf5.1-gcc-libgfortran
-# ==============================================================
-%package -n i386-pc-netbsdelf5.1-gcc-libgfortran
-Summary:	Fortran 95 support libraries for i386-pc-netbsdelf5.1-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i386-pc-netbsdelf5.1-gcc-libgfortran
-%{summary}
-
-%files -n i386-pc-netbsdelf5.1-gcc-libgfortran -f build/files.gfortran
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}
-%if "%{gcc_version}" >= "4.2.0"
-%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/finclude
-%endif
-
-# ==============================================================
-# i386-pc-netbsdelf5.1-gcc-objc
-# ==============================================================
-%package -n i386-pc-netbsdelf5.1-gcc-objc
-Summary:        Objective C support for i386-pc-netbsdelf5.1-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       i386-pc-netbsdelf5.1-gcc = %{gcc_rpmvers}-%{release}
-Requires:       i386-pc-netbsdelf5.1-gcc-libobjc = %{gcc_rpmvers}-%{release}
-
-%description -n i386-pc-netbsdelf5.1-gcc-objc
-GCC objc compiler for i386-pc-netbsdelf5.1.
-
-%files -n i386-pc-netbsdelf5.1-gcc-objc
-%defattr(-,root,root)
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i386-pc-netbsdelf5.1
-%dir %{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}
-%{_libexecdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/cc1obj%{_exeext}
-
-# ==============================================================
-# i386-pc-netbsdelf5.1-gcc-libobjc
-# ==============================================================
-%package -n i386-pc-netbsdelf5.1-gcc-libobjc
-Summary:        Objective C support for i386-pc-netbsdelf5.1-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n i386-pc-netbsdelf5.1-gcc-libobjc
-Support libraries for GCC's objc compiler for i386-pc-netbsdelf5.1.
-
-%files -n i386-pc-netbsdelf5.1-gcc-libobjc -f build/files.objc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/include
-%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/%{gcc_version}/include/objc
-
diff --git a/contrib/crossrpms/netbsd5.1/i386/i386-pc-netbsdelf5.1-libs.spec b/contrib/crossrpms/netbsd5.1/i386/i386-pc-netbsdelf5.1-libs.spec
deleted file mode 100644
index ac96050..0000000
--- a/contrib/crossrpms/netbsd5.1/i386/i386-pc-netbsdelf5.1-libs.spec
+++ /dev/null
@@ -1,163 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define netbsd_version 5.1
-%define netbsd_rpmvers %{expand:%(echo 5.1 | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		i386-pc-netbsdelf5.1
-Release:	0.20110320.0%{?dist}
-License:	NetBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%netbsd_rpmvers
-Summary:      	i386-pc-netbsdelf5.1 Libraries
-
-Source0:	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-5.0.2/i386/binary/sets/base.tgz
-Source1:	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-5.0.2/i386/binary/sets/comp.tgz
-
-%description
-i386-pc-netbsdelf5.1 libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version} -a 0 -a 1
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p i386-pc-netbsdelf5.1/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd i386-pc-netbsdelf5.1/sys-root ; %{__tar} xf -)
-
-  pushd i386-pc-netbsdelf5.1/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a i386-pc-netbsdelf5.1 $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{netbsd_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-pc-netbsdelf5.1/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{netbsd_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{netbsd_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{netbsd_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-pc-netbsdelf5.1/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-pc-netbsdelf5.1/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{netbsd_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{netbsd_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%package sys-root
-Group: Development/Tools
-Summary: i386-pc-netbsdelf5.1 target files for gcc >= 3.4
-
-%description sys-root
-i386-pc-netbsdelf5.1 target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/i386-pc-netbsdelf5.1
-%{_prefix}/i386-pc-netbsdelf5.1/sys-root
diff --git a/contrib/crossrpms/netbsd5.1/i386/libs.add b/contrib/crossrpms/netbsd5.1/i386/libs.add
deleted file mode 100644
index 6388353..0000000
--- a/contrib/crossrpms/netbsd5.1/i386/libs.add
+++ /dev/null
@@ -1,55 +0,0 @@
-%define netbsd_version @NETBSD_VERS@
-%define netbsd_rpmvers %{expand:%(echo @NETBSD_VERS@ | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		@rpmprefix@@tool_target@
-Release:	@NETBSD_RPMREL@
-License:	NetBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%netbsd_rpmvers
-Summary:      	@tool_target@ Libraries
-
-Source0:	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-5.0.2/i386/binary/sets/base.tgz
-Source1:	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-5.0.2/i386/binary/sets/comp.tgz
-
-%description
- at tool_target@ libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version} -a 0 -a 1
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
-
-  pushd @tool_target@/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/netbsd5.1/i386/target-libs.add b/contrib/crossrpms/netbsd5.1/i386/target-libs.add
deleted file mode 100644
index 0550fc7..0000000
--- a/contrib/crossrpms/netbsd5.1/i386/target-libs.add
+++ /dev/null
@@ -1,11 +0,0 @@
-%package sys-root
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc >= 3.4
-
-%description sys-root
- at tool_target@ target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
diff --git a/contrib/crossrpms/netbsd5.1/libs.am b/contrib/crossrpms/netbsd5.1/libs.am
deleted file mode 100644
index e7eca99..0000000
--- a/contrib/crossrpms/netbsd5.1/libs.am
+++ /dev/null
@@ -1,18 +0,0 @@
-LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add
-LIBS_SUBPACKAGES += $(srcdir)/libs.add
-LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-LIBS_SUBPACKAGES += $(srcdir)/target-libs.add
-
-$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
-	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s/[@]NETBSD_VERS[@]/$(NETBSD_VERS)/g" \
-	  -e "s/[@]NETBSD_RPMREL[@]/$(NETBSD_RPMREL)%{?dist}/g" \
-	  -e "s,%{gcc_rpmvers},%{netbsd_rpmvers},g" \
-	> $(TARGET)-libs.spec.in
-CLEANFILES += $(TARGET)-libs.spec.in
-	                      
- at rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in $(srcdir)/../libs.am
-	$(MKSPEC) $(TARGET)-libs.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
-noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
diff --git a/contrib/crossrpms/netbsd5.1/x86_64/Makefile.am b/contrib/crossrpms/netbsd5.1/x86_64/Makefile.am
deleted file mode 100644
index 17f32c5..0000000
--- a/contrib/crossrpms/netbsd5.1/x86_64/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-TARGET = amd64-pc-netbsdelf5.1
-
-include $(top_srcdir)/mkspec.am
-
-NETBSD_VERS = 5.1
-NETBSD_RPMREL = 0.20110320.0
-EXTRA_DIST += libs.add
-EXTRA_DIST += target-libs.add
-include ../libs.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 0.20111122.0
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.5.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20111116.0
-include ../gcc.am
-GCC_OPTS += --languages=c,cxx,fortran,objc
diff --git a/contrib/crossrpms/netbsd5.1/x86_64/amd64-pc-netbsdelf5.1-binutils.spec b/contrib/crossrpms/netbsd5.1/x86_64/amd64-pc-netbsdelf5.1-binutils.spec
deleted file mode 100644
index 0a574af..0000000
--- a/contrib/crossrpms/netbsd5.1/x86_64/amd64-pc-netbsdelf5.1-binutils.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		amd64-pc-netbsdelf5.1-binutils
-Summary:	Binutils for target amd64-pc-netbsdelf5.1
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	0.20111122.0%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-
-%description
-Cross binutils for target amd64-pc-netbsdelf5.1
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=amd64-pc-netbsdelf5.1 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --with-sysroot=%{_prefix}/amd64-pc-netbsdelf5.1/sys-root \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-
-# Conflict with a native binutils' infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/amd64-pc-netbsdelf5.1-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/amd64-pc-netbsdelf5.1-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/amd64-pc-netbsdelf5.1-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/amd64-pc-netbsdelf5.1-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/amd64-pc-netbsdelf5.1-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/amd64-pc-netbsdelf5.1-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/amd64-pc-netbsdelf5.1-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/amd64-pc-netbsdelf5.1-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# amd64-pc-netbsdelf5.1-binutils
-# ==============================================================
-# %package -n amd64-pc-netbsdelf5.1-binutils
-# Summary:      rtems binutils for amd64-pc-netbsdelf5.1
-# Group: Development/Tools
-# %if %build_infos
-# Requires: binutils-common
-# %endif
-
-%description -n amd64-pc-netbsdelf5.1-binutils
-GNU binutils targetting amd64-pc-netbsdelf5.1.
-
-%files -n amd64-pc-netbsdelf5.1-binutils
-%defattr(-,root,root)
-
-%{_mandir}/man1/amd64-pc-netbsdelf5.1-*.1*
-
-%{_bindir}/amd64-pc-netbsdelf5.1-*
-
-%dir %{_exec_prefix}/amd64-pc-netbsdelf5.1
-%dir %{_exec_prefix}/amd64-pc-netbsdelf5.1/bin
-%{_exec_prefix}/amd64-pc-netbsdelf5.1/bin/*
-
-%dir %{_exec_prefix}/amd64-pc-netbsdelf5.1/lib
-%{_exec_prefix}/amd64-pc-netbsdelf5.1/lib/ldscripts
-
diff --git a/contrib/crossrpms/netbsd5.1/x86_64/amd64-pc-netbsdelf5.1-gcc.spec b/contrib/crossrpms/netbsd5.1/x86_64/amd64-pc-netbsdelf5.1-gcc.spec
deleted file mode 100644
index 0fc4885..0000000
--- a/contrib/crossrpms/netbsd5.1/x86_64/amd64-pc-netbsdelf5.1-gcc.spec
+++ /dev/null
@@ -1,798 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.5.2
-%define gcc_version 4.5.2
-%define gcc_rpmvers %{expand:%(echo "4.5.2" | tr - _ )}
-
-
-Name:         	amd64-pc-netbsdelf5.1-gcc
-Summary:      	amd64-pc-netbsdelf5.1 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	0.20111116.0%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%define gmp_required		4.1
-%define mpfr_required		2.2.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  amd64-pc-netbsdelf5.1-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	amd64-pc-netbsdelf5.1-binutils
-BuildRequires:	amd64-pc-netbsdelf5.1-sys-root
-
-Requires:	amd64-pc-netbsdelf5.1-binutils
-Requires:	amd64-pc-netbsdelf5.1-sys-root
-Requires:	amd64-pc-netbsdelf5.1-gcc-libgcc = %{gcc_rpmvers}-%{release}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	2}
-
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	5}
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for amd64-pc-netbsdelf5.1.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-%{?SOURCE2:%setup -q -T -D -n %{name}-%{version} -a2}
-%{?PATCH2:%patch2 -p0}
-
-
-
-%{?SOURCE5:%setup -q -T -D -n %{name}-%{version} -a5}
-%{?PATCH5:%patch5 -p0}
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  languages="$languages,fortran"
-  languages="$languages,objc"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=amd64-pc-netbsdelf5.1 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    --with-sysroot=%{_exec_prefix}/amd64-pc-netbsdelf5.1/sys-root \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/amd64-pc-netbsdelf5.1-c++filt%{_exeext}
-
-
-# Conflict with a native GCC's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# Conflict with a native GCC's man pages
-  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/amd64-pc-netbsdelf5.1-amd64-pc-netbsdelf5.1-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/amd64-pc-netbsdelf5.1/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/amd64-pc-netbsdelf5.1/include/bits
-  fi
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/amd64-pc-netbsdelf5.1/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/amd64-pc-netbsdelf5.1/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/amd64-pc-netbsdelf5.1/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# amd64-pc-netbsdelf5.1-gcc
-# ==============================================================
-# %package -n amd64-pc-netbsdelf5.1-gcc
-# Summary:        GNU cc compiler for amd64-pc-netbsdelf5.1
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       amd64-pc-netbsdelf5.1-binutils
-# License:	GPL
-
-# %if %build_infos
-# Requires:      gcc-common
-# %endif
-
-%description -n amd64-pc-netbsdelf5.1-gcc
-GNU cc compiler for amd64-pc-netbsdelf5.1.
-
-# ==============================================================
-# amd64-pc-netbsdelf5.1-gcc-libgcc
-# ==============================================================
-%package -n amd64-pc-netbsdelf5.1-gcc-libgcc
-Summary:        libgcc for amd64-pc-netbsdelf5.1-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n amd64-pc-netbsdelf5.1-gcc-libgcc
-libgcc amd64-pc-netbsdelf5.1-gcc.
-
-
-%files -n amd64-pc-netbsdelf5.1-gcc
-%defattr(-,root,root)
-
-%{_mandir}/man1/amd64-pc-netbsdelf5.1-gcc.1*
-%{_mandir}/man1/amd64-pc-netbsdelf5.1-cpp.1*
-%{_mandir}/man1/amd64-pc-netbsdelf5.1-gcov.1*
-
-%{_bindir}/amd64-pc-netbsdelf5.1-cpp%{_exeext}
-%{_bindir}/amd64-pc-netbsdelf5.1-gcc%{_exeext}
-%{_bindir}/amd64-pc-netbsdelf5.1-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/amd64-pc-netbsdelf5.1-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/amd64-pc-netbsdelf5.1-gccbug
-%endif
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/amd64-pc-netbsdelf5.1
-%dir %{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}
-%{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n amd64-pc-netbsdelf5.1-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# amd64-pc-netbsdelf5.1-gcc-c++
-# ==============================================================
-%package -n amd64-pc-netbsdelf5.1-gcc-c++
-Summary:	GCC c++ compiler for amd64-pc-netbsdelf5.1
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       amd64-pc-netbsdelf5.1-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  amd64-pc-netbsdelf5.1-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       amd64-pc-netbsdelf5.1-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n amd64-pc-netbsdelf5.1-gcc-c++
-GCC c++ compiler for amd64-pc-netbsdelf5.1.
-
-
-%package -n amd64-pc-netbsdelf5.1-gcc-libstdc++
-Summary:	libstdc++ for amd64-pc-netbsdelf5.1
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n amd64-pc-netbsdelf5.1-gcc-libstdc++
-%{summary}
-
-
-%files -n amd64-pc-netbsdelf5.1-gcc-c++
-%defattr(-,root,root)
-
-%{_mandir}/man1/amd64-pc-netbsdelf5.1-g++.1*
-
-%{_bindir}/amd64-pc-netbsdelf5.1-c++%{_exeext}
-%{_bindir}/amd64-pc-netbsdelf5.1-g++%{_exeext}
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/amd64-pc-netbsdelf5.1
-%dir %{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}
-%{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n amd64-pc-netbsdelf5.1-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/include
-%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/include/c++
-
-# ==============================================================
-# amd64-pc-netbsdelf5.1-gcc-gfortran
-# ==============================================================
-%package -n amd64-pc-netbsdelf5.1-gcc-gfortran
-Summary:	Fortran 95 support for amd64-pc-netbsdelf5.1-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       amd64-pc-netbsdelf5.1-gcc = %{gcc_rpmvers}-%{release}
-Requires:       amd64-pc-netbsdelf5.1-gcc-libgfortran = %{gcc_rpmvers}-%{release}
-
-%description -n amd64-pc-netbsdelf5.1-gcc-gfortran
-GCC fortran compiler for amd64-pc-netbsdelf5.1.
-
-%files -n amd64-pc-netbsdelf5.1-gcc-gfortran
-%defattr(-,root,root)
-%{_bindir}/amd64-pc-netbsdelf5.1-gfortran%{_exeext}
-
-%{_mandir}/man1/amd64-pc-netbsdelf5.1-gfortran.1*
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/amd64-pc-netbsdelf5.1
-%dir %{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}
-%{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/f951%{_exeext}
-
-# ==============================================================
-# amd64-pc-netbsdelf5.1-gcc-libgfortran
-# ==============================================================
-%package -n amd64-pc-netbsdelf5.1-gcc-libgfortran
-Summary:	Fortran 95 support libraries for amd64-pc-netbsdelf5.1-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n amd64-pc-netbsdelf5.1-gcc-libgfortran
-%{summary}
-
-%files -n amd64-pc-netbsdelf5.1-gcc-libgfortran -f build/files.gfortran
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}
-%if "%{gcc_version}" >= "4.2.0"
-%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/finclude
-%endif
-
-# ==============================================================
-# amd64-pc-netbsdelf5.1-gcc-objc
-# ==============================================================
-%package -n amd64-pc-netbsdelf5.1-gcc-objc
-Summary:        Objective C support for amd64-pc-netbsdelf5.1-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       amd64-pc-netbsdelf5.1-gcc = %{gcc_rpmvers}-%{release}
-Requires:       amd64-pc-netbsdelf5.1-gcc-libobjc = %{gcc_rpmvers}-%{release}
-
-%description -n amd64-pc-netbsdelf5.1-gcc-objc
-GCC objc compiler for amd64-pc-netbsdelf5.1.
-
-%files -n amd64-pc-netbsdelf5.1-gcc-objc
-%defattr(-,root,root)
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/amd64-pc-netbsdelf5.1
-%dir %{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}
-%{_libexecdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/cc1obj%{_exeext}
-
-# ==============================================================
-# amd64-pc-netbsdelf5.1-gcc-libobjc
-# ==============================================================
-%package -n amd64-pc-netbsdelf5.1-gcc-libobjc
-Summary:        Objective C support for amd64-pc-netbsdelf5.1-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n amd64-pc-netbsdelf5.1-gcc-libobjc
-Support libraries for GCC's objc compiler for amd64-pc-netbsdelf5.1.
-
-%files -n amd64-pc-netbsdelf5.1-gcc-libobjc -f build/files.objc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}
-%dir %{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/include
-%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/%{gcc_version}/include/objc
-
diff --git a/contrib/crossrpms/netbsd5.1/x86_64/amd64-pc-netbsdelf5.1-libs.spec b/contrib/crossrpms/netbsd5.1/x86_64/amd64-pc-netbsdelf5.1-libs.spec
deleted file mode 100644
index 02733e2..0000000
--- a/contrib/crossrpms/netbsd5.1/x86_64/amd64-pc-netbsdelf5.1-libs.spec
+++ /dev/null
@@ -1,163 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define netbsd_version 5.1
-%define netbsd_rpmvers %{expand:%(echo 5.1 | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		amd64-pc-netbsdelf5.1
-Release:	0.20110320.0%{?dist}
-License:	NetBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%netbsd_rpmvers
-Summary:      	amd64-pc-netbsdelf5.1 Libraries
-
-Source0:	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-5.0.2/amd64/binary/sets/base.tgz
-Source1:	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-5.0.2/amd64/binary/sets/comp.tgz
-
-%description
-amd64-pc-netbsdelf5.1 libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version} -a 0 -a 1
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p amd64-pc-netbsdelf5.1/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd amd64-pc-netbsdelf5.1/sys-root ; %{__tar} xf -)
-
-  pushd amd64-pc-netbsdelf5.1/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a amd64-pc-netbsdelf5.1 $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{netbsd_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/amd64-pc-netbsdelf5.1/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{netbsd_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{netbsd_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{netbsd_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/amd64-pc-netbsdelf5.1/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/amd64-pc-netbsdelf5.1/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{netbsd_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{netbsd_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%package sys-root
-Group: Development/Tools
-Summary: amd64-pc-netbsdelf5.1 target files for gcc >= 3.4
-
-%description sys-root
-amd64-pc-netbsdelf5.1 target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/amd64-pc-netbsdelf5.1
-%{_prefix}/amd64-pc-netbsdelf5.1/sys-root
diff --git a/contrib/crossrpms/netbsd5.1/x86_64/binutils-sources.add b/contrib/crossrpms/netbsd5.1/x86_64/binutils-sources.add
deleted file mode 100644
index e458c6f..0000000
--- a/contrib/crossrpms/netbsd5.1/x86_64/binutils-sources.add
+++ /dev/null
@@ -1,2 +0,0 @@
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
- at PATCH0@
diff --git a/contrib/crossrpms/netbsd5.1/x86_64/gcc-sources.add b/contrib/crossrpms/netbsd5.1/x86_64/gcc-sources.add
deleted file mode 100644
index 18c9848..0000000
--- a/contrib/crossrpms/netbsd5.1/x86_64/gcc-sources.add
+++ /dev/null
@@ -1,37 +0,0 @@
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
-%endif
-%{?_without_sources:NoSource:	0}
-
-%if %build_cxx
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
-%endif
-%{?_without_sources:NoSource:	1}
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
- at PATCH2@
-%{?_without_sources:NoSource:	2}
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
- at PATCH3@
-%{?_without_sources:NoSource:	3}
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
- at PATCH4@
-%{?_without_sources:NoSource:	4}
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
- at PATCH5@
-%{?_without_sources:NoSource:	5}
-%endif
diff --git a/contrib/crossrpms/netbsd5.1/x86_64/libs.add b/contrib/crossrpms/netbsd5.1/x86_64/libs.add
deleted file mode 100644
index 6cb7553..0000000
--- a/contrib/crossrpms/netbsd5.1/x86_64/libs.add
+++ /dev/null
@@ -1,55 +0,0 @@
-%define netbsd_version @NETBSD_VERS@
-%define netbsd_rpmvers %{expand:%(echo @NETBSD_VERS@ | tr - _)}
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:		@rpmprefix@@tool_target@
-Release:	@NETBSD_RPMREL@
-License:	NetBSD
-Group:		Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%netbsd_rpmvers
-Summary:      	@tool_target@ Libraries
-
-Source0:	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-5.0.2/amd64/binary/sets/base.tgz
-Source1:	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-5.0.2/amd64/binary/sets/comp.tgz
-
-%description
- at tool_target@ libraries.
-
-%prep
-%setup -q -c -T -n %{name}-%{version} -a 0 -a 1
-
-%build
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  %{__tar} cf - lib usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
-
-  pushd @tool_target@/sys-root/usr/lib > /dev/null
-  # missing files
-  rm -f lib*_p.*
-  # not needed
-  rm -rf aout compat
-
-  # Fix up symlinks
-  find -type l -exec ls -l {} \; | \
-    while read a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aA ; do \
-    case $aA in
-    /lib* ) # link
-       rm $a8;
-       b=`basename $aA`
-       ln -s ../../lib/$b $a8
-       ;;
-    esac
-  done
-  popd > /dev/null
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/netbsd5.1/x86_64/target-libs.add b/contrib/crossrpms/netbsd5.1/x86_64/target-libs.add
deleted file mode 100644
index 0550fc7..0000000
--- a/contrib/crossrpms/netbsd5.1/x86_64/target-libs.add
+++ /dev/null
@@ -1,11 +0,0 @@
-%package sys-root
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc >= 3.4
-
-%description sys-root
- at tool_target@ target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
diff --git a/contrib/crossrpms/patches/binutils-2.17.50-cygwin-20060817-1.diff b/contrib/crossrpms/patches/binutils-2.17.50-cygwin-20060817-1.diff
deleted file mode 100644
index 6896980..0000000
--- a/contrib/crossrpms/patches/binutils-2.17.50-cygwin-20060817-1.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur binutils-20060817-1.orig/configure binutils-20060817-1/configure
---- binutils-20060817-1.orig/configure	2006-08-17 07:00:58.000000000 +0200
-+++ binutils-20060817-1/configure	2008-03-12 03:52:57.000000000 +0100
-@@ -3681,7 +3681,7 @@
-     # For an installed makeinfo, we require it to be from texinfo 4.4 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
-diff -Naur binutils-20060817-1.orig/configure.in binutils-20060817-1/configure.in
---- binutils-20060817-1.orig/configure.in	2006-08-17 07:00:58.000000000 +0200
-+++ binutils-20060817-1/configure.in	2008-03-12 03:52:57.000000000 +0100
-@@ -2232,7 +2232,7 @@
-     # For an installed makeinfo, we require it to be from texinfo 4.4 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
diff --git a/contrib/crossrpms/patches/binutils-2.21-rtems4.11-20110107.diff b/contrib/crossrpms/patches/binutils-2.21-rtems4.11-20110107.diff
deleted file mode 100644
index 771e4f3..0000000
--- a/contrib/crossrpms/patches/binutils-2.21-rtems4.11-20110107.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naur binutils-2.21.orig/ld/ChangeLog binutils-2.21/ld/ChangeLog
---- binutils-2.21.orig/ld/ChangeLog	2010-12-01 12:03:47.000000000 +0100
-+++ binutils-2.21/ld/ChangeLog	2011-01-07 08:40:32.459885370 +0100
-@@ -1,3 +1,8 @@
-+2010-12-04  Alan Modra  <amodra at gmail.com>
-+
-+	* ldlang.c (lang_size_sections_1): Align lma using same alignment
-+	as for vma.
-+
- 2010-11-30  Joel Sherrill  <joel.sherrill at oarcorp.com>
- 
- 	* configure.tgt: Add sparc64-rtems.
-diff -Naur binutils-2.21.orig/ld/ldlang.c binutils-2.21/ld/ldlang.c
---- binutils-2.21.orig/ld/ldlang.c	2010-11-05 06:56:53.000000000 +0100
-+++ binutils-2.21/ld/ldlang.c	2011-01-07 08:40:32.461885415 +0100
-@@ -4788,6 +4788,7 @@
- 	    bfd_vma newdot, after;
- 	    lang_output_section_statement_type *os;
- 	    lang_memory_region_type *r;
-+	    int section_alignment = 0;
- 
- 	    os = &s->output_section_statement;
- 	    if (os->constraint == -1)
-@@ -4857,8 +4858,6 @@
- 	      }
- 	    else
- 	      {
--		int align;
--
- 		if (os->addr_tree == NULL)
- 		  {
- 		    /* No address specified for this section, get one
-@@ -4909,16 +4908,16 @@
- 		      }
- 
- 		    newdot = os->region->current;
--		    align = os->bfd_section->alignment_power;
-+		    section_alignment = os->bfd_section->alignment_power;
- 		  }
- 		else
--		  align = os->section_alignment;
-+		  section_alignment = os->section_alignment;
- 
- 		/* Align to what the section needs.  */
--		if (align > 0)
-+		if (section_alignment > 0)
- 		  {
- 		    bfd_vma savedot = newdot;
--		    newdot = align_power (newdot, align);
-+		    newdot = align_power (newdot, section_alignment);
- 
- 		    if (newdot != savedot
- 			&& (config.warn_section_align
-@@ -4974,8 +4973,8 @@
- 	      {
- 		bfd_vma lma = os->lma_region->current;
- 
--		if (os->section_alignment != -1)
--		  lma = align_power (lma, os->section_alignment);
-+		if (section_alignment > 0)
-+		  lma = align_power (lma, section_alignment);
- 		os->bfd_section->lma = lma;
- 	      }
- 	    else if (r->last_os != NULL
-@@ -5016,8 +5015,8 @@
- 		    else
- 		      lma = dot + last->lma - last->vma;
- 
--		    if (os->section_alignment != -1)
--		      lma = align_power (lma, os->section_alignment);
-+		    if (section_alignment > 0)
-+		      lma = align_power (lma, section_alignment);
- 		    os->bfd_section->lma = lma;
- 		  }
- 	      }
diff --git a/contrib/crossrpms/patches/cygwin-gcc-3.4.4-3.diff b/contrib/crossrpms/patches/cygwin-gcc-3.4.4-3.diff
deleted file mode 100644
index 0dfd882..0000000
--- a/contrib/crossrpms/patches/cygwin-gcc-3.4.4-3.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gcc-3.4.4.cyg/libiberty/strsignal.c gcc-3.4.4/libiberty/strsignal.c
---- gcc-3.4.4.cyg/libiberty/strsignal.c	2003-04-15 22:36:33.000000000 +0200
-+++ gcc-3.4.4/libiberty/strsignal.c	2010-04-25 06:52:18.000000000 +0200
-@@ -409,7 +409,7 @@
- 
- #ifndef HAVE_STRSIGNAL
- 
--const char *
-+char *
- strsignal (signo)
-   int signo;
- {
diff --git a/contrib/crossrpms/patches/gcc-core-4.5.3-rtems4.11-20110426.diff b/contrib/crossrpms/patches/gcc-core-4.5.3-rtems4.11-20110426.diff
deleted file mode 100644
index 5833e5a..0000000
--- a/contrib/crossrpms/patches/gcc-core-4.5.3-rtems4.11-20110426.diff
+++ /dev/null
@@ -1,447 +0,0 @@
-diff -Naur gcc-4.5.3.orig/ChangeLog.rtems gcc-4.5.3/ChangeLog.rtems
---- gcc-4.5.3.orig/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.3/ChangeLog.rtems	2011-04-26 07:57:53.879665216 +0200
-@@ -0,0 +1,4 @@
-+2008-02-05	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* configure, configure.ac (skipdirs): Add target-libiberty.
-+
-diff -Naur gcc-4.5.3.orig/configure gcc-4.5.3/configure
---- gcc-4.5.3.orig/configure	2011-01-25 16:49:54.000000000 +0100
-+++ gcc-4.5.3/configure	2011-04-26 07:57:53.882665279 +0200
-@@ -3291,6 +3291,7 @@
-     noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
-     ;;
-   *-*-rtems*)
-+    skipdirs="$skipdirs target-libiberty"
-     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-     ;;
-     # The tpf target doesn't support gdb yet.
-@@ -7975,7 +7976,7 @@
-        # to it.  This is right: we don't want to search that directory
-        # for binaries, but we want the header files in there, so add
-        # them explicitly.
--       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include'
-+       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed'
- 
-        # Someone might think of using the pre-installed headers on
-        # Canadian crosses, in case the installed compiler is not fully
-diff -Naur gcc-4.5.3.orig/configure.ac gcc-4.5.3/configure.ac
---- gcc-4.5.3.orig/configure.ac	2011-01-25 16:49:54.000000000 +0100
-+++ gcc-4.5.3/configure.ac	2011-04-26 07:57:53.883665292 +0200
-@@ -528,6 +528,7 @@
-     noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
-     ;;
-   *-*-rtems*)
-+    skipdirs="$skipdirs target-libiberty"
-     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-     ;;
-     # The tpf target doesn't support gdb yet.
-@@ -3028,7 +3029,7 @@
-        # to it.  This is right: we don't want to search that directory
-        # for binaries, but we want the header files in there, so add
-        # them explicitly.
--       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include'
-+       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed'
- 
-        # Someone might think of using the pre-installed headers on
-        # Canadian crosses, in case the installed compiler is not fully
-diff -Naur gcc-4.5.3.orig/gcc/ChangeLog.rtems gcc-4.5.3/gcc/ChangeLog.rtems
---- gcc-4.5.3.orig/gcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.3/gcc/ChangeLog.rtems	2011-04-26 07:57:53.884665306 +0200
-@@ -0,0 +1,58 @@
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Add -mcpu=8540/-mfloat-gprs=double multilib.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Remove -mcpu=601 multilib.
-+	* config/rs6000/t-rtems: Remove -Dmpc8260 multilib.
-+	* config/rs6000/rtems.h: Allow --float-gprs=... to override grps on
-+	E500 targets.
-+
-+2010-05-19  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+    	* config.gcc (sparc64-*-rtems*): New target.
-+	* config/sparc/sp64-rtemself.h: New file.
-+
-+2010-04-19	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _X86_64_ANSI_H_ is 
-+	defined (Used by amd64-*-netbsdelf5.*).
-+
-+2010-04-18	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _I386_ANSI_H_ is 
-+	defined (Used by i386-*-netbsdelf5.*).
-+
-+2010-03-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	Patch from Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>:
-+	* config/arm/rtems-elf.h, config/arm/t-rtems: Add optional support
-+	for vfp FPU model
-+
-+2009-12-01	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/avr/avr.h (LINK_SPEC): Pass -m avrN to ld for -mmcu=avrN.
-+
-+2009-11-04	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/m32c/rtems.h, config/m68k/rtemself.h,
-+	config/m68k/rtemself.h, config/sh/rtemself.h,
-+	config/sparc/rtemself.h: Undef WCHAR_TYPE_SIZE, WCHAR_TYPE. 
-+	(Resets WCHAR_TYPE's to defaults. Prevents broken GCC tm_files 
-+	to interfere and cause wchar_t/wint_t incompatibilities).
-+
-+2009-10-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/avr/t-rtems: Don't build _exit.
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/rtems.h: Support for custom RTEMS multilibs.
-+	Support TARGET_E500.
-+	* config/rs6000/t-rtems: Custom RTEMS multilibs. 
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/mips/elf.h: Remove NO_IMPLICIT_EXTERN_C.
-+	
-diff -Naur gcc-4.5.3.orig/gcc/config/arm/rtems-elf.h gcc-4.5.3/gcc/config/arm/rtems-elf.h
---- gcc-4.5.3.orig/gcc/config/arm/rtems-elf.h	2009-03-25 13:54:16.000000000 +0100
-+++ gcc-4.5.3/gcc/config/arm/rtems-elf.h	2011-04-26 07:57:53.884665306 +0200
-@@ -36,7 +36,7 @@
-  */
- #undef SUBTARGET_EXTRA_ASM_SPEC
- #define SUBTARGET_EXTRA_ASM_SPEC "\
--  %{!mhard-float: %{!msoft-float:-mfpu=softfpa}}"
-+  %{!mhard-float: %{!mfpu=vfp: %{!msoft-float:-mfpu=softfpa}}}"
- 
- /*
-  *  The default includes --start-group and --end-group which conflicts
-diff -Naur gcc-4.5.3.orig/gcc/config/arm/t-rtems gcc-4.5.3/gcc/config/arm/t-rtems
---- gcc-4.5.3.orig/gcc/config/arm/t-rtems	2004-11-23 06:30:32.000000000 +0100
-+++ gcc-4.5.3/gcc/config/arm/t-rtems	2011-04-26 07:57:53.884665306 +0200
-@@ -5,6 +5,41 @@
- MULTILIB_EXCEPTIONS  = 
- MULTILIB_MATCHES     = marm=mno-thumb
- 
--MULTILIB_OPTIONS    += msoft-float/mhard-float
--MULTILIB_DIRNAMES   += soft fpu
--MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
-+MULTILIB_OPTIONS    += mhard-float/mfloat-abi=softfp
-+MULTILIB_DIRNAMES   += fpu softfp
-+MULTILIB_EXCEPTIONS += *mthumb*/*mhard-float* *mthumb*/*mfloat-abi=softfp*
-+MULTILIB_MATCHES     =
-+
-+MULTILIB_OPTIONS    += mfpu=vfp
-+MULTILIB_DIRNAMES   += vfp
-+MULTILIB_EXCEPTIONS += *mhard-float*/*mfpu=vfp* *marm*/*mfloat-abi=softfp*/*mfpu=fpa*
-+MULTILIB_EXCLUSIONS += !mthumb/mfloat-abi=softfp/!mfpu=vfp
-+
-+# default float model is fpa, so don't create a explicit copy of it
-+MULTILIB_EXCEPTIONS += *marm*/*mfpa*
-+
-+# permutations of the options which are useful (+) or make no sense (-),
-+# defaults are in brackets:
-+# + (arm/soft/fpa)
-+# + (arm/soft)/vfp
-+# - (arm)/softfp(/fpa)
-+# + (arm)/softfp/vfp
-+# + (arm)/hard-float(/fpa)
-+# - (arm)/hard-float/vfp
-+# + thumb/(soft/fpa)
-+# + thumb/(soft/)vfp
-+# - thumb/softfp/fpa
-+# - thumb/softfp/vfp
-+# - thumb/hard-float/fpa
-+# - thumb/hard-float/vfp
-+
-+# subdirs to be used for multilibs and their respective options:
-+#/thumb/vfp  -> thumb/soft/vfp
-+#/thumb/fpa  -> thumb/soft/fpa
-+#/thumb      -> thumb/soft/fpa
-+#/vfp        -> arm/soft/vfp
-+#/softfp/vfp -> arm/softfp/cfp
-+#/fpu/fpa    -> arm/hard/fpa
-+#/fpu        -> arm/hard/fpa
-+#/fpa        -> arm/soft/fpa
-+#.           -> arm/soft/fpa
-diff -Naur gcc-4.5.3.orig/gcc/config/avr/t-rtems gcc-4.5.3/gcc/config/avr/t-rtems
---- gcc-4.5.3.orig/gcc/config/avr/t-rtems	2004-11-23 04:44:03.000000000 +0100
-+++ gcc-4.5.3/gcc/config/avr/t-rtems	2011-04-26 07:57:53.884665306 +0200
-@@ -1,3 +1,4 @@
- # Multilibs for avr RTEMS targets.
- 
--# ATM, this is just a stub
-+# RTEMS uses _exit from newlib
-+LIB1ASMFUNCS := $(filter-out _exit,$(LIB1ASMFUNCS))
-diff -Naur gcc-4.5.3.orig/gcc/config/m32c/rtems.h gcc-4.5.3/gcc/config/m32c/rtems.h
---- gcc-4.5.3.orig/gcc/config/m32c/rtems.h	2008-12-01 17:34:42.000000000 +0100
-+++ gcc-4.5.3/gcc/config/m32c/rtems.h	2011-04-26 07:57:53.884665306 +0200
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.5.3.orig/gcc/config/m68k/rtemself.h gcc-4.5.3/gcc/config/m68k/rtemself.h
---- gcc-4.5.3.orig/gcc/config/m68k/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.5.3/gcc/config/m68k/rtemself.h	2011-04-26 07:57:53.884665306 +0200
-@@ -31,3 +31,8 @@
- 	builtin_assert ("system=rtems");	\
-     }						\
-   while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.5.3.orig/gcc/config/mips/elf.h gcc-4.5.3/gcc/config/mips/elf.h
---- gcc-4.5.3.orig/gcc/config/mips/elf.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.5.3/gcc/config/mips/elf.h	2011-04-26 07:57:53.885665320 +0200
-@@ -48,6 +48,4 @@
- #undef  ENDFILE_SPEC
- #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
- 
--#define NO_IMPLICIT_EXTERN_C 1
--
- #define HANDLE_PRAGMA_PACK_PUSH_POP 1
-diff -Naur gcc-4.5.3.orig/gcc/config/rs6000/rtems.h gcc-4.5.3/gcc/config/rs6000/rtems.h
---- gcc-4.5.3.orig/gcc/config/rs6000/rtems.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.5.3/gcc/config/rs6000/rtems.h	2011-04-26 07:57:53.885665320 +0200
-@@ -49,8 +49,23 @@
- %{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
- %{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
- %{mcpu=821:  %{!Dppc*: %{!Dmpc*: -Dmpc821}  } } \
--%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } }" 
-+%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } } \
-+%{mcpu=8540: %{!Dppc*: %{!Dmpc*: -Dppc8540}  } }" 
- 
- #undef  SUBSUBTARGET_EXTRA_SPECS
- #define SUBSUBTARGET_EXTRA_SPECS \
-   { "cpp_os_rtems",		CPP_OS_RTEMS_SPEC }
-+
-+#undef SUBSUBTARGET_OVERRIDE_OPTIONS
-+#define SUBSUBTARGET_OVERRIDE_OPTIONS			\
-+  do {							\
-+    if (TARGET_E500)					\
-+      {							\
-+        if (!rs6000_explicit_options.float_gprs)	\
-+          rs6000_float_gprs = 1; 			\
-+      }							\
-+  } while(0)
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.5.3.orig/gcc/config/rs6000/t-rtems gcc-4.5.3/gcc/config/rs6000/t-rtems
---- gcc-4.5.3.orig/gcc/config/rs6000/t-rtems	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.5.3/gcc/config/rs6000/t-rtems	2011-04-26 07:57:53.885665320 +0200
-@@ -19,14 +19,12 @@
- # <http://www.gnu.org/licenses/>.
- 
- MULTILIB_OPTIONS	= \
--mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \
--Dmpc8260 \
--msoft-float
-+mcpu=403/mcpu=505/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
-+msoft-float/mfloat-gprs=double
- 
- MULTILIB_DIRNAMES	= \
--m403 m505 m601 m603e m604 m860 m7400 \
--mpc8260 \
--nof
-+m403 m505 m603e m604 m860 m7400 m8540 \
-+nof gprsdouble
- 
- # MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT}
- MULTILIB_MATCHES	=
-@@ -47,6 +45,13 @@
- # Map 750 to .
- MULTILIB_MATCHES	+= mcpu?750=
- 
-+# Map 8548 to 8540
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8548
-+
-+# Map -mcpu=8540 -mfloat-gprs=single to -mcpu=8540
-+# (mfloat-gprs=single is implicit default)
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8540/mfloat-gprs?single
-+
- # Soft-float only, default implies msoft-float
- # NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES
- MULTILIB_SOFTFLOAT_ONLY = \
-@@ -62,6 +67,16 @@
- MULTILIB_HARDFLOAT_ONLY = \
- *mcpu=505/*msoft-float*
- 
-+# Targets which do not support gprs
-+MULTILIB_NOGPRS = \
-+mfloat-gprs=* \
-+*mcpu=403/*mfloat-gprs=* \
-+*mcpu=505/*mfloat-gprs=* \
-+*mcpu=603e/*mfloat-gprs=* \
-+*mcpu=604/*mfloat-gprs=* \
-+*mcpu=860/*mfloat-gprs=* \
-+*mcpu=7400/*mfloat-gprs=*
-+
- MULTILIB_EXCEPTIONS =
- 
- # Disallow -Dppc and -Dmpc without other options
-@@ -69,14 +84,8 @@
- 
- MULTILIB_EXCEPTIONS	+= \
- ${MULTILIB_SOFTFLOAT_ONLY} \
--${MULTILIB_HARDFLOAT_ONLY}
-+${MULTILIB_HARDFLOAT_ONLY} \
-+${MULTILIB_NOGPRS}
- 
- # Special rules
- # Take out all variants we don't want
--MULTILIB_EXCEPTIONS += *mcpu=403/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=505/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=601/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=604/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
-diff -Naur gcc-4.5.3.orig/gcc/config/sh/rtemself.h gcc-4.5.3/gcc/config/sh/rtemself.h
---- gcc-4.5.3.orig/gcc/config/sh/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.5.3/gcc/config/sh/rtemself.h	2011-04-26 07:57:53.885665320 +0200
-@@ -24,3 +24,8 @@
-   builtin_define( "__rtems__" );		\
-   builtin_assert( "system=rtems" );		\
- } while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.5.3.orig/gcc/config/sparc/rtemself.h gcc-4.5.3/gcc/config/sparc/rtemself.h
---- gcc-4.5.3.orig/gcc/config/sparc/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.5.3/gcc/config/sparc/rtemself.h	2011-04-26 07:57:53.885665320 +0200
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.5.3.orig/gcc/config/sparc/sp64-rtemself.h gcc-4.5.3/gcc/config/sparc/sp64-rtemself.h
---- gcc-4.5.3.orig/gcc/config/sparc/sp64-rtemself.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.3/gcc/config/sparc/sp64-rtemself.h	2011-04-26 07:57:53.885665320 +0200
-@@ -0,0 +1,37 @@
-+/* Definitions for rtems targeting a SPARC64 using ELF.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   Contributed by Joel Sherrill (joel at OARcorp.com).
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* Target OS builtins.  */
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+  do						\
-+    {						\
-+	builtin_define ("__rtems__");		\
-+	builtin_define ("__USE_INIT_FINI__");	\
-+	builtin_assert ("system=rtems");	\
-+    }						\
-+  while (0)
-+
-+/* Use the default */
-+#undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+/* we are not svr4 */
-+#undef CPP_SUBTARGET_SPEC
-+#define CPP_SUBTARGET_SPEC ""
-diff -Naur gcc-4.5.3.orig/gcc/config.gcc gcc-4.5.3/gcc/config.gcc
---- gcc-4.5.3.orig/gcc/config.gcc	2011-02-27 02:06:15.000000000 +0100
-+++ gcc-4.5.3/gcc/config.gcc	2011-04-26 07:57:53.887665352 +0200
-@@ -2408,6 +2408,12 @@
- 	tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
- 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
- 	;;
-+sparc64-*-rtems*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/sp64-rtemself.h rtems.h"
-+	extra_options="${extra_options} sparc/little-endian.opt"
-+	tmake_file="${tmake_file} sparc/t-crtfm t-rtems"
-+	extra_parts="crtbegin.o crtend.o"
-+	;;
- sparc*-*-solaris2*)
- 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
- 	case ${target} in
-diff -Naur gcc-4.5.3.orig/gcc/ginclude/stddef.h gcc-4.5.3/gcc/ginclude/stddef.h
---- gcc-4.5.3.orig/gcc/ginclude/stddef.h	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.5.3/gcc/ginclude/stddef.h	2011-04-26 07:57:53.887665352 +0200
-@@ -53,7 +53,13 @@
-    one less case to deal with in the following.  */
- #if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__)
- #include <machine/ansi.h>
-+#if !defined(_MACHINE_ANSI_H_)
-+#if defined(_I386_ANSI_H_) || defined(_X86_64_ANSI_H_)
-+#define _MACHINE_ANSI_H_
- #endif
-+#endif
-+#endif
-+
- /* On FreeBSD 5, machine/ansi.h does not exist anymore... */
- #if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
- #include <sys/_types.h>
-diff -Naur gcc-4.5.3.orig/libgcc/ChangeLog.rtems gcc-4.5.3/libgcc/ChangeLog.rtems
---- gcc-4.5.3.orig/libgcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.3/libgcc/ChangeLog.rtems	2011-04-26 07:57:53.887665352 +0200
-@@ -0,0 +1,9 @@
-+2010-08-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	1669/Tools, GCC-BZ 44793
-+	* config.host (powerpc-*-rtems*): Add tmake_file.
-+	Add extra_parts.
-+
-+2010-05-19  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+	* config.host (sparc64-*-rtems*): New target.
-diff -Naur gcc-4.5.3.orig/libgcc/config.host gcc-4.5.3/libgcc/config.host
---- gcc-4.5.3.orig/libgcc/config.host	2011-02-23 19:06:29.000000000 +0100
-+++ gcc-4.5.3/libgcc/config.host	2011-04-26 07:57:53.887665352 +0200
-@@ -470,6 +470,8 @@
- 	tmake_file="${tmake_file} rs6000/t-ppccomm"
- 	;;
- powerpc-*-rtems*)
-+	tmake_file="${tmake_file} rs6000/t-ppccomm t-softfp"
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
- 	;;
- powerpc-*-linux* | powerpc64-*-linux*)
- 	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp"
-@@ -539,7 +541,7 @@
- 	extra_parts="$extra_parts crtfastmath.o"
- 	tmake_file="${tmake_file} sparc/t-crtfm"
- 	;;
--sparc-*-rtems*)
-+sparc-*-rtems* | sparc64-*-rtems* )
- 	;;
- sparc64-*-solaris2* | sparcv9-*-solaris2*)
- 	;;
diff --git a/contrib/crossrpms/patches/gcc-core-4.5.3-rtems4.11-20110905.diff b/contrib/crossrpms/patches/gcc-core-4.5.3-rtems4.11-20110905.diff
deleted file mode 100644
index 2caf60f..0000000
--- a/contrib/crossrpms/patches/gcc-core-4.5.3-rtems4.11-20110905.diff
+++ /dev/null
@@ -1,486 +0,0 @@
-diff -Naur gcc-4.5.3.orig/ChangeLog.rtems gcc-4.5.3/ChangeLog.rtems
---- gcc-4.5.3.orig/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.3/ChangeLog.rtems	2011-09-05 17:43:10.093883031 +0200
-@@ -0,0 +1,4 @@
-+2008-02-05	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* configure, configure.ac (skipdirs): Add target-libiberty.
-+
-diff -Naur gcc-4.5.3.orig/configure gcc-4.5.3/configure
---- gcc-4.5.3.orig/configure	2011-01-25 16:49:54.000000000 +0100
-+++ gcc-4.5.3/configure	2011-09-05 17:43:10.097883093 +0200
-@@ -3291,6 +3291,7 @@
-     noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
-     ;;
-   *-*-rtems*)
-+    skipdirs="$skipdirs target-libiberty"
-     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-     ;;
-     # The tpf target doesn't support gdb yet.
-@@ -7975,7 +7976,7 @@
-        # to it.  This is right: we don't want to search that directory
-        # for binaries, but we want the header files in there, so add
-        # them explicitly.
--       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include'
-+       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed'
- 
-        # Someone might think of using the pre-installed headers on
-        # Canadian crosses, in case the installed compiler is not fully
-diff -Naur gcc-4.5.3.orig/configure.ac gcc-4.5.3/configure.ac
---- gcc-4.5.3.orig/configure.ac	2011-01-25 16:49:54.000000000 +0100
-+++ gcc-4.5.3/configure.ac	2011-09-05 17:43:10.098883109 +0200
-@@ -528,6 +528,7 @@
-     noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
-     ;;
-   *-*-rtems*)
-+    skipdirs="$skipdirs target-libiberty"
-     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-     ;;
-     # The tpf target doesn't support gdb yet.
-@@ -3028,7 +3029,7 @@
-        # to it.  This is right: we don't want to search that directory
-        # for binaries, but we want the header files in there, so add
-        # them explicitly.
--       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include'
-+       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed'
- 
-        # Someone might think of using the pre-installed headers on
-        # Canadian crosses, in case the installed compiler is not fully
-diff -Naur gcc-4.5.3.orig/gcc/ChangeLog.rtems gcc-4.5.3/gcc/ChangeLog.rtems
---- gcc-4.5.3.orig/gcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.3/gcc/ChangeLog.rtems	2011-09-05 17:43:10.098883109 +0200
-@@ -0,0 +1,63 @@
-+2011-09-05	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/lm32/t-rtems: New.
-+	* config.gcc (lm32-*-rtems*): Add lm32/t-rtems.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Add -mcpu=8540/-mfloat-gprs=double multilib.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Remove -mcpu=601 multilib.
-+	* config/rs6000/t-rtems: Remove -Dmpc8260 multilib.
-+	* config/rs6000/rtems.h: Allow --float-gprs=... to override grps on
-+	E500 targets.
-+
-+2010-05-19  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+    	* config.gcc (sparc64-*-rtems*): New target.
-+	* config/sparc/sp64-rtemself.h: New file.
-+
-+2010-04-19	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _X86_64_ANSI_H_ is 
-+	defined (Used by amd64-*-netbsdelf5.*).
-+
-+2010-04-18	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _I386_ANSI_H_ is 
-+	defined (Used by i386-*-netbsdelf5.*).
-+
-+2010-03-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	Patch from Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>:
-+	* config/arm/rtems-elf.h, config/arm/t-rtems: Add optional support
-+	for vfp FPU model
-+
-+2009-12-01	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/avr/avr.h (LINK_SPEC): Pass -m avrN to ld for -mmcu=avrN.
-+
-+2009-11-04	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/m32c/rtems.h, config/m68k/rtemself.h,
-+	config/m68k/rtemself.h, config/sh/rtemself.h,
-+	config/sparc/rtemself.h: Undef WCHAR_TYPE_SIZE, WCHAR_TYPE. 
-+	(Resets WCHAR_TYPE's to defaults. Prevents broken GCC tm_files 
-+	to interfere and cause wchar_t/wint_t incompatibilities).
-+
-+2009-10-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/avr/t-rtems: Don't build _exit.
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/rtems.h: Support for custom RTEMS multilibs.
-+	Support TARGET_E500.
-+	* config/rs6000/t-rtems: Custom RTEMS multilibs. 
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/mips/elf.h: Remove NO_IMPLICIT_EXTERN_C.
-+	
-diff -Naur gcc-4.5.3.orig/gcc/config/arm/rtems-elf.h gcc-4.5.3/gcc/config/arm/rtems-elf.h
---- gcc-4.5.3.orig/gcc/config/arm/rtems-elf.h	2009-03-25 13:54:16.000000000 +0100
-+++ gcc-4.5.3/gcc/config/arm/rtems-elf.h	2011-09-05 17:43:10.100883141 +0200
-@@ -36,7 +36,7 @@
-  */
- #undef SUBTARGET_EXTRA_ASM_SPEC
- #define SUBTARGET_EXTRA_ASM_SPEC "\
--  %{!mhard-float: %{!msoft-float:-mfpu=softfpa}}"
-+  %{!mhard-float: %{!mfpu=vfp: %{!msoft-float:-mfpu=softfpa}}}"
- 
- /*
-  *  The default includes --start-group and --end-group which conflicts
-diff -Naur gcc-4.5.3.orig/gcc/config/arm/t-rtems gcc-4.5.3/gcc/config/arm/t-rtems
---- gcc-4.5.3.orig/gcc/config/arm/t-rtems	2004-11-23 06:30:32.000000000 +0100
-+++ gcc-4.5.3/gcc/config/arm/t-rtems	2011-09-05 17:43:10.100883141 +0200
-@@ -5,6 +5,41 @@
- MULTILIB_EXCEPTIONS  = 
- MULTILIB_MATCHES     = marm=mno-thumb
- 
--MULTILIB_OPTIONS    += msoft-float/mhard-float
--MULTILIB_DIRNAMES   += soft fpu
--MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
-+MULTILIB_OPTIONS    += mhard-float/mfloat-abi=softfp
-+MULTILIB_DIRNAMES   += fpu softfp
-+MULTILIB_EXCEPTIONS += *mthumb*/*mhard-float* *mthumb*/*mfloat-abi=softfp*
-+MULTILIB_MATCHES     =
-+
-+MULTILIB_OPTIONS    += mfpu=vfp
-+MULTILIB_DIRNAMES   += vfp
-+MULTILIB_EXCEPTIONS += *mhard-float*/*mfpu=vfp* *marm*/*mfloat-abi=softfp*/*mfpu=fpa*
-+MULTILIB_EXCLUSIONS += !mthumb/mfloat-abi=softfp/!mfpu=vfp
-+
-+# default float model is fpa, so don't create a explicit copy of it
-+MULTILIB_EXCEPTIONS += *marm*/*mfpa*
-+
-+# permutations of the options which are useful (+) or make no sense (-),
-+# defaults are in brackets:
-+# + (arm/soft/fpa)
-+# + (arm/soft)/vfp
-+# - (arm)/softfp(/fpa)
-+# + (arm)/softfp/vfp
-+# + (arm)/hard-float(/fpa)
-+# - (arm)/hard-float/vfp
-+# + thumb/(soft/fpa)
-+# + thumb/(soft/)vfp
-+# - thumb/softfp/fpa
-+# - thumb/softfp/vfp
-+# - thumb/hard-float/fpa
-+# - thumb/hard-float/vfp
-+
-+# subdirs to be used for multilibs and their respective options:
-+#/thumb/vfp  -> thumb/soft/vfp
-+#/thumb/fpa  -> thumb/soft/fpa
-+#/thumb      -> thumb/soft/fpa
-+#/vfp        -> arm/soft/vfp
-+#/softfp/vfp -> arm/softfp/cfp
-+#/fpu/fpa    -> arm/hard/fpa
-+#/fpu        -> arm/hard/fpa
-+#/fpa        -> arm/soft/fpa
-+#.           -> arm/soft/fpa
-diff -Naur gcc-4.5.3.orig/gcc/config/avr/t-rtems gcc-4.5.3/gcc/config/avr/t-rtems
---- gcc-4.5.3.orig/gcc/config/avr/t-rtems	2004-11-23 04:44:03.000000000 +0100
-+++ gcc-4.5.3/gcc/config/avr/t-rtems	2011-09-05 17:43:10.100883141 +0200
-@@ -1,3 +1,4 @@
- # Multilibs for avr RTEMS targets.
- 
--# ATM, this is just a stub
-+# RTEMS uses _exit from newlib
-+LIB1ASMFUNCS := $(filter-out _exit,$(LIB1ASMFUNCS))
-diff -Naur gcc-4.5.3.orig/gcc/config/lm32/t-rtems gcc-4.5.3/gcc/config/lm32/t-rtems
---- gcc-4.5.3.orig/gcc/config/lm32/t-rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.3/gcc/config/lm32/t-rtems	2011-09-05 17:43:10.100883141 +0200
-@@ -0,0 +1,21 @@
-+# for multilib
-+MULTILIB_OPTIONS = mmultiply-enabled mbarrel-shift-enabled
-+MULTILIB_OPTIONS += mdivide-enabled msign-extend-enabled
-+
-+MULTILIB_EXCEPTIONS =
-+# MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/mdivide-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/msign-extend-enabled
-+#MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mdivide-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/msign-extend-enabled
-+# MULTILIB_EXCEPTIONS += mmultiply-enabled
-+MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/mdivide-enabled
-+MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/msign-extend-enabled
-+# MULTILIB_EXCEPTIONS += mbarrel-shift-enabled
-+MULTILIB_EXCEPTIONS += mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mdivide-enabled
-+MULTILIB_EXCEPTIONS += msign-extend-enabled
-+# MULTILIB_EXCEPTIONS += 
-diff -Naur gcc-4.5.3.orig/gcc/config/m32c/rtems.h gcc-4.5.3/gcc/config/m32c/rtems.h
---- gcc-4.5.3.orig/gcc/config/m32c/rtems.h	2008-12-01 17:34:42.000000000 +0100
-+++ gcc-4.5.3/gcc/config/m32c/rtems.h	2011-09-05 17:43:10.100883141 +0200
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.5.3.orig/gcc/config/m68k/rtemself.h gcc-4.5.3/gcc/config/m68k/rtemself.h
---- gcc-4.5.3.orig/gcc/config/m68k/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.5.3/gcc/config/m68k/rtemself.h	2011-09-05 17:43:10.101883157 +0200
-@@ -31,3 +31,8 @@
- 	builtin_assert ("system=rtems");	\
-     }						\
-   while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.5.3.orig/gcc/config/mips/elf.h gcc-4.5.3/gcc/config/mips/elf.h
---- gcc-4.5.3.orig/gcc/config/mips/elf.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.5.3/gcc/config/mips/elf.h	2011-09-05 17:43:10.101883157 +0200
-@@ -48,6 +48,4 @@
- #undef  ENDFILE_SPEC
- #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
- 
--#define NO_IMPLICIT_EXTERN_C 1
--
- #define HANDLE_PRAGMA_PACK_PUSH_POP 1
-diff -Naur gcc-4.5.3.orig/gcc/config/rs6000/rtems.h gcc-4.5.3/gcc/config/rs6000/rtems.h
---- gcc-4.5.3.orig/gcc/config/rs6000/rtems.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.5.3/gcc/config/rs6000/rtems.h	2011-09-05 17:43:10.101883157 +0200
-@@ -49,8 +49,23 @@
- %{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
- %{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
- %{mcpu=821:  %{!Dppc*: %{!Dmpc*: -Dmpc821}  } } \
--%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } }" 
-+%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } } \
-+%{mcpu=8540: %{!Dppc*: %{!Dmpc*: -Dppc8540}  } }" 
- 
- #undef  SUBSUBTARGET_EXTRA_SPECS
- #define SUBSUBTARGET_EXTRA_SPECS \
-   { "cpp_os_rtems",		CPP_OS_RTEMS_SPEC }
-+
-+#undef SUBSUBTARGET_OVERRIDE_OPTIONS
-+#define SUBSUBTARGET_OVERRIDE_OPTIONS			\
-+  do {							\
-+    if (TARGET_E500)					\
-+      {							\
-+        if (!rs6000_explicit_options.float_gprs)	\
-+          rs6000_float_gprs = 1; 			\
-+      }							\
-+  } while(0)
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.5.3.orig/gcc/config/rs6000/t-rtems gcc-4.5.3/gcc/config/rs6000/t-rtems
---- gcc-4.5.3.orig/gcc/config/rs6000/t-rtems	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.5.3/gcc/config/rs6000/t-rtems	2011-09-05 17:43:10.101883157 +0200
-@@ -19,14 +19,12 @@
- # <http://www.gnu.org/licenses/>.
- 
- MULTILIB_OPTIONS	= \
--mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \
--Dmpc8260 \
--msoft-float
-+mcpu=403/mcpu=505/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
-+msoft-float/mfloat-gprs=double
- 
- MULTILIB_DIRNAMES	= \
--m403 m505 m601 m603e m604 m860 m7400 \
--mpc8260 \
--nof
-+m403 m505 m603e m604 m860 m7400 m8540 \
-+nof gprsdouble
- 
- # MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT}
- MULTILIB_MATCHES	=
-@@ -47,6 +45,13 @@
- # Map 750 to .
- MULTILIB_MATCHES	+= mcpu?750=
- 
-+# Map 8548 to 8540
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8548
-+
-+# Map -mcpu=8540 -mfloat-gprs=single to -mcpu=8540
-+# (mfloat-gprs=single is implicit default)
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8540/mfloat-gprs?single
-+
- # Soft-float only, default implies msoft-float
- # NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES
- MULTILIB_SOFTFLOAT_ONLY = \
-@@ -62,6 +67,16 @@
- MULTILIB_HARDFLOAT_ONLY = \
- *mcpu=505/*msoft-float*
- 
-+# Targets which do not support gprs
-+MULTILIB_NOGPRS = \
-+mfloat-gprs=* \
-+*mcpu=403/*mfloat-gprs=* \
-+*mcpu=505/*mfloat-gprs=* \
-+*mcpu=603e/*mfloat-gprs=* \
-+*mcpu=604/*mfloat-gprs=* \
-+*mcpu=860/*mfloat-gprs=* \
-+*mcpu=7400/*mfloat-gprs=*
-+
- MULTILIB_EXCEPTIONS =
- 
- # Disallow -Dppc and -Dmpc without other options
-@@ -69,14 +84,8 @@
- 
- MULTILIB_EXCEPTIONS	+= \
- ${MULTILIB_SOFTFLOAT_ONLY} \
--${MULTILIB_HARDFLOAT_ONLY}
-+${MULTILIB_HARDFLOAT_ONLY} \
-+${MULTILIB_NOGPRS}
- 
- # Special rules
- # Take out all variants we don't want
--MULTILIB_EXCEPTIONS += *mcpu=403/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=505/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=601/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=604/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
-diff -Naur gcc-4.5.3.orig/gcc/config/sh/rtemself.h gcc-4.5.3/gcc/config/sh/rtemself.h
---- gcc-4.5.3.orig/gcc/config/sh/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.5.3/gcc/config/sh/rtemself.h	2011-09-05 17:43:10.101883157 +0200
-@@ -24,3 +24,8 @@
-   builtin_define( "__rtems__" );		\
-   builtin_assert( "system=rtems" );		\
- } while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.5.3.orig/gcc/config/sparc/rtemself.h gcc-4.5.3/gcc/config/sparc/rtemself.h
---- gcc-4.5.3.orig/gcc/config/sparc/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.5.3/gcc/config/sparc/rtemself.h	2011-09-05 17:43:10.102883173 +0200
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.5.3.orig/gcc/config/sparc/sp64-rtemself.h gcc-4.5.3/gcc/config/sparc/sp64-rtemself.h
---- gcc-4.5.3.orig/gcc/config/sparc/sp64-rtemself.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.3/gcc/config/sparc/sp64-rtemself.h	2011-09-05 17:43:10.102883173 +0200
-@@ -0,0 +1,37 @@
-+/* Definitions for rtems targeting a SPARC64 using ELF.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   Contributed by Joel Sherrill (joel at OARcorp.com).
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* Target OS builtins.  */
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+  do						\
-+    {						\
-+	builtin_define ("__rtems__");		\
-+	builtin_define ("__USE_INIT_FINI__");	\
-+	builtin_assert ("system=rtems");	\
-+    }						\
-+  while (0)
-+
-+/* Use the default */
-+#undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+/* we are not svr4 */
-+#undef CPP_SUBTARGET_SPEC
-+#define CPP_SUBTARGET_SPEC ""
-diff -Naur gcc-4.5.3.orig/gcc/config.gcc gcc-4.5.3/gcc/config.gcc
---- gcc-4.5.3.orig/gcc/config.gcc	2011-02-27 02:06:15.000000000 +0100
-+++ gcc-4.5.3/gcc/config.gcc	2011-09-05 17:43:10.099883125 +0200
-@@ -1526,7 +1526,7 @@
- lm32-*-rtems*)
- 	tm_file="dbxelf.h elfos.h ${tm_file} lm32/rtems.h rtems.h newlib-stdint.h"
- 	tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
--	tmake_file="${tmake_file} t-rtems"
-+	tmake_file="${tmake_file} t-rtems lm32/t-rtems"
-          ;;
- lm32-*-uclinux*)
-         tm_file="dbxelf.h elfos.h ${tm_file} linux.h lm32/uclinux-elf.h"
-@@ -2408,6 +2408,12 @@
- 	tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
- 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
- 	;;
-+sparc64-*-rtems*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/sp64-rtemself.h rtems.h"
-+	extra_options="${extra_options} sparc/little-endian.opt"
-+	tmake_file="${tmake_file} sparc/t-crtfm t-rtems"
-+	extra_parts="crtbegin.o crtend.o"
-+	;;
- sparc*-*-solaris2*)
- 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
- 	case ${target} in
-diff -Naur gcc-4.5.3.orig/gcc/ginclude/stddef.h gcc-4.5.3/gcc/ginclude/stddef.h
---- gcc-4.5.3.orig/gcc/ginclude/stddef.h	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.5.3/gcc/ginclude/stddef.h	2011-09-05 17:43:10.102883173 +0200
-@@ -53,7 +53,13 @@
-    one less case to deal with in the following.  */
- #if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__)
- #include <machine/ansi.h>
-+#if !defined(_MACHINE_ANSI_H_)
-+#if defined(_I386_ANSI_H_) || defined(_X86_64_ANSI_H_)
-+#define _MACHINE_ANSI_H_
- #endif
-+#endif
-+#endif
-+
- /* On FreeBSD 5, machine/ansi.h does not exist anymore... */
- #if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
- #include <sys/_types.h>
-diff -Naur gcc-4.5.3.orig/libgcc/ChangeLog.rtems gcc-4.5.3/libgcc/ChangeLog.rtems
---- gcc-4.5.3.orig/libgcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.5.3/libgcc/ChangeLog.rtems	2011-09-05 17:43:10.102883173 +0200
-@@ -0,0 +1,9 @@
-+2010-08-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	1669/Tools, GCC-BZ 44793
-+	* config.host (powerpc-*-rtems*): Add tmake_file.
-+	Add extra_parts.
-+
-+2010-05-19  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+	* config.host (sparc64-*-rtems*): New target.
-diff -Naur gcc-4.5.3.orig/libgcc/config.host gcc-4.5.3/libgcc/config.host
---- gcc-4.5.3.orig/libgcc/config.host	2011-02-23 19:06:29.000000000 +0100
-+++ gcc-4.5.3/libgcc/config.host	2011-09-05 17:43:10.102883173 +0200
-@@ -470,6 +470,8 @@
- 	tmake_file="${tmake_file} rs6000/t-ppccomm"
- 	;;
- powerpc-*-rtems*)
-+	tmake_file="${tmake_file} rs6000/t-ppccomm t-softfp"
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
- 	;;
- powerpc-*-linux* | powerpc64-*-linux*)
- 	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp"
-@@ -539,7 +541,7 @@
- 	extra_parts="$extra_parts crtfastmath.o"
- 	tmake_file="${tmake_file} sparc/t-crtfm"
- 	;;
--sparc-*-rtems*)
-+sparc-*-rtems* | sparc64-*-rtems* )
- 	;;
- sparc64-*-solaris2* | sparcv9-*-solaris2*)
- 	;;
diff --git a/contrib/crossrpms/patches/gcc-core-4.6.1-rtems4.11-20110715.diff b/contrib/crossrpms/patches/gcc-core-4.6.1-rtems4.11-20110715.diff
deleted file mode 100644
index 2cf9e55..0000000
--- a/contrib/crossrpms/patches/gcc-core-4.6.1-rtems4.11-20110715.diff
+++ /dev/null
@@ -1,507 +0,0 @@
-diff -Naur gcc-4.6.1.orig/gcc/ChangeLog.rtems gcc-4.6.1/gcc/ChangeLog.rtems
---- gcc-4.6.1.orig/gcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/ChangeLog.rtems	2011-07-15 12:35:30.508715941 +0200
-@@ -0,0 +1,80 @@
-+2011-07-15	Peter Dufault <dufault at hda.com>,
-+		Sebastian Huber <sebastian.huber at embedded-brains.de>
-+
-+	* config/rs6000/rtems.h (SUBSUBTARGET_OVERRIDE_OPTIONS):
-+	Extend rs6000_spe handling.
-+
-+2011-06-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* sparc/t-rtems: Reflect introduction of sparc/t-crtin.
-+
-+2011-05-20	Sebastian Huber <sebastian.huber at embedded-brains.de>
-+
-+	* config.gcc (arm*-*-rtemseabi*): New target.
-+	* config/arm/rtems-eabi.h: New.
-+	* config/arm/t-rtems-eabi: New.
-+
-+2011-03-23	Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+	* config.gcc (sparc-*-rtems*, sparc64-*-rtems*):
-+	Add sparc/t-rtems, crti.o crtn.o.
-+	* config/sparc/t-rtems: New.
-+
-+2011-03-22	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config.gcc (sparc64-rtems*): Remove sysv.h from tm_file.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Add -mcpu=8540/-mfloat-gprs=double multilib.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Remove -mcpu=601 multilib.
-+	* config/rs6000/t-rtems: Remove -Dmpc8260 multilib.
-+	* config/rs6000/rtems.h: Allow --float-gprs=... to override grps on
-+	E500 targets.
-+
-+2010-05-19  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+    	* config.gcc (sparc64-*-rtems*): New target.
-+	* config/sparc/sp64-rtemself.h: New file.
-+
-+2010-04-19	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _X86_64_ANSI_H_ is 
-+	defined (Used by amd64-*-netbsdelf5.*).
-+
-+2010-04-18	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _I386_ANSI_H_ is 
-+	defined (Used by i386-*-netbsdelf5.*).
-+
-+2010-03-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	Patch from Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>:
-+	* config/arm/rtems-elf.h, config/arm/t-rtems: Add optional support
-+	for vfp FPU model
-+
-+2009-11-04	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/m32c/rtems.h, config/m68k/rtemself.h,
-+	config/m68k/rtemself.h, config/sh/rtemself.h,
-+	config/sparc/rtemself.h: Undef WCHAR_TYPE_SIZE, WCHAR_TYPE. 
-+	(Resets WCHAR_TYPE's to defaults. Prevents broken GCC tm_files 
-+	to interfere and cause wchar_t/wint_t incompatibilities).
-+
-+2009-10-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/avr/t-rtems: Don't build _exit.
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/rtems.h: Support for custom RTEMS multilibs.
-+	Support TARGET_E500.
-+	* config/rs6000/t-rtems: Custom RTEMS multilibs. 
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/mips/elf.h: Remove NO_IMPLICIT_EXTERN_C.
-+	
-diff -Naur gcc-4.6.1.orig/gcc/config/arm/rtems-eabi.h gcc-4.6.1/gcc/config/arm/rtems-eabi.h
---- gcc-4.6.1.orig/gcc/config/arm/rtems-eabi.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/config/arm/rtems-eabi.h	2011-07-15 12:35:09.957379536 +0200
-@@ -0,0 +1,33 @@
-+/* Definitions for RTEMS based ARM systems using EABI
-+   Copyright (C) 2011 Free Software Foundation, Inc.
-+ 
-+   This file is part of GCC.
-+ 
-+   GCC is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published
-+   by the Free Software Foundation; either version 3, or (at your
-+   option) any later version.
-+ 
-+   GCC is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+   License for more details.
-+ 
-+   You should have received a copy of the GNU General Public License
-+   along with GCC; see the file COPYING3.  If not see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+/* Run-time Target Specification.  */
-+#undef TARGET_VERSION
-+#define TARGET_VERSION  fputs (" (ARM/EABI RTEMS)", stderr);
-+
-+#define HAS_INIT_SECTION
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+    do {					\
-+	builtin_define ("__rtems__");		\
-+	builtin_define ("__USE_INIT_FINI__");	\
-+	builtin_assert ("system=rtems");	\
-+	TARGET_BPABI_CPP_BUILTINS();    	\
-+    } while (0)
-diff -Naur gcc-4.6.1.orig/gcc/config/arm/rtems-elf.h gcc-4.6.1/gcc/config/arm/rtems-elf.h
---- gcc-4.6.1.orig/gcc/config/arm/rtems-elf.h	2009-03-25 13:54:16.000000000 +0100
-+++ gcc-4.6.1/gcc/config/arm/rtems-elf.h	2011-07-15 12:35:09.958379568 +0200
-@@ -36,7 +36,7 @@
-  */
- #undef SUBTARGET_EXTRA_ASM_SPEC
- #define SUBTARGET_EXTRA_ASM_SPEC "\
--  %{!mhard-float: %{!msoft-float:-mfpu=softfpa}}"
-+  %{!mhard-float: %{!mfpu=vfp: %{!msoft-float:-mfpu=softfpa}}}"
- 
- /*
-  *  The default includes --start-group and --end-group which conflicts
-diff -Naur gcc-4.6.1.orig/gcc/config/arm/t-rtems gcc-4.6.1/gcc/config/arm/t-rtems
---- gcc-4.6.1.orig/gcc/config/arm/t-rtems	2004-11-23 06:30:32.000000000 +0100
-+++ gcc-4.6.1/gcc/config/arm/t-rtems	2011-07-15 12:35:09.958379568 +0200
-@@ -5,6 +5,41 @@
- MULTILIB_EXCEPTIONS  = 
- MULTILIB_MATCHES     = marm=mno-thumb
- 
--MULTILIB_OPTIONS    += msoft-float/mhard-float
--MULTILIB_DIRNAMES   += soft fpu
--MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
-+MULTILIB_OPTIONS    += mhard-float/mfloat-abi=softfp
-+MULTILIB_DIRNAMES   += fpu softfp
-+MULTILIB_EXCEPTIONS += *mthumb*/*mhard-float* *mthumb*/*mfloat-abi=softfp*
-+MULTILIB_MATCHES     =
-+
-+MULTILIB_OPTIONS    += mfpu=vfp
-+MULTILIB_DIRNAMES   += vfp
-+MULTILIB_EXCEPTIONS += *mhard-float*/*mfpu=vfp* *marm*/*mfloat-abi=softfp*/*mfpu=fpa*
-+MULTILIB_EXCLUSIONS += !mthumb/mfloat-abi=softfp/!mfpu=vfp
-+
-+# default float model is fpa, so don't create a explicit copy of it
-+MULTILIB_EXCEPTIONS += *marm*/*mfpa*
-+
-+# permutations of the options which are useful (+) or make no sense (-),
-+# defaults are in brackets:
-+# + (arm/soft/fpa)
-+# + (arm/soft)/vfp
-+# - (arm)/softfp(/fpa)
-+# + (arm)/softfp/vfp
-+# + (arm)/hard-float(/fpa)
-+# - (arm)/hard-float/vfp
-+# + thumb/(soft/fpa)
-+# + thumb/(soft/)vfp
-+# - thumb/softfp/fpa
-+# - thumb/softfp/vfp
-+# - thumb/hard-float/fpa
-+# - thumb/hard-float/vfp
-+
-+# subdirs to be used for multilibs and their respective options:
-+#/thumb/vfp  -> thumb/soft/vfp
-+#/thumb/fpa  -> thumb/soft/fpa
-+#/thumb      -> thumb/soft/fpa
-+#/vfp        -> arm/soft/vfp
-+#/softfp/vfp -> arm/softfp/cfp
-+#/fpu/fpa    -> arm/hard/fpa
-+#/fpu        -> arm/hard/fpa
-+#/fpa        -> arm/soft/fpa
-+#.           -> arm/soft/fpa
-diff -Naur gcc-4.6.1.orig/gcc/config/arm/t-rtems-eabi gcc-4.6.1/gcc/config/arm/t-rtems-eabi
---- gcc-4.6.1.orig/gcc/config/arm/t-rtems-eabi	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/config/arm/t-rtems-eabi	2011-07-15 12:35:09.958379568 +0200
-@@ -0,0 +1,6 @@
-+# Custom RTEMS EABI multilibs
-+
-+MULTILIB_OPTIONS    = mthumb march=armv6-m/march=armv7/march=armv7-m
-+MULTILIB_DIRNAMES   = thumb armv6-m armv7 armv7-m
-+MULTILIB_EXCEPTIONS = march=armv6-m march=armv7 march=armv7-m
-+MULTILIB_MATCHES    = marm=mno-thumb
-diff -Naur gcc-4.6.1.orig/gcc/config/avr/t-rtems gcc-4.6.1/gcc/config/avr/t-rtems
---- gcc-4.6.1.orig/gcc/config/avr/t-rtems	2004-11-23 04:44:03.000000000 +0100
-+++ gcc-4.6.1/gcc/config/avr/t-rtems	2011-07-15 12:35:09.958379568 +0200
-@@ -1,3 +1,4 @@
- # Multilibs for avr RTEMS targets.
- 
--# ATM, this is just a stub
-+# RTEMS uses _exit from newlib
-+LIB1ASMFUNCS := $(filter-out _exit,$(LIB1ASMFUNCS))
-diff -Naur gcc-4.6.1.orig/gcc/config/m32c/rtems.h gcc-4.6.1/gcc/config/m32c/rtems.h
---- gcc-4.6.1.orig/gcc/config/m32c/rtems.h	2008-12-01 17:34:42.000000000 +0100
-+++ gcc-4.6.1/gcc/config/m32c/rtems.h	2011-07-15 12:35:09.958379568 +0200
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.1.orig/gcc/config/m68k/rtemself.h gcc-4.6.1/gcc/config/m68k/rtemself.h
---- gcc-4.6.1.orig/gcc/config/m68k/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.1/gcc/config/m68k/rtemself.h	2011-07-15 12:35:09.958379568 +0200
-@@ -31,3 +31,8 @@
- 	builtin_assert ("system=rtems");	\
-     }						\
-   while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.1.orig/gcc/config/mips/elf.h gcc-4.6.1/gcc/config/mips/elf.h
---- gcc-4.6.1.orig/gcc/config/mips/elf.h	2010-11-21 01:54:14.000000000 +0100
-+++ gcc-4.6.1/gcc/config/mips/elf.h	2011-07-15 12:35:09.959379604 +0200
-@@ -47,5 +47,3 @@
- 
- #undef  ENDFILE_SPEC
- #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
--
--#define NO_IMPLICIT_EXTERN_C 1
-diff -Naur gcc-4.6.1.orig/gcc/config/rs6000/rtems.h gcc-4.6.1/gcc/config/rs6000/rtems.h
---- gcc-4.6.1.orig/gcc/config/rs6000/rtems.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.1/gcc/config/rs6000/rtems.h	2011-07-15 12:35:30.508715941 +0200
-@@ -49,8 +49,27 @@
- %{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
- %{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
- %{mcpu=821:  %{!Dppc*: %{!Dmpc*: -Dmpc821}  } } \
--%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } }" 
-+%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } } \
-+%{mcpu=8540: %{!Dppc*: %{!Dmpc*: -Dppc8540}  } }" 
- 
- #undef  SUBSUBTARGET_EXTRA_SPECS
- #define SUBSUBTARGET_EXTRA_SPECS \
-   { "cpp_os_rtems",		CPP_OS_RTEMS_SPEC }
-+
-+#undef SUBSUBTARGET_OVERRIDE_OPTIONS
-+#define SUBSUBTARGET_OVERRIDE_OPTIONS					\
-+  do {									\
-+    if (TARGET_E500)							\
-+      {									\
-+        if (TARGET_HARD_FLOAT && !rs6000_explicit_options.float_gprs)	\
-+          rs6000_float_gprs = 1; 					\
-+        if (rs6000_float_gprs != 0 && !rs6000_explicit_options.spe)	\
-+          rs6000_spe = 1;						\
-+        if (rs6000_spe && !rs6000_explicit_options.spe_abi)		\
-+          rs6000_spe_abi = 1;						\
-+      }									\
-+  } while(0)
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.1.orig/gcc/config/rs6000/t-rtems gcc-4.6.1/gcc/config/rs6000/t-rtems
---- gcc-4.6.1.orig/gcc/config/rs6000/t-rtems	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6.1/gcc/config/rs6000/t-rtems	2011-07-15 12:35:09.959379604 +0200
-@@ -19,14 +19,12 @@
- # <http://www.gnu.org/licenses/>.
- 
- MULTILIB_OPTIONS	= \
--mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \
--Dmpc8260 \
--msoft-float
-+mcpu=403/mcpu=505/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
-+msoft-float/mfloat-gprs=double
- 
- MULTILIB_DIRNAMES	= \
--m403 m505 m601 m603e m604 m860 m7400 \
--mpc8260 \
--nof
-+m403 m505 m603e m604 m860 m7400 m8540 \
-+nof gprsdouble
- 
- # MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT}
- MULTILIB_MATCHES	=
-@@ -47,6 +45,13 @@
- # Map 750 to .
- MULTILIB_MATCHES	+= mcpu?750=
- 
-+# Map 8548 to 8540
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8548
-+
-+# Map -mcpu=8540 -mfloat-gprs=single to -mcpu=8540
-+# (mfloat-gprs=single is implicit default)
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8540/mfloat-gprs?single
-+
- # Soft-float only, default implies msoft-float
- # NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES
- MULTILIB_SOFTFLOAT_ONLY = \
-@@ -62,6 +67,16 @@
- MULTILIB_HARDFLOAT_ONLY = \
- *mcpu=505/*msoft-float*
- 
-+# Targets which do not support gprs
-+MULTILIB_NOGPRS = \
-+mfloat-gprs=* \
-+*mcpu=403/*mfloat-gprs=* \
-+*mcpu=505/*mfloat-gprs=* \
-+*mcpu=603e/*mfloat-gprs=* \
-+*mcpu=604/*mfloat-gprs=* \
-+*mcpu=860/*mfloat-gprs=* \
-+*mcpu=7400/*mfloat-gprs=*
-+
- MULTILIB_EXCEPTIONS =
- 
- # Disallow -Dppc and -Dmpc without other options
-@@ -69,14 +84,8 @@
- 
- MULTILIB_EXCEPTIONS	+= \
- ${MULTILIB_SOFTFLOAT_ONLY} \
--${MULTILIB_HARDFLOAT_ONLY}
-+${MULTILIB_HARDFLOAT_ONLY} \
-+${MULTILIB_NOGPRS}
- 
- # Special rules
- # Take out all variants we don't want
--MULTILIB_EXCEPTIONS += *mcpu=403/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=505/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=601/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=604/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
-diff -Naur gcc-4.6.1.orig/gcc/config/sh/rtemself.h gcc-4.6.1/gcc/config/sh/rtemself.h
---- gcc-4.6.1.orig/gcc/config/sh/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.1/gcc/config/sh/rtemself.h	2011-07-15 12:35:09.959379604 +0200
-@@ -24,3 +24,8 @@
-   builtin_define( "__rtems__" );		\
-   builtin_assert( "system=rtems" );		\
- } while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.1.orig/gcc/config/sparc/rtemself.h gcc-4.6.1/gcc/config/sparc/rtemself.h
---- gcc-4.6.1.orig/gcc/config/sparc/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.1/gcc/config/sparc/rtemself.h	2011-07-15 12:35:09.960379639 +0200
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.1.orig/gcc/config/sparc/sp64-rtemself.h gcc-4.6.1/gcc/config/sparc/sp64-rtemself.h
---- gcc-4.6.1.orig/gcc/config/sparc/sp64-rtemself.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/config/sparc/sp64-rtemself.h	2011-07-15 12:35:09.960379639 +0200
-@@ -0,0 +1,37 @@
-+/* Definitions for rtems targeting a SPARC64 using ELF.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   Contributed by Joel Sherrill (joel at OARcorp.com).
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* Target OS builtins.  */
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+  do						\
-+    {						\
-+	builtin_define ("__rtems__");		\
-+	builtin_define ("__USE_INIT_FINI__");	\
-+	builtin_assert ("system=rtems");	\
-+    }						\
-+  while (0)
-+
-+/* Use the default */
-+#undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+/* we are not svr4 */
-+#undef CPP_SUBTARGET_SPEC
-+#define CPP_SUBTARGET_SPEC ""
-diff -Naur gcc-4.6.1.orig/gcc/config/sparc/t-rtems gcc-4.6.1/gcc/config/sparc/t-rtems
---- gcc-4.6.1.orig/gcc/config/sparc/t-rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/config/sparc/t-rtems	2011-07-15 12:35:09.960379639 +0200
-@@ -0,0 +1,18 @@
-+# Copyright (C) 2011 Free Software Foundation, Inc.
-+#
-+# This file is part of GCC.
-+#
-+# GCC is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# GCC is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GCC; see the file COPYING3.  If not see
-+# <http://www.gnu.org/licenses/>.
-+#
-diff -Naur gcc-4.6.1.orig/gcc/config.gcc gcc-4.6.1/gcc/config.gcc
---- gcc-4.6.1.orig/gcc/config.gcc	2011-05-22 22:03:43.000000000 +0200
-+++ gcc-4.6.1/gcc/config.gcc	2011-07-15 12:35:09.961379674 +0200
-@@ -894,6 +894,17 @@
- 	tm_file="${tm_file} arm/aout.h arm/arm.h"
- 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
- 	;;
-+arm*-*-rtemseabi*)
-+	need_64bit_hwint=yes
-+	default_use_cxa_atexit=yes
-+	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
-+	tm_file="${tm_file} ../../libgcc/config/arm/bpabi-lib.h"
-+	tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
-+	tm_file="${tm_file} arm/aout.h arm/arm.h"
-+	tmake_file="arm/t-arm arm/t-arm-elf"
-+	tmake_file="${tmake_file} arm/t-bpabi t-rtems arm/t-rtems-eabi"
-+ 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-+ 	;;
- arm*-*-rtems*)
- 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h newlib-stdint.h"
- 	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
-@@ -2527,8 +2538,8 @@
- 	;;
- sparc-*-rtems*)
- 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
--	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm t-rtems"
--	extra_parts="crtbegin.o crtend.o"
-+	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm sparc/t-rtems t-rtems"
-+	extra_parts="crtbegin.o crtend.o crtbegin.o crtend.o"
- 	;;
- sparc-*-linux*)
- 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h"
-@@ -2621,8 +2632,8 @@
- sparc64-*-rtems*)
- 	tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
- 	extra_options="${extra_options} sparc/little-endian.opt"
--	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm t-rtems"
--	extra_parts="crtbegin.o crtend.o"
-+	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm sparc/t-rtems t-rtems"
-+	extra_parts="crtbegin.o crtend.o crtbegin.o crtend.o"
- 	;;
- sparc64-*-linux*)
- 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/linux64.h"
-diff -Naur gcc-4.6.1.orig/gcc/ginclude/stddef.h gcc-4.6.1/gcc/ginclude/stddef.h
---- gcc-4.6.1.orig/gcc/ginclude/stddef.h	2011-01-29 23:15:52.000000000 +0100
-+++ gcc-4.6.1/gcc/ginclude/stddef.h	2011-07-15 12:35:09.961379674 +0200
-@@ -53,7 +53,13 @@
-    one less case to deal with in the following.  */
- #if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__)
- #include <machine/ansi.h>
-+#if !defined(_MACHINE_ANSI_H_)
-+#if defined(_I386_ANSI_H_) || defined(_X86_64_ANSI_H_)
-+#define _MACHINE_ANSI_H_
- #endif
-+#endif
-+#endif
-+
- /* On FreeBSD 5, machine/ansi.h does not exist anymore... */
- #if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
- #include <sys/_types.h>
-diff -Naur gcc-4.6.1.orig/libgcc/ChangeLog.rtems gcc-4.6.1/libgcc/ChangeLog.rtems
---- gcc-4.6.1.orig/libgcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/libgcc/ChangeLog.rtems	2011-07-15 12:35:09.962379706 +0200
-@@ -0,0 +1,5 @@
-+2010-08-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	1669/Tools, GCC-BZ 44793
-+	* config.host (powerpc-*-rtems*): Add tmake_file.
-+	Add extra_parts.
-diff -Naur gcc-4.6.1.orig/libgcc/config.host gcc-4.6.1/libgcc/config.host
---- gcc-4.6.1.orig/libgcc/config.host	2011-03-14 07:06:23.000000000 +0100
-+++ gcc-4.6.1/libgcc/config.host	2011-07-15 12:35:09.962379706 +0200
-@@ -483,6 +483,8 @@
- 	tmake_file="${tmake_file} rs6000/t-ppccomm"
- 	;;
- powerpc-*-rtems*)
-+	tmake_file="${tmake_file} rs6000/t-ppccomm t-softfp"
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
- 	;;
- powerpc-*-linux* | powerpc64-*-linux*)
- 	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp"
diff --git a/contrib/crossrpms/patches/gcc-core-4.6.1-rtems4.11-20110825.diff b/contrib/crossrpms/patches/gcc-core-4.6.1-rtems4.11-20110825.diff
deleted file mode 100644
index ffaf62b..0000000
--- a/contrib/crossrpms/patches/gcc-core-4.6.1-rtems4.11-20110825.diff
+++ /dev/null
@@ -1,579 +0,0 @@
-diff -Naur gcc-4.6.1.orig/gcc/ChangeLog gcc-4.6.1/gcc/ChangeLog
---- gcc-4.6.1.orig/gcc/ChangeLog	2011-06-27 12:02:46.000000000 +0200
-+++ gcc-4.6.1/gcc/ChangeLog	2011-08-25 19:01:04.134484958 +0200
-@@ -1,3 +1,10 @@
-+2011-07-19  Jakub Jelinek  <jakub at redhat.com>
-+
-+	PR tree-optimization/49768
-+	* tree-ssa-ccp.c (fold_nonarray_ctor_reference): Return NULL
-+	if offset is smaller than bitoffset, but offset+size is bigger
-+	than bitoffset.
-+
- 2011-06-27  Release Manager
- 
- 	* GCC 4.6.1 released.
-diff -Naur gcc-4.6.1.orig/gcc/ChangeLog.rtems gcc-4.6.1/gcc/ChangeLog.rtems
---- gcc-4.6.1.orig/gcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/ChangeLog.rtems	2011-08-25 19:01:04.134484958 +0200
-@@ -0,0 +1,80 @@
-+2011-07-15	Peter Dufault <dufault at hda.com>,
-+		Sebastian Huber <sebastian.huber at embedded-brains.de>
-+
-+	* config/rs6000/rtems.h (SUBSUBTARGET_OVERRIDE_OPTIONS):
-+	Extend rs6000_spe handling.
-+
-+2011-06-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* sparc/t-rtems: Reflect introduction of sparc/t-crtin.
-+
-+2011-05-20	Sebastian Huber <sebastian.huber at embedded-brains.de>
-+
-+	* config.gcc (arm*-*-rtemseabi*): New target.
-+	* config/arm/rtems-eabi.h: New.
-+	* config/arm/t-rtems-eabi: New.
-+
-+2011-03-23	Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+	* config.gcc (sparc-*-rtems*, sparc64-*-rtems*):
-+	Add sparc/t-rtems, crti.o crtn.o.
-+	* config/sparc/t-rtems: New.
-+
-+2011-03-22	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config.gcc (sparc64-rtems*): Remove sysv.h from tm_file.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Add -mcpu=8540/-mfloat-gprs=double multilib.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Remove -mcpu=601 multilib.
-+	* config/rs6000/t-rtems: Remove -Dmpc8260 multilib.
-+	* config/rs6000/rtems.h: Allow --float-gprs=... to override grps on
-+	E500 targets.
-+
-+2010-05-19  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+    	* config.gcc (sparc64-*-rtems*): New target.
-+	* config/sparc/sp64-rtemself.h: New file.
-+
-+2010-04-19	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _X86_64_ANSI_H_ is 
-+	defined (Used by amd64-*-netbsdelf5.*).
-+
-+2010-04-18	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _I386_ANSI_H_ is 
-+	defined (Used by i386-*-netbsdelf5.*).
-+
-+2010-03-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	Patch from Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>:
-+	* config/arm/rtems-elf.h, config/arm/t-rtems: Add optional support
-+	for vfp FPU model
-+
-+2009-11-04	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/m32c/rtems.h, config/m68k/rtemself.h,
-+	config/m68k/rtemself.h, config/sh/rtemself.h,
-+	config/sparc/rtemself.h: Undef WCHAR_TYPE_SIZE, WCHAR_TYPE. 
-+	(Resets WCHAR_TYPE's to defaults. Prevents broken GCC tm_files 
-+	to interfere and cause wchar_t/wint_t incompatibilities).
-+
-+2009-10-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/avr/t-rtems: Don't build _exit.
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/rtems.h: Support for custom RTEMS multilibs.
-+	Support TARGET_E500.
-+	* config/rs6000/t-rtems: Custom RTEMS multilibs. 
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/mips/elf.h: Remove NO_IMPLICIT_EXTERN_C.
-+	
-diff -Naur gcc-4.6.1.orig/gcc/config/arm/rtems-eabi.h gcc-4.6.1/gcc/config/arm/rtems-eabi.h
---- gcc-4.6.1.orig/gcc/config/arm/rtems-eabi.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/config/arm/rtems-eabi.h	2011-08-25 19:01:04.136484960 +0200
-@@ -0,0 +1,33 @@
-+/* Definitions for RTEMS based ARM systems using EABI
-+   Copyright (C) 2011 Free Software Foundation, Inc.
-+ 
-+   This file is part of GCC.
-+ 
-+   GCC is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published
-+   by the Free Software Foundation; either version 3, or (at your
-+   option) any later version.
-+ 
-+   GCC is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+   License for more details.
-+ 
-+   You should have received a copy of the GNU General Public License
-+   along with GCC; see the file COPYING3.  If not see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+/* Run-time Target Specification.  */
-+#undef TARGET_VERSION
-+#define TARGET_VERSION  fputs (" (ARM/EABI RTEMS)", stderr);
-+
-+#define HAS_INIT_SECTION
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+    do {					\
-+	builtin_define ("__rtems__");		\
-+	builtin_define ("__USE_INIT_FINI__");	\
-+	builtin_assert ("system=rtems");	\
-+	TARGET_BPABI_CPP_BUILTINS();    	\
-+    } while (0)
-diff -Naur gcc-4.6.1.orig/gcc/config/arm/rtems-elf.h gcc-4.6.1/gcc/config/arm/rtems-elf.h
---- gcc-4.6.1.orig/gcc/config/arm/rtems-elf.h	2009-03-25 13:54:16.000000000 +0100
-+++ gcc-4.6.1/gcc/config/arm/rtems-elf.h	2011-08-25 19:01:04.136484960 +0200
-@@ -36,7 +36,7 @@
-  */
- #undef SUBTARGET_EXTRA_ASM_SPEC
- #define SUBTARGET_EXTRA_ASM_SPEC "\
--  %{!mhard-float: %{!msoft-float:-mfpu=softfpa}}"
-+  %{!mhard-float: %{!mfpu=vfp: %{!msoft-float:-mfpu=softfpa}}}"
- 
- /*
-  *  The default includes --start-group and --end-group which conflicts
-diff -Naur gcc-4.6.1.orig/gcc/config/arm/t-rtems gcc-4.6.1/gcc/config/arm/t-rtems
---- gcc-4.6.1.orig/gcc/config/arm/t-rtems	2004-11-23 06:30:32.000000000 +0100
-+++ gcc-4.6.1/gcc/config/arm/t-rtems	2011-08-25 19:01:04.136484960 +0200
-@@ -5,6 +5,41 @@
- MULTILIB_EXCEPTIONS  = 
- MULTILIB_MATCHES     = marm=mno-thumb
- 
--MULTILIB_OPTIONS    += msoft-float/mhard-float
--MULTILIB_DIRNAMES   += soft fpu
--MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
-+MULTILIB_OPTIONS    += mhard-float/mfloat-abi=softfp
-+MULTILIB_DIRNAMES   += fpu softfp
-+MULTILIB_EXCEPTIONS += *mthumb*/*mhard-float* *mthumb*/*mfloat-abi=softfp*
-+MULTILIB_MATCHES     =
-+
-+MULTILIB_OPTIONS    += mfpu=vfp
-+MULTILIB_DIRNAMES   += vfp
-+MULTILIB_EXCEPTIONS += *mhard-float*/*mfpu=vfp* *marm*/*mfloat-abi=softfp*/*mfpu=fpa*
-+MULTILIB_EXCLUSIONS += !mthumb/mfloat-abi=softfp/!mfpu=vfp
-+
-+# default float model is fpa, so don't create a explicit copy of it
-+MULTILIB_EXCEPTIONS += *marm*/*mfpa*
-+
-+# permutations of the options which are useful (+) or make no sense (-),
-+# defaults are in brackets:
-+# + (arm/soft/fpa)
-+# + (arm/soft)/vfp
-+# - (arm)/softfp(/fpa)
-+# + (arm)/softfp/vfp
-+# + (arm)/hard-float(/fpa)
-+# - (arm)/hard-float/vfp
-+# + thumb/(soft/fpa)
-+# + thumb/(soft/)vfp
-+# - thumb/softfp/fpa
-+# - thumb/softfp/vfp
-+# - thumb/hard-float/fpa
-+# - thumb/hard-float/vfp
-+
-+# subdirs to be used for multilibs and their respective options:
-+#/thumb/vfp  -> thumb/soft/vfp
-+#/thumb/fpa  -> thumb/soft/fpa
-+#/thumb      -> thumb/soft/fpa
-+#/vfp        -> arm/soft/vfp
-+#/softfp/vfp -> arm/softfp/cfp
-+#/fpu/fpa    -> arm/hard/fpa
-+#/fpu        -> arm/hard/fpa
-+#/fpa        -> arm/soft/fpa
-+#.           -> arm/soft/fpa
-diff -Naur gcc-4.6.1.orig/gcc/config/arm/t-rtems-eabi gcc-4.6.1/gcc/config/arm/t-rtems-eabi
---- gcc-4.6.1.orig/gcc/config/arm/t-rtems-eabi	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/config/arm/t-rtems-eabi	2011-08-25 19:01:04.136484960 +0200
-@@ -0,0 +1,6 @@
-+# Custom RTEMS EABI multilibs
-+
-+MULTILIB_OPTIONS    = mthumb march=armv6-m/march=armv7/march=armv7-m
-+MULTILIB_DIRNAMES   = thumb armv6-m armv7 armv7-m
-+MULTILIB_EXCEPTIONS = march=armv6-m march=armv7 march=armv7-m
-+MULTILIB_MATCHES    = marm=mno-thumb
-diff -Naur gcc-4.6.1.orig/gcc/config/avr/t-rtems gcc-4.6.1/gcc/config/avr/t-rtems
---- gcc-4.6.1.orig/gcc/config/avr/t-rtems	2004-11-23 04:44:03.000000000 +0100
-+++ gcc-4.6.1/gcc/config/avr/t-rtems	2011-08-25 19:01:04.137484965 +0200
-@@ -1,3 +1,4 @@
- # Multilibs for avr RTEMS targets.
- 
--# ATM, this is just a stub
-+# RTEMS uses _exit from newlib
-+LIB1ASMFUNCS := $(filter-out _exit,$(LIB1ASMFUNCS))
-diff -Naur gcc-4.6.1.orig/gcc/config/m32c/rtems.h gcc-4.6.1/gcc/config/m32c/rtems.h
---- gcc-4.6.1.orig/gcc/config/m32c/rtems.h	2008-12-01 17:34:42.000000000 +0100
-+++ gcc-4.6.1/gcc/config/m32c/rtems.h	2011-08-25 19:01:04.137484965 +0200
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.1.orig/gcc/config/m68k/rtemself.h gcc-4.6.1/gcc/config/m68k/rtemself.h
---- gcc-4.6.1.orig/gcc/config/m68k/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.1/gcc/config/m68k/rtemself.h	2011-08-25 19:01:04.137484965 +0200
-@@ -31,3 +31,8 @@
- 	builtin_assert ("system=rtems");	\
-     }						\
-   while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.1.orig/gcc/config/mips/elf.h gcc-4.6.1/gcc/config/mips/elf.h
---- gcc-4.6.1.orig/gcc/config/mips/elf.h	2010-11-21 01:54:14.000000000 +0100
-+++ gcc-4.6.1/gcc/config/mips/elf.h	2011-08-25 19:01:04.137484965 +0200
-@@ -47,5 +47,3 @@
- 
- #undef  ENDFILE_SPEC
- #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
--
--#define NO_IMPLICIT_EXTERN_C 1
-diff -Naur gcc-4.6.1.orig/gcc/config/rs6000/rtems.h gcc-4.6.1/gcc/config/rs6000/rtems.h
---- gcc-4.6.1.orig/gcc/config/rs6000/rtems.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.1/gcc/config/rs6000/rtems.h	2011-08-25 19:01:04.137484965 +0200
-@@ -49,8 +49,27 @@
- %{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
- %{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
- %{mcpu=821:  %{!Dppc*: %{!Dmpc*: -Dmpc821}  } } \
--%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } }" 
-+%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } } \
-+%{mcpu=8540: %{!Dppc*: %{!Dmpc*: -Dppc8540}  } }" 
- 
- #undef  SUBSUBTARGET_EXTRA_SPECS
- #define SUBSUBTARGET_EXTRA_SPECS \
-   { "cpp_os_rtems",		CPP_OS_RTEMS_SPEC }
-+
-+#undef SUBSUBTARGET_OVERRIDE_OPTIONS
-+#define SUBSUBTARGET_OVERRIDE_OPTIONS					\
-+  do {									\
-+    if (TARGET_E500)							\
-+      {									\
-+        if (TARGET_HARD_FLOAT && !rs6000_explicit_options.float_gprs)	\
-+          rs6000_float_gprs = 1; 					\
-+        if (rs6000_float_gprs != 0 && !rs6000_explicit_options.spe)	\
-+          rs6000_spe = 1;						\
-+        if (rs6000_spe && !rs6000_explicit_options.spe_abi)		\
-+          rs6000_spe_abi = 1;						\
-+      }									\
-+  } while(0)
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.1.orig/gcc/config/rs6000/t-rtems gcc-4.6.1/gcc/config/rs6000/t-rtems
---- gcc-4.6.1.orig/gcc/config/rs6000/t-rtems	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6.1/gcc/config/rs6000/t-rtems	2011-08-25 19:01:04.138484976 +0200
-@@ -19,14 +19,12 @@
- # <http://www.gnu.org/licenses/>.
- 
- MULTILIB_OPTIONS	= \
--mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \
--Dmpc8260 \
--msoft-float
-+mcpu=403/mcpu=505/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
-+msoft-float/mfloat-gprs=double
- 
- MULTILIB_DIRNAMES	= \
--m403 m505 m601 m603e m604 m860 m7400 \
--mpc8260 \
--nof
-+m403 m505 m603e m604 m860 m7400 m8540 \
-+nof gprsdouble
- 
- # MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT}
- MULTILIB_MATCHES	=
-@@ -47,6 +45,13 @@
- # Map 750 to .
- MULTILIB_MATCHES	+= mcpu?750=
- 
-+# Map 8548 to 8540
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8548
-+
-+# Map -mcpu=8540 -mfloat-gprs=single to -mcpu=8540
-+# (mfloat-gprs=single is implicit default)
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8540/mfloat-gprs?single
-+
- # Soft-float only, default implies msoft-float
- # NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES
- MULTILIB_SOFTFLOAT_ONLY = \
-@@ -62,6 +67,16 @@
- MULTILIB_HARDFLOAT_ONLY = \
- *mcpu=505/*msoft-float*
- 
-+# Targets which do not support gprs
-+MULTILIB_NOGPRS = \
-+mfloat-gprs=* \
-+*mcpu=403/*mfloat-gprs=* \
-+*mcpu=505/*mfloat-gprs=* \
-+*mcpu=603e/*mfloat-gprs=* \
-+*mcpu=604/*mfloat-gprs=* \
-+*mcpu=860/*mfloat-gprs=* \
-+*mcpu=7400/*mfloat-gprs=*
-+
- MULTILIB_EXCEPTIONS =
- 
- # Disallow -Dppc and -Dmpc without other options
-@@ -69,14 +84,8 @@
- 
- MULTILIB_EXCEPTIONS	+= \
- ${MULTILIB_SOFTFLOAT_ONLY} \
--${MULTILIB_HARDFLOAT_ONLY}
-+${MULTILIB_HARDFLOAT_ONLY} \
-+${MULTILIB_NOGPRS}
- 
- # Special rules
- # Take out all variants we don't want
--MULTILIB_EXCEPTIONS += *mcpu=403/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=505/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=601/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=604/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
-diff -Naur gcc-4.6.1.orig/gcc/config/sh/rtemself.h gcc-4.6.1/gcc/config/sh/rtemself.h
---- gcc-4.6.1.orig/gcc/config/sh/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.1/gcc/config/sh/rtemself.h	2011-08-25 19:01:04.138484976 +0200
-@@ -24,3 +24,8 @@
-   builtin_define( "__rtems__" );		\
-   builtin_assert( "system=rtems" );		\
- } while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.1.orig/gcc/config/sparc/rtemself.h gcc-4.6.1/gcc/config/sparc/rtemself.h
---- gcc-4.6.1.orig/gcc/config/sparc/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.1/gcc/config/sparc/rtemself.h	2011-08-25 19:01:04.138484976 +0200
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.1.orig/gcc/config/sparc/sp64-rtemself.h gcc-4.6.1/gcc/config/sparc/sp64-rtemself.h
---- gcc-4.6.1.orig/gcc/config/sparc/sp64-rtemself.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/config/sparc/sp64-rtemself.h	2011-08-25 19:01:04.138484976 +0200
-@@ -0,0 +1,37 @@
-+/* Definitions for rtems targeting a SPARC64 using ELF.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   Contributed by Joel Sherrill (joel at OARcorp.com).
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* Target OS builtins.  */
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+  do						\
-+    {						\
-+	builtin_define ("__rtems__");		\
-+	builtin_define ("__USE_INIT_FINI__");	\
-+	builtin_assert ("system=rtems");	\
-+    }						\
-+  while (0)
-+
-+/* Use the default */
-+#undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+/* we are not svr4 */
-+#undef CPP_SUBTARGET_SPEC
-+#define CPP_SUBTARGET_SPEC ""
-diff -Naur gcc-4.6.1.orig/gcc/config/sparc/t-rtems gcc-4.6.1/gcc/config/sparc/t-rtems
---- gcc-4.6.1.orig/gcc/config/sparc/t-rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/config/sparc/t-rtems	2011-08-25 19:01:04.138484976 +0200
-@@ -0,0 +1,18 @@
-+# Copyright (C) 2011 Free Software Foundation, Inc.
-+#
-+# This file is part of GCC.
-+#
-+# GCC is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# GCC is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GCC; see the file COPYING3.  If not see
-+# <http://www.gnu.org/licenses/>.
-+#
-diff -Naur gcc-4.6.1.orig/gcc/config.gcc gcc-4.6.1/gcc/config.gcc
---- gcc-4.6.1.orig/gcc/config.gcc	2011-05-22 22:03:43.000000000 +0200
-+++ gcc-4.6.1/gcc/config.gcc	2011-08-25 19:01:04.136484960 +0200
-@@ -894,6 +894,17 @@
- 	tm_file="${tm_file} arm/aout.h arm/arm.h"
- 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
- 	;;
-+arm*-*-rtemseabi*)
-+	need_64bit_hwint=yes
-+	default_use_cxa_atexit=yes
-+	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
-+	tm_file="${tm_file} ../../libgcc/config/arm/bpabi-lib.h"
-+	tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
-+	tm_file="${tm_file} arm/aout.h arm/arm.h"
-+	tmake_file="arm/t-arm arm/t-arm-elf"
-+	tmake_file="${tmake_file} arm/t-bpabi t-rtems arm/t-rtems-eabi"
-+ 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-+ 	;;
- arm*-*-rtems*)
- 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h newlib-stdint.h"
- 	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
-@@ -2527,8 +2538,8 @@
- 	;;
- sparc-*-rtems*)
- 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
--	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm t-rtems"
--	extra_parts="crtbegin.o crtend.o"
-+	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm sparc/t-rtems t-rtems"
-+	extra_parts="crtbegin.o crtend.o crtbegin.o crtend.o"
- 	;;
- sparc-*-linux*)
- 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h"
-@@ -2621,8 +2632,8 @@
- sparc64-*-rtems*)
- 	tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
- 	extra_options="${extra_options} sparc/little-endian.opt"
--	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm t-rtems"
--	extra_parts="crtbegin.o crtend.o"
-+	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm sparc/t-rtems t-rtems"
-+	extra_parts="crtbegin.o crtend.o crtbegin.o crtend.o"
- 	;;
- sparc64-*-linux*)
- 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/linux64.h"
-diff -Naur gcc-4.6.1.orig/gcc/ginclude/stddef.h gcc-4.6.1/gcc/ginclude/stddef.h
---- gcc-4.6.1.orig/gcc/ginclude/stddef.h	2011-01-29 23:15:52.000000000 +0100
-+++ gcc-4.6.1/gcc/ginclude/stddef.h	2011-08-25 19:01:04.139484977 +0200
-@@ -53,7 +53,13 @@
-    one less case to deal with in the following.  */
- #if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__)
- #include <machine/ansi.h>
-+#if !defined(_MACHINE_ANSI_H_)
-+#if defined(_I386_ANSI_H_) || defined(_X86_64_ANSI_H_)
-+#define _MACHINE_ANSI_H_
- #endif
-+#endif
-+#endif
-+
- /* On FreeBSD 5, machine/ansi.h does not exist anymore... */
- #if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
- #include <sys/_types.h>
-diff -Naur gcc-4.6.1.orig/gcc/testsuite/gcc.c-torture/execute/pr49768.c gcc-4.6.1/gcc/testsuite/gcc.c-torture/execute/pr49768.c
---- gcc-4.6.1.orig/gcc/testsuite/gcc.c-torture/execute/pr49768.c	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/gcc/testsuite/gcc.c-torture/execute/pr49768.c	2011-08-25 19:01:10.506594161 +0200
-@@ -0,0 +1,12 @@
-+/* PR tree-optimization/49768 */
-+
-+extern void abort (void);
-+
-+int
-+main ()
-+{
-+  static struct { unsigned int : 1; unsigned int s : 1; } s = { .s = 1 };
-+  if (s.s != 1)
-+    abort ();
-+  return 0;
-+}
-diff -Naur gcc-4.6.1.orig/gcc/tree-ssa-ccp.c gcc-4.6.1/gcc/tree-ssa-ccp.c
---- gcc-4.6.1.orig/gcc/tree-ssa-ccp.c	2011-01-31 17:52:22.000000000 +0100
-+++ gcc-4.6.1/gcc/tree-ssa-ccp.c	2011-08-25 19:01:10.507594219 +0200
-@@ -1520,7 +1520,7 @@
-       double_int bitoffset;
-       double_int byte_offset_cst = tree_to_double_int (byte_offset);
-       double_int bits_per_unit_cst = uhwi_to_double_int (BITS_PER_UNIT);
--      double_int bitoffset_end;
-+      double_int bitoffset_end, access_end;
- 
-       /* Variable sized objects in static constructors makes no sense,
- 	 but field_size can be NULL for flexible array members.  */
-@@ -1541,14 +1541,16 @@
-       else
- 	bitoffset_end = double_int_zero;
- 
--      /* Is OFFSET in the range (BITOFFSET, BITOFFSET_END)? */
--      if (double_int_cmp (uhwi_to_double_int (offset), bitoffset, 0) >= 0
-+      access_end = double_int_add (uhwi_to_double_int (offset),
-+				   uhwi_to_double_int (size));
-+
-+      /* Is there any overlap between [OFFSET, OFFSET+SIZE) and
-+	 [BITOFFSET, BITOFFSET_END)?  */
-+      if (double_int_cmp (access_end, bitoffset, 0) > 0
- 	  && (field_size == NULL_TREE
- 	      || double_int_cmp (uhwi_to_double_int (offset),
- 				 bitoffset_end, 0) < 0))
- 	{
--	  double_int access_end = double_int_add (uhwi_to_double_int (offset),
--						  uhwi_to_double_int (size));
- 	  double_int inner_offset = double_int_sub (uhwi_to_double_int (offset),
- 						    bitoffset);
- 	  /* We do have overlap.  Now see if field is large enough to
-@@ -1556,6 +1558,8 @@
- 	     fields.  */
- 	  if (double_int_cmp (access_end, bitoffset_end, 0) > 0)
- 	    return NULL_TREE;
-+	  if (double_int_cmp (uhwi_to_double_int (offset), bitoffset, 0) < 0)
-+	    return NULL_TREE;
- 	  return fold_ctor_reference (type, cval,
- 				      double_int_to_uhwi (inner_offset), size);
- 	}
-diff -Naur gcc-4.6.1.orig/libgcc/ChangeLog.rtems gcc-4.6.1/libgcc/ChangeLog.rtems
---- gcc-4.6.1.orig/libgcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.1/libgcc/ChangeLog.rtems	2011-08-25 19:01:10.507594219 +0200
-@@ -0,0 +1,5 @@
-+2010-08-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	1669/Tools, GCC-BZ 44793
-+	* config.host (powerpc-*-rtems*): Add tmake_file.
-+	Add extra_parts.
-diff -Naur gcc-4.6.1.orig/libgcc/config.host gcc-4.6.1/libgcc/config.host
---- gcc-4.6.1.orig/libgcc/config.host	2011-03-14 07:06:23.000000000 +0100
-+++ gcc-4.6.1/libgcc/config.host	2011-08-25 19:01:10.507594219 +0200
-@@ -483,6 +483,8 @@
- 	tmake_file="${tmake_file} rs6000/t-ppccomm"
- 	;;
- powerpc-*-rtems*)
-+	tmake_file="${tmake_file} rs6000/t-ppccomm t-softfp"
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
- 	;;
- powerpc-*-linux* | powerpc64-*-linux*)
- 	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp"
diff --git a/contrib/crossrpms/patches/gcc-core-4.6.2-rtems4.11-20111028.diff b/contrib/crossrpms/patches/gcc-core-4.6.2-rtems4.11-20111028.diff
deleted file mode 100644
index 4e2b7f8..0000000
--- a/contrib/crossrpms/patches/gcc-core-4.6.2-rtems4.11-20111028.diff
+++ /dev/null
@@ -1,559 +0,0 @@
-diff -Naur gcc-4.6.2.orig/gcc/ChangeLog.rtems gcc-4.6.2/gcc/ChangeLog.rtems
---- gcc-4.6.2.orig/gcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/ChangeLog.rtems	2011-10-28 18:54:18.865629372 +0200
-@@ -0,0 +1,89 @@
-+2011-10-28	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/avr/rtems.h: Remove __USE_INIT_FINI__.
-+
-+2011-09-05	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/lm32/t-rtems: New.
-+	* config.gcc (lm32-*-rtems*): Add t-rtems.
-+
-+2011-07-15	Peter Dufault <dufault at hda.com>,
-+		Sebastian Huber <sebastian.huber at embedded-brains.de>
-+
-+	* config/rs6000/rtems.h (SUBSUBTARGET_OVERRIDE_OPTIONS):
-+	Extend rs6000_spe handling.
-+
-+2011-06-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* sparc/t-rtems: Reflect introduction of sparc/t-crtin.
-+
-+2011-05-20	Sebastian Huber <sebastian.huber at embedded-brains.de>
-+
-+	* config.gcc (arm*-*-rtemseabi*): New target.
-+	* config/arm/rtems-eabi.h: New.
-+	* config/arm/t-rtems-eabi: New.
-+
-+2011-03-23	Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+	* config.gcc (sparc-*-rtems*, sparc64-*-rtems*):
-+	Add sparc/t-rtems, crti.o crtn.o.
-+	* config/sparc/t-rtems: New.
-+
-+2011-03-22	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config.gcc (sparc64-rtems*): Remove sysv.h from tm_file.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Add -mcpu=8540/-mfloat-gprs=double multilib.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Remove -mcpu=601 multilib.
-+	* config/rs6000/t-rtems: Remove -Dmpc8260 multilib.
-+	* config/rs6000/rtems.h: Allow --float-gprs=... to override grps on
-+	E500 targets.
-+
-+2010-05-19  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+    	* config.gcc (sparc64-*-rtems*): New target.
-+	* config/sparc/sp64-rtemself.h: New file.
-+
-+2010-04-19	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _X86_64_ANSI_H_ is 
-+	defined (Used by amd64-*-netbsdelf5.*).
-+
-+2010-04-18	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _I386_ANSI_H_ is 
-+	defined (Used by i386-*-netbsdelf5.*).
-+
-+2010-03-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	Patch from Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>:
-+	* config/arm/rtems-elf.h, config/arm/t-rtems: Add optional support
-+	for vfp FPU model
-+
-+2009-11-04	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/m32c/rtems.h, config/m68k/rtemself.h,
-+	config/m68k/rtemself.h, config/sh/rtemself.h,
-+	config/sparc/rtemself.h: Undef WCHAR_TYPE_SIZE, WCHAR_TYPE. 
-+	(Resets WCHAR_TYPE's to defaults. Prevents broken GCC tm_files 
-+	to interfere and cause wchar_t/wint_t incompatibilities).
-+
-+2009-10-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/avr/t-rtems: Don't build _exit.
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/rtems.h: Support for custom RTEMS multilibs.
-+	Support TARGET_E500.
-+	* config/rs6000/t-rtems: Custom RTEMS multilibs. 
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/mips/elf.h: Remove NO_IMPLICIT_EXTERN_C.
-+	
-diff -Naur gcc-4.6.2.orig/gcc/config/arm/rtems-eabi.h gcc-4.6.2/gcc/config/arm/rtems-eabi.h
---- gcc-4.6.2.orig/gcc/config/arm/rtems-eabi.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/config/arm/rtems-eabi.h	2011-10-28 18:54:18.867629390 +0200
-@@ -0,0 +1,33 @@
-+/* Definitions for RTEMS based ARM systems using EABI
-+   Copyright (C) 2011 Free Software Foundation, Inc.
-+ 
-+   This file is part of GCC.
-+ 
-+   GCC is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published
-+   by the Free Software Foundation; either version 3, or (at your
-+   option) any later version.
-+ 
-+   GCC is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+   License for more details.
-+ 
-+   You should have received a copy of the GNU General Public License
-+   along with GCC; see the file COPYING3.  If not see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+/* Run-time Target Specification.  */
-+#undef TARGET_VERSION
-+#define TARGET_VERSION  fputs (" (ARM/EABI RTEMS)", stderr);
-+
-+#define HAS_INIT_SECTION
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+    do {					\
-+	builtin_define ("__rtems__");		\
-+	builtin_define ("__USE_INIT_FINI__");	\
-+	builtin_assert ("system=rtems");	\
-+	TARGET_BPABI_CPP_BUILTINS();    	\
-+    } while (0)
-diff -Naur gcc-4.6.2.orig/gcc/config/arm/rtems-elf.h gcc-4.6.2/gcc/config/arm/rtems-elf.h
---- gcc-4.6.2.orig/gcc/config/arm/rtems-elf.h	2009-03-25 13:54:16.000000000 +0100
-+++ gcc-4.6.2/gcc/config/arm/rtems-elf.h	2011-10-28 18:54:18.867629390 +0200
-@@ -36,7 +36,7 @@
-  */
- #undef SUBTARGET_EXTRA_ASM_SPEC
- #define SUBTARGET_EXTRA_ASM_SPEC "\
--  %{!mhard-float: %{!msoft-float:-mfpu=softfpa}}"
-+  %{!mhard-float: %{!mfpu=vfp: %{!msoft-float:-mfpu=softfpa}}}"
- 
- /*
-  *  The default includes --start-group and --end-group which conflicts
-diff -Naur gcc-4.6.2.orig/gcc/config/arm/t-rtems gcc-4.6.2/gcc/config/arm/t-rtems
---- gcc-4.6.2.orig/gcc/config/arm/t-rtems	2004-11-23 06:30:32.000000000 +0100
-+++ gcc-4.6.2/gcc/config/arm/t-rtems	2011-10-28 18:54:18.867629390 +0200
-@@ -5,6 +5,41 @@
- MULTILIB_EXCEPTIONS  = 
- MULTILIB_MATCHES     = marm=mno-thumb
- 
--MULTILIB_OPTIONS    += msoft-float/mhard-float
--MULTILIB_DIRNAMES   += soft fpu
--MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
-+MULTILIB_OPTIONS    += mhard-float/mfloat-abi=softfp
-+MULTILIB_DIRNAMES   += fpu softfp
-+MULTILIB_EXCEPTIONS += *mthumb*/*mhard-float* *mthumb*/*mfloat-abi=softfp*
-+MULTILIB_MATCHES     =
-+
-+MULTILIB_OPTIONS    += mfpu=vfp
-+MULTILIB_DIRNAMES   += vfp
-+MULTILIB_EXCEPTIONS += *mhard-float*/*mfpu=vfp* *marm*/*mfloat-abi=softfp*/*mfpu=fpa*
-+MULTILIB_EXCLUSIONS += !mthumb/mfloat-abi=softfp/!mfpu=vfp
-+
-+# default float model is fpa, so don't create a explicit copy of it
-+MULTILIB_EXCEPTIONS += *marm*/*mfpa*
-+
-+# permutations of the options which are useful (+) or make no sense (-),
-+# defaults are in brackets:
-+# + (arm/soft/fpa)
-+# + (arm/soft)/vfp
-+# - (arm)/softfp(/fpa)
-+# + (arm)/softfp/vfp
-+# + (arm)/hard-float(/fpa)
-+# - (arm)/hard-float/vfp
-+# + thumb/(soft/fpa)
-+# + thumb/(soft/)vfp
-+# - thumb/softfp/fpa
-+# - thumb/softfp/vfp
-+# - thumb/hard-float/fpa
-+# - thumb/hard-float/vfp
-+
-+# subdirs to be used for multilibs and their respective options:
-+#/thumb/vfp  -> thumb/soft/vfp
-+#/thumb/fpa  -> thumb/soft/fpa
-+#/thumb      -> thumb/soft/fpa
-+#/vfp        -> arm/soft/vfp
-+#/softfp/vfp -> arm/softfp/cfp
-+#/fpu/fpa    -> arm/hard/fpa
-+#/fpu        -> arm/hard/fpa
-+#/fpa        -> arm/soft/fpa
-+#.           -> arm/soft/fpa
-diff -Naur gcc-4.6.2.orig/gcc/config/arm/t-rtems-eabi gcc-4.6.2/gcc/config/arm/t-rtems-eabi
---- gcc-4.6.2.orig/gcc/config/arm/t-rtems-eabi	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/config/arm/t-rtems-eabi	2011-10-28 18:54:18.867629390 +0200
-@@ -0,0 +1,6 @@
-+# Custom RTEMS EABI multilibs
-+
-+MULTILIB_OPTIONS    = mthumb march=armv6-m/march=armv7/march=armv7-m
-+MULTILIB_DIRNAMES   = thumb armv6-m armv7 armv7-m
-+MULTILIB_EXCEPTIONS = march=armv6-m march=armv7 march=armv7-m
-+MULTILIB_MATCHES    = marm=mno-thumb
-diff -Naur gcc-4.6.2.orig/gcc/config/avr/rtems.h gcc-4.6.2/gcc/config/avr/rtems.h
---- gcc-4.6.2.orig/gcc/config/avr/rtems.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.2/gcc/config/avr/rtems.h	2011-10-28 18:54:18.868629411 +0200
-@@ -23,6 +23,5 @@
- #define TARGET_OS_CPP_BUILTINS()	\
- do {					\
-   builtin_define ("__rtems__");		\
--  builtin_define ("__USE_INIT_FINI__");	\
-   builtin_assert ("system=rtems");	\
- } while (0)
-diff -Naur gcc-4.6.2.orig/gcc/config/avr/t-rtems gcc-4.6.2/gcc/config/avr/t-rtems
---- gcc-4.6.2.orig/gcc/config/avr/t-rtems	2004-11-23 04:44:03.000000000 +0100
-+++ gcc-4.6.2/gcc/config/avr/t-rtems	2011-10-28 18:54:18.868629411 +0200
-@@ -1,3 +1,4 @@
- # Multilibs for avr RTEMS targets.
- 
--# ATM, this is just a stub
-+# RTEMS uses _exit from newlib
-+LIB1ASMFUNCS := $(filter-out _exit,$(LIB1ASMFUNCS))
-diff -Naur gcc-4.6.2.orig/gcc/config/lm32/t-rtems gcc-4.6.2/gcc/config/lm32/t-rtems
---- gcc-4.6.2.orig/gcc/config/lm32/t-rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/config/lm32/t-rtems	2011-10-28 18:54:18.868629411 +0200
-@@ -0,0 +1,21 @@
-+# for multilib
-+MULTILIB_OPTIONS = mmultiply-enabled mbarrel-shift-enabled
-+MULTILIB_OPTIONS += mdivide-enabled msign-extend-enabled
-+
-+MULTILIB_EXCEPTIONS =
-+# MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/mdivide-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/msign-extend-enabled
-+#MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mdivide-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/msign-extend-enabled
-+# MULTILIB_EXCEPTIONS += mmultiply-enabled
-+MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/mdivide-enabled
-+MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/msign-extend-enabled
-+# MULTILIB_EXCEPTIONS += mbarrel-shift-enabled
-+MULTILIB_EXCEPTIONS += mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mdivide-enabled
-+MULTILIB_EXCEPTIONS += msign-extend-enabled
-+# MULTILIB_EXCEPTIONS += 
-diff -Naur gcc-4.6.2.orig/gcc/config/m32c/rtems.h gcc-4.6.2/gcc/config/m32c/rtems.h
---- gcc-4.6.2.orig/gcc/config/m32c/rtems.h	2008-12-01 17:34:42.000000000 +0100
-+++ gcc-4.6.2/gcc/config/m32c/rtems.h	2011-10-28 18:54:18.868629411 +0200
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.2.orig/gcc/config/m68k/rtemself.h gcc-4.6.2/gcc/config/m68k/rtemself.h
---- gcc-4.6.2.orig/gcc/config/m68k/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.2/gcc/config/m68k/rtemself.h	2011-10-28 18:54:18.868629411 +0200
-@@ -31,3 +31,8 @@
- 	builtin_assert ("system=rtems");	\
-     }						\
-   while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.2.orig/gcc/config/mips/elf.h gcc-4.6.2/gcc/config/mips/elf.h
---- gcc-4.6.2.orig/gcc/config/mips/elf.h	2010-11-21 01:54:14.000000000 +0100
-+++ gcc-4.6.2/gcc/config/mips/elf.h	2011-10-28 18:54:18.869629432 +0200
-@@ -47,5 +47,3 @@
- 
- #undef  ENDFILE_SPEC
- #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
--
--#define NO_IMPLICIT_EXTERN_C 1
-diff -Naur gcc-4.6.2.orig/gcc/config/rs6000/rtems.h gcc-4.6.2/gcc/config/rs6000/rtems.h
---- gcc-4.6.2.orig/gcc/config/rs6000/rtems.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.2/gcc/config/rs6000/rtems.h	2011-10-28 18:54:18.869629432 +0200
-@@ -49,8 +49,27 @@
- %{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
- %{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
- %{mcpu=821:  %{!Dppc*: %{!Dmpc*: -Dmpc821}  } } \
--%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } }" 
-+%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } } \
-+%{mcpu=8540: %{!Dppc*: %{!Dmpc*: -Dppc8540}  } }" 
- 
- #undef  SUBSUBTARGET_EXTRA_SPECS
- #define SUBSUBTARGET_EXTRA_SPECS \
-   { "cpp_os_rtems",		CPP_OS_RTEMS_SPEC }
-+
-+#undef SUBSUBTARGET_OVERRIDE_OPTIONS
-+#define SUBSUBTARGET_OVERRIDE_OPTIONS					\
-+  do {									\
-+    if (TARGET_E500)							\
-+      {									\
-+        if (TARGET_HARD_FLOAT && !rs6000_explicit_options.float_gprs)	\
-+          rs6000_float_gprs = 1; 					\
-+        if (rs6000_float_gprs != 0 && !rs6000_explicit_options.spe)	\
-+          rs6000_spe = 1;						\
-+        if (rs6000_spe && !rs6000_explicit_options.spe_abi)		\
-+          rs6000_spe_abi = 1;						\
-+      }									\
-+  } while(0)
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.2.orig/gcc/config/rs6000/t-rtems gcc-4.6.2/gcc/config/rs6000/t-rtems
---- gcc-4.6.2.orig/gcc/config/rs6000/t-rtems	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6.2/gcc/config/rs6000/t-rtems	2011-10-28 18:54:18.869629432 +0200
-@@ -19,14 +19,12 @@
- # <http://www.gnu.org/licenses/>.
- 
- MULTILIB_OPTIONS	= \
--mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \
--Dmpc8260 \
--msoft-float
-+mcpu=403/mcpu=505/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
-+msoft-float/mfloat-gprs=double
- 
- MULTILIB_DIRNAMES	= \
--m403 m505 m601 m603e m604 m860 m7400 \
--mpc8260 \
--nof
-+m403 m505 m603e m604 m860 m7400 m8540 \
-+nof gprsdouble
- 
- # MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT}
- MULTILIB_MATCHES	=
-@@ -47,6 +45,13 @@
- # Map 750 to .
- MULTILIB_MATCHES	+= mcpu?750=
- 
-+# Map 8548 to 8540
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8548
-+
-+# Map -mcpu=8540 -mfloat-gprs=single to -mcpu=8540
-+# (mfloat-gprs=single is implicit default)
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8540/mfloat-gprs?single
-+
- # Soft-float only, default implies msoft-float
- # NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES
- MULTILIB_SOFTFLOAT_ONLY = \
-@@ -62,6 +67,16 @@
- MULTILIB_HARDFLOAT_ONLY = \
- *mcpu=505/*msoft-float*
- 
-+# Targets which do not support gprs
-+MULTILIB_NOGPRS = \
-+mfloat-gprs=* \
-+*mcpu=403/*mfloat-gprs=* \
-+*mcpu=505/*mfloat-gprs=* \
-+*mcpu=603e/*mfloat-gprs=* \
-+*mcpu=604/*mfloat-gprs=* \
-+*mcpu=860/*mfloat-gprs=* \
-+*mcpu=7400/*mfloat-gprs=*
-+
- MULTILIB_EXCEPTIONS =
- 
- # Disallow -Dppc and -Dmpc without other options
-@@ -69,14 +84,8 @@
- 
- MULTILIB_EXCEPTIONS	+= \
- ${MULTILIB_SOFTFLOAT_ONLY} \
--${MULTILIB_HARDFLOAT_ONLY}
-+${MULTILIB_HARDFLOAT_ONLY} \
-+${MULTILIB_NOGPRS}
- 
- # Special rules
- # Take out all variants we don't want
--MULTILIB_EXCEPTIONS += *mcpu=403/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=505/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=601/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=604/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
-diff -Naur gcc-4.6.2.orig/gcc/config/sh/rtemself.h gcc-4.6.2/gcc/config/sh/rtemself.h
---- gcc-4.6.2.orig/gcc/config/sh/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.2/gcc/config/sh/rtemself.h	2011-10-28 18:54:18.869629432 +0200
-@@ -24,3 +24,8 @@
-   builtin_define( "__rtems__" );		\
-   builtin_assert( "system=rtems" );		\
- } while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.2.orig/gcc/config/sparc/rtemself.h gcc-4.6.2/gcc/config/sparc/rtemself.h
---- gcc-4.6.2.orig/gcc/config/sparc/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.2/gcc/config/sparc/rtemself.h	2011-10-28 18:54:18.869629432 +0200
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.2.orig/gcc/config/sparc/sp64-rtemself.h gcc-4.6.2/gcc/config/sparc/sp64-rtemself.h
---- gcc-4.6.2.orig/gcc/config/sparc/sp64-rtemself.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/config/sparc/sp64-rtemself.h	2011-10-28 18:54:18.870629460 +0200
-@@ -0,0 +1,37 @@
-+/* Definitions for rtems targeting a SPARC64 using ELF.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   Contributed by Joel Sherrill (joel at OARcorp.com).
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* Target OS builtins.  */
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+  do						\
-+    {						\
-+	builtin_define ("__rtems__");		\
-+	builtin_define ("__USE_INIT_FINI__");	\
-+	builtin_assert ("system=rtems");	\
-+    }						\
-+  while (0)
-+
-+/* Use the default */
-+#undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+/* we are not svr4 */
-+#undef CPP_SUBTARGET_SPEC
-+#define CPP_SUBTARGET_SPEC ""
-diff -Naur gcc-4.6.2.orig/gcc/config/sparc/t-rtems gcc-4.6.2/gcc/config/sparc/t-rtems
---- gcc-4.6.2.orig/gcc/config/sparc/t-rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/config/sparc/t-rtems	2011-10-28 18:54:18.870629460 +0200
-@@ -0,0 +1,18 @@
-+# Copyright (C) 2011 Free Software Foundation, Inc.
-+#
-+# This file is part of GCC.
-+#
-+# GCC is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# GCC is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GCC; see the file COPYING3.  If not see
-+# <http://www.gnu.org/licenses/>.
-+#
-diff -Naur gcc-4.6.2.orig/gcc/config.gcc gcc-4.6.2/gcc/config.gcc
---- gcc-4.6.2.orig/gcc/config.gcc	2011-07-22 18:44:50.000000000 +0200
-+++ gcc-4.6.2/gcc/config.gcc	2011-10-28 18:54:18.867629390 +0200
-@@ -895,6 +895,17 @@
- 	tm_file="${tm_file} arm/aout.h arm/arm.h"
- 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
- 	;;
-+arm*-*-rtemseabi*)
-+	need_64bit_hwint=yes
-+	default_use_cxa_atexit=yes
-+	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
-+	tm_file="${tm_file} ../../libgcc/config/arm/bpabi-lib.h"
-+	tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
-+	tm_file="${tm_file} arm/aout.h arm/arm.h"
-+	tmake_file="arm/t-arm arm/t-arm-elf"
-+	tmake_file="${tmake_file} arm/t-bpabi t-rtems arm/t-rtems-eabi"
-+ 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-+ 	;;
- arm*-*-rtems*)
- 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h newlib-stdint.h"
- 	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
-@@ -1666,6 +1677,7 @@
- 	tm_file="dbxelf.h elfos.h ${tm_file} lm32/rtems.h rtems.h newlib-stdint.h"
- 	tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
- 	tmake_file="${tmake_file} t-rtems"
-+	tmake_file="${tmake_file} lm32/t-rtems"
-          ;;
- lm32-*-uclinux*)
-         tm_file="dbxelf.h elfos.h ${tm_file} gnu-user.h linux.h lm32/uclinux-elf.h"
-@@ -2540,8 +2552,8 @@
- 	;;
- sparc-*-rtems*)
- 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
--	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm t-rtems"
--	extra_parts="crtbegin.o crtend.o"
-+	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm sparc/t-rtems t-rtems"
-+	extra_parts="crtbegin.o crtend.o crtbegin.o crtend.o"
- 	;;
- sparc-*-linux*)
- 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h"
-@@ -2634,8 +2646,8 @@
- sparc64-*-rtems*)
- 	tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
- 	extra_options="${extra_options} sparc/little-endian.opt"
--	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm t-rtems"
--	extra_parts="crtbegin.o crtend.o"
-+	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm sparc/t-rtems t-rtems"
-+	extra_parts="crtbegin.o crtend.o crtbegin.o crtend.o"
- 	;;
- sparc64-*-linux*)
- 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/linux64.h"
-diff -Naur gcc-4.6.2.orig/gcc/ginclude/stddef.h gcc-4.6.2/gcc/ginclude/stddef.h
---- gcc-4.6.2.orig/gcc/ginclude/stddef.h	2011-01-29 23:15:52.000000000 +0100
-+++ gcc-4.6.2/gcc/ginclude/stddef.h	2011-10-28 18:54:18.870629460 +0200
-@@ -53,7 +53,13 @@
-    one less case to deal with in the following.  */
- #if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__)
- #include <machine/ansi.h>
-+#if !defined(_MACHINE_ANSI_H_)
-+#if defined(_I386_ANSI_H_) || defined(_X86_64_ANSI_H_)
-+#define _MACHINE_ANSI_H_
- #endif
-+#endif
-+#endif
-+
- /* On FreeBSD 5, machine/ansi.h does not exist anymore... */
- #if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
- #include <sys/_types.h>
-diff -Naur gcc-4.6.2.orig/libgcc/ChangeLog.rtems gcc-4.6.2/libgcc/ChangeLog.rtems
---- gcc-4.6.2.orig/libgcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/libgcc/ChangeLog.rtems	2011-10-28 18:54:18.870629460 +0200
-@@ -0,0 +1,5 @@
-+2010-08-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	1669/Tools, GCC-BZ 44793
-+	* config.host (powerpc-*-rtems*): Add tmake_file.
-+	Add extra_parts.
-diff -Naur gcc-4.6.2.orig/libgcc/config.host gcc-4.6.2/libgcc/config.host
---- gcc-4.6.2.orig/libgcc/config.host	2011-03-14 07:06:23.000000000 +0100
-+++ gcc-4.6.2/libgcc/config.host	2011-10-28 18:54:18.870629460 +0200
-@@ -483,6 +483,8 @@
- 	tmake_file="${tmake_file} rs6000/t-ppccomm"
- 	;;
- powerpc-*-rtems*)
-+	tmake_file="${tmake_file} rs6000/t-ppccomm t-softfp"
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
- 	;;
- powerpc-*-linux* | powerpc64-*-linux*)
- 	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp"
diff --git a/contrib/crossrpms/patches/gcc-core-4.6.2-rtems4.11-20111124.diff b/contrib/crossrpms/patches/gcc-core-4.6.2-rtems4.11-20111124.diff
deleted file mode 100644
index e7b0e81..0000000
--- a/contrib/crossrpms/patches/gcc-core-4.6.2-rtems4.11-20111124.diff
+++ /dev/null
@@ -1,582 +0,0 @@
-diff -Naur gcc-4.6.2.orig/gcc/ChangeLog gcc-4.6.2/gcc/ChangeLog
---- gcc-4.6.2.orig/gcc/ChangeLog	2011-10-26 11:05:37.000000000 +0200
-+++ gcc-4.6.2/gcc/ChangeLog	2011-11-24 10:18:40.432100879 +0100
-@@ -1,3 +1,8 @@
-+2011-11-04  Eric Botcazou  <ebotcazou at adacore.com>
-+
-+	PR target/50979
-+	* config/sparc/sparc.h (ASM_CPU_SPEC): Pass -Av8 if -mcpu=v8.
-+
- 2011-10-26  Release Manager
- 
- 	* GCC 4.6.2 released.
-diff -Naur gcc-4.6.2.orig/gcc/ChangeLog.rtems gcc-4.6.2/gcc/ChangeLog.rtems
---- gcc-4.6.2.orig/gcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/ChangeLog.rtems	2011-11-24 10:18:40.433100944 +0100
-@@ -0,0 +1,89 @@
-+2011-10-28	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/avr/rtems.h: Remove __USE_INIT_FINI__.
-+
-+2011-09-05	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/lm32/t-rtems: New.
-+	* config.gcc (lm32-*-rtems*): Add t-rtems.
-+
-+2011-07-15	Peter Dufault <dufault at hda.com>,
-+		Sebastian Huber <sebastian.huber at embedded-brains.de>
-+
-+	* config/rs6000/rtems.h (SUBSUBTARGET_OVERRIDE_OPTIONS):
-+	Extend rs6000_spe handling.
-+
-+2011-06-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* sparc/t-rtems: Reflect introduction of sparc/t-crtin.
-+
-+2011-05-20	Sebastian Huber <sebastian.huber at embedded-brains.de>
-+
-+	* config.gcc (arm*-*-rtemseabi*): New target.
-+	* config/arm/rtems-eabi.h: New.
-+	* config/arm/t-rtems-eabi: New.
-+
-+2011-03-23	Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+	* config.gcc (sparc-*-rtems*, sparc64-*-rtems*):
-+	Add sparc/t-rtems, crti.o crtn.o.
-+	* config/sparc/t-rtems: New.
-+
-+2011-03-22	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config.gcc (sparc64-rtems*): Remove sysv.h from tm_file.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Add -mcpu=8540/-mfloat-gprs=double multilib.
-+
-+2011-02-20	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/t-rtems: Remove -mcpu=601 multilib.
-+	* config/rs6000/t-rtems: Remove -Dmpc8260 multilib.
-+	* config/rs6000/rtems.h: Allow --float-gprs=... to override grps on
-+	E500 targets.
-+
-+2010-05-19  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+    	* config.gcc (sparc64-*-rtems*): New target.
-+	* config/sparc/sp64-rtemself.h: New file.
-+
-+2010-04-19	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _X86_64_ANSI_H_ is 
-+	defined (Used by amd64-*-netbsdelf5.*).
-+
-+2010-04-18	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _I386_ANSI_H_ is 
-+	defined (Used by i386-*-netbsdelf5.*).
-+
-+2010-03-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	Patch from Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>:
-+	* config/arm/rtems-elf.h, config/arm/t-rtems: Add optional support
-+	for vfp FPU model
-+
-+2009-11-04	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/m32c/rtems.h, config/m68k/rtemself.h,
-+	config/m68k/rtemself.h, config/sh/rtemself.h,
-+	config/sparc/rtemself.h: Undef WCHAR_TYPE_SIZE, WCHAR_TYPE. 
-+	(Resets WCHAR_TYPE's to defaults. Prevents broken GCC tm_files 
-+	to interfere and cause wchar_t/wint_t incompatibilities).
-+
-+2009-10-15	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/avr/t-rtems: Don't build _exit.
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/rs6000/rtems.h: Support for custom RTEMS multilibs.
-+	Support TARGET_E500.
-+	* config/rs6000/t-rtems: Custom RTEMS multilibs. 
-+
-+		Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* config/mips/elf.h: Remove NO_IMPLICIT_EXTERN_C.
-+	
-diff -Naur gcc-4.6.2.orig/gcc/config/arm/rtems-eabi.h gcc-4.6.2/gcc/config/arm/rtems-eabi.h
---- gcc-4.6.2.orig/gcc/config/arm/rtems-eabi.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/config/arm/rtems-eabi.h	2011-11-24 10:18:40.436101119 +0100
-@@ -0,0 +1,33 @@
-+/* Definitions for RTEMS based ARM systems using EABI
-+   Copyright (C) 2011 Free Software Foundation, Inc.
-+ 
-+   This file is part of GCC.
-+ 
-+   GCC is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published
-+   by the Free Software Foundation; either version 3, or (at your
-+   option) any later version.
-+ 
-+   GCC is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+   License for more details.
-+ 
-+   You should have received a copy of the GNU General Public License
-+   along with GCC; see the file COPYING3.  If not see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+/* Run-time Target Specification.  */
-+#undef TARGET_VERSION
-+#define TARGET_VERSION  fputs (" (ARM/EABI RTEMS)", stderr);
-+
-+#define HAS_INIT_SECTION
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+    do {					\
-+	builtin_define ("__rtems__");		\
-+	builtin_define ("__USE_INIT_FINI__");	\
-+	builtin_assert ("system=rtems");	\
-+	TARGET_BPABI_CPP_BUILTINS();    	\
-+    } while (0)
-diff -Naur gcc-4.6.2.orig/gcc/config/arm/rtems-elf.h gcc-4.6.2/gcc/config/arm/rtems-elf.h
---- gcc-4.6.2.orig/gcc/config/arm/rtems-elf.h	2009-03-25 13:54:16.000000000 +0100
-+++ gcc-4.6.2/gcc/config/arm/rtems-elf.h	2011-11-24 10:18:40.436101119 +0100
-@@ -36,7 +36,7 @@
-  */
- #undef SUBTARGET_EXTRA_ASM_SPEC
- #define SUBTARGET_EXTRA_ASM_SPEC "\
--  %{!mhard-float: %{!msoft-float:-mfpu=softfpa}}"
-+  %{!mhard-float: %{!mfpu=vfp: %{!msoft-float:-mfpu=softfpa}}}"
- 
- /*
-  *  The default includes --start-group and --end-group which conflicts
-diff -Naur gcc-4.6.2.orig/gcc/config/arm/t-rtems gcc-4.6.2/gcc/config/arm/t-rtems
---- gcc-4.6.2.orig/gcc/config/arm/t-rtems	2004-11-23 06:30:32.000000000 +0100
-+++ gcc-4.6.2/gcc/config/arm/t-rtems	2011-11-24 10:18:40.436101119 +0100
-@@ -5,6 +5,41 @@
- MULTILIB_EXCEPTIONS  = 
- MULTILIB_MATCHES     = marm=mno-thumb
- 
--MULTILIB_OPTIONS    += msoft-float/mhard-float
--MULTILIB_DIRNAMES   += soft fpu
--MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
-+MULTILIB_OPTIONS    += mhard-float/mfloat-abi=softfp
-+MULTILIB_DIRNAMES   += fpu softfp
-+MULTILIB_EXCEPTIONS += *mthumb*/*mhard-float* *mthumb*/*mfloat-abi=softfp*
-+MULTILIB_MATCHES     =
-+
-+MULTILIB_OPTIONS    += mfpu=vfp
-+MULTILIB_DIRNAMES   += vfp
-+MULTILIB_EXCEPTIONS += *mhard-float*/*mfpu=vfp* *marm*/*mfloat-abi=softfp*/*mfpu=fpa*
-+MULTILIB_EXCLUSIONS += !mthumb/mfloat-abi=softfp/!mfpu=vfp
-+
-+# default float model is fpa, so don't create a explicit copy of it
-+MULTILIB_EXCEPTIONS += *marm*/*mfpa*
-+
-+# permutations of the options which are useful (+) or make no sense (-),
-+# defaults are in brackets:
-+# + (arm/soft/fpa)
-+# + (arm/soft)/vfp
-+# - (arm)/softfp(/fpa)
-+# + (arm)/softfp/vfp
-+# + (arm)/hard-float(/fpa)
-+# - (arm)/hard-float/vfp
-+# + thumb/(soft/fpa)
-+# + thumb/(soft/)vfp
-+# - thumb/softfp/fpa
-+# - thumb/softfp/vfp
-+# - thumb/hard-float/fpa
-+# - thumb/hard-float/vfp
-+
-+# subdirs to be used for multilibs and their respective options:
-+#/thumb/vfp  -> thumb/soft/vfp
-+#/thumb/fpa  -> thumb/soft/fpa
-+#/thumb      -> thumb/soft/fpa
-+#/vfp        -> arm/soft/vfp
-+#/softfp/vfp -> arm/softfp/cfp
-+#/fpu/fpa    -> arm/hard/fpa
-+#/fpu        -> arm/hard/fpa
-+#/fpa        -> arm/soft/fpa
-+#.           -> arm/soft/fpa
-diff -Naur gcc-4.6.2.orig/gcc/config/arm/t-rtems-eabi gcc-4.6.2/gcc/config/arm/t-rtems-eabi
---- gcc-4.6.2.orig/gcc/config/arm/t-rtems-eabi	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/config/arm/t-rtems-eabi	2011-11-24 10:18:40.437101171 +0100
-@@ -0,0 +1,6 @@
-+# Custom RTEMS EABI multilibs
-+
-+MULTILIB_OPTIONS    = mthumb march=armv6-m/march=armv7/march=armv7-m
-+MULTILIB_DIRNAMES   = thumb armv6-m armv7 armv7-m
-+MULTILIB_EXCEPTIONS = march=armv6-m march=armv7 march=armv7-m
-+MULTILIB_MATCHES    = marm=mno-thumb
-diff -Naur gcc-4.6.2.orig/gcc/config/avr/rtems.h gcc-4.6.2/gcc/config/avr/rtems.h
---- gcc-4.6.2.orig/gcc/config/avr/rtems.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.2/gcc/config/avr/rtems.h	2011-11-24 10:18:40.437101171 +0100
-@@ -23,6 +23,5 @@
- #define TARGET_OS_CPP_BUILTINS()	\
- do {					\
-   builtin_define ("__rtems__");		\
--  builtin_define ("__USE_INIT_FINI__");	\
-   builtin_assert ("system=rtems");	\
- } while (0)
-diff -Naur gcc-4.6.2.orig/gcc/config/avr/t-rtems gcc-4.6.2/gcc/config/avr/t-rtems
---- gcc-4.6.2.orig/gcc/config/avr/t-rtems	2004-11-23 04:44:03.000000000 +0100
-+++ gcc-4.6.2/gcc/config/avr/t-rtems	2011-11-24 10:18:40.437101171 +0100
-@@ -1,3 +1,4 @@
- # Multilibs for avr RTEMS targets.
- 
--# ATM, this is just a stub
-+# RTEMS uses _exit from newlib
-+LIB1ASMFUNCS := $(filter-out _exit,$(LIB1ASMFUNCS))
-diff -Naur gcc-4.6.2.orig/gcc/config/lm32/t-rtems gcc-4.6.2/gcc/config/lm32/t-rtems
---- gcc-4.6.2.orig/gcc/config/lm32/t-rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/config/lm32/t-rtems	2011-11-24 10:18:40.437101171 +0100
-@@ -0,0 +1,21 @@
-+# for multilib
-+MULTILIB_OPTIONS = mmultiply-enabled mbarrel-shift-enabled
-+MULTILIB_OPTIONS += mdivide-enabled msign-extend-enabled
-+
-+MULTILIB_EXCEPTIONS =
-+# MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/mdivide-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/msign-extend-enabled
-+#MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/mdivide-enabled
-+MULTILIB_EXCEPTIONS += mmultiply-enabled/msign-extend-enabled
-+# MULTILIB_EXCEPTIONS += mmultiply-enabled
-+MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/mdivide-enabled
-+MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/msign-extend-enabled
-+# MULTILIB_EXCEPTIONS += mbarrel-shift-enabled
-+MULTILIB_EXCEPTIONS += mdivide-enabled/msign-extend-enabled
-+MULTILIB_EXCEPTIONS += mdivide-enabled
-+MULTILIB_EXCEPTIONS += msign-extend-enabled
-+# MULTILIB_EXCEPTIONS += 
-diff -Naur gcc-4.6.2.orig/gcc/config/m32c/rtems.h gcc-4.6.2/gcc/config/m32c/rtems.h
---- gcc-4.6.2.orig/gcc/config/m32c/rtems.h	2008-12-01 17:34:42.000000000 +0100
-+++ gcc-4.6.2/gcc/config/m32c/rtems.h	2011-11-24 10:18:40.438101222 +0100
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.2.orig/gcc/config/m68k/rtemself.h gcc-4.6.2/gcc/config/m68k/rtemself.h
---- gcc-4.6.2.orig/gcc/config/m68k/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.2/gcc/config/m68k/rtemself.h	2011-11-24 10:18:40.438101222 +0100
-@@ -31,3 +31,8 @@
- 	builtin_assert ("system=rtems");	\
-     }						\
-   while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.2.orig/gcc/config/mips/elf.h gcc-4.6.2/gcc/config/mips/elf.h
---- gcc-4.6.2.orig/gcc/config/mips/elf.h	2010-11-21 01:54:14.000000000 +0100
-+++ gcc-4.6.2/gcc/config/mips/elf.h	2011-11-24 10:18:40.438101222 +0100
-@@ -47,5 +47,3 @@
- 
- #undef  ENDFILE_SPEC
- #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
--
--#define NO_IMPLICIT_EXTERN_C 1
-diff -Naur gcc-4.6.2.orig/gcc/config/rs6000/rtems.h gcc-4.6.2/gcc/config/rs6000/rtems.h
---- gcc-4.6.2.orig/gcc/config/rs6000/rtems.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.2/gcc/config/rs6000/rtems.h	2011-11-24 10:18:40.439101270 +0100
-@@ -49,8 +49,27 @@
- %{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
- %{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
- %{mcpu=821:  %{!Dppc*: %{!Dmpc*: -Dmpc821}  } } \
--%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } }" 
-+%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } } \
-+%{mcpu=8540: %{!Dppc*: %{!Dmpc*: -Dppc8540}  } }" 
- 
- #undef  SUBSUBTARGET_EXTRA_SPECS
- #define SUBSUBTARGET_EXTRA_SPECS \
-   { "cpp_os_rtems",		CPP_OS_RTEMS_SPEC }
-+
-+#undef SUBSUBTARGET_OVERRIDE_OPTIONS
-+#define SUBSUBTARGET_OVERRIDE_OPTIONS					\
-+  do {									\
-+    if (TARGET_E500)							\
-+      {									\
-+        if (TARGET_HARD_FLOAT && !rs6000_explicit_options.float_gprs)	\
-+          rs6000_float_gprs = 1; 					\
-+        if (rs6000_float_gprs != 0 && !rs6000_explicit_options.spe)	\
-+          rs6000_spe = 1;						\
-+        if (rs6000_spe && !rs6000_explicit_options.spe_abi)		\
-+          rs6000_spe_abi = 1;						\
-+      }									\
-+  } while(0)
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.2.orig/gcc/config/rs6000/t-rtems gcc-4.6.2/gcc/config/rs6000/t-rtems
---- gcc-4.6.2.orig/gcc/config/rs6000/t-rtems	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6.2/gcc/config/rs6000/t-rtems	2011-11-24 10:18:40.439101270 +0100
-@@ -19,14 +19,12 @@
- # <http://www.gnu.org/licenses/>.
- 
- MULTILIB_OPTIONS	= \
--mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \
--Dmpc8260 \
--msoft-float
-+mcpu=403/mcpu=505/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
-+msoft-float/mfloat-gprs=double
- 
- MULTILIB_DIRNAMES	= \
--m403 m505 m601 m603e m604 m860 m7400 \
--mpc8260 \
--nof
-+m403 m505 m603e m604 m860 m7400 m8540 \
-+nof gprsdouble
- 
- # MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT}
- MULTILIB_MATCHES	=
-@@ -47,6 +45,13 @@
- # Map 750 to .
- MULTILIB_MATCHES	+= mcpu?750=
- 
-+# Map 8548 to 8540
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8548
-+
-+# Map -mcpu=8540 -mfloat-gprs=single to -mcpu=8540
-+# (mfloat-gprs=single is implicit default)
-+MULTILIB_MATCHES	+= mcpu?8540=mcpu?8540/mfloat-gprs?single
-+
- # Soft-float only, default implies msoft-float
- # NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES
- MULTILIB_SOFTFLOAT_ONLY = \
-@@ -62,6 +67,16 @@
- MULTILIB_HARDFLOAT_ONLY = \
- *mcpu=505/*msoft-float*
- 
-+# Targets which do not support gprs
-+MULTILIB_NOGPRS = \
-+mfloat-gprs=* \
-+*mcpu=403/*mfloat-gprs=* \
-+*mcpu=505/*mfloat-gprs=* \
-+*mcpu=603e/*mfloat-gprs=* \
-+*mcpu=604/*mfloat-gprs=* \
-+*mcpu=860/*mfloat-gprs=* \
-+*mcpu=7400/*mfloat-gprs=*
-+
- MULTILIB_EXCEPTIONS =
- 
- # Disallow -Dppc and -Dmpc without other options
-@@ -69,14 +84,8 @@
- 
- MULTILIB_EXCEPTIONS	+= \
- ${MULTILIB_SOFTFLOAT_ONLY} \
--${MULTILIB_HARDFLOAT_ONLY}
-+${MULTILIB_HARDFLOAT_ONLY} \
-+${MULTILIB_NOGPRS}
- 
- # Special rules
- # Take out all variants we don't want
--MULTILIB_EXCEPTIONS += *mcpu=403/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=505/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=601/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=604/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
--MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
-diff -Naur gcc-4.6.2.orig/gcc/config/sh/rtemself.h gcc-4.6.2/gcc/config/sh/rtemself.h
---- gcc-4.6.2.orig/gcc/config/sh/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.2/gcc/config/sh/rtemself.h	2011-11-24 10:18:40.440101315 +0100
-@@ -24,3 +24,8 @@
-   builtin_define( "__rtems__" );		\
-   builtin_assert( "system=rtems" );		\
- } while (0)
-+
-+/* Use the defaults */
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.2.orig/gcc/config/sparc/rtemself.h gcc-4.6.2/gcc/config/sparc/rtemself.h
---- gcc-4.6.2.orig/gcc/config/sparc/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.6.2/gcc/config/sparc/rtemself.h	2011-11-24 10:18:40.440101315 +0100
-@@ -29,5 +29,9 @@
-     }						\
-   while (0)
- 
--/* Use the default */
-+/* Use the defaults */
- #undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+#undef WCHAR_TYPE
-+
-+#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.6.2.orig/gcc/config/sparc/sp64-rtemself.h gcc-4.6.2/gcc/config/sparc/sp64-rtemself.h
---- gcc-4.6.2.orig/gcc/config/sparc/sp64-rtemself.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/config/sparc/sp64-rtemself.h	2011-11-24 10:18:40.440101315 +0100
-@@ -0,0 +1,37 @@
-+/* Definitions for rtems targeting a SPARC64 using ELF.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   Contributed by Joel Sherrill (joel at OARcorp.com).
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* Target OS builtins.  */
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+  do						\
-+    {						\
-+	builtin_define ("__rtems__");		\
-+	builtin_define ("__USE_INIT_FINI__");	\
-+	builtin_assert ("system=rtems");	\
-+    }						\
-+  while (0)
-+
-+/* Use the default */
-+#undef LINK_GCC_C_SEQUENCE_SPEC
-+
-+/* we are not svr4 */
-+#undef CPP_SUBTARGET_SPEC
-+#define CPP_SUBTARGET_SPEC ""
-diff -Naur gcc-4.6.2.orig/gcc/config/sparc/sparc.h gcc-4.6.2/gcc/config/sparc/sparc.h
---- gcc-4.6.2.orig/gcc/config/sparc/sparc.h	2011-02-17 14:58:09.000000000 +0100
-+++ gcc-4.6.2/gcc/config/sparc/sparc.h	2011-11-24 10:18:40.441101359 +0100
-@@ -408,6 +408,7 @@
- %{mcpu=sparclite:-Asparclite} \
- %{mcpu=sparclite86x:-Asparclite} \
- %{mcpu=f930:-Asparclite} %{mcpu=f934:-Asparclite} \
-+%{mcpu=v8:-Av8} \
- %{mv8plus:-Av8plus} \
- %{mcpu=v9:-Av9} \
- %{mcpu=ultrasparc:%{!mv8plus:-Av9a}} \
-diff -Naur gcc-4.6.2.orig/gcc/config/sparc/t-rtems gcc-4.6.2/gcc/config/sparc/t-rtems
---- gcc-4.6.2.orig/gcc/config/sparc/t-rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/gcc/config/sparc/t-rtems	2011-11-24 10:18:40.442101402 +0100
-@@ -0,0 +1,18 @@
-+# Copyright (C) 2011 Free Software Foundation, Inc.
-+#
-+# This file is part of GCC.
-+#
-+# GCC is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# GCC is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GCC; see the file COPYING3.  If not see
-+# <http://www.gnu.org/licenses/>.
-+#
-diff -Naur gcc-4.6.2.orig/gcc/config.gcc gcc-4.6.2/gcc/config.gcc
---- gcc-4.6.2.orig/gcc/config.gcc	2011-07-22 18:44:50.000000000 +0200
-+++ gcc-4.6.2/gcc/config.gcc	2011-11-24 10:18:40.435101064 +0100
-@@ -895,6 +895,17 @@
- 	tm_file="${tm_file} arm/aout.h arm/arm.h"
- 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
- 	;;
-+arm*-*-rtemseabi*)
-+	need_64bit_hwint=yes
-+	default_use_cxa_atexit=yes
-+	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
-+	tm_file="${tm_file} ../../libgcc/config/arm/bpabi-lib.h"
-+	tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
-+	tm_file="${tm_file} arm/aout.h arm/arm.h"
-+	tmake_file="arm/t-arm arm/t-arm-elf"
-+	tmake_file="${tmake_file} arm/t-bpabi t-rtems arm/t-rtems-eabi"
-+ 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-+ 	;;
- arm*-*-rtems*)
- 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h newlib-stdint.h"
- 	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
-@@ -1666,6 +1677,7 @@
- 	tm_file="dbxelf.h elfos.h ${tm_file} lm32/rtems.h rtems.h newlib-stdint.h"
- 	tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
- 	tmake_file="${tmake_file} t-rtems"
-+	tmake_file="${tmake_file} lm32/t-rtems"
-          ;;
- lm32-*-uclinux*)
-         tm_file="dbxelf.h elfos.h ${tm_file} gnu-user.h linux.h lm32/uclinux-elf.h"
-@@ -2540,8 +2552,8 @@
- 	;;
- sparc-*-rtems*)
- 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
--	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm t-rtems"
--	extra_parts="crtbegin.o crtend.o"
-+	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm sparc/t-rtems t-rtems"
-+	extra_parts="crtbegin.o crtend.o crtbegin.o crtend.o"
- 	;;
- sparc-*-linux*)
- 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h"
-@@ -2634,8 +2646,8 @@
- sparc64-*-rtems*)
- 	tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
- 	extra_options="${extra_options} sparc/little-endian.opt"
--	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm t-rtems"
--	extra_parts="crtbegin.o crtend.o"
-+	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm sparc/t-rtems t-rtems"
-+	extra_parts="crtbegin.o crtend.o crtbegin.o crtend.o"
- 	;;
- sparc64-*-linux*)
- 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/linux64.h"
-diff -Naur gcc-4.6.2.orig/gcc/ginclude/stddef.h gcc-4.6.2/gcc/ginclude/stddef.h
---- gcc-4.6.2.orig/gcc/ginclude/stddef.h	2011-01-29 23:15:52.000000000 +0100
-+++ gcc-4.6.2/gcc/ginclude/stddef.h	2011-11-24 10:18:40.442101402 +0100
-@@ -53,7 +53,13 @@
-    one less case to deal with in the following.  */
- #if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__)
- #include <machine/ansi.h>
-+#if !defined(_MACHINE_ANSI_H_)
-+#if defined(_I386_ANSI_H_) || defined(_X86_64_ANSI_H_)
-+#define _MACHINE_ANSI_H_
- #endif
-+#endif
-+#endif
-+
- /* On FreeBSD 5, machine/ansi.h does not exist anymore... */
- #if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
- #include <sys/_types.h>
-diff -Naur gcc-4.6.2.orig/libgcc/ChangeLog.rtems gcc-4.6.2/libgcc/ChangeLog.rtems
---- gcc-4.6.2.orig/libgcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.2/libgcc/ChangeLog.rtems	2011-11-24 10:18:40.442101402 +0100
-@@ -0,0 +1,5 @@
-+2010-08-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	1669/Tools, GCC-BZ 44793
-+	* config.host (powerpc-*-rtems*): Add tmake_file.
-+	Add extra_parts.
-diff -Naur gcc-4.6.2.orig/libgcc/config.host gcc-4.6.2/libgcc/config.host
---- gcc-4.6.2.orig/libgcc/config.host	2011-03-14 07:06:23.000000000 +0100
-+++ gcc-4.6.2/libgcc/config.host	2011-11-24 10:18:40.443101442 +0100
-@@ -483,6 +483,8 @@
- 	tmake_file="${tmake_file} rs6000/t-ppccomm"
- 	;;
- powerpc-*-rtems*)
-+	tmake_file="${tmake_file} rs6000/t-ppccomm t-softfp"
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
- 	;;
- powerpc-*-linux* | powerpc64-*-linux*)
- 	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp"
diff --git a/contrib/crossrpms/patches/gcc-g++-4.5.3-rtems4.11-20110426.diff b/contrib/crossrpms/patches/gcc-g++-4.5.3-rtems4.11-20110426.diff
deleted file mode 100644
index 95e49b8..0000000
--- a/contrib/crossrpms/patches/gcc-g++-4.5.3-rtems4.11-20110426.diff
+++ /dev/null
@@ -1,5887 +0,0 @@
-diff -Naur gcc-4.5.3.orig/libstdc++-v3/configure gcc-4.5.3/libstdc++-v3/configure
---- gcc-4.5.3.orig/libstdc++-v3/configure	2010-08-27 20:25:00.000000000 +0200
-+++ gcc-4.5.3/libstdc++-v3/configure	2011-04-26 08:02:07.904785280 +0200
-@@ -57089,6 +57089,5867 @@
-     $as_echo "#define HAVE_SINHL 1" >>confdefs.h
- 
-     ;;
-+  *-rtems*)
-+
-+  # All these tests are for C++; save the language and the compiler flags.
-+  # The CXXFLAGS thing is suspicious, but based on similar bits previously
-+  # found in GLIBCXX_CONFIGURE.
-+
-+  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+  ac_test_CXXFLAGS="${CXXFLAGS+set}"
-+  ac_save_CXXFLAGS="$CXXFLAGS"
-+
-+  # Check for maintainer-mode bits.
-+  if test x"$USE_MAINTAINER_MODE" = xno; then
-+    WERROR=''
-+  else
-+    WERROR='-Werror'
-+  fi
-+
-+  # Check for -ffunction-sections -fdata-sections
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for g++ that supports -ffunction-sections -fdata-sections" >&5
-+$as_echo_n "checking for g++ that supports -ffunction-sections -fdata-sections... " >&6; }
-+  CXXFLAGS='-g -Werror -ffunction-sections -fdata-sections'
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int foo; void bar() { };
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_fdsections=yes
-+else
-+  ac_fdsections=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  if test "$ac_test_CXXFLAGS" = set; then
-+    CXXFLAGS="$ac_save_CXXFLAGS"
-+  else
-+    # this is the suspicious part
-+    CXXFLAGS=''
-+  fi
-+  if test x"$ac_fdsections" = x"yes"; then
-+    SECTION_FLAGS='-ffunction-sections -fdata-sections'
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_fdsections" >&5
-+$as_echo "$ac_fdsections" >&6; }
-+
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+  # If we're not using GNU ld, then there's no point in even trying these
-+  # tests.  Check for that first.  We should have already tested for gld
-+  # by now (in libtool), but require it now just to be safe...
-+  test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS=''
-+  test -z "$OPT_LDFLAGS" && OPT_LDFLAGS=''
-+
-+
-+
-+  # The name set by libtool depends on the version of libtool.  Shame on us
-+  # for depending on an impl detail, but c'est la vie.  Older versions used
-+  # ac_cv_prog_gnu_ld, but now it's lt_cv_prog_gnu_ld, and is copied back on
-+  # top of with_gnu_ld (which is also set by --with-gnu-ld, so that actually
-+  # makes sense).  We'll test with_gnu_ld everywhere else, so if that isn't
-+  # set (hence we're using an older libtool), then set it.
-+  if test x${with_gnu_ld+set} != xset; then
-+    if test x${ac_cv_prog_gnu_ld+set} != xset; then
-+      # We got through "ac_require(ac_prog_ld)" and still not set?  Huh?
-+      with_gnu_ld=no
-+    else
-+      with_gnu_ld=$ac_cv_prog_gnu_ld
-+    fi
-+  fi
-+
-+  # Start by getting the version number.  I think the libtool test already
-+  # does some of this, but throws away the result.
-+  glibcxx_ld_is_gold=no
-+  if test x"$with_gnu_ld" = x"yes"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld version" >&5
-+$as_echo_n "checking for ld version... " >&6; }
-+
-+    if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
-+      glibcxx_ld_is_gold=yes
-+    fi
-+    ldver=`$LD --version 2>/dev/null |
-+	   sed -e 's/GNU gold /GNU ld /;s/GNU ld version /GNU ld /;s/GNU ld ([^)]*) /GNU ld /;s/GNU ld \([0-9.][0-9.]*\).*/\1/; q'`
-+
-+    glibcxx_gnu_ld_version=`echo $ldver | \
-+           $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_gnu_ld_version" >&5
-+$as_echo "$glibcxx_gnu_ld_version" >&6; }
-+  fi
-+
-+  # Set --gc-sections.
-+  glibcxx_have_gc_sections=no
-+  if test "$glibcxx_ld_is_gold" = "yes"; then
-+    if $LD --help 2>/dev/null | grep gc-sections >/dev/null 2>&1; then
-+      glibcxx_have_gc_sections=yes
-+    fi
-+  else
-+    glibcxx_gcsections_min_ld=21602
-+    if test x"$with_gnu_ld" = x"yes" &&
-+	test $glibcxx_gnu_ld_version -gt $glibcxx_gcsections_min_ld ; then
-+      glibcxx_have_gc_sections=yes
-+    fi
-+  fi
-+  if test "$glibcxx_have_gc_sections" = "yes"; then
-+    # Sufficiently young GNU ld it is!  Joy and bunny rabbits!
-+    # NB: This flag only works reliably after 2.16.1. Configure tests
-+    # for this are difficult, so hard wire a value that should work.
-+
-+    ac_test_CFLAGS="${CFLAGS+set}"
-+    ac_save_CFLAGS="$CFLAGS"
-+    CFLAGS='-Wl,--gc-sections'
-+
-+    # Check for -Wl,--gc-sections
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,--gc-sections" >&5
-+$as_echo_n "checking for ld that supports -Wl,--gc-sections... " >&6; }
-+    if test x$gcc_no_link = xyes; then
-+  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-+fi
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+ int one(void) { return 1; }
-+     int two(void) { return 2; }
-+
-+int
-+main ()
-+{
-+ two();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_gcsections=yes
-+else
-+  ac_gcsections=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+    if test "$ac_gcsections" = "yes"; then
-+      rm -f conftest.c
-+      touch conftest.c
-+      if $CC -c conftest.c; then
-+	if $LD --gc-sections -o conftest conftest.o 2>&1 | \
-+	   grep "Warning: gc-sections option ignored" > /dev/null; then
-+	  ac_gcsections=no
-+	fi
-+      fi
-+      rm -f conftest.c conftest.o conftest
-+    fi
-+    if test "$ac_gcsections" = "yes"; then
-+      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
-+    fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
-+$as_echo "$ac_gcsections" >&6; }
-+
-+    if test "$ac_test_CFLAGS" = set; then
-+      CFLAGS="$ac_save_CFLAGS"
-+    else
-+      # this is the suspicious part
-+      CFLAGS=''
-+    fi
-+  fi
-+
-+  # Set -z,relro.
-+  # Note this is only for shared objects.
-+  ac_ld_relro=no
-+  if test x"$with_gnu_ld" = x"yes"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
-+$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
-+    cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
-+    if test -n "$cxx_z_relo"; then
-+      OPT_LDFLAGS="-Wl,-z,relro"
-+      ac_ld_relro=yes
-+    fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ld_relro" >&5
-+$as_echo "$ac_ld_relro" >&6; }
-+  fi
-+
-+  # Set linker optimization flags.
-+  if test x"$with_gnu_ld" = x"yes"; then
-+    OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
-+  fi
-+
-+
-+
-+
-+
-+  ac_test_CXXFLAGS="${CXXFLAGS+set}"
-+  ac_save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS='-fno-builtin -D_GNU_SOURCE'
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
-+$as_echo_n "checking for sin in -lm... " >&6; }
-+if test "${ac_cv_lib_m_sin+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm  $LIBS"
-+if test x$gcc_no_link = xyes; then
-+  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-+fi
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char sin ();
-+int
-+main ()
-+{
-+return sin ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_m_sin=yes
-+else
-+  ac_cv_lib_m_sin=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
-+$as_echo "$ac_cv_lib_m_sin" >&6; }
-+if test "x$ac_cv_lib_m_sin" = x""yes; then :
-+  libm="-lm"
-+fi
-+
-+  ac_save_LIBS="$LIBS"
-+  LIBS="$LIBS $libm"
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf declaration" >&5
-+$as_echo_n "checking for isinf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isinf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isinf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isinf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isinf_use=yes
-+else
-+  glibcxx_cv_func_isinf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isinf_use" >&5
-+$as_echo "$glibcxx_cv_func_isinf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isinf_use = x"yes"; then
-+    for ac_func in isinf
-+do :
-+  ac_fn_c_check_func "$LINENO" "isinf" "ac_cv_func_isinf"
-+if test "x$ac_cv_func_isinf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISINF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isinf declaration" >&5
-+$as_echo_n "checking for _isinf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isinf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isinf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isinf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isinf_use=yes
-+else
-+  glibcxx_cv_func__isinf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isinf_use" >&5
-+$as_echo "$glibcxx_cv_func__isinf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isinf_use = x"yes"; then
-+      for ac_func in _isinf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isinf" "ac_cv_func__isinf"
-+if test "x$ac_cv_func__isinf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISINF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan declaration" >&5
-+$as_echo_n "checking for isnan declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isnan_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isnan_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isnan(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isnan_use=yes
-+else
-+  glibcxx_cv_func_isnan_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isnan_use" >&5
-+$as_echo "$glibcxx_cv_func_isnan_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isnan_use = x"yes"; then
-+    for ac_func in isnan
-+do :
-+  ac_fn_c_check_func "$LINENO" "isnan" "ac_cv_func_isnan"
-+if test "x$ac_cv_func_isnan" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISNAN 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isnan declaration" >&5
-+$as_echo_n "checking for _isnan declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isnan_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isnan_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isnan(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isnan_use=yes
-+else
-+  glibcxx_cv_func__isnan_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isnan_use" >&5
-+$as_echo "$glibcxx_cv_func__isnan_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isnan_use = x"yes"; then
-+      for ac_func in _isnan
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isnan" "ac_cv_func__isnan"
-+if test "x$ac_cv_func__isnan" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISNAN 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for finite declaration" >&5
-+$as_echo_n "checking for finite declaration... " >&6; }
-+  if test x${glibcxx_cv_func_finite_use+set} != xset; then
-+    if test "${glibcxx_cv_func_finite_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ finite(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_finite_use=yes
-+else
-+  glibcxx_cv_func_finite_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_finite_use" >&5
-+$as_echo "$glibcxx_cv_func_finite_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_finite_use = x"yes"; then
-+    for ac_func in finite
-+do :
-+  ac_fn_c_check_func "$LINENO" "finite" "ac_cv_func_finite"
-+if test "x$ac_cv_func_finite" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FINITE 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _finite declaration" >&5
-+$as_echo_n "checking for _finite declaration... " >&6; }
-+  if test x${glibcxx_cv_func__finite_use+set} != xset; then
-+    if test "${glibcxx_cv_func__finite_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _finite(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__finite_use=yes
-+else
-+  glibcxx_cv_func__finite_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__finite_use" >&5
-+$as_echo "$glibcxx_cv_func__finite_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__finite_use = x"yes"; then
-+      for ac_func in _finite
-+do :
-+  ac_fn_c_check_func "$LINENO" "_finite" "ac_cv_func__finite"
-+if test "x$ac_cv_func__finite" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FINITE 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincos declaration" >&5
-+$as_echo_n "checking for sincos declaration... " >&6; }
-+  if test x${glibcxx_cv_func_sincos_use+set} != xset; then
-+    if test "${glibcxx_cv_func_sincos_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ sincos(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_sincos_use=yes
-+else
-+  glibcxx_cv_func_sincos_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_sincos_use" >&5
-+$as_echo "$glibcxx_cv_func_sincos_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_sincos_use = x"yes"; then
-+    for ac_func in sincos
-+do :
-+  ac_fn_c_check_func "$LINENO" "sincos" "ac_cv_func_sincos"
-+if test "x$ac_cv_func_sincos" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SINCOS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _sincos declaration" >&5
-+$as_echo_n "checking for _sincos declaration... " >&6; }
-+  if test x${glibcxx_cv_func__sincos_use+set} != xset; then
-+    if test "${glibcxx_cv_func__sincos_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _sincos(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__sincos_use=yes
-+else
-+  glibcxx_cv_func__sincos_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__sincos_use" >&5
-+$as_echo "$glibcxx_cv_func__sincos_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__sincos_use = x"yes"; then
-+      for ac_func in _sincos
-+do :
-+  ac_fn_c_check_func "$LINENO" "_sincos" "ac_cv_func__sincos"
-+if test "x$ac_cv_func__sincos" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__SINCOS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fpclass declaration" >&5
-+$as_echo_n "checking for fpclass declaration... " >&6; }
-+  if test x${glibcxx_cv_func_fpclass_use+set} != xset; then
-+    if test "${glibcxx_cv_func_fpclass_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ fpclass(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_fpclass_use=yes
-+else
-+  glibcxx_cv_func_fpclass_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_fpclass_use" >&5
-+$as_echo "$glibcxx_cv_func_fpclass_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_fpclass_use = x"yes"; then
-+    for ac_func in fpclass
-+do :
-+  ac_fn_c_check_func "$LINENO" "fpclass" "ac_cv_func_fpclass"
-+if test "x$ac_cv_func_fpclass" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FPCLASS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _fpclass declaration" >&5
-+$as_echo_n "checking for _fpclass declaration... " >&6; }
-+  if test x${glibcxx_cv_func__fpclass_use+set} != xset; then
-+    if test "${glibcxx_cv_func__fpclass_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _fpclass(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__fpclass_use=yes
-+else
-+  glibcxx_cv_func__fpclass_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__fpclass_use" >&5
-+$as_echo "$glibcxx_cv_func__fpclass_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__fpclass_use = x"yes"; then
-+      for ac_func in _fpclass
-+do :
-+  ac_fn_c_check_func "$LINENO" "_fpclass" "ac_cv_func__fpclass"
-+if test "x$ac_cv_func__fpclass" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FPCLASS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qfpclass declaration" >&5
-+$as_echo_n "checking for qfpclass declaration... " >&6; }
-+  if test x${glibcxx_cv_func_qfpclass_use+set} != xset; then
-+    if test "${glibcxx_cv_func_qfpclass_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ qfpclass(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_qfpclass_use=yes
-+else
-+  glibcxx_cv_func_qfpclass_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_qfpclass_use" >&5
-+$as_echo "$glibcxx_cv_func_qfpclass_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_qfpclass_use = x"yes"; then
-+    for ac_func in qfpclass
-+do :
-+  ac_fn_c_check_func "$LINENO" "qfpclass" "ac_cv_func_qfpclass"
-+if test "x$ac_cv_func_qfpclass" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_QFPCLASS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _qfpclass declaration" >&5
-+$as_echo_n "checking for _qfpclass declaration... " >&6; }
-+  if test x${glibcxx_cv_func__qfpclass_use+set} != xset; then
-+    if test "${glibcxx_cv_func__qfpclass_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _qfpclass(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__qfpclass_use=yes
-+else
-+  glibcxx_cv_func__qfpclass_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__qfpclass_use" >&5
-+$as_echo "$glibcxx_cv_func__qfpclass_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__qfpclass_use = x"yes"; then
-+      for ac_func in _qfpclass
-+do :
-+  ac_fn_c_check_func "$LINENO" "_qfpclass" "ac_cv_func__qfpclass"
-+if test "x$ac_cv_func__qfpclass" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__QFPCLASS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hypot declaration" >&5
-+$as_echo_n "checking for hypot declaration... " >&6; }
-+  if test x${glibcxx_cv_func_hypot_use+set} != xset; then
-+    if test "${glibcxx_cv_func_hypot_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ hypot(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_hypot_use=yes
-+else
-+  glibcxx_cv_func_hypot_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_hypot_use" >&5
-+$as_echo "$glibcxx_cv_func_hypot_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_hypot_use = x"yes"; then
-+    for ac_func in hypot
-+do :
-+  ac_fn_c_check_func "$LINENO" "hypot" "ac_cv_func_hypot"
-+if test "x$ac_cv_func_hypot" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_HYPOT 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _hypot declaration" >&5
-+$as_echo_n "checking for _hypot declaration... " >&6; }
-+  if test x${glibcxx_cv_func__hypot_use+set} != xset; then
-+    if test "${glibcxx_cv_func__hypot_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _hypot(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__hypot_use=yes
-+else
-+  glibcxx_cv_func__hypot_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__hypot_use" >&5
-+$as_echo "$glibcxx_cv_func__hypot_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__hypot_use = x"yes"; then
-+      for ac_func in _hypot
-+do :
-+  ac_fn_c_check_func "$LINENO" "_hypot" "ac_cv_func__hypot"
-+if test "x$ac_cv_func__hypot" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__HYPOT 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for float trig functions" >&5
-+$as_echo_n "checking for float trig functions... " >&6; }
-+  if test "${glibcxx_cv_func_float_trig_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+acosf (0); asinf (0); atanf (0); cosf (0); sinf (0); tanf (0); coshf (0); sinhf (0); tanhf (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_float_trig_use=yes
-+else
-+  glibcxx_cv_func_float_trig_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_float_trig_use" >&5
-+$as_echo "$glibcxx_cv_func_float_trig_use" >&6; }
-+  if test x$glibcxx_cv_func_float_trig_use = x"yes"; then
-+    for ac_func in acosf asinf atanf cosf sinf tanf coshf sinhf tanhf
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _float trig functions" >&5
-+$as_echo_n "checking for _float trig functions... " >&6; }
-+    if test "${glibcxx_cv_func__float_trig_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+_acosf (0); _asinf (0); _atanf (0); _cosf (0); _sinf (0); _tanf (0); _coshf (0); _sinhf (0); _tanhf (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__float_trig_use=yes
-+else
-+  glibcxx_cv_func__float_trig_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__float_trig_use" >&5
-+$as_echo "$glibcxx_cv_func__float_trig_use" >&6; }
-+    if test x$glibcxx_cv_func__float_trig_use = x"yes"; then
-+      for ac_func in _acosf _asinf _atanf _cosf _sinf _tanf _coshf _sinhf _tanhf
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for float round functions" >&5
-+$as_echo_n "checking for float round functions... " >&6; }
-+  if test "${glibcxx_cv_func_float_round_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ceilf (0); floorf (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_float_round_use=yes
-+else
-+  glibcxx_cv_func_float_round_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_float_round_use" >&5
-+$as_echo "$glibcxx_cv_func_float_round_use" >&6; }
-+  if test x$glibcxx_cv_func_float_round_use = x"yes"; then
-+    for ac_func in ceilf floorf
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _float round functions" >&5
-+$as_echo_n "checking for _float round functions... " >&6; }
-+    if test "${glibcxx_cv_func__float_round_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+_ceilf (0); _floorf (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__float_round_use=yes
-+else
-+  glibcxx_cv_func__float_round_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__float_round_use" >&5
-+$as_echo "$glibcxx_cv_func__float_round_use" >&6; }
-+    if test x$glibcxx_cv_func__float_round_use = x"yes"; then
-+      for ac_func in _ceilf _floorf
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for expf declaration" >&5
-+$as_echo_n "checking for expf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_expf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_expf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ expf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_expf_use=yes
-+else
-+  glibcxx_cv_func_expf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_expf_use" >&5
-+$as_echo "$glibcxx_cv_func_expf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_expf_use = x"yes"; then
-+    for ac_func in expf
-+do :
-+  ac_fn_c_check_func "$LINENO" "expf" "ac_cv_func_expf"
-+if test "x$ac_cv_func_expf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_EXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _expf declaration" >&5
-+$as_echo_n "checking for _expf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__expf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__expf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _expf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__expf_use=yes
-+else
-+  glibcxx_cv_func__expf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__expf_use" >&5
-+$as_echo "$glibcxx_cv_func__expf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__expf_use = x"yes"; then
-+      for ac_func in _expf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_expf" "ac_cv_func__expf"
-+if test "x$ac_cv_func__expf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__EXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnanf declaration" >&5
-+$as_echo_n "checking for isnanf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isnanf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isnanf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isnanf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isnanf_use=yes
-+else
-+  glibcxx_cv_func_isnanf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isnanf_use" >&5
-+$as_echo "$glibcxx_cv_func_isnanf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isnanf_use = x"yes"; then
-+    for ac_func in isnanf
-+do :
-+  ac_fn_c_check_func "$LINENO" "isnanf" "ac_cv_func_isnanf"
-+if test "x$ac_cv_func_isnanf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISNANF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isnanf declaration" >&5
-+$as_echo_n "checking for _isnanf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isnanf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isnanf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isnanf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isnanf_use=yes
-+else
-+  glibcxx_cv_func__isnanf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isnanf_use" >&5
-+$as_echo "$glibcxx_cv_func__isnanf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isnanf_use = x"yes"; then
-+      for ac_func in _isnanf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isnanf" "ac_cv_func__isnanf"
-+if test "x$ac_cv_func__isnanf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISNANF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinff declaration" >&5
-+$as_echo_n "checking for isinff declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isinff_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isinff_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isinff(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isinff_use=yes
-+else
-+  glibcxx_cv_func_isinff_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isinff_use" >&5
-+$as_echo "$glibcxx_cv_func_isinff_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isinff_use = x"yes"; then
-+    for ac_func in isinff
-+do :
-+  ac_fn_c_check_func "$LINENO" "isinff" "ac_cv_func_isinff"
-+if test "x$ac_cv_func_isinff" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISINFF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isinff declaration" >&5
-+$as_echo_n "checking for _isinff declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isinff_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isinff_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isinff(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isinff_use=yes
-+else
-+  glibcxx_cv_func__isinff_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isinff_use" >&5
-+$as_echo "$glibcxx_cv_func__isinff_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isinff_use = x"yes"; then
-+      for ac_func in _isinff
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isinff" "ac_cv_func__isinff"
-+if test "x$ac_cv_func__isinff" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISINFF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atan2f declaration" >&5
-+$as_echo_n "checking for atan2f declaration... " >&6; }
-+  if test x${glibcxx_cv_func_atan2f_use+set} != xset; then
-+    if test "${glibcxx_cv_func_atan2f_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ atan2f(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_atan2f_use=yes
-+else
-+  glibcxx_cv_func_atan2f_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_atan2f_use" >&5
-+$as_echo "$glibcxx_cv_func_atan2f_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_atan2f_use = x"yes"; then
-+    for ac_func in atan2f
-+do :
-+  ac_fn_c_check_func "$LINENO" "atan2f" "ac_cv_func_atan2f"
-+if test "x$ac_cv_func_atan2f" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ATAN2F 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _atan2f declaration" >&5
-+$as_echo_n "checking for _atan2f declaration... " >&6; }
-+  if test x${glibcxx_cv_func__atan2f_use+set} != xset; then
-+    if test "${glibcxx_cv_func__atan2f_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _atan2f(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__atan2f_use=yes
-+else
-+  glibcxx_cv_func__atan2f_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__atan2f_use" >&5
-+$as_echo "$glibcxx_cv_func__atan2f_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__atan2f_use = x"yes"; then
-+      for ac_func in _atan2f
-+do :
-+  ac_fn_c_check_func "$LINENO" "_atan2f" "ac_cv_func__atan2f"
-+if test "x$ac_cv_func__atan2f" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ATAN2F 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fabsf declaration" >&5
-+$as_echo_n "checking for fabsf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_fabsf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_fabsf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ fabsf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_fabsf_use=yes
-+else
-+  glibcxx_cv_func_fabsf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_fabsf_use" >&5
-+$as_echo "$glibcxx_cv_func_fabsf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_fabsf_use = x"yes"; then
-+    for ac_func in fabsf
-+do :
-+  ac_fn_c_check_func "$LINENO" "fabsf" "ac_cv_func_fabsf"
-+if test "x$ac_cv_func_fabsf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FABSF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _fabsf declaration" >&5
-+$as_echo_n "checking for _fabsf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__fabsf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__fabsf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _fabsf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__fabsf_use=yes
-+else
-+  glibcxx_cv_func__fabsf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__fabsf_use" >&5
-+$as_echo "$glibcxx_cv_func__fabsf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__fabsf_use = x"yes"; then
-+      for ac_func in _fabsf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_fabsf" "ac_cv_func__fabsf"
-+if test "x$ac_cv_func__fabsf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FABSF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmodf declaration" >&5
-+$as_echo_n "checking for fmodf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_fmodf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_fmodf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ fmodf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_fmodf_use=yes
-+else
-+  glibcxx_cv_func_fmodf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_fmodf_use" >&5
-+$as_echo "$glibcxx_cv_func_fmodf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_fmodf_use = x"yes"; then
-+    for ac_func in fmodf
-+do :
-+  ac_fn_c_check_func "$LINENO" "fmodf" "ac_cv_func_fmodf"
-+if test "x$ac_cv_func_fmodf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FMODF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _fmodf declaration" >&5
-+$as_echo_n "checking for _fmodf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__fmodf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__fmodf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _fmodf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__fmodf_use=yes
-+else
-+  glibcxx_cv_func__fmodf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__fmodf_use" >&5
-+$as_echo "$glibcxx_cv_func__fmodf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__fmodf_use = x"yes"; then
-+      for ac_func in _fmodf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_fmodf" "ac_cv_func__fmodf"
-+if test "x$ac_cv_func__fmodf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FMODF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for frexpf declaration" >&5
-+$as_echo_n "checking for frexpf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_frexpf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_frexpf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ frexpf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_frexpf_use=yes
-+else
-+  glibcxx_cv_func_frexpf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_frexpf_use" >&5
-+$as_echo "$glibcxx_cv_func_frexpf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_frexpf_use = x"yes"; then
-+    for ac_func in frexpf
-+do :
-+  ac_fn_c_check_func "$LINENO" "frexpf" "ac_cv_func_frexpf"
-+if test "x$ac_cv_func_frexpf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FREXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _frexpf declaration" >&5
-+$as_echo_n "checking for _frexpf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__frexpf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__frexpf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _frexpf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__frexpf_use=yes
-+else
-+  glibcxx_cv_func__frexpf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__frexpf_use" >&5
-+$as_echo "$glibcxx_cv_func__frexpf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__frexpf_use = x"yes"; then
-+      for ac_func in _frexpf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_frexpf" "ac_cv_func__frexpf"
-+if test "x$ac_cv_func__frexpf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FREXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hypotf declaration" >&5
-+$as_echo_n "checking for hypotf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_hypotf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_hypotf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ hypotf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_hypotf_use=yes
-+else
-+  glibcxx_cv_func_hypotf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_hypotf_use" >&5
-+$as_echo "$glibcxx_cv_func_hypotf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_hypotf_use = x"yes"; then
-+    for ac_func in hypotf
-+do :
-+  ac_fn_c_check_func "$LINENO" "hypotf" "ac_cv_func_hypotf"
-+if test "x$ac_cv_func_hypotf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_HYPOTF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _hypotf declaration" >&5
-+$as_echo_n "checking for _hypotf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__hypotf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__hypotf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _hypotf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__hypotf_use=yes
-+else
-+  glibcxx_cv_func__hypotf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__hypotf_use" >&5
-+$as_echo "$glibcxx_cv_func__hypotf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__hypotf_use = x"yes"; then
-+      for ac_func in _hypotf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_hypotf" "ac_cv_func__hypotf"
-+if test "x$ac_cv_func__hypotf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__HYPOTF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldexpf declaration" >&5
-+$as_echo_n "checking for ldexpf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_ldexpf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_ldexpf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ ldexpf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_ldexpf_use=yes
-+else
-+  glibcxx_cv_func_ldexpf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_ldexpf_use" >&5
-+$as_echo "$glibcxx_cv_func_ldexpf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_ldexpf_use = x"yes"; then
-+    for ac_func in ldexpf
-+do :
-+  ac_fn_c_check_func "$LINENO" "ldexpf" "ac_cv_func_ldexpf"
-+if test "x$ac_cv_func_ldexpf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LDEXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ldexpf declaration" >&5
-+$as_echo_n "checking for _ldexpf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__ldexpf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__ldexpf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _ldexpf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__ldexpf_use=yes
-+else
-+  glibcxx_cv_func__ldexpf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__ldexpf_use" >&5
-+$as_echo "$glibcxx_cv_func__ldexpf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__ldexpf_use = x"yes"; then
-+      for ac_func in _ldexpf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_ldexpf" "ac_cv_func__ldexpf"
-+if test "x$ac_cv_func__ldexpf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LDEXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for logf declaration" >&5
-+$as_echo_n "checking for logf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_logf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_logf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ logf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_logf_use=yes
-+else
-+  glibcxx_cv_func_logf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_logf_use" >&5
-+$as_echo "$glibcxx_cv_func_logf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_logf_use = x"yes"; then
-+    for ac_func in logf
-+do :
-+  ac_fn_c_check_func "$LINENO" "logf" "ac_cv_func_logf"
-+if test "x$ac_cv_func_logf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LOGF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _logf declaration" >&5
-+$as_echo_n "checking for _logf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__logf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__logf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _logf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__logf_use=yes
-+else
-+  glibcxx_cv_func__logf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__logf_use" >&5
-+$as_echo "$glibcxx_cv_func__logf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__logf_use = x"yes"; then
-+      for ac_func in _logf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_logf" "ac_cv_func__logf"
-+if test "x$ac_cv_func__logf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LOGF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log10f declaration" >&5
-+$as_echo_n "checking for log10f declaration... " >&6; }
-+  if test x${glibcxx_cv_func_log10f_use+set} != xset; then
-+    if test "${glibcxx_cv_func_log10f_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ log10f(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_log10f_use=yes
-+else
-+  glibcxx_cv_func_log10f_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_log10f_use" >&5
-+$as_echo "$glibcxx_cv_func_log10f_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_log10f_use = x"yes"; then
-+    for ac_func in log10f
-+do :
-+  ac_fn_c_check_func "$LINENO" "log10f" "ac_cv_func_log10f"
-+if test "x$ac_cv_func_log10f" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LOG10F 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _log10f declaration" >&5
-+$as_echo_n "checking for _log10f declaration... " >&6; }
-+  if test x${glibcxx_cv_func__log10f_use+set} != xset; then
-+    if test "${glibcxx_cv_func__log10f_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _log10f(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__log10f_use=yes
-+else
-+  glibcxx_cv_func__log10f_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__log10f_use" >&5
-+$as_echo "$glibcxx_cv_func__log10f_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__log10f_use = x"yes"; then
-+      for ac_func in _log10f
-+do :
-+  ac_fn_c_check_func "$LINENO" "_log10f" "ac_cv_func__log10f"
-+if test "x$ac_cv_func__log10f" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LOG10F 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for modff declaration" >&5
-+$as_echo_n "checking for modff declaration... " >&6; }
-+  if test x${glibcxx_cv_func_modff_use+set} != xset; then
-+    if test "${glibcxx_cv_func_modff_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ modff(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_modff_use=yes
-+else
-+  glibcxx_cv_func_modff_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_modff_use" >&5
-+$as_echo "$glibcxx_cv_func_modff_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_modff_use = x"yes"; then
-+    for ac_func in modff
-+do :
-+  ac_fn_c_check_func "$LINENO" "modff" "ac_cv_func_modff"
-+if test "x$ac_cv_func_modff" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_MODFF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _modff declaration" >&5
-+$as_echo_n "checking for _modff declaration... " >&6; }
-+  if test x${glibcxx_cv_func__modff_use+set} != xset; then
-+    if test "${glibcxx_cv_func__modff_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _modff(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__modff_use=yes
-+else
-+  glibcxx_cv_func__modff_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__modff_use" >&5
-+$as_echo "$glibcxx_cv_func__modff_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__modff_use = x"yes"; then
-+      for ac_func in _modff
-+do :
-+  ac_fn_c_check_func "$LINENO" "_modff" "ac_cv_func__modff"
-+if test "x$ac_cv_func__modff" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__MODFF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for modf declaration" >&5
-+$as_echo_n "checking for modf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_modf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_modf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ modf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_modf_use=yes
-+else
-+  glibcxx_cv_func_modf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_modf_use" >&5
-+$as_echo "$glibcxx_cv_func_modf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_modf_use = x"yes"; then
-+    for ac_func in modf
-+do :
-+  ac_fn_c_check_func "$LINENO" "modf" "ac_cv_func_modf"
-+if test "x$ac_cv_func_modf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_MODF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _modf declaration" >&5
-+$as_echo_n "checking for _modf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__modf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__modf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _modf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__modf_use=yes
-+else
-+  glibcxx_cv_func__modf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__modf_use" >&5
-+$as_echo "$glibcxx_cv_func__modf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__modf_use = x"yes"; then
-+      for ac_func in _modf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_modf" "ac_cv_func__modf"
-+if test "x$ac_cv_func__modf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__MODF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for powf declaration" >&5
-+$as_echo_n "checking for powf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_powf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_powf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ powf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_powf_use=yes
-+else
-+  glibcxx_cv_func_powf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_powf_use" >&5
-+$as_echo "$glibcxx_cv_func_powf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_powf_use = x"yes"; then
-+    for ac_func in powf
-+do :
-+  ac_fn_c_check_func "$LINENO" "powf" "ac_cv_func_powf"
-+if test "x$ac_cv_func_powf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_POWF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _powf declaration" >&5
-+$as_echo_n "checking for _powf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__powf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__powf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _powf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__powf_use=yes
-+else
-+  glibcxx_cv_func__powf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__powf_use" >&5
-+$as_echo "$glibcxx_cv_func__powf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__powf_use = x"yes"; then
-+      for ac_func in _powf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_powf" "ac_cv_func__powf"
-+if test "x$ac_cv_func__powf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__POWF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrtf declaration" >&5
-+$as_echo_n "checking for sqrtf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_sqrtf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_sqrtf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ sqrtf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_sqrtf_use=yes
-+else
-+  glibcxx_cv_func_sqrtf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_sqrtf_use" >&5
-+$as_echo "$glibcxx_cv_func_sqrtf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_sqrtf_use = x"yes"; then
-+    for ac_func in sqrtf
-+do :
-+  ac_fn_c_check_func "$LINENO" "sqrtf" "ac_cv_func_sqrtf"
-+if test "x$ac_cv_func_sqrtf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SQRTF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _sqrtf declaration" >&5
-+$as_echo_n "checking for _sqrtf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__sqrtf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__sqrtf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _sqrtf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__sqrtf_use=yes
-+else
-+  glibcxx_cv_func__sqrtf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__sqrtf_use" >&5
-+$as_echo "$glibcxx_cv_func__sqrtf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__sqrtf_use = x"yes"; then
-+      for ac_func in _sqrtf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_sqrtf" "ac_cv_func__sqrtf"
-+if test "x$ac_cv_func__sqrtf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__SQRTF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincosf declaration" >&5
-+$as_echo_n "checking for sincosf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_sincosf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_sincosf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ sincosf(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_sincosf_use=yes
-+else
-+  glibcxx_cv_func_sincosf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_sincosf_use" >&5
-+$as_echo "$glibcxx_cv_func_sincosf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_sincosf_use = x"yes"; then
-+    for ac_func in sincosf
-+do :
-+  ac_fn_c_check_func "$LINENO" "sincosf" "ac_cv_func_sincosf"
-+if test "x$ac_cv_func_sincosf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SINCOSF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _sincosf declaration" >&5
-+$as_echo_n "checking for _sincosf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__sincosf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__sincosf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _sincosf(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__sincosf_use=yes
-+else
-+  glibcxx_cv_func__sincosf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__sincosf_use" >&5
-+$as_echo "$glibcxx_cv_func__sincosf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__sincosf_use = x"yes"; then
-+      for ac_func in _sincosf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_sincosf" "ac_cv_func__sincosf"
-+if test "x$ac_cv_func__sincosf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__SINCOSF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for finitef declaration" >&5
-+$as_echo_n "checking for finitef declaration... " >&6; }
-+  if test x${glibcxx_cv_func_finitef_use+set} != xset; then
-+    if test "${glibcxx_cv_func_finitef_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ finitef(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_finitef_use=yes
-+else
-+  glibcxx_cv_func_finitef_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_finitef_use" >&5
-+$as_echo "$glibcxx_cv_func_finitef_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_finitef_use = x"yes"; then
-+    for ac_func in finitef
-+do :
-+  ac_fn_c_check_func "$LINENO" "finitef" "ac_cv_func_finitef"
-+if test "x$ac_cv_func_finitef" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FINITEF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _finitef declaration" >&5
-+$as_echo_n "checking for _finitef declaration... " >&6; }
-+  if test x${glibcxx_cv_func__finitef_use+set} != xset; then
-+    if test "${glibcxx_cv_func__finitef_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _finitef(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__finitef_use=yes
-+else
-+  glibcxx_cv_func__finitef_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__finitef_use" >&5
-+$as_echo "$glibcxx_cv_func__finitef_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__finitef_use = x"yes"; then
-+      for ac_func in _finitef
-+do :
-+  ac_fn_c_check_func "$LINENO" "_finitef" "ac_cv_func__finitef"
-+if test "x$ac_cv_func__finitef" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FINITEF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double trig functions" >&5
-+$as_echo_n "checking for long double trig functions... " >&6; }
-+  if test "${glibcxx_cv_func_long_double_trig_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+acosl (0); asinl (0); atanl (0); cosl (0); sinl (0); tanl (0); coshl (0); sinhl (0); tanhl (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_long_double_trig_use=yes
-+else
-+  glibcxx_cv_func_long_double_trig_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_long_double_trig_use" >&5
-+$as_echo "$glibcxx_cv_func_long_double_trig_use" >&6; }
-+  if test x$glibcxx_cv_func_long_double_trig_use = x"yes"; then
-+    for ac_func in acosl asinl atanl cosl sinl tanl coshl sinhl tanhl
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _long double trig functions" >&5
-+$as_echo_n "checking for _long double trig functions... " >&6; }
-+    if test "${glibcxx_cv_func__long_double_trig_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+_acosl (0); _asinl (0); _atanl (0); _cosl (0); _sinl (0); _tanl (0); _coshl (0); _sinhl (0); _tanhl (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__long_double_trig_use=yes
-+else
-+  glibcxx_cv_func__long_double_trig_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__long_double_trig_use" >&5
-+$as_echo "$glibcxx_cv_func__long_double_trig_use" >&6; }
-+    if test x$glibcxx_cv_func__long_double_trig_use = x"yes"; then
-+      for ac_func in _acosl _asinl _atanl _cosl _sinl _tanl _coshl _sinhl _tanhl
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double round functions" >&5
-+$as_echo_n "checking for long double round functions... " >&6; }
-+  if test "${glibcxx_cv_func_long_double_round_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ceill (0); floorl (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_long_double_round_use=yes
-+else
-+  glibcxx_cv_func_long_double_round_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_long_double_round_use" >&5
-+$as_echo "$glibcxx_cv_func_long_double_round_use" >&6; }
-+  if test x$glibcxx_cv_func_long_double_round_use = x"yes"; then
-+    for ac_func in ceill floorl
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _long double round functions" >&5
-+$as_echo_n "checking for _long double round functions... " >&6; }
-+    if test "${glibcxx_cv_func__long_double_round_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+_ceill (0); _floorl (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__long_double_round_use=yes
-+else
-+  glibcxx_cv_func__long_double_round_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__long_double_round_use" >&5
-+$as_echo "$glibcxx_cv_func__long_double_round_use" >&6; }
-+    if test x$glibcxx_cv_func__long_double_round_use = x"yes"; then
-+      for ac_func in _ceill _floorl
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnanl declaration" >&5
-+$as_echo_n "checking for isnanl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isnanl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isnanl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isnanl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isnanl_use=yes
-+else
-+  glibcxx_cv_func_isnanl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isnanl_use" >&5
-+$as_echo "$glibcxx_cv_func_isnanl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isnanl_use = x"yes"; then
-+    for ac_func in isnanl
-+do :
-+  ac_fn_c_check_func "$LINENO" "isnanl" "ac_cv_func_isnanl"
-+if test "x$ac_cv_func_isnanl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISNANL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isnanl declaration" >&5
-+$as_echo_n "checking for _isnanl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isnanl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isnanl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isnanl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isnanl_use=yes
-+else
-+  glibcxx_cv_func__isnanl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isnanl_use" >&5
-+$as_echo "$glibcxx_cv_func__isnanl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isnanl_use = x"yes"; then
-+      for ac_func in _isnanl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isnanl" "ac_cv_func__isnanl"
-+if test "x$ac_cv_func__isnanl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISNANL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinfl declaration" >&5
-+$as_echo_n "checking for isinfl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isinfl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isinfl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isinfl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isinfl_use=yes
-+else
-+  glibcxx_cv_func_isinfl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isinfl_use" >&5
-+$as_echo "$glibcxx_cv_func_isinfl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isinfl_use = x"yes"; then
-+    for ac_func in isinfl
-+do :
-+  ac_fn_c_check_func "$LINENO" "isinfl" "ac_cv_func_isinfl"
-+if test "x$ac_cv_func_isinfl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISINFL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isinfl declaration" >&5
-+$as_echo_n "checking for _isinfl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isinfl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isinfl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isinfl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isinfl_use=yes
-+else
-+  glibcxx_cv_func__isinfl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isinfl_use" >&5
-+$as_echo "$glibcxx_cv_func__isinfl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isinfl_use = x"yes"; then
-+      for ac_func in _isinfl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isinfl" "ac_cv_func__isinfl"
-+if test "x$ac_cv_func__isinfl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISINFL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atan2l declaration" >&5
-+$as_echo_n "checking for atan2l declaration... " >&6; }
-+  if test x${glibcxx_cv_func_atan2l_use+set} != xset; then
-+    if test "${glibcxx_cv_func_atan2l_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ atan2l(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_atan2l_use=yes
-+else
-+  glibcxx_cv_func_atan2l_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_atan2l_use" >&5
-+$as_echo "$glibcxx_cv_func_atan2l_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_atan2l_use = x"yes"; then
-+    for ac_func in atan2l
-+do :
-+  ac_fn_c_check_func "$LINENO" "atan2l" "ac_cv_func_atan2l"
-+if test "x$ac_cv_func_atan2l" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ATAN2L 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _atan2l declaration" >&5
-+$as_echo_n "checking for _atan2l declaration... " >&6; }
-+  if test x${glibcxx_cv_func__atan2l_use+set} != xset; then
-+    if test "${glibcxx_cv_func__atan2l_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _atan2l(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__atan2l_use=yes
-+else
-+  glibcxx_cv_func__atan2l_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__atan2l_use" >&5
-+$as_echo "$glibcxx_cv_func__atan2l_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__atan2l_use = x"yes"; then
-+      for ac_func in _atan2l
-+do :
-+  ac_fn_c_check_func "$LINENO" "_atan2l" "ac_cv_func__atan2l"
-+if test "x$ac_cv_func__atan2l" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ATAN2L 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for expl declaration" >&5
-+$as_echo_n "checking for expl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_expl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_expl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ expl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_expl_use=yes
-+else
-+  glibcxx_cv_func_expl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_expl_use" >&5
-+$as_echo "$glibcxx_cv_func_expl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_expl_use = x"yes"; then
-+    for ac_func in expl
-+do :
-+  ac_fn_c_check_func "$LINENO" "expl" "ac_cv_func_expl"
-+if test "x$ac_cv_func_expl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_EXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _expl declaration" >&5
-+$as_echo_n "checking for _expl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__expl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__expl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _expl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__expl_use=yes
-+else
-+  glibcxx_cv_func__expl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__expl_use" >&5
-+$as_echo "$glibcxx_cv_func__expl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__expl_use = x"yes"; then
-+      for ac_func in _expl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_expl" "ac_cv_func__expl"
-+if test "x$ac_cv_func__expl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__EXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fabsl declaration" >&5
-+$as_echo_n "checking for fabsl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_fabsl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_fabsl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ fabsl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_fabsl_use=yes
-+else
-+  glibcxx_cv_func_fabsl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_fabsl_use" >&5
-+$as_echo "$glibcxx_cv_func_fabsl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_fabsl_use = x"yes"; then
-+    for ac_func in fabsl
-+do :
-+  ac_fn_c_check_func "$LINENO" "fabsl" "ac_cv_func_fabsl"
-+if test "x$ac_cv_func_fabsl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FABSL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _fabsl declaration" >&5
-+$as_echo_n "checking for _fabsl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__fabsl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__fabsl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _fabsl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__fabsl_use=yes
-+else
-+  glibcxx_cv_func__fabsl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__fabsl_use" >&5
-+$as_echo "$glibcxx_cv_func__fabsl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__fabsl_use = x"yes"; then
-+      for ac_func in _fabsl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_fabsl" "ac_cv_func__fabsl"
-+if test "x$ac_cv_func__fabsl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FABSL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmodl declaration" >&5
-+$as_echo_n "checking for fmodl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_fmodl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_fmodl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ fmodl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_fmodl_use=yes
-+else
-+  glibcxx_cv_func_fmodl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_fmodl_use" >&5
-+$as_echo "$glibcxx_cv_func_fmodl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_fmodl_use = x"yes"; then
-+    for ac_func in fmodl
-+do :
-+  ac_fn_c_check_func "$LINENO" "fmodl" "ac_cv_func_fmodl"
-+if test "x$ac_cv_func_fmodl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FMODL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _fmodl declaration" >&5
-+$as_echo_n "checking for _fmodl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__fmodl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__fmodl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _fmodl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__fmodl_use=yes
-+else
-+  glibcxx_cv_func__fmodl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__fmodl_use" >&5
-+$as_echo "$glibcxx_cv_func__fmodl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__fmodl_use = x"yes"; then
-+      for ac_func in _fmodl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_fmodl" "ac_cv_func__fmodl"
-+if test "x$ac_cv_func__fmodl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FMODL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for frexpl declaration" >&5
-+$as_echo_n "checking for frexpl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_frexpl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_frexpl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ frexpl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_frexpl_use=yes
-+else
-+  glibcxx_cv_func_frexpl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_frexpl_use" >&5
-+$as_echo "$glibcxx_cv_func_frexpl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_frexpl_use = x"yes"; then
-+    for ac_func in frexpl
-+do :
-+  ac_fn_c_check_func "$LINENO" "frexpl" "ac_cv_func_frexpl"
-+if test "x$ac_cv_func_frexpl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FREXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _frexpl declaration" >&5
-+$as_echo_n "checking for _frexpl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__frexpl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__frexpl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _frexpl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__frexpl_use=yes
-+else
-+  glibcxx_cv_func__frexpl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__frexpl_use" >&5
-+$as_echo "$glibcxx_cv_func__frexpl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__frexpl_use = x"yes"; then
-+      for ac_func in _frexpl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_frexpl" "ac_cv_func__frexpl"
-+if test "x$ac_cv_func__frexpl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FREXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hypotl declaration" >&5
-+$as_echo_n "checking for hypotl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_hypotl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_hypotl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ hypotl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_hypotl_use=yes
-+else
-+  glibcxx_cv_func_hypotl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_hypotl_use" >&5
-+$as_echo "$glibcxx_cv_func_hypotl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_hypotl_use = x"yes"; then
-+    for ac_func in hypotl
-+do :
-+  ac_fn_c_check_func "$LINENO" "hypotl" "ac_cv_func_hypotl"
-+if test "x$ac_cv_func_hypotl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_HYPOTL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _hypotl declaration" >&5
-+$as_echo_n "checking for _hypotl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__hypotl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__hypotl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _hypotl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__hypotl_use=yes
-+else
-+  glibcxx_cv_func__hypotl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__hypotl_use" >&5
-+$as_echo "$glibcxx_cv_func__hypotl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__hypotl_use = x"yes"; then
-+      for ac_func in _hypotl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_hypotl" "ac_cv_func__hypotl"
-+if test "x$ac_cv_func__hypotl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__HYPOTL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldexpl declaration" >&5
-+$as_echo_n "checking for ldexpl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_ldexpl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_ldexpl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ ldexpl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_ldexpl_use=yes
-+else
-+  glibcxx_cv_func_ldexpl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_ldexpl_use" >&5
-+$as_echo "$glibcxx_cv_func_ldexpl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_ldexpl_use = x"yes"; then
-+    for ac_func in ldexpl
-+do :
-+  ac_fn_c_check_func "$LINENO" "ldexpl" "ac_cv_func_ldexpl"
-+if test "x$ac_cv_func_ldexpl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LDEXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ldexpl declaration" >&5
-+$as_echo_n "checking for _ldexpl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__ldexpl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__ldexpl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _ldexpl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__ldexpl_use=yes
-+else
-+  glibcxx_cv_func__ldexpl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__ldexpl_use" >&5
-+$as_echo "$glibcxx_cv_func__ldexpl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__ldexpl_use = x"yes"; then
-+      for ac_func in _ldexpl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_ldexpl" "ac_cv_func__ldexpl"
-+if test "x$ac_cv_func__ldexpl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LDEXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for logl declaration" >&5
-+$as_echo_n "checking for logl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_logl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_logl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ logl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_logl_use=yes
-+else
-+  glibcxx_cv_func_logl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_logl_use" >&5
-+$as_echo "$glibcxx_cv_func_logl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_logl_use = x"yes"; then
-+    for ac_func in logl
-+do :
-+  ac_fn_c_check_func "$LINENO" "logl" "ac_cv_func_logl"
-+if test "x$ac_cv_func_logl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LOGL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _logl declaration" >&5
-+$as_echo_n "checking for _logl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__logl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__logl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _logl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__logl_use=yes
-+else
-+  glibcxx_cv_func__logl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__logl_use" >&5
-+$as_echo "$glibcxx_cv_func__logl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__logl_use = x"yes"; then
-+      for ac_func in _logl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_logl" "ac_cv_func__logl"
-+if test "x$ac_cv_func__logl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LOGL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log10l declaration" >&5
-+$as_echo_n "checking for log10l declaration... " >&6; }
-+  if test x${glibcxx_cv_func_log10l_use+set} != xset; then
-+    if test "${glibcxx_cv_func_log10l_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ log10l(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_log10l_use=yes
-+else
-+  glibcxx_cv_func_log10l_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_log10l_use" >&5
-+$as_echo "$glibcxx_cv_func_log10l_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_log10l_use = x"yes"; then
-+    for ac_func in log10l
-+do :
-+  ac_fn_c_check_func "$LINENO" "log10l" "ac_cv_func_log10l"
-+if test "x$ac_cv_func_log10l" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LOG10L 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _log10l declaration" >&5
-+$as_echo_n "checking for _log10l declaration... " >&6; }
-+  if test x${glibcxx_cv_func__log10l_use+set} != xset; then
-+    if test "${glibcxx_cv_func__log10l_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _log10l(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__log10l_use=yes
-+else
-+  glibcxx_cv_func__log10l_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__log10l_use" >&5
-+$as_echo "$glibcxx_cv_func__log10l_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__log10l_use = x"yes"; then
-+      for ac_func in _log10l
-+do :
-+  ac_fn_c_check_func "$LINENO" "_log10l" "ac_cv_func__log10l"
-+if test "x$ac_cv_func__log10l" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LOG10L 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for modfl declaration" >&5
-+$as_echo_n "checking for modfl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_modfl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_modfl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ modfl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_modfl_use=yes
-+else
-+  glibcxx_cv_func_modfl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_modfl_use" >&5
-+$as_echo "$glibcxx_cv_func_modfl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_modfl_use = x"yes"; then
-+    for ac_func in modfl
-+do :
-+  ac_fn_c_check_func "$LINENO" "modfl" "ac_cv_func_modfl"
-+if test "x$ac_cv_func_modfl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_MODFL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _modfl declaration" >&5
-+$as_echo_n "checking for _modfl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__modfl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__modfl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _modfl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__modfl_use=yes
-+else
-+  glibcxx_cv_func__modfl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__modfl_use" >&5
-+$as_echo "$glibcxx_cv_func__modfl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__modfl_use = x"yes"; then
-+      for ac_func in _modfl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_modfl" "ac_cv_func__modfl"
-+if test "x$ac_cv_func__modfl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__MODFL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for powl declaration" >&5
-+$as_echo_n "checking for powl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_powl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_powl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ powl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_powl_use=yes
-+else
-+  glibcxx_cv_func_powl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_powl_use" >&5
-+$as_echo "$glibcxx_cv_func_powl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_powl_use = x"yes"; then
-+    for ac_func in powl
-+do :
-+  ac_fn_c_check_func "$LINENO" "powl" "ac_cv_func_powl"
-+if test "x$ac_cv_func_powl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_POWL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _powl declaration" >&5
-+$as_echo_n "checking for _powl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__powl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__powl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _powl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__powl_use=yes
-+else
-+  glibcxx_cv_func__powl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__powl_use" >&5
-+$as_echo "$glibcxx_cv_func__powl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__powl_use = x"yes"; then
-+      for ac_func in _powl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_powl" "ac_cv_func__powl"
-+if test "x$ac_cv_func__powl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__POWL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrtl declaration" >&5
-+$as_echo_n "checking for sqrtl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_sqrtl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_sqrtl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ sqrtl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_sqrtl_use=yes
-+else
-+  glibcxx_cv_func_sqrtl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_sqrtl_use" >&5
-+$as_echo "$glibcxx_cv_func_sqrtl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_sqrtl_use = x"yes"; then
-+    for ac_func in sqrtl
-+do :
-+  ac_fn_c_check_func "$LINENO" "sqrtl" "ac_cv_func_sqrtl"
-+if test "x$ac_cv_func_sqrtl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SQRTL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _sqrtl declaration" >&5
-+$as_echo_n "checking for _sqrtl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__sqrtl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__sqrtl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _sqrtl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__sqrtl_use=yes
-+else
-+  glibcxx_cv_func__sqrtl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__sqrtl_use" >&5
-+$as_echo "$glibcxx_cv_func__sqrtl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__sqrtl_use = x"yes"; then
-+      for ac_func in _sqrtl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_sqrtl" "ac_cv_func__sqrtl"
-+if test "x$ac_cv_func__sqrtl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__SQRTL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincosl declaration" >&5
-+$as_echo_n "checking for sincosl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_sincosl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_sincosl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ sincosl(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_sincosl_use=yes
-+else
-+  glibcxx_cv_func_sincosl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_sincosl_use" >&5
-+$as_echo "$glibcxx_cv_func_sincosl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_sincosl_use = x"yes"; then
-+    for ac_func in sincosl
-+do :
-+  ac_fn_c_check_func "$LINENO" "sincosl" "ac_cv_func_sincosl"
-+if test "x$ac_cv_func_sincosl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SINCOSL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _sincosl declaration" >&5
-+$as_echo_n "checking for _sincosl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__sincosl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__sincosl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _sincosl(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__sincosl_use=yes
-+else
-+  glibcxx_cv_func__sincosl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__sincosl_use" >&5
-+$as_echo "$glibcxx_cv_func__sincosl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__sincosl_use = x"yes"; then
-+      for ac_func in _sincosl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_sincosl" "ac_cv_func__sincosl"
-+if test "x$ac_cv_func__sincosl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__SINCOSL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for finitel declaration" >&5
-+$as_echo_n "checking for finitel declaration... " >&6; }
-+  if test x${glibcxx_cv_func_finitel_use+set} != xset; then
-+    if test "${glibcxx_cv_func_finitel_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ finitel(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_finitel_use=yes
-+else
-+  glibcxx_cv_func_finitel_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_finitel_use" >&5
-+$as_echo "$glibcxx_cv_func_finitel_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_finitel_use = x"yes"; then
-+    for ac_func in finitel
-+do :
-+  ac_fn_c_check_func "$LINENO" "finitel" "ac_cv_func_finitel"
-+if test "x$ac_cv_func_finitel" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FINITEL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _finitel declaration" >&5
-+$as_echo_n "checking for _finitel declaration... " >&6; }
-+  if test x${glibcxx_cv_func__finitel_use+set} != xset; then
-+    if test "${glibcxx_cv_func__finitel_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _finitel(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__finitel_use=yes
-+else
-+  glibcxx_cv_func__finitel_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__finitel_use" >&5
-+$as_echo "$glibcxx_cv_func__finitel_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__finitel_use = x"yes"; then
-+      for ac_func in _finitel
-+do :
-+  ac_fn_c_check_func "$LINENO" "_finitel" "ac_cv_func__finitel"
-+if test "x$ac_cv_func__finitel" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FINITEL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+  LIBS="$ac_save_LIBS"
-+  CXXFLAGS="$ac_save_CXXFLAGS"
-+
-+
-+  ac_test_CXXFLAGS="${CXXFLAGS+set}"
-+  ac_save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS='-fno-builtin -D_GNU_SOURCE'
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtold declaration" >&5
-+$as_echo_n "checking for strtold declaration... " >&6; }
-+  if test x${glibcxx_cv_func_strtold_use+set} != xset; then
-+    if test "${glibcxx_cv_func_strtold_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+ strtold(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_strtold_use=yes
-+else
-+  glibcxx_cv_func_strtold_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_strtold_use" >&5
-+$as_echo "$glibcxx_cv_func_strtold_use" >&6; }
-+  if test x$glibcxx_cv_func_strtold_use = x"yes"; then
-+    for ac_func in strtold
-+do :
-+  ac_fn_c_check_func "$LINENO" "strtold" "ac_cv_func_strtold"
-+if test "x$ac_cv_func_strtold" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRTOLD 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  fi
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtof declaration" >&5
-+$as_echo_n "checking for strtof declaration... " >&6; }
-+  if test x${glibcxx_cv_func_strtof_use+set} != xset; then
-+    if test "${glibcxx_cv_func_strtof_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+ strtof(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_strtof_use=yes
-+else
-+  glibcxx_cv_func_strtof_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_strtof_use" >&5
-+$as_echo "$glibcxx_cv_func_strtof_use" >&6; }
-+  if test x$glibcxx_cv_func_strtof_use = x"yes"; then
-+    for ac_func in strtof
-+do :
-+  ac_fn_c_check_func "$LINENO" "strtof" "ac_cv_func_strtof"
-+if test "x$ac_cv_func_strtof" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRTOF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  fi
-+
-+
-+
-+
-+  CXXFLAGS="$ac_save_CXXFLAGS"
-+
-+    ;;
-   *-solaris*)
-     case "$target" in
-       *-solaris2.7 | *-solaris2.8 | *-solaris2.9 | *-solaris2.10)
-diff -Naur gcc-4.5.3.orig/libstdc++-v3/crossconfig.m4 gcc-4.5.3/libstdc++-v3/crossconfig.m4
---- gcc-4.5.3.orig/libstdc++-v3/crossconfig.m4	2009-06-02 21:15:03.000000000 +0200
-+++ gcc-4.5.3/libstdc++-v3/crossconfig.m4	2011-04-26 08:02:07.905785297 +0200
-@@ -198,6 +198,12 @@
-     AC_DEFINE(HAVE_SINHF)
-     AC_DEFINE(HAVE_SINHL)
-     ;;
-+  *-rtems*)
-+    GLIBCXX_CHECK_COMPILER_FEATURES
-+    GLIBCXX_CHECK_LINKER_FEATURES
-+    GLIBCXX_CHECK_MATH_SUPPORT
-+    GLIBCXX_CHECK_STDLIB_SUPPORT
-+    ;;
-   *-solaris*)
-     case "$target" in
-       *-solaris2.7 | *-solaris2.8 | *-solaris2.9 | *-solaris2.10)
diff --git a/contrib/crossrpms/patches/gcc-g++-4.5.3-rtems4.11-20110905.diff b/contrib/crossrpms/patches/gcc-g++-4.5.3-rtems4.11-20110905.diff
deleted file mode 100644
index d7f6e69..0000000
--- a/contrib/crossrpms/patches/gcc-g++-4.5.3-rtems4.11-20110905.diff
+++ /dev/null
@@ -1,5887 +0,0 @@
-diff -Naur gcc-4.5.3.orig/libstdc++-v3/configure gcc-4.5.3/libstdc++-v3/configure
---- gcc-4.5.3.orig/libstdc++-v3/configure	2010-08-27 20:25:00.000000000 +0200
-+++ gcc-4.5.3/libstdc++-v3/configure	2011-09-05 17:43:13.870942400 +0200
-@@ -57089,6 +57089,5867 @@
-     $as_echo "#define HAVE_SINHL 1" >>confdefs.h
- 
-     ;;
-+  *-rtems*)
-+
-+  # All these tests are for C++; save the language and the compiler flags.
-+  # The CXXFLAGS thing is suspicious, but based on similar bits previously
-+  # found in GLIBCXX_CONFIGURE.
-+
-+  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+  ac_test_CXXFLAGS="${CXXFLAGS+set}"
-+  ac_save_CXXFLAGS="$CXXFLAGS"
-+
-+  # Check for maintainer-mode bits.
-+  if test x"$USE_MAINTAINER_MODE" = xno; then
-+    WERROR=''
-+  else
-+    WERROR='-Werror'
-+  fi
-+
-+  # Check for -ffunction-sections -fdata-sections
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for g++ that supports -ffunction-sections -fdata-sections" >&5
-+$as_echo_n "checking for g++ that supports -ffunction-sections -fdata-sections... " >&6; }
-+  CXXFLAGS='-g -Werror -ffunction-sections -fdata-sections'
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int foo; void bar() { };
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_fdsections=yes
-+else
-+  ac_fdsections=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  if test "$ac_test_CXXFLAGS" = set; then
-+    CXXFLAGS="$ac_save_CXXFLAGS"
-+  else
-+    # this is the suspicious part
-+    CXXFLAGS=''
-+  fi
-+  if test x"$ac_fdsections" = x"yes"; then
-+    SECTION_FLAGS='-ffunction-sections -fdata-sections'
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_fdsections" >&5
-+$as_echo "$ac_fdsections" >&6; }
-+
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+  # If we're not using GNU ld, then there's no point in even trying these
-+  # tests.  Check for that first.  We should have already tested for gld
-+  # by now (in libtool), but require it now just to be safe...
-+  test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS=''
-+  test -z "$OPT_LDFLAGS" && OPT_LDFLAGS=''
-+
-+
-+
-+  # The name set by libtool depends on the version of libtool.  Shame on us
-+  # for depending on an impl detail, but c'est la vie.  Older versions used
-+  # ac_cv_prog_gnu_ld, but now it's lt_cv_prog_gnu_ld, and is copied back on
-+  # top of with_gnu_ld (which is also set by --with-gnu-ld, so that actually
-+  # makes sense).  We'll test with_gnu_ld everywhere else, so if that isn't
-+  # set (hence we're using an older libtool), then set it.
-+  if test x${with_gnu_ld+set} != xset; then
-+    if test x${ac_cv_prog_gnu_ld+set} != xset; then
-+      # We got through "ac_require(ac_prog_ld)" and still not set?  Huh?
-+      with_gnu_ld=no
-+    else
-+      with_gnu_ld=$ac_cv_prog_gnu_ld
-+    fi
-+  fi
-+
-+  # Start by getting the version number.  I think the libtool test already
-+  # does some of this, but throws away the result.
-+  glibcxx_ld_is_gold=no
-+  if test x"$with_gnu_ld" = x"yes"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld version" >&5
-+$as_echo_n "checking for ld version... " >&6; }
-+
-+    if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
-+      glibcxx_ld_is_gold=yes
-+    fi
-+    ldver=`$LD --version 2>/dev/null |
-+	   sed -e 's/GNU gold /GNU ld /;s/GNU ld version /GNU ld /;s/GNU ld ([^)]*) /GNU ld /;s/GNU ld \([0-9.][0-9.]*\).*/\1/; q'`
-+
-+    glibcxx_gnu_ld_version=`echo $ldver | \
-+           $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_gnu_ld_version" >&5
-+$as_echo "$glibcxx_gnu_ld_version" >&6; }
-+  fi
-+
-+  # Set --gc-sections.
-+  glibcxx_have_gc_sections=no
-+  if test "$glibcxx_ld_is_gold" = "yes"; then
-+    if $LD --help 2>/dev/null | grep gc-sections >/dev/null 2>&1; then
-+      glibcxx_have_gc_sections=yes
-+    fi
-+  else
-+    glibcxx_gcsections_min_ld=21602
-+    if test x"$with_gnu_ld" = x"yes" &&
-+	test $glibcxx_gnu_ld_version -gt $glibcxx_gcsections_min_ld ; then
-+      glibcxx_have_gc_sections=yes
-+    fi
-+  fi
-+  if test "$glibcxx_have_gc_sections" = "yes"; then
-+    # Sufficiently young GNU ld it is!  Joy and bunny rabbits!
-+    # NB: This flag only works reliably after 2.16.1. Configure tests
-+    # for this are difficult, so hard wire a value that should work.
-+
-+    ac_test_CFLAGS="${CFLAGS+set}"
-+    ac_save_CFLAGS="$CFLAGS"
-+    CFLAGS='-Wl,--gc-sections'
-+
-+    # Check for -Wl,--gc-sections
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,--gc-sections" >&5
-+$as_echo_n "checking for ld that supports -Wl,--gc-sections... " >&6; }
-+    if test x$gcc_no_link = xyes; then
-+  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-+fi
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+ int one(void) { return 1; }
-+     int two(void) { return 2; }
-+
-+int
-+main ()
-+{
-+ two();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_gcsections=yes
-+else
-+  ac_gcsections=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+    if test "$ac_gcsections" = "yes"; then
-+      rm -f conftest.c
-+      touch conftest.c
-+      if $CC -c conftest.c; then
-+	if $LD --gc-sections -o conftest conftest.o 2>&1 | \
-+	   grep "Warning: gc-sections option ignored" > /dev/null; then
-+	  ac_gcsections=no
-+	fi
-+      fi
-+      rm -f conftest.c conftest.o conftest
-+    fi
-+    if test "$ac_gcsections" = "yes"; then
-+      SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
-+    fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5
-+$as_echo "$ac_gcsections" >&6; }
-+
-+    if test "$ac_test_CFLAGS" = set; then
-+      CFLAGS="$ac_save_CFLAGS"
-+    else
-+      # this is the suspicious part
-+      CFLAGS=''
-+    fi
-+  fi
-+
-+  # Set -z,relro.
-+  # Note this is only for shared objects.
-+  ac_ld_relro=no
-+  if test x"$with_gnu_ld" = x"yes"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
-+$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
-+    cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
-+    if test -n "$cxx_z_relo"; then
-+      OPT_LDFLAGS="-Wl,-z,relro"
-+      ac_ld_relro=yes
-+    fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ld_relro" >&5
-+$as_echo "$ac_ld_relro" >&6; }
-+  fi
-+
-+  # Set linker optimization flags.
-+  if test x"$with_gnu_ld" = x"yes"; then
-+    OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
-+  fi
-+
-+
-+
-+
-+
-+  ac_test_CXXFLAGS="${CXXFLAGS+set}"
-+  ac_save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS='-fno-builtin -D_GNU_SOURCE'
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
-+$as_echo_n "checking for sin in -lm... " >&6; }
-+if test "${ac_cv_lib_m_sin+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm  $LIBS"
-+if test x$gcc_no_link = xyes; then
-+  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
-+fi
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char sin ();
-+int
-+main ()
-+{
-+return sin ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_m_sin=yes
-+else
-+  ac_cv_lib_m_sin=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
-+$as_echo "$ac_cv_lib_m_sin" >&6; }
-+if test "x$ac_cv_lib_m_sin" = x""yes; then :
-+  libm="-lm"
-+fi
-+
-+  ac_save_LIBS="$LIBS"
-+  LIBS="$LIBS $libm"
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf declaration" >&5
-+$as_echo_n "checking for isinf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isinf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isinf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isinf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isinf_use=yes
-+else
-+  glibcxx_cv_func_isinf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isinf_use" >&5
-+$as_echo "$glibcxx_cv_func_isinf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isinf_use = x"yes"; then
-+    for ac_func in isinf
-+do :
-+  ac_fn_c_check_func "$LINENO" "isinf" "ac_cv_func_isinf"
-+if test "x$ac_cv_func_isinf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISINF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isinf declaration" >&5
-+$as_echo_n "checking for _isinf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isinf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isinf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isinf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isinf_use=yes
-+else
-+  glibcxx_cv_func__isinf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isinf_use" >&5
-+$as_echo "$glibcxx_cv_func__isinf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isinf_use = x"yes"; then
-+      for ac_func in _isinf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isinf" "ac_cv_func__isinf"
-+if test "x$ac_cv_func__isinf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISINF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan declaration" >&5
-+$as_echo_n "checking for isnan declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isnan_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isnan_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isnan(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isnan_use=yes
-+else
-+  glibcxx_cv_func_isnan_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isnan_use" >&5
-+$as_echo "$glibcxx_cv_func_isnan_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isnan_use = x"yes"; then
-+    for ac_func in isnan
-+do :
-+  ac_fn_c_check_func "$LINENO" "isnan" "ac_cv_func_isnan"
-+if test "x$ac_cv_func_isnan" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISNAN 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isnan declaration" >&5
-+$as_echo_n "checking for _isnan declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isnan_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isnan_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isnan(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isnan_use=yes
-+else
-+  glibcxx_cv_func__isnan_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isnan_use" >&5
-+$as_echo "$glibcxx_cv_func__isnan_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isnan_use = x"yes"; then
-+      for ac_func in _isnan
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isnan" "ac_cv_func__isnan"
-+if test "x$ac_cv_func__isnan" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISNAN 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for finite declaration" >&5
-+$as_echo_n "checking for finite declaration... " >&6; }
-+  if test x${glibcxx_cv_func_finite_use+set} != xset; then
-+    if test "${glibcxx_cv_func_finite_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ finite(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_finite_use=yes
-+else
-+  glibcxx_cv_func_finite_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_finite_use" >&5
-+$as_echo "$glibcxx_cv_func_finite_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_finite_use = x"yes"; then
-+    for ac_func in finite
-+do :
-+  ac_fn_c_check_func "$LINENO" "finite" "ac_cv_func_finite"
-+if test "x$ac_cv_func_finite" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FINITE 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _finite declaration" >&5
-+$as_echo_n "checking for _finite declaration... " >&6; }
-+  if test x${glibcxx_cv_func__finite_use+set} != xset; then
-+    if test "${glibcxx_cv_func__finite_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _finite(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__finite_use=yes
-+else
-+  glibcxx_cv_func__finite_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__finite_use" >&5
-+$as_echo "$glibcxx_cv_func__finite_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__finite_use = x"yes"; then
-+      for ac_func in _finite
-+do :
-+  ac_fn_c_check_func "$LINENO" "_finite" "ac_cv_func__finite"
-+if test "x$ac_cv_func__finite" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FINITE 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincos declaration" >&5
-+$as_echo_n "checking for sincos declaration... " >&6; }
-+  if test x${glibcxx_cv_func_sincos_use+set} != xset; then
-+    if test "${glibcxx_cv_func_sincos_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ sincos(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_sincos_use=yes
-+else
-+  glibcxx_cv_func_sincos_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_sincos_use" >&5
-+$as_echo "$glibcxx_cv_func_sincos_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_sincos_use = x"yes"; then
-+    for ac_func in sincos
-+do :
-+  ac_fn_c_check_func "$LINENO" "sincos" "ac_cv_func_sincos"
-+if test "x$ac_cv_func_sincos" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SINCOS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _sincos declaration" >&5
-+$as_echo_n "checking for _sincos declaration... " >&6; }
-+  if test x${glibcxx_cv_func__sincos_use+set} != xset; then
-+    if test "${glibcxx_cv_func__sincos_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _sincos(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__sincos_use=yes
-+else
-+  glibcxx_cv_func__sincos_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__sincos_use" >&5
-+$as_echo "$glibcxx_cv_func__sincos_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__sincos_use = x"yes"; then
-+      for ac_func in _sincos
-+do :
-+  ac_fn_c_check_func "$LINENO" "_sincos" "ac_cv_func__sincos"
-+if test "x$ac_cv_func__sincos" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__SINCOS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fpclass declaration" >&5
-+$as_echo_n "checking for fpclass declaration... " >&6; }
-+  if test x${glibcxx_cv_func_fpclass_use+set} != xset; then
-+    if test "${glibcxx_cv_func_fpclass_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ fpclass(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_fpclass_use=yes
-+else
-+  glibcxx_cv_func_fpclass_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_fpclass_use" >&5
-+$as_echo "$glibcxx_cv_func_fpclass_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_fpclass_use = x"yes"; then
-+    for ac_func in fpclass
-+do :
-+  ac_fn_c_check_func "$LINENO" "fpclass" "ac_cv_func_fpclass"
-+if test "x$ac_cv_func_fpclass" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FPCLASS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _fpclass declaration" >&5
-+$as_echo_n "checking for _fpclass declaration... " >&6; }
-+  if test x${glibcxx_cv_func__fpclass_use+set} != xset; then
-+    if test "${glibcxx_cv_func__fpclass_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _fpclass(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__fpclass_use=yes
-+else
-+  glibcxx_cv_func__fpclass_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__fpclass_use" >&5
-+$as_echo "$glibcxx_cv_func__fpclass_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__fpclass_use = x"yes"; then
-+      for ac_func in _fpclass
-+do :
-+  ac_fn_c_check_func "$LINENO" "_fpclass" "ac_cv_func__fpclass"
-+if test "x$ac_cv_func__fpclass" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FPCLASS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qfpclass declaration" >&5
-+$as_echo_n "checking for qfpclass declaration... " >&6; }
-+  if test x${glibcxx_cv_func_qfpclass_use+set} != xset; then
-+    if test "${glibcxx_cv_func_qfpclass_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ qfpclass(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_qfpclass_use=yes
-+else
-+  glibcxx_cv_func_qfpclass_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_qfpclass_use" >&5
-+$as_echo "$glibcxx_cv_func_qfpclass_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_qfpclass_use = x"yes"; then
-+    for ac_func in qfpclass
-+do :
-+  ac_fn_c_check_func "$LINENO" "qfpclass" "ac_cv_func_qfpclass"
-+if test "x$ac_cv_func_qfpclass" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_QFPCLASS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _qfpclass declaration" >&5
-+$as_echo_n "checking for _qfpclass declaration... " >&6; }
-+  if test x${glibcxx_cv_func__qfpclass_use+set} != xset; then
-+    if test "${glibcxx_cv_func__qfpclass_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _qfpclass(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__qfpclass_use=yes
-+else
-+  glibcxx_cv_func__qfpclass_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__qfpclass_use" >&5
-+$as_echo "$glibcxx_cv_func__qfpclass_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__qfpclass_use = x"yes"; then
-+      for ac_func in _qfpclass
-+do :
-+  ac_fn_c_check_func "$LINENO" "_qfpclass" "ac_cv_func__qfpclass"
-+if test "x$ac_cv_func__qfpclass" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__QFPCLASS 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hypot declaration" >&5
-+$as_echo_n "checking for hypot declaration... " >&6; }
-+  if test x${glibcxx_cv_func_hypot_use+set} != xset; then
-+    if test "${glibcxx_cv_func_hypot_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ hypot(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_hypot_use=yes
-+else
-+  glibcxx_cv_func_hypot_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_hypot_use" >&5
-+$as_echo "$glibcxx_cv_func_hypot_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_hypot_use = x"yes"; then
-+    for ac_func in hypot
-+do :
-+  ac_fn_c_check_func "$LINENO" "hypot" "ac_cv_func_hypot"
-+if test "x$ac_cv_func_hypot" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_HYPOT 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _hypot declaration" >&5
-+$as_echo_n "checking for _hypot declaration... " >&6; }
-+  if test x${glibcxx_cv_func__hypot_use+set} != xset; then
-+    if test "${glibcxx_cv_func__hypot_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _hypot(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__hypot_use=yes
-+else
-+  glibcxx_cv_func__hypot_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__hypot_use" >&5
-+$as_echo "$glibcxx_cv_func__hypot_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__hypot_use = x"yes"; then
-+      for ac_func in _hypot
-+do :
-+  ac_fn_c_check_func "$LINENO" "_hypot" "ac_cv_func__hypot"
-+if test "x$ac_cv_func__hypot" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__HYPOT 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for float trig functions" >&5
-+$as_echo_n "checking for float trig functions... " >&6; }
-+  if test "${glibcxx_cv_func_float_trig_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+acosf (0); asinf (0); atanf (0); cosf (0); sinf (0); tanf (0); coshf (0); sinhf (0); tanhf (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_float_trig_use=yes
-+else
-+  glibcxx_cv_func_float_trig_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_float_trig_use" >&5
-+$as_echo "$glibcxx_cv_func_float_trig_use" >&6; }
-+  if test x$glibcxx_cv_func_float_trig_use = x"yes"; then
-+    for ac_func in acosf asinf atanf cosf sinf tanf coshf sinhf tanhf
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _float trig functions" >&5
-+$as_echo_n "checking for _float trig functions... " >&6; }
-+    if test "${glibcxx_cv_func__float_trig_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+_acosf (0); _asinf (0); _atanf (0); _cosf (0); _sinf (0); _tanf (0); _coshf (0); _sinhf (0); _tanhf (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__float_trig_use=yes
-+else
-+  glibcxx_cv_func__float_trig_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__float_trig_use" >&5
-+$as_echo "$glibcxx_cv_func__float_trig_use" >&6; }
-+    if test x$glibcxx_cv_func__float_trig_use = x"yes"; then
-+      for ac_func in _acosf _asinf _atanf _cosf _sinf _tanf _coshf _sinhf _tanhf
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for float round functions" >&5
-+$as_echo_n "checking for float round functions... " >&6; }
-+  if test "${glibcxx_cv_func_float_round_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ceilf (0); floorf (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_float_round_use=yes
-+else
-+  glibcxx_cv_func_float_round_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_float_round_use" >&5
-+$as_echo "$glibcxx_cv_func_float_round_use" >&6; }
-+  if test x$glibcxx_cv_func_float_round_use = x"yes"; then
-+    for ac_func in ceilf floorf
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _float round functions" >&5
-+$as_echo_n "checking for _float round functions... " >&6; }
-+    if test "${glibcxx_cv_func__float_round_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+_ceilf (0); _floorf (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__float_round_use=yes
-+else
-+  glibcxx_cv_func__float_round_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__float_round_use" >&5
-+$as_echo "$glibcxx_cv_func__float_round_use" >&6; }
-+    if test x$glibcxx_cv_func__float_round_use = x"yes"; then
-+      for ac_func in _ceilf _floorf
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for expf declaration" >&5
-+$as_echo_n "checking for expf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_expf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_expf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ expf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_expf_use=yes
-+else
-+  glibcxx_cv_func_expf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_expf_use" >&5
-+$as_echo "$glibcxx_cv_func_expf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_expf_use = x"yes"; then
-+    for ac_func in expf
-+do :
-+  ac_fn_c_check_func "$LINENO" "expf" "ac_cv_func_expf"
-+if test "x$ac_cv_func_expf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_EXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _expf declaration" >&5
-+$as_echo_n "checking for _expf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__expf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__expf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _expf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__expf_use=yes
-+else
-+  glibcxx_cv_func__expf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__expf_use" >&5
-+$as_echo "$glibcxx_cv_func__expf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__expf_use = x"yes"; then
-+      for ac_func in _expf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_expf" "ac_cv_func__expf"
-+if test "x$ac_cv_func__expf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__EXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnanf declaration" >&5
-+$as_echo_n "checking for isnanf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isnanf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isnanf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isnanf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isnanf_use=yes
-+else
-+  glibcxx_cv_func_isnanf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isnanf_use" >&5
-+$as_echo "$glibcxx_cv_func_isnanf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isnanf_use = x"yes"; then
-+    for ac_func in isnanf
-+do :
-+  ac_fn_c_check_func "$LINENO" "isnanf" "ac_cv_func_isnanf"
-+if test "x$ac_cv_func_isnanf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISNANF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isnanf declaration" >&5
-+$as_echo_n "checking for _isnanf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isnanf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isnanf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isnanf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isnanf_use=yes
-+else
-+  glibcxx_cv_func__isnanf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isnanf_use" >&5
-+$as_echo "$glibcxx_cv_func__isnanf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isnanf_use = x"yes"; then
-+      for ac_func in _isnanf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isnanf" "ac_cv_func__isnanf"
-+if test "x$ac_cv_func__isnanf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISNANF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinff declaration" >&5
-+$as_echo_n "checking for isinff declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isinff_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isinff_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isinff(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isinff_use=yes
-+else
-+  glibcxx_cv_func_isinff_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isinff_use" >&5
-+$as_echo "$glibcxx_cv_func_isinff_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isinff_use = x"yes"; then
-+    for ac_func in isinff
-+do :
-+  ac_fn_c_check_func "$LINENO" "isinff" "ac_cv_func_isinff"
-+if test "x$ac_cv_func_isinff" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISINFF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isinff declaration" >&5
-+$as_echo_n "checking for _isinff declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isinff_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isinff_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isinff(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isinff_use=yes
-+else
-+  glibcxx_cv_func__isinff_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isinff_use" >&5
-+$as_echo "$glibcxx_cv_func__isinff_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isinff_use = x"yes"; then
-+      for ac_func in _isinff
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isinff" "ac_cv_func__isinff"
-+if test "x$ac_cv_func__isinff" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISINFF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atan2f declaration" >&5
-+$as_echo_n "checking for atan2f declaration... " >&6; }
-+  if test x${glibcxx_cv_func_atan2f_use+set} != xset; then
-+    if test "${glibcxx_cv_func_atan2f_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ atan2f(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_atan2f_use=yes
-+else
-+  glibcxx_cv_func_atan2f_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_atan2f_use" >&5
-+$as_echo "$glibcxx_cv_func_atan2f_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_atan2f_use = x"yes"; then
-+    for ac_func in atan2f
-+do :
-+  ac_fn_c_check_func "$LINENO" "atan2f" "ac_cv_func_atan2f"
-+if test "x$ac_cv_func_atan2f" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ATAN2F 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _atan2f declaration" >&5
-+$as_echo_n "checking for _atan2f declaration... " >&6; }
-+  if test x${glibcxx_cv_func__atan2f_use+set} != xset; then
-+    if test "${glibcxx_cv_func__atan2f_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _atan2f(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__atan2f_use=yes
-+else
-+  glibcxx_cv_func__atan2f_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__atan2f_use" >&5
-+$as_echo "$glibcxx_cv_func__atan2f_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__atan2f_use = x"yes"; then
-+      for ac_func in _atan2f
-+do :
-+  ac_fn_c_check_func "$LINENO" "_atan2f" "ac_cv_func__atan2f"
-+if test "x$ac_cv_func__atan2f" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ATAN2F 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fabsf declaration" >&5
-+$as_echo_n "checking for fabsf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_fabsf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_fabsf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ fabsf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_fabsf_use=yes
-+else
-+  glibcxx_cv_func_fabsf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_fabsf_use" >&5
-+$as_echo "$glibcxx_cv_func_fabsf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_fabsf_use = x"yes"; then
-+    for ac_func in fabsf
-+do :
-+  ac_fn_c_check_func "$LINENO" "fabsf" "ac_cv_func_fabsf"
-+if test "x$ac_cv_func_fabsf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FABSF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _fabsf declaration" >&5
-+$as_echo_n "checking for _fabsf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__fabsf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__fabsf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _fabsf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__fabsf_use=yes
-+else
-+  glibcxx_cv_func__fabsf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__fabsf_use" >&5
-+$as_echo "$glibcxx_cv_func__fabsf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__fabsf_use = x"yes"; then
-+      for ac_func in _fabsf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_fabsf" "ac_cv_func__fabsf"
-+if test "x$ac_cv_func__fabsf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FABSF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmodf declaration" >&5
-+$as_echo_n "checking for fmodf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_fmodf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_fmodf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ fmodf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_fmodf_use=yes
-+else
-+  glibcxx_cv_func_fmodf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_fmodf_use" >&5
-+$as_echo "$glibcxx_cv_func_fmodf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_fmodf_use = x"yes"; then
-+    for ac_func in fmodf
-+do :
-+  ac_fn_c_check_func "$LINENO" "fmodf" "ac_cv_func_fmodf"
-+if test "x$ac_cv_func_fmodf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FMODF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _fmodf declaration" >&5
-+$as_echo_n "checking for _fmodf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__fmodf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__fmodf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _fmodf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__fmodf_use=yes
-+else
-+  glibcxx_cv_func__fmodf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__fmodf_use" >&5
-+$as_echo "$glibcxx_cv_func__fmodf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__fmodf_use = x"yes"; then
-+      for ac_func in _fmodf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_fmodf" "ac_cv_func__fmodf"
-+if test "x$ac_cv_func__fmodf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FMODF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for frexpf declaration" >&5
-+$as_echo_n "checking for frexpf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_frexpf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_frexpf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ frexpf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_frexpf_use=yes
-+else
-+  glibcxx_cv_func_frexpf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_frexpf_use" >&5
-+$as_echo "$glibcxx_cv_func_frexpf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_frexpf_use = x"yes"; then
-+    for ac_func in frexpf
-+do :
-+  ac_fn_c_check_func "$LINENO" "frexpf" "ac_cv_func_frexpf"
-+if test "x$ac_cv_func_frexpf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FREXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _frexpf declaration" >&5
-+$as_echo_n "checking for _frexpf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__frexpf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__frexpf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _frexpf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__frexpf_use=yes
-+else
-+  glibcxx_cv_func__frexpf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__frexpf_use" >&5
-+$as_echo "$glibcxx_cv_func__frexpf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__frexpf_use = x"yes"; then
-+      for ac_func in _frexpf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_frexpf" "ac_cv_func__frexpf"
-+if test "x$ac_cv_func__frexpf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FREXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hypotf declaration" >&5
-+$as_echo_n "checking for hypotf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_hypotf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_hypotf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ hypotf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_hypotf_use=yes
-+else
-+  glibcxx_cv_func_hypotf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_hypotf_use" >&5
-+$as_echo "$glibcxx_cv_func_hypotf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_hypotf_use = x"yes"; then
-+    for ac_func in hypotf
-+do :
-+  ac_fn_c_check_func "$LINENO" "hypotf" "ac_cv_func_hypotf"
-+if test "x$ac_cv_func_hypotf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_HYPOTF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _hypotf declaration" >&5
-+$as_echo_n "checking for _hypotf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__hypotf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__hypotf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _hypotf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__hypotf_use=yes
-+else
-+  glibcxx_cv_func__hypotf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__hypotf_use" >&5
-+$as_echo "$glibcxx_cv_func__hypotf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__hypotf_use = x"yes"; then
-+      for ac_func in _hypotf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_hypotf" "ac_cv_func__hypotf"
-+if test "x$ac_cv_func__hypotf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__HYPOTF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldexpf declaration" >&5
-+$as_echo_n "checking for ldexpf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_ldexpf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_ldexpf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ ldexpf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_ldexpf_use=yes
-+else
-+  glibcxx_cv_func_ldexpf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_ldexpf_use" >&5
-+$as_echo "$glibcxx_cv_func_ldexpf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_ldexpf_use = x"yes"; then
-+    for ac_func in ldexpf
-+do :
-+  ac_fn_c_check_func "$LINENO" "ldexpf" "ac_cv_func_ldexpf"
-+if test "x$ac_cv_func_ldexpf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LDEXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ldexpf declaration" >&5
-+$as_echo_n "checking for _ldexpf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__ldexpf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__ldexpf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _ldexpf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__ldexpf_use=yes
-+else
-+  glibcxx_cv_func__ldexpf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__ldexpf_use" >&5
-+$as_echo "$glibcxx_cv_func__ldexpf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__ldexpf_use = x"yes"; then
-+      for ac_func in _ldexpf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_ldexpf" "ac_cv_func__ldexpf"
-+if test "x$ac_cv_func__ldexpf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LDEXPF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for logf declaration" >&5
-+$as_echo_n "checking for logf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_logf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_logf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ logf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_logf_use=yes
-+else
-+  glibcxx_cv_func_logf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_logf_use" >&5
-+$as_echo "$glibcxx_cv_func_logf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_logf_use = x"yes"; then
-+    for ac_func in logf
-+do :
-+  ac_fn_c_check_func "$LINENO" "logf" "ac_cv_func_logf"
-+if test "x$ac_cv_func_logf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LOGF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _logf declaration" >&5
-+$as_echo_n "checking for _logf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__logf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__logf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _logf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__logf_use=yes
-+else
-+  glibcxx_cv_func__logf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__logf_use" >&5
-+$as_echo "$glibcxx_cv_func__logf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__logf_use = x"yes"; then
-+      for ac_func in _logf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_logf" "ac_cv_func__logf"
-+if test "x$ac_cv_func__logf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LOGF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log10f declaration" >&5
-+$as_echo_n "checking for log10f declaration... " >&6; }
-+  if test x${glibcxx_cv_func_log10f_use+set} != xset; then
-+    if test "${glibcxx_cv_func_log10f_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ log10f(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_log10f_use=yes
-+else
-+  glibcxx_cv_func_log10f_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_log10f_use" >&5
-+$as_echo "$glibcxx_cv_func_log10f_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_log10f_use = x"yes"; then
-+    for ac_func in log10f
-+do :
-+  ac_fn_c_check_func "$LINENO" "log10f" "ac_cv_func_log10f"
-+if test "x$ac_cv_func_log10f" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LOG10F 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _log10f declaration" >&5
-+$as_echo_n "checking for _log10f declaration... " >&6; }
-+  if test x${glibcxx_cv_func__log10f_use+set} != xset; then
-+    if test "${glibcxx_cv_func__log10f_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _log10f(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__log10f_use=yes
-+else
-+  glibcxx_cv_func__log10f_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__log10f_use" >&5
-+$as_echo "$glibcxx_cv_func__log10f_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__log10f_use = x"yes"; then
-+      for ac_func in _log10f
-+do :
-+  ac_fn_c_check_func "$LINENO" "_log10f" "ac_cv_func__log10f"
-+if test "x$ac_cv_func__log10f" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LOG10F 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for modff declaration" >&5
-+$as_echo_n "checking for modff declaration... " >&6; }
-+  if test x${glibcxx_cv_func_modff_use+set} != xset; then
-+    if test "${glibcxx_cv_func_modff_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ modff(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_modff_use=yes
-+else
-+  glibcxx_cv_func_modff_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_modff_use" >&5
-+$as_echo "$glibcxx_cv_func_modff_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_modff_use = x"yes"; then
-+    for ac_func in modff
-+do :
-+  ac_fn_c_check_func "$LINENO" "modff" "ac_cv_func_modff"
-+if test "x$ac_cv_func_modff" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_MODFF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _modff declaration" >&5
-+$as_echo_n "checking for _modff declaration... " >&6; }
-+  if test x${glibcxx_cv_func__modff_use+set} != xset; then
-+    if test "${glibcxx_cv_func__modff_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _modff(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__modff_use=yes
-+else
-+  glibcxx_cv_func__modff_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__modff_use" >&5
-+$as_echo "$glibcxx_cv_func__modff_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__modff_use = x"yes"; then
-+      for ac_func in _modff
-+do :
-+  ac_fn_c_check_func "$LINENO" "_modff" "ac_cv_func__modff"
-+if test "x$ac_cv_func__modff" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__MODFF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for modf declaration" >&5
-+$as_echo_n "checking for modf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_modf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_modf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ modf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_modf_use=yes
-+else
-+  glibcxx_cv_func_modf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_modf_use" >&5
-+$as_echo "$glibcxx_cv_func_modf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_modf_use = x"yes"; then
-+    for ac_func in modf
-+do :
-+  ac_fn_c_check_func "$LINENO" "modf" "ac_cv_func_modf"
-+if test "x$ac_cv_func_modf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_MODF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _modf declaration" >&5
-+$as_echo_n "checking for _modf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__modf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__modf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _modf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__modf_use=yes
-+else
-+  glibcxx_cv_func__modf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__modf_use" >&5
-+$as_echo "$glibcxx_cv_func__modf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__modf_use = x"yes"; then
-+      for ac_func in _modf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_modf" "ac_cv_func__modf"
-+if test "x$ac_cv_func__modf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__MODF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for powf declaration" >&5
-+$as_echo_n "checking for powf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_powf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_powf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ powf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_powf_use=yes
-+else
-+  glibcxx_cv_func_powf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_powf_use" >&5
-+$as_echo "$glibcxx_cv_func_powf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_powf_use = x"yes"; then
-+    for ac_func in powf
-+do :
-+  ac_fn_c_check_func "$LINENO" "powf" "ac_cv_func_powf"
-+if test "x$ac_cv_func_powf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_POWF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _powf declaration" >&5
-+$as_echo_n "checking for _powf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__powf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__powf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _powf(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__powf_use=yes
-+else
-+  glibcxx_cv_func__powf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__powf_use" >&5
-+$as_echo "$glibcxx_cv_func__powf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__powf_use = x"yes"; then
-+      for ac_func in _powf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_powf" "ac_cv_func__powf"
-+if test "x$ac_cv_func__powf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__POWF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrtf declaration" >&5
-+$as_echo_n "checking for sqrtf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_sqrtf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_sqrtf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ sqrtf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_sqrtf_use=yes
-+else
-+  glibcxx_cv_func_sqrtf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_sqrtf_use" >&5
-+$as_echo "$glibcxx_cv_func_sqrtf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_sqrtf_use = x"yes"; then
-+    for ac_func in sqrtf
-+do :
-+  ac_fn_c_check_func "$LINENO" "sqrtf" "ac_cv_func_sqrtf"
-+if test "x$ac_cv_func_sqrtf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SQRTF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _sqrtf declaration" >&5
-+$as_echo_n "checking for _sqrtf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__sqrtf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__sqrtf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _sqrtf(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__sqrtf_use=yes
-+else
-+  glibcxx_cv_func__sqrtf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__sqrtf_use" >&5
-+$as_echo "$glibcxx_cv_func__sqrtf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__sqrtf_use = x"yes"; then
-+      for ac_func in _sqrtf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_sqrtf" "ac_cv_func__sqrtf"
-+if test "x$ac_cv_func__sqrtf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__SQRTF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincosf declaration" >&5
-+$as_echo_n "checking for sincosf declaration... " >&6; }
-+  if test x${glibcxx_cv_func_sincosf_use+set} != xset; then
-+    if test "${glibcxx_cv_func_sincosf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ sincosf(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_sincosf_use=yes
-+else
-+  glibcxx_cv_func_sincosf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_sincosf_use" >&5
-+$as_echo "$glibcxx_cv_func_sincosf_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_sincosf_use = x"yes"; then
-+    for ac_func in sincosf
-+do :
-+  ac_fn_c_check_func "$LINENO" "sincosf" "ac_cv_func_sincosf"
-+if test "x$ac_cv_func_sincosf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SINCOSF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _sincosf declaration" >&5
-+$as_echo_n "checking for _sincosf declaration... " >&6; }
-+  if test x${glibcxx_cv_func__sincosf_use+set} != xset; then
-+    if test "${glibcxx_cv_func__sincosf_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _sincosf(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__sincosf_use=yes
-+else
-+  glibcxx_cv_func__sincosf_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__sincosf_use" >&5
-+$as_echo "$glibcxx_cv_func__sincosf_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__sincosf_use = x"yes"; then
-+      for ac_func in _sincosf
-+do :
-+  ac_fn_c_check_func "$LINENO" "_sincosf" "ac_cv_func__sincosf"
-+if test "x$ac_cv_func__sincosf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__SINCOSF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for finitef declaration" >&5
-+$as_echo_n "checking for finitef declaration... " >&6; }
-+  if test x${glibcxx_cv_func_finitef_use+set} != xset; then
-+    if test "${glibcxx_cv_func_finitef_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ finitef(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_finitef_use=yes
-+else
-+  glibcxx_cv_func_finitef_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_finitef_use" >&5
-+$as_echo "$glibcxx_cv_func_finitef_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_finitef_use = x"yes"; then
-+    for ac_func in finitef
-+do :
-+  ac_fn_c_check_func "$LINENO" "finitef" "ac_cv_func_finitef"
-+if test "x$ac_cv_func_finitef" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FINITEF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _finitef declaration" >&5
-+$as_echo_n "checking for _finitef declaration... " >&6; }
-+  if test x${glibcxx_cv_func__finitef_use+set} != xset; then
-+    if test "${glibcxx_cv_func__finitef_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _finitef(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__finitef_use=yes
-+else
-+  glibcxx_cv_func__finitef_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__finitef_use" >&5
-+$as_echo "$glibcxx_cv_func__finitef_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__finitef_use = x"yes"; then
-+      for ac_func in _finitef
-+do :
-+  ac_fn_c_check_func "$LINENO" "_finitef" "ac_cv_func__finitef"
-+if test "x$ac_cv_func__finitef" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FINITEF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double trig functions" >&5
-+$as_echo_n "checking for long double trig functions... " >&6; }
-+  if test "${glibcxx_cv_func_long_double_trig_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+acosl (0); asinl (0); atanl (0); cosl (0); sinl (0); tanl (0); coshl (0); sinhl (0); tanhl (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_long_double_trig_use=yes
-+else
-+  glibcxx_cv_func_long_double_trig_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_long_double_trig_use" >&5
-+$as_echo "$glibcxx_cv_func_long_double_trig_use" >&6; }
-+  if test x$glibcxx_cv_func_long_double_trig_use = x"yes"; then
-+    for ac_func in acosl asinl atanl cosl sinl tanl coshl sinhl tanhl
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _long double trig functions" >&5
-+$as_echo_n "checking for _long double trig functions... " >&6; }
-+    if test "${glibcxx_cv_func__long_double_trig_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+_acosl (0); _asinl (0); _atanl (0); _cosl (0); _sinl (0); _tanl (0); _coshl (0); _sinhl (0); _tanhl (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__long_double_trig_use=yes
-+else
-+  glibcxx_cv_func__long_double_trig_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__long_double_trig_use" >&5
-+$as_echo "$glibcxx_cv_func__long_double_trig_use" >&6; }
-+    if test x$glibcxx_cv_func__long_double_trig_use = x"yes"; then
-+      for ac_func in _acosl _asinl _atanl _cosl _sinl _tanl _coshl _sinhl _tanhl
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double round functions" >&5
-+$as_echo_n "checking for long double round functions... " >&6; }
-+  if test "${glibcxx_cv_func_long_double_round_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ceill (0); floorl (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_long_double_round_use=yes
-+else
-+  glibcxx_cv_func_long_double_round_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_long_double_round_use" >&5
-+$as_echo "$glibcxx_cv_func_long_double_round_use" >&6; }
-+  if test x$glibcxx_cv_func_long_double_round_use = x"yes"; then
-+    for ac_func in ceill floorl
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _long double round functions" >&5
-+$as_echo_n "checking for _long double round functions... " >&6; }
-+    if test "${glibcxx_cv_func__long_double_round_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+_ceill (0); _floorl (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__long_double_round_use=yes
-+else
-+  glibcxx_cv_func__long_double_round_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__long_double_round_use" >&5
-+$as_echo "$glibcxx_cv_func__long_double_round_use" >&6; }
-+    if test x$glibcxx_cv_func__long_double_round_use = x"yes"; then
-+      for ac_func in _ceill _floorl
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnanl declaration" >&5
-+$as_echo_n "checking for isnanl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isnanl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isnanl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isnanl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isnanl_use=yes
-+else
-+  glibcxx_cv_func_isnanl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isnanl_use" >&5
-+$as_echo "$glibcxx_cv_func_isnanl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isnanl_use = x"yes"; then
-+    for ac_func in isnanl
-+do :
-+  ac_fn_c_check_func "$LINENO" "isnanl" "ac_cv_func_isnanl"
-+if test "x$ac_cv_func_isnanl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISNANL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isnanl declaration" >&5
-+$as_echo_n "checking for _isnanl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isnanl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isnanl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isnanl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isnanl_use=yes
-+else
-+  glibcxx_cv_func__isnanl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isnanl_use" >&5
-+$as_echo "$glibcxx_cv_func__isnanl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isnanl_use = x"yes"; then
-+      for ac_func in _isnanl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isnanl" "ac_cv_func__isnanl"
-+if test "x$ac_cv_func__isnanl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISNANL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinfl declaration" >&5
-+$as_echo_n "checking for isinfl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_isinfl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_isinfl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ isinfl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_isinfl_use=yes
-+else
-+  glibcxx_cv_func_isinfl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_isinfl_use" >&5
-+$as_echo "$glibcxx_cv_func_isinfl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_isinfl_use = x"yes"; then
-+    for ac_func in isinfl
-+do :
-+  ac_fn_c_check_func "$LINENO" "isinfl" "ac_cv_func_isinfl"
-+if test "x$ac_cv_func_isinfl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ISINFL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _isinfl declaration" >&5
-+$as_echo_n "checking for _isinfl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__isinfl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__isinfl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _isinfl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__isinfl_use=yes
-+else
-+  glibcxx_cv_func__isinfl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__isinfl_use" >&5
-+$as_echo "$glibcxx_cv_func__isinfl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__isinfl_use = x"yes"; then
-+      for ac_func in _isinfl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_isinfl" "ac_cv_func__isinfl"
-+if test "x$ac_cv_func__isinfl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ISINFL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atan2l declaration" >&5
-+$as_echo_n "checking for atan2l declaration... " >&6; }
-+  if test x${glibcxx_cv_func_atan2l_use+set} != xset; then
-+    if test "${glibcxx_cv_func_atan2l_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ atan2l(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_atan2l_use=yes
-+else
-+  glibcxx_cv_func_atan2l_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_atan2l_use" >&5
-+$as_echo "$glibcxx_cv_func_atan2l_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_atan2l_use = x"yes"; then
-+    for ac_func in atan2l
-+do :
-+  ac_fn_c_check_func "$LINENO" "atan2l" "ac_cv_func_atan2l"
-+if test "x$ac_cv_func_atan2l" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_ATAN2L 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _atan2l declaration" >&5
-+$as_echo_n "checking for _atan2l declaration... " >&6; }
-+  if test x${glibcxx_cv_func__atan2l_use+set} != xset; then
-+    if test "${glibcxx_cv_func__atan2l_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _atan2l(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__atan2l_use=yes
-+else
-+  glibcxx_cv_func__atan2l_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__atan2l_use" >&5
-+$as_echo "$glibcxx_cv_func__atan2l_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__atan2l_use = x"yes"; then
-+      for ac_func in _atan2l
-+do :
-+  ac_fn_c_check_func "$LINENO" "_atan2l" "ac_cv_func__atan2l"
-+if test "x$ac_cv_func__atan2l" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__ATAN2L 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for expl declaration" >&5
-+$as_echo_n "checking for expl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_expl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_expl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ expl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_expl_use=yes
-+else
-+  glibcxx_cv_func_expl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_expl_use" >&5
-+$as_echo "$glibcxx_cv_func_expl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_expl_use = x"yes"; then
-+    for ac_func in expl
-+do :
-+  ac_fn_c_check_func "$LINENO" "expl" "ac_cv_func_expl"
-+if test "x$ac_cv_func_expl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_EXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _expl declaration" >&5
-+$as_echo_n "checking for _expl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__expl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__expl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _expl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__expl_use=yes
-+else
-+  glibcxx_cv_func__expl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__expl_use" >&5
-+$as_echo "$glibcxx_cv_func__expl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__expl_use = x"yes"; then
-+      for ac_func in _expl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_expl" "ac_cv_func__expl"
-+if test "x$ac_cv_func__expl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__EXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fabsl declaration" >&5
-+$as_echo_n "checking for fabsl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_fabsl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_fabsl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ fabsl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_fabsl_use=yes
-+else
-+  glibcxx_cv_func_fabsl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_fabsl_use" >&5
-+$as_echo "$glibcxx_cv_func_fabsl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_fabsl_use = x"yes"; then
-+    for ac_func in fabsl
-+do :
-+  ac_fn_c_check_func "$LINENO" "fabsl" "ac_cv_func_fabsl"
-+if test "x$ac_cv_func_fabsl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FABSL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _fabsl declaration" >&5
-+$as_echo_n "checking for _fabsl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__fabsl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__fabsl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _fabsl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__fabsl_use=yes
-+else
-+  glibcxx_cv_func__fabsl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__fabsl_use" >&5
-+$as_echo "$glibcxx_cv_func__fabsl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__fabsl_use = x"yes"; then
-+      for ac_func in _fabsl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_fabsl" "ac_cv_func__fabsl"
-+if test "x$ac_cv_func__fabsl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FABSL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmodl declaration" >&5
-+$as_echo_n "checking for fmodl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_fmodl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_fmodl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ fmodl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_fmodl_use=yes
-+else
-+  glibcxx_cv_func_fmodl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_fmodl_use" >&5
-+$as_echo "$glibcxx_cv_func_fmodl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_fmodl_use = x"yes"; then
-+    for ac_func in fmodl
-+do :
-+  ac_fn_c_check_func "$LINENO" "fmodl" "ac_cv_func_fmodl"
-+if test "x$ac_cv_func_fmodl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FMODL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _fmodl declaration" >&5
-+$as_echo_n "checking for _fmodl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__fmodl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__fmodl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _fmodl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__fmodl_use=yes
-+else
-+  glibcxx_cv_func__fmodl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__fmodl_use" >&5
-+$as_echo "$glibcxx_cv_func__fmodl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__fmodl_use = x"yes"; then
-+      for ac_func in _fmodl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_fmodl" "ac_cv_func__fmodl"
-+if test "x$ac_cv_func__fmodl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FMODL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for frexpl declaration" >&5
-+$as_echo_n "checking for frexpl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_frexpl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_frexpl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ frexpl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_frexpl_use=yes
-+else
-+  glibcxx_cv_func_frexpl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_frexpl_use" >&5
-+$as_echo "$glibcxx_cv_func_frexpl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_frexpl_use = x"yes"; then
-+    for ac_func in frexpl
-+do :
-+  ac_fn_c_check_func "$LINENO" "frexpl" "ac_cv_func_frexpl"
-+if test "x$ac_cv_func_frexpl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FREXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _frexpl declaration" >&5
-+$as_echo_n "checking for _frexpl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__frexpl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__frexpl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _frexpl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__frexpl_use=yes
-+else
-+  glibcxx_cv_func__frexpl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__frexpl_use" >&5
-+$as_echo "$glibcxx_cv_func__frexpl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__frexpl_use = x"yes"; then
-+      for ac_func in _frexpl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_frexpl" "ac_cv_func__frexpl"
-+if test "x$ac_cv_func__frexpl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FREXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hypotl declaration" >&5
-+$as_echo_n "checking for hypotl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_hypotl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_hypotl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ hypotl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_hypotl_use=yes
-+else
-+  glibcxx_cv_func_hypotl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_hypotl_use" >&5
-+$as_echo "$glibcxx_cv_func_hypotl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_hypotl_use = x"yes"; then
-+    for ac_func in hypotl
-+do :
-+  ac_fn_c_check_func "$LINENO" "hypotl" "ac_cv_func_hypotl"
-+if test "x$ac_cv_func_hypotl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_HYPOTL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _hypotl declaration" >&5
-+$as_echo_n "checking for _hypotl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__hypotl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__hypotl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _hypotl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__hypotl_use=yes
-+else
-+  glibcxx_cv_func__hypotl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__hypotl_use" >&5
-+$as_echo "$glibcxx_cv_func__hypotl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__hypotl_use = x"yes"; then
-+      for ac_func in _hypotl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_hypotl" "ac_cv_func__hypotl"
-+if test "x$ac_cv_func__hypotl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__HYPOTL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldexpl declaration" >&5
-+$as_echo_n "checking for ldexpl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_ldexpl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_ldexpl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ ldexpl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_ldexpl_use=yes
-+else
-+  glibcxx_cv_func_ldexpl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_ldexpl_use" >&5
-+$as_echo "$glibcxx_cv_func_ldexpl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_ldexpl_use = x"yes"; then
-+    for ac_func in ldexpl
-+do :
-+  ac_fn_c_check_func "$LINENO" "ldexpl" "ac_cv_func_ldexpl"
-+if test "x$ac_cv_func_ldexpl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LDEXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ldexpl declaration" >&5
-+$as_echo_n "checking for _ldexpl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__ldexpl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__ldexpl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _ldexpl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__ldexpl_use=yes
-+else
-+  glibcxx_cv_func__ldexpl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__ldexpl_use" >&5
-+$as_echo "$glibcxx_cv_func__ldexpl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__ldexpl_use = x"yes"; then
-+      for ac_func in _ldexpl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_ldexpl" "ac_cv_func__ldexpl"
-+if test "x$ac_cv_func__ldexpl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LDEXPL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for logl declaration" >&5
-+$as_echo_n "checking for logl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_logl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_logl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ logl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_logl_use=yes
-+else
-+  glibcxx_cv_func_logl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_logl_use" >&5
-+$as_echo "$glibcxx_cv_func_logl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_logl_use = x"yes"; then
-+    for ac_func in logl
-+do :
-+  ac_fn_c_check_func "$LINENO" "logl" "ac_cv_func_logl"
-+if test "x$ac_cv_func_logl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LOGL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _logl declaration" >&5
-+$as_echo_n "checking for _logl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__logl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__logl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _logl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__logl_use=yes
-+else
-+  glibcxx_cv_func__logl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__logl_use" >&5
-+$as_echo "$glibcxx_cv_func__logl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__logl_use = x"yes"; then
-+      for ac_func in _logl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_logl" "ac_cv_func__logl"
-+if test "x$ac_cv_func__logl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LOGL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log10l declaration" >&5
-+$as_echo_n "checking for log10l declaration... " >&6; }
-+  if test x${glibcxx_cv_func_log10l_use+set} != xset; then
-+    if test "${glibcxx_cv_func_log10l_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ log10l(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_log10l_use=yes
-+else
-+  glibcxx_cv_func_log10l_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_log10l_use" >&5
-+$as_echo "$glibcxx_cv_func_log10l_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_log10l_use = x"yes"; then
-+    for ac_func in log10l
-+do :
-+  ac_fn_c_check_func "$LINENO" "log10l" "ac_cv_func_log10l"
-+if test "x$ac_cv_func_log10l" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LOG10L 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _log10l declaration" >&5
-+$as_echo_n "checking for _log10l declaration... " >&6; }
-+  if test x${glibcxx_cv_func__log10l_use+set} != xset; then
-+    if test "${glibcxx_cv_func__log10l_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _log10l(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__log10l_use=yes
-+else
-+  glibcxx_cv_func__log10l_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__log10l_use" >&5
-+$as_echo "$glibcxx_cv_func__log10l_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__log10l_use = x"yes"; then
-+      for ac_func in _log10l
-+do :
-+  ac_fn_c_check_func "$LINENO" "_log10l" "ac_cv_func__log10l"
-+if test "x$ac_cv_func__log10l" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__LOG10L 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for modfl declaration" >&5
-+$as_echo_n "checking for modfl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_modfl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_modfl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ modfl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_modfl_use=yes
-+else
-+  glibcxx_cv_func_modfl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_modfl_use" >&5
-+$as_echo "$glibcxx_cv_func_modfl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_modfl_use = x"yes"; then
-+    for ac_func in modfl
-+do :
-+  ac_fn_c_check_func "$LINENO" "modfl" "ac_cv_func_modfl"
-+if test "x$ac_cv_func_modfl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_MODFL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _modfl declaration" >&5
-+$as_echo_n "checking for _modfl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__modfl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__modfl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _modfl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__modfl_use=yes
-+else
-+  glibcxx_cv_func__modfl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__modfl_use" >&5
-+$as_echo "$glibcxx_cv_func__modfl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__modfl_use = x"yes"; then
-+      for ac_func in _modfl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_modfl" "ac_cv_func__modfl"
-+if test "x$ac_cv_func__modfl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__MODFL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for powl declaration" >&5
-+$as_echo_n "checking for powl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_powl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_powl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ powl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_powl_use=yes
-+else
-+  glibcxx_cv_func_powl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_powl_use" >&5
-+$as_echo "$glibcxx_cv_func_powl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_powl_use = x"yes"; then
-+    for ac_func in powl
-+do :
-+  ac_fn_c_check_func "$LINENO" "powl" "ac_cv_func_powl"
-+if test "x$ac_cv_func_powl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_POWL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _powl declaration" >&5
-+$as_echo_n "checking for _powl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__powl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__powl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _powl(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__powl_use=yes
-+else
-+  glibcxx_cv_func__powl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__powl_use" >&5
-+$as_echo "$glibcxx_cv_func__powl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__powl_use = x"yes"; then
-+      for ac_func in _powl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_powl" "ac_cv_func__powl"
-+if test "x$ac_cv_func__powl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__POWL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrtl declaration" >&5
-+$as_echo_n "checking for sqrtl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_sqrtl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_sqrtl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ sqrtl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_sqrtl_use=yes
-+else
-+  glibcxx_cv_func_sqrtl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_sqrtl_use" >&5
-+$as_echo "$glibcxx_cv_func_sqrtl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_sqrtl_use = x"yes"; then
-+    for ac_func in sqrtl
-+do :
-+  ac_fn_c_check_func "$LINENO" "sqrtl" "ac_cv_func_sqrtl"
-+if test "x$ac_cv_func_sqrtl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SQRTL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _sqrtl declaration" >&5
-+$as_echo_n "checking for _sqrtl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__sqrtl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__sqrtl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _sqrtl(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__sqrtl_use=yes
-+else
-+  glibcxx_cv_func__sqrtl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__sqrtl_use" >&5
-+$as_echo "$glibcxx_cv_func__sqrtl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__sqrtl_use = x"yes"; then
-+      for ac_func in _sqrtl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_sqrtl" "ac_cv_func__sqrtl"
-+if test "x$ac_cv_func__sqrtl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__SQRTL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincosl declaration" >&5
-+$as_echo_n "checking for sincosl declaration... " >&6; }
-+  if test x${glibcxx_cv_func_sincosl_use+set} != xset; then
-+    if test "${glibcxx_cv_func_sincosl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ sincosl(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_sincosl_use=yes
-+else
-+  glibcxx_cv_func_sincosl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_sincosl_use" >&5
-+$as_echo "$glibcxx_cv_func_sincosl_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_sincosl_use = x"yes"; then
-+    for ac_func in sincosl
-+do :
-+  ac_fn_c_check_func "$LINENO" "sincosl" "ac_cv_func_sincosl"
-+if test "x$ac_cv_func_sincosl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SINCOSL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _sincosl declaration" >&5
-+$as_echo_n "checking for _sincosl declaration... " >&6; }
-+  if test x${glibcxx_cv_func__sincosl_use+set} != xset; then
-+    if test "${glibcxx_cv_func__sincosl_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+int
-+main ()
-+{
-+ _sincosl(0, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__sincosl_use=yes
-+else
-+  glibcxx_cv_func__sincosl_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__sincosl_use" >&5
-+$as_echo "$glibcxx_cv_func__sincosl_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__sincosl_use = x"yes"; then
-+      for ac_func in _sincosl
-+do :
-+  ac_fn_c_check_func "$LINENO" "_sincosl" "ac_cv_func__sincosl"
-+if test "x$ac_cv_func__sincosl" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__SINCOSL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for finitel declaration" >&5
-+$as_echo_n "checking for finitel declaration... " >&6; }
-+  if test x${glibcxx_cv_func_finitel_use+set} != xset; then
-+    if test "${glibcxx_cv_func_finitel_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ finitel(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_finitel_use=yes
-+else
-+  glibcxx_cv_func_finitel_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_finitel_use" >&5
-+$as_echo "$glibcxx_cv_func_finitel_use" >&6; }
-+
-+  if test x$glibcxx_cv_func_finitel_use = x"yes"; then
-+    for ac_func in finitel
-+do :
-+  ac_fn_c_check_func "$LINENO" "finitel" "ac_cv_func_finitel"
-+if test "x$ac_cv_func_finitel" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FINITEL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  else
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _finitel declaration" >&5
-+$as_echo_n "checking for _finitel declaration... " >&6; }
-+  if test x${glibcxx_cv_func__finitel_use+set} != xset; then
-+    if test "${glibcxx_cv_func__finitel_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <math.h>
-+		      #ifdef HAVE_IEEEFP_H
-+		      #include <ieeefp.h>
-+		      #endif
-+
-+int
-+main ()
-+{
-+ _finitel(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func__finitel_use=yes
-+else
-+  glibcxx_cv_func__finitel_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func__finitel_use" >&5
-+$as_echo "$glibcxx_cv_func__finitel_use" >&6; }
-+
-+    if test x$glibcxx_cv_func__finitel_use = x"yes"; then
-+      for ac_func in _finitel
-+do :
-+  ac_fn_c_check_func "$LINENO" "_finitel" "ac_cv_func__finitel"
-+if test "x$ac_cv_func__finitel" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE__FINITEL 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    fi
-+  fi
-+
-+
-+
-+
-+  LIBS="$ac_save_LIBS"
-+  CXXFLAGS="$ac_save_CXXFLAGS"
-+
-+
-+  ac_test_CXXFLAGS="${CXXFLAGS+set}"
-+  ac_save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS='-fno-builtin -D_GNU_SOURCE'
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtold declaration" >&5
-+$as_echo_n "checking for strtold declaration... " >&6; }
-+  if test x${glibcxx_cv_func_strtold_use+set} != xset; then
-+    if test "${glibcxx_cv_func_strtold_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+ strtold(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_strtold_use=yes
-+else
-+  glibcxx_cv_func_strtold_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_strtold_use" >&5
-+$as_echo "$glibcxx_cv_func_strtold_use" >&6; }
-+  if test x$glibcxx_cv_func_strtold_use = x"yes"; then
-+    for ac_func in strtold
-+do :
-+  ac_fn_c_check_func "$LINENO" "strtold" "ac_cv_func_strtold"
-+if test "x$ac_cv_func_strtold" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRTOLD 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  fi
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtof declaration" >&5
-+$as_echo_n "checking for strtof declaration... " >&6; }
-+  if test x${glibcxx_cv_func_strtof_use+set} != xset; then
-+    if test "${glibcxx_cv_func_strtof_use+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+      ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+ strtof(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  glibcxx_cv_func_strtof_use=yes
-+else
-+  glibcxx_cv_func_strtof_use=no
-+fi
-+rm -f core 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'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+fi
-+
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_func_strtof_use" >&5
-+$as_echo "$glibcxx_cv_func_strtof_use" >&6; }
-+  if test x$glibcxx_cv_func_strtof_use = x"yes"; then
-+    for ac_func in strtof
-+do :
-+  ac_fn_c_check_func "$LINENO" "strtof" "ac_cv_func_strtof"
-+if test "x$ac_cv_func_strtof" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRTOF 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  fi
-+
-+
-+
-+
-+  CXXFLAGS="$ac_save_CXXFLAGS"
-+
-+    ;;
-   *-solaris*)
-     case "$target" in
-       *-solaris2.7 | *-solaris2.8 | *-solaris2.9 | *-solaris2.10)
-diff -Naur gcc-4.5.3.orig/libstdc++-v3/crossconfig.m4 gcc-4.5.3/libstdc++-v3/crossconfig.m4
---- gcc-4.5.3.orig/libstdc++-v3/crossconfig.m4	2009-06-02 21:15:03.000000000 +0200
-+++ gcc-4.5.3/libstdc++-v3/crossconfig.m4	2011-09-05 17:43:13.871942416 +0200
-@@ -198,6 +198,12 @@
-     AC_DEFINE(HAVE_SINHF)
-     AC_DEFINE(HAVE_SINHL)
-     ;;
-+  *-rtems*)
-+    GLIBCXX_CHECK_COMPILER_FEATURES
-+    GLIBCXX_CHECK_LINKER_FEATURES
-+    GLIBCXX_CHECK_MATH_SUPPORT
-+    GLIBCXX_CHECK_STDLIB_SUPPORT
-+    ;;
-   *-solaris*)
-     case "$target" in
-       *-solaris2.7 | *-solaris2.8 | *-solaris2.9 | *-solaris2.10)
diff --git a/contrib/crossrpms/patches/gdb-7.2-rtems4.11-20100903.diff b/contrib/crossrpms/patches/gdb-7.2-rtems4.11-20100903.diff
deleted file mode 100644
index e3e0542..0000000
--- a/contrib/crossrpms/patches/gdb-7.2-rtems4.11-20100903.diff
+++ /dev/null
@@ -1,532 +0,0 @@
-diff -Naur gdb-7.2.orig/gdb/lm32-tdep.c gdb-7.2/gdb/lm32-tdep.c
---- gdb-7.2.orig/gdb/lm32-tdep.c	2010-01-01 08:31:37.000000000 +0100
-+++ gdb-7.2/gdb/lm32-tdep.c	2010-09-03 06:31:13.248351984 +0200
-@@ -35,7 +35,7 @@
- #include "regcache.h"
- #include "trad-frame.h"
- #include "reggroups.h"
--#include "opcodes/lm32-desc.h"
-+#include "../opcodes/lm32-desc.h"
- 
- #include "gdb_string.h"
- 
-diff -Naur gdb-7.2.orig/gdb/sparc-tdep.c gdb-7.2/gdb/sparc-tdep.c
---- gdb-7.2.orig/gdb/sparc-tdep.c	2010-05-05 18:58:59.000000000 +0200
-+++ gdb-7.2/gdb/sparc-tdep.c	2010-09-03 06:31:39.753477822 +0200
-@@ -1105,7 +1105,7 @@
- sparc32_store_return_value (struct type *type, struct regcache *regcache,
- 			    const gdb_byte *valbuf)
- {
--  int len = TYPE_LENGTH (type);
-+  size_t len = TYPE_LENGTH (type);
-   gdb_byte buf[8];
- 
-   gdb_assert (!sparc_structure_or_union_p (type));
-diff -Naur gdb-7.2.orig/sim/erc32/configure gdb-7.2/sim/erc32/configure
---- gdb-7.2.orig/sim/erc32/configure	2010-01-09 22:11:39.000000000 +0100
-+++ gdb-7.2/sim/erc32/configure	2010-09-03 06:33:38.106477633 +0200
-@@ -591,8 +591,9 @@
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- cgen_breaks
-+READLINE_CFLAGS
-+READLINE_DEPS
- READLINE
--TERMCAP
- REPORT_BUGS_TEXI
- REPORT_BUGS_TO
- PKGVERSION
-@@ -716,6 +717,7 @@
- enable_sim_profile
- with_pkgversion
- with_bugurl
-+with_system_readline
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1358,6 +1360,7 @@
-   --with-zlib             include zlib support (auto/yes/no) default=auto
-   --with-pkgversion=PKG   Use PKG in the version string in place of "GDB"
-   --with-bugurl=URL       Direct users to URL to report a bug
-+  --with-system-readline  use installed readline library
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -2416,7 +2419,6 @@
- 
- 
- 
--
- # Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
- # it by inlining the macro's contents.
- # This file contains common code used by all simulators.
-@@ -2916,18 +2918,18 @@
- int
- main ()
- {
--
-+return 0;
-   ;
-   return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
- # The possible output files:
-@@ -2989,10 +2991,10 @@
- else
-   ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
--  $as_echo "$as_me: failed program was:" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -3000,51 +3002,18 @@
- { as_fn_set_status 77
- as_fn_error "C compiler cannot create executables
- See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
- 
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
--  if { ac_try='./$ac_file'
--  { { case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then
--    cross_compiling=no
--  else
--    if test "$cross_compiling" = maybe; then
--	cross_compiling=yes
--    else
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
--    fi
--  fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3084,6 +3053,63 @@
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+  { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+  if { ac_try='./conftest$ac_cv_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -4532,86 +4558,41 @@
- done
- 
- 
--# In the Cygwin environment, we need some additional flags.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin" >&5
--$as_echo_n "checking for cygwin... " >&6; }
--if test "${sim_cv_os_cygwin+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
- 
--#ifdef __CYGWIN__
--lose
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "lose" >/dev/null 2>&1; then :
--  sim_cv_os_cygwin=yes
--else
--  sim_cv_os_cygwin=no
-+# Check whether --with-system-readline was given.
-+if test "${with_system_readline+set}" = set; then :
-+  withval=$with_system_readline;
- fi
--rm -f conftest*
- 
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_cv_os_cygwin" >&5
--$as_echo "$sim_cv_os_cygwin" >&6; }
- 
--if test x$sim_cv_os_cygwin = xyes; then
--  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltermcap" >&5
--$as_echo_n "checking for main in -ltermcap... " >&6; }
--if test "${ac_cv_lib_termcap_main+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltermcap  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+if test "$with_system_readline" = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
-+$as_echo_n "checking for readline... " >&6; }
-+  save_LIBS="$LIBS"
-+  LIBS="-lreadline $save_LIBS"
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char add_history ();
- int
- main ()
- {
--return main ();
-+return add_history ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_termcap_main=yes
--else
--  ac_cv_lib_termcap_main=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_main" >&5
--$as_echo "$ac_cv_lib_termcap_main" >&6; }
--if test "x$ac_cv_lib_termcap_main" = x""yes; then :
--  TERMCAP=-ltermcap
--else
--  TERMCAP=""
--fi
--
--fi
--
--
--# We prefer the in-tree readline.  Top-level dependencies make sure
--# src/readline (if it's there) is configured before src/sim.
--if test -r ../../readline/Makefile; then
--  READLINE=../../readline/libreadline.a
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
--$as_echo_n "checking for readline in -lreadline... " >&6; }
--if test "${ac_cv_lib_readline_readline+set}" = set; then :
--  $as_echo_n "(cached) " >&6
-+  READLINE=-lreadline
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline $TERMCAP $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+   LIBS="-lreadline -lncurses $save_LIBS"
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -4620,33 +4601,39 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char readline ();
-+char add_history ();
- int
- main ()
- {
--return readline ();
-+return add_history ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_readline_readline=yes
-+  READLINE="-lreadline -lncurses"
- else
--  ac_cv_lib_readline_readline=no
-+  as_fn_error "unable to detect readline" "$LINENO" 5
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
--$as_echo "$ac_cv_lib_readline_readline" >&6; }
--if test "x$ac_cv_lib_readline_readline" = x""yes; then :
--  READLINE=-lreadline
--else
--  as_fn_error "the required \"readline\" library is missing" "$LINENO" 5
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  LIBS="$save_LIBS"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
-+$as_echo "$READLINE" >&6; }
-+  READLINE_DEPS=
-+  READLINE_CFLAGS=
-+else
-+  READLINE='../../readline/libreadline.a -lncurses'
-+  READLINE_DEPS='$(READLINE)'
-+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
- fi
- 
--fi
-+
-+
- 
- 
- ac_sources="$sim_link_files"
-diff -Naur gdb-7.2.orig/sim/erc32/configure.ac gdb-7.2/sim/erc32/configure.ac
---- gdb-7.2.orig/sim/erc32/configure.ac	2006-12-20 23:35:51.000000000 +0100
-+++ gdb-7.2/sim/erc32/configure.ac	2010-09-03 06:33:15.282478080 +0200
-@@ -11,27 +11,32 @@
- 
- AC_CHECK_HEADERS(stdlib.h)
- 
--# In the Cygwin environment, we need some additional flags.
--AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
--[AC_EGREP_CPP(lose, [
--#ifdef __CYGWIN__
--lose
--#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])])
-+AC_ARG_WITH([system-readline],
-+  [AS_HELP_STRING([--with-system-readline],
-+                  [use installed readline library])])
- 
--if test x$sim_cv_os_cygwin = xyes; then
--  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
-+if test "$with_system_readline" = yes; then
-+  AC_MSG_CHECKING([for readline])
-+  save_LIBS="$LIBS"
-+  LIBS="-lreadline $save_LIBS"
-+  AC_LINK_IFELSE([AC_LANG_CALL([],
-+    [add_history])], [READLINE=-lreadline], 
-+    [ LIBS="-lreadline -lncurses $save_LIBS"
-+      AC_LINK_IFELSE([AC_LANG_CALL([],
-+        [add_history])], [READLINE="-lreadline -lncurses"],
-+        [AC_MSG_ERROR([unable to detect readline])])
-+    ])
-+  LIBS="$save_LIBS"
-+  AC_MSG_RESULT($READLINE)
-+  READLINE_DEPS=
-+  READLINE_CFLAGS=
- else
--  AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="")
--fi
--AC_SUBST(TERMCAP)
--
--# We prefer the in-tree readline.  Top-level dependencies make sure
--# src/readline (if it's there) is configured before src/sim.
--if test -r ../../readline/Makefile; then
--  READLINE=../../readline/libreadline.a
--else
--  AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
--	       AC_ERROR([the required "readline" library is missing]), $TERMCAP)
-+  READLINE='../../readline/libreadline.a -lncurses'
-+  READLINE_DEPS='$(READLINE)'
-+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
- fi
- AC_SUBST(READLINE)
-+AC_SUBST(READLINE_DEPS)
-+AC_SUBST(READLINE_CFLAGS)
-+
- SIM_AC_OUTPUT
-diff -Naur gdb-7.2.orig/sim/erc32/erc32.c gdb-7.2/sim/erc32/erc32.c
---- gdb-7.2.orig/sim/erc32/erc32.c	2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.2/sim/erc32/erc32.c	2010-09-03 06:32:13.730781311 +0200
-@@ -414,7 +414,7 @@
-     if (rom8) mec_memcfg &= ~0x20000;
-     else mec_memcfg |= 0x20000;
- 
--    mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
-+    mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
-     mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
- 
-     if (sparclite_board) {
-diff -Naur gdb-7.2.orig/sim/erc32/Makefile.in gdb-7.2/sim/erc32/Makefile.in
---- gdb-7.2.orig/sim/erc32/Makefile.in	2010-01-01 11:03:28.000000000 +0100
-+++ gdb-7.2/sim/erc32/Makefile.in	2010-09-03 06:33:01.576353269 +0200
-@@ -19,12 +19,12 @@
- 
- ## COMMON_PRE_CONFIG_FRAG
- 
--TERMCAP_LIB = @TERMCAP@
-+# TERMCAP_LIB = -lncurses
- READLINE_LIB = @READLINE@
- 
- SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
- SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
--SIM_EXTRA_ALL = sis
-+SIM_EXTRA_ALL = sis$(EXEEXT)
- SIM_EXTRA_INSTALL = install-sis
- SIM_EXTRA_CLEAN = clean-sis
- 
-@@ -38,8 +38,8 @@
- # `sis' doesn't need interf.o.
- SIS_OFILES = exec.o erc32.o func.o help.o float.o
- 
--sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
--	$(CC) $(ALL_CFLAGS) -o sis \
-+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
-+	$(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
- 	  sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
- 
- # FIXME: This computes the build host's endianness, doesn't it?
-@@ -52,11 +52,11 @@
- 
- # Copy the files into directories where they will be run.
- install-sis: installdirs
--	n=`echo sis | sed '$(program_transform_name)'`; \
--	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
-+	n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \
-+	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n
- 
- clean-sis:
--	rm -f sis end end.h
-+	rm -f sis$(EXEEXT) end end.h
- 
- configure:
- 	@echo "Rebuilding configure..."
-diff -Naur gdb-7.2.orig/sim/h8300/compile.c gdb-7.2/sim/h8300/compile.c
---- gdb-7.2.orig/sim/h8300/compile.c	2010-04-14 09:38:04.000000000 +0200
-+++ gdb-7.2/sim/h8300/compile.c	2010-09-03 06:32:35.424409014 +0200
-@@ -38,6 +38,12 @@
- # define SIGTRAP 5
- #endif
- 
-+#ifdef _WIN32
-+#ifndef SIGBUS
-+#define SIGBUS 10
-+#endif
-+#endif
-+
- int debug;
- 
- host_callback *sim_callback;
-diff -Naur gdb-7.2.orig/sim/m32c/Makefile.in gdb-7.2/sim/m32c/Makefile.in
---- gdb-7.2.orig/sim/m32c/Makefile.in	2010-01-01 11:03:31.000000000 +0100
-+++ gdb-7.2/sim/m32c/Makefile.in	2010-09-03 06:32:48.480609447 +0200
-@@ -55,7 +55,7 @@
- 	./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c
- 
- opc2c : opc2c.o safe-fgets.o
--	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@
- 
- sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
- 	../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
-@@ -83,8 +83,10 @@
- mem.o : mem.h cpu.h syscalls.h
- misc.o : cpu.h misc.h
- opc2c.o : safe-fgets.h
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c
- reg.o : cpu.h
- safe-fgets.o : safe-fgets.h
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c
- srcdest.c : cpu.h mem.h
- syscalls.c : cpu.h mem.h syscalls.h
- 
diff --git a/contrib/crossrpms/patches/gdb-7.2-rtems4.11-20100907.diff b/contrib/crossrpms/patches/gdb-7.2-rtems4.11-20100907.diff
deleted file mode 100644
index d09d28f..0000000
--- a/contrib/crossrpms/patches/gdb-7.2-rtems4.11-20100907.diff
+++ /dev/null
@@ -1,595 +0,0 @@
-diff -Naur gdb-7.2.orig/gdb/lm32-tdep.c gdb-7.2/gdb/lm32-tdep.c
---- gdb-7.2.orig/gdb/lm32-tdep.c	2010-01-01 08:31:37.000000000 +0100
-+++ gdb-7.2/gdb/lm32-tdep.c	2010-09-07 18:58:56.459350879 +0200
-@@ -35,7 +35,7 @@
- #include "regcache.h"
- #include "trad-frame.h"
- #include "reggroups.h"
--#include "opcodes/lm32-desc.h"
-+#include "../opcodes/lm32-desc.h"
- 
- #include "gdb_string.h"
- 
-diff -Naur gdb-7.2.orig/gdb/sparc-tdep.c gdb-7.2/gdb/sparc-tdep.c
---- gdb-7.2.orig/gdb/sparc-tdep.c	2010-05-05 18:58:59.000000000 +0200
-+++ gdb-7.2/gdb/sparc-tdep.c	2010-09-07 18:58:56.460348909 +0200
-@@ -1105,7 +1105,7 @@
- sparc32_store_return_value (struct type *type, struct regcache *regcache,
- 			    const gdb_byte *valbuf)
- {
--  int len = TYPE_LENGTH (type);
-+  size_t len = TYPE_LENGTH (type);
-   gdb_byte buf[8];
- 
-   gdb_assert (!sparc_structure_or_union_p (type));
-diff -Naur gdb-7.2.orig/sim/common/gentmap.c gdb-7.2/sim/common/gentmap.c
---- gdb-7.2.orig/sim/common/gentmap.c	2006-11-07 20:29:59.000000000 +0100
-+++ gdb-7.2/sim/common/gentmap.c	2010-09-07 18:58:56.460348909 +0200
-@@ -2,6 +2,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- struct tdefs {
-   char *symbol;
-diff -Naur gdb-7.2.orig/sim/erc32/configure gdb-7.2/sim/erc32/configure
---- gdb-7.2.orig/sim/erc32/configure	2010-01-09 22:11:39.000000000 +0100
-+++ gdb-7.2/sim/erc32/configure	2010-09-07 18:58:56.462352817 +0200
-@@ -591,8 +591,9 @@
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- cgen_breaks
-+READLINE_CFLAGS
-+READLINE_DEPS
- READLINE
--TERMCAP
- REPORT_BUGS_TEXI
- REPORT_BUGS_TO
- PKGVERSION
-@@ -716,6 +717,7 @@
- enable_sim_profile
- with_pkgversion
- with_bugurl
-+with_system_readline
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1358,6 +1360,7 @@
-   --with-zlib             include zlib support (auto/yes/no) default=auto
-   --with-pkgversion=PKG   Use PKG in the version string in place of "GDB"
-   --with-bugurl=URL       Direct users to URL to report a bug
-+  --with-system-readline  use installed readline library
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -2416,7 +2419,6 @@
- 
- 
- 
--
- # Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
- # it by inlining the macro's contents.
- # This file contains common code used by all simulators.
-@@ -2916,18 +2918,18 @@
- int
- main ()
- {
--
-+return 0;
-   ;
-   return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
- # The possible output files:
-@@ -2989,10 +2991,10 @@
- else
-   ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
--  $as_echo "$as_me: failed program was:" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -3000,51 +3002,18 @@
- { as_fn_set_status 77
- as_fn_error "C compiler cannot create executables
- See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
- 
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
--  if { ac_try='./$ac_file'
--  { { case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then
--    cross_compiling=no
--  else
--    if test "$cross_compiling" = maybe; then
--	cross_compiling=yes
--    else
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
--    fi
--  fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3084,6 +3053,63 @@
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+  { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+  if { ac_try='./conftest$ac_cv_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -4532,86 +4558,41 @@
- done
- 
- 
--# In the Cygwin environment, we need some additional flags.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin" >&5
--$as_echo_n "checking for cygwin... " >&6; }
--if test "${sim_cv_os_cygwin+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
- 
--#ifdef __CYGWIN__
--lose
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "lose" >/dev/null 2>&1; then :
--  sim_cv_os_cygwin=yes
--else
--  sim_cv_os_cygwin=no
-+# Check whether --with-system-readline was given.
-+if test "${with_system_readline+set}" = set; then :
-+  withval=$with_system_readline;
- fi
--rm -f conftest*
- 
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_cv_os_cygwin" >&5
--$as_echo "$sim_cv_os_cygwin" >&6; }
- 
--if test x$sim_cv_os_cygwin = xyes; then
--  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltermcap" >&5
--$as_echo_n "checking for main in -ltermcap... " >&6; }
--if test "${ac_cv_lib_termcap_main+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltermcap  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+if test "$with_system_readline" = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
-+$as_echo_n "checking for readline... " >&6; }
-+  save_LIBS="$LIBS"
-+  LIBS="-lreadline $save_LIBS"
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char add_history ();
- int
- main ()
- {
--return main ();
-+return add_history ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_termcap_main=yes
--else
--  ac_cv_lib_termcap_main=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_main" >&5
--$as_echo "$ac_cv_lib_termcap_main" >&6; }
--if test "x$ac_cv_lib_termcap_main" = x""yes; then :
--  TERMCAP=-ltermcap
--else
--  TERMCAP=""
--fi
--
--fi
--
--
--# We prefer the in-tree readline.  Top-level dependencies make sure
--# src/readline (if it's there) is configured before src/sim.
--if test -r ../../readline/Makefile; then
--  READLINE=../../readline/libreadline.a
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
--$as_echo_n "checking for readline in -lreadline... " >&6; }
--if test "${ac_cv_lib_readline_readline+set}" = set; then :
--  $as_echo_n "(cached) " >&6
-+  READLINE=-lreadline
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline $TERMCAP $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+   LIBS="-lreadline -lncurses $save_LIBS"
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -4620,33 +4601,39 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char readline ();
-+char add_history ();
- int
- main ()
- {
--return readline ();
-+return add_history ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_readline_readline=yes
-+  READLINE="-lreadline -lncurses"
- else
--  ac_cv_lib_readline_readline=no
-+  as_fn_error "unable to detect readline" "$LINENO" 5
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
--$as_echo "$ac_cv_lib_readline_readline" >&6; }
--if test "x$ac_cv_lib_readline_readline" = x""yes; then :
--  READLINE=-lreadline
--else
--  as_fn_error "the required \"readline\" library is missing" "$LINENO" 5
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  LIBS="$save_LIBS"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
-+$as_echo "$READLINE" >&6; }
-+  READLINE_DEPS=
-+  READLINE_CFLAGS=
-+else
-+  READLINE='../../readline/libreadline.a -lncurses'
-+  READLINE_DEPS='$(READLINE)'
-+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
- fi
- 
--fi
-+
-+
- 
- 
- ac_sources="$sim_link_files"
-diff -Naur gdb-7.2.orig/sim/erc32/configure.ac gdb-7.2/sim/erc32/configure.ac
---- gdb-7.2.orig/sim/erc32/configure.ac	2006-12-20 23:35:51.000000000 +0100
-+++ gdb-7.2/sim/erc32/configure.ac	2010-09-07 18:58:56.463352715 +0200
-@@ -11,27 +11,32 @@
- 
- AC_CHECK_HEADERS(stdlib.h)
- 
--# In the Cygwin environment, we need some additional flags.
--AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
--[AC_EGREP_CPP(lose, [
--#ifdef __CYGWIN__
--lose
--#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])])
-+AC_ARG_WITH([system-readline],
-+  [AS_HELP_STRING([--with-system-readline],
-+                  [use installed readline library])])
- 
--if test x$sim_cv_os_cygwin = xyes; then
--  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
-+if test "$with_system_readline" = yes; then
-+  AC_MSG_CHECKING([for readline])
-+  save_LIBS="$LIBS"
-+  LIBS="-lreadline $save_LIBS"
-+  AC_LINK_IFELSE([AC_LANG_CALL([],
-+    [add_history])], [READLINE=-lreadline], 
-+    [ LIBS="-lreadline -lncurses $save_LIBS"
-+      AC_LINK_IFELSE([AC_LANG_CALL([],
-+        [add_history])], [READLINE="-lreadline -lncurses"],
-+        [AC_MSG_ERROR([unable to detect readline])])
-+    ])
-+  LIBS="$save_LIBS"
-+  AC_MSG_RESULT($READLINE)
-+  READLINE_DEPS=
-+  READLINE_CFLAGS=
- else
--  AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="")
--fi
--AC_SUBST(TERMCAP)
--
--# We prefer the in-tree readline.  Top-level dependencies make sure
--# src/readline (if it's there) is configured before src/sim.
--if test -r ../../readline/Makefile; then
--  READLINE=../../readline/libreadline.a
--else
--  AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
--	       AC_ERROR([the required "readline" library is missing]), $TERMCAP)
-+  READLINE='../../readline/libreadline.a -lncurses'
-+  READLINE_DEPS='$(READLINE)'
-+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
- fi
- AC_SUBST(READLINE)
-+AC_SUBST(READLINE_DEPS)
-+AC_SUBST(READLINE_CFLAGS)
-+
- SIM_AC_OUTPUT
-diff -Naur gdb-7.2.orig/sim/erc32/erc32.c gdb-7.2/sim/erc32/erc32.c
---- gdb-7.2.orig/sim/erc32/erc32.c	2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.2/sim/erc32/erc32.c	2010-09-07 18:58:56.463352715 +0200
-@@ -414,7 +414,7 @@
-     if (rom8) mec_memcfg &= ~0x20000;
-     else mec_memcfg |= 0x20000;
- 
--    mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
-+    mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
-     mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
- 
-     if (sparclite_board) {
-diff -Naur gdb-7.2.orig/sim/erc32/Makefile.in gdb-7.2/sim/erc32/Makefile.in
---- gdb-7.2.orig/sim/erc32/Makefile.in	2010-01-01 11:03:28.000000000 +0100
-+++ gdb-7.2/sim/erc32/Makefile.in	2010-09-07 18:58:56.463352715 +0200
-@@ -19,12 +19,12 @@
- 
- ## COMMON_PRE_CONFIG_FRAG
- 
--TERMCAP_LIB = @TERMCAP@
-+# TERMCAP_LIB = -lncurses
- READLINE_LIB = @READLINE@
- 
- SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
- SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
--SIM_EXTRA_ALL = sis
-+SIM_EXTRA_ALL = sis$(EXEEXT)
- SIM_EXTRA_INSTALL = install-sis
- SIM_EXTRA_CLEAN = clean-sis
- 
-@@ -38,8 +38,8 @@
- # `sis' doesn't need interf.o.
- SIS_OFILES = exec.o erc32.o func.o help.o float.o
- 
--sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
--	$(CC) $(ALL_CFLAGS) -o sis \
-+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
-+	$(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
- 	  sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
- 
- # FIXME: This computes the build host's endianness, doesn't it?
-@@ -52,11 +52,11 @@
- 
- # Copy the files into directories where they will be run.
- install-sis: installdirs
--	n=`echo sis | sed '$(program_transform_name)'`; \
--	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
-+	n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \
-+	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n
- 
- clean-sis:
--	rm -f sis end end.h
-+	rm -f sis$(EXEEXT) end end.h
- 
- configure:
- 	@echo "Rebuilding configure..."
-diff -Naur gdb-7.2.orig/sim/h8300/compile.c gdb-7.2/sim/h8300/compile.c
---- gdb-7.2.orig/sim/h8300/compile.c	2010-04-14 09:38:04.000000000 +0200
-+++ gdb-7.2/sim/h8300/compile.c	2010-09-07 18:58:56.465352608 +0200
-@@ -38,6 +38,12 @@
- # define SIGTRAP 5
- #endif
- 
-+#ifdef _WIN32
-+#ifndef SIGBUS
-+#define SIGBUS 10
-+#endif
-+#endif
-+
- int debug;
- 
- host_callback *sim_callback;
-diff -Naur gdb-7.2.orig/sim/m32c/Makefile.in gdb-7.2/sim/m32c/Makefile.in
---- gdb-7.2.orig/sim/m32c/Makefile.in	2010-01-01 11:03:31.000000000 +0100
-+++ gdb-7.2/sim/m32c/Makefile.in	2010-09-07 18:58:56.465352608 +0200
-@@ -55,7 +55,7 @@
- 	./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c
- 
- opc2c : opc2c.o safe-fgets.o
--	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@
- 
- sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
- 	../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
-@@ -83,8 +83,10 @@
- mem.o : mem.h cpu.h syscalls.h
- misc.o : cpu.h misc.h
- opc2c.o : safe-fgets.h
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c
- reg.o : cpu.h
- safe-fgets.o : safe-fgets.h
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c
- srcdest.c : cpu.h mem.h
- syscalls.c : cpu.h mem.h syscalls.h
- 
-diff -Naur gdb-7.2.orig/sim/ppc/ChangeLog.rtems gdb-7.2/sim/ppc/ChangeLog.rtems
---- gdb-7.2.orig/sim/ppc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-7.2/sim/ppc/ChangeLog.rtems	2010-09-07 19:00:36.912350575 +0200
-@@ -0,0 +1,5 @@
-+2010-09-06	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* device.h, device.c: Remove "void volatile".
-+	* hw_glue.c: Use %zd to print sizes.
-+
-diff -Naur gdb-7.2.orig/sim/ppc/device.c gdb-7.2/sim/ppc/device.c
---- gdb-7.2.orig/sim/ppc/device.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-7.2/sim/ppc/device.c	2010-09-07 18:58:56.466352788 +0200
-@@ -1816,7 +1816,7 @@
- /* I/O */
- 
- EXTERN_DEVICE\
--(void volatile)
-+(void)
- device_error(device *me,
- 	     const char *fmt,
- 	     ...)
-diff -Naur gdb-7.2.orig/sim/ppc/device.h gdb-7.2/sim/ppc/device.h
---- gdb-7.2.orig/sim/ppc/device.h	2001-12-14 01:22:12.000000000 +0100
-+++ gdb-7.2/sim/ppc/device.h	2010-09-07 18:58:56.466352788 +0200
-@@ -727,7 +727,7 @@
-    */
- 
- EXTERN_DEVICE\
--(void volatile) device_error
-+(void) device_error
- (device *me,
-  const char *fmt,
-  ...) __attribute__ ((format (printf, 2, 3)));
-diff -Naur gdb-7.2.orig/sim/ppc/hw_glue.c gdb-7.2/sim/ppc/hw_glue.c
---- gdb-7.2.orig/sim/ppc/hw_glue.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-7.2/sim/ppc/hw_glue.c	2010-09-07 18:58:56.466352788 +0200
-@@ -194,13 +194,13 @@
-     if (glue->sizeof_output == 0)
-       device_error(me, "at least one reg property size must be nonzero");
-     if (glue->sizeof_output % sizeof(unsigned_word) != 0)
--      device_error(me, "reg property size must be %d aligned", sizeof(unsigned_word));
-+      device_error(me, "reg property size must be %zd aligned", sizeof(unsigned_word));
-     /* and the address */
-     device_address_to_attach_address(device_parent(me),
- 				     &unit.address, &glue->space, &glue->address,
- 				     me);
-     if (glue->address % (sizeof(unsigned_word) * max_nr_interrupts) != 0)
--      device_error(me, "reg property address must be %d aligned",
-+      device_error(me, "reg property address must be %zd aligned",
- 		   sizeof(unsigned_word) * max_nr_interrupts);
-     glue->nr_outputs = glue->sizeof_output / sizeof(unsigned_word);
-     glue->output = zalloc(glue->sizeof_output);
diff --git a/contrib/crossrpms/patches/gdb-7.3.1-rtems4.11-20110905.diff b/contrib/crossrpms/patches/gdb-7.3.1-rtems4.11-20110905.diff
deleted file mode 100644
index 0a201a5..0000000
--- a/contrib/crossrpms/patches/gdb-7.3.1-rtems4.11-20110905.diff
+++ /dev/null
@@ -1,586 +0,0 @@
-diff -Naur gdb-7.3.1.orig/gdb/lm32-tdep.c gdb-7.3.1/gdb/lm32-tdep.c
---- gdb-7.3.1.orig/gdb/lm32-tdep.c	2011-03-18 19:52:30.000000000 +0100
-+++ gdb-7.3.1/gdb/lm32-tdep.c	2011-09-05 05:15:58.049769734 +0200
-@@ -35,7 +35,7 @@
- #include "regcache.h"
- #include "trad-frame.h"
- #include "reggroups.h"
--#include "opcodes/lm32-desc.h"
-+#include "../opcodes/lm32-desc.h"
- 
- #include "gdb_string.h"
- 
-diff -Naur gdb-7.3.1.orig/gdb/sparc-tdep.c gdb-7.3.1/gdb/sparc-tdep.c
---- gdb-7.3.1.orig/gdb/sparc-tdep.c	2011-03-18 19:52:32.000000000 +0100
-+++ gdb-7.3.1/gdb/sparc-tdep.c	2011-09-05 05:15:58.049769734 +0200
-@@ -1117,7 +1117,7 @@
- sparc32_store_return_value (struct type *type, struct regcache *regcache,
- 			    const gdb_byte *valbuf)
- {
--  int len = TYPE_LENGTH (type);
-+  size_t len = TYPE_LENGTH (type);
-   gdb_byte buf[8];
- 
-   gdb_assert (!sparc_structure_or_union_p (type));
-diff -Naur gdb-7.3.1.orig/sim/common/gentmap.c gdb-7.3.1/sim/common/gentmap.c
---- gdb-7.3.1.orig/sim/common/gentmap.c	2006-11-07 20:29:59.000000000 +0100
-+++ gdb-7.3.1/sim/common/gentmap.c	2011-09-05 05:15:58.064769977 +0200
-@@ -2,6 +2,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- struct tdefs {
-   char *symbol;
-diff -Naur gdb-7.3.1.orig/sim/erc32/configure gdb-7.3.1/sim/erc32/configure
---- gdb-7.3.1.orig/sim/erc32/configure	2010-01-09 22:11:39.000000000 +0100
-+++ gdb-7.3.1/sim/erc32/configure	2011-09-05 05:15:58.075770156 +0200
-@@ -591,8 +591,9 @@
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- cgen_breaks
-+READLINE_CFLAGS
-+READLINE_DEPS
- READLINE
--TERMCAP
- REPORT_BUGS_TEXI
- REPORT_BUGS_TO
- PKGVERSION
-@@ -716,6 +717,7 @@
- enable_sim_profile
- with_pkgversion
- with_bugurl
-+with_system_readline
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1358,6 +1360,7 @@
-   --with-zlib             include zlib support (auto/yes/no) default=auto
-   --with-pkgversion=PKG   Use PKG in the version string in place of "GDB"
-   --with-bugurl=URL       Direct users to URL to report a bug
-+  --with-system-readline  use installed readline library
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -2416,7 +2419,6 @@
- 
- 
- 
--
- # Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
- # it by inlining the macro's contents.
- # This file contains common code used by all simulators.
-@@ -2916,18 +2918,18 @@
- int
- main ()
- {
--
-+return 0;
-   ;
-   return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
- # The possible output files:
-@@ -2989,10 +2991,10 @@
- else
-   ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
--  $as_echo "$as_me: failed program was:" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -3000,51 +3002,18 @@
- { as_fn_set_status 77
- as_fn_error "C compiler cannot create executables
- See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
- 
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
--  if { ac_try='./$ac_file'
--  { { case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then
--    cross_compiling=no
--  else
--    if test "$cross_compiling" = maybe; then
--	cross_compiling=yes
--    else
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
--    fi
--  fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3084,6 +3053,63 @@
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+  { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+  if { ac_try='./conftest$ac_cv_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -4532,86 +4558,41 @@
- done
- 
- 
--# In the Cygwin environment, we need some additional flags.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin" >&5
--$as_echo_n "checking for cygwin... " >&6; }
--if test "${sim_cv_os_cygwin+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
- 
--#ifdef __CYGWIN__
--lose
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "lose" >/dev/null 2>&1; then :
--  sim_cv_os_cygwin=yes
--else
--  sim_cv_os_cygwin=no
-+# Check whether --with-system-readline was given.
-+if test "${with_system_readline+set}" = set; then :
-+  withval=$with_system_readline;
- fi
--rm -f conftest*
- 
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_cv_os_cygwin" >&5
--$as_echo "$sim_cv_os_cygwin" >&6; }
- 
--if test x$sim_cv_os_cygwin = xyes; then
--  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltermcap" >&5
--$as_echo_n "checking for main in -ltermcap... " >&6; }
--if test "${ac_cv_lib_termcap_main+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltermcap  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+if test "$with_system_readline" = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
-+$as_echo_n "checking for readline... " >&6; }
-+  save_LIBS="$LIBS"
-+  LIBS="-lreadline $save_LIBS"
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char add_history ();
- int
- main ()
- {
--return main ();
-+return add_history ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_termcap_main=yes
--else
--  ac_cv_lib_termcap_main=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_main" >&5
--$as_echo "$ac_cv_lib_termcap_main" >&6; }
--if test "x$ac_cv_lib_termcap_main" = x""yes; then :
--  TERMCAP=-ltermcap
--else
--  TERMCAP=""
--fi
--
--fi
--
--
--# We prefer the in-tree readline.  Top-level dependencies make sure
--# src/readline (if it's there) is configured before src/sim.
--if test -r ../../readline/Makefile; then
--  READLINE=../../readline/libreadline.a
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
--$as_echo_n "checking for readline in -lreadline... " >&6; }
--if test "${ac_cv_lib_readline_readline+set}" = set; then :
--  $as_echo_n "(cached) " >&6
-+  READLINE=-lreadline
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline $TERMCAP $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+   LIBS="-lreadline -lncurses $save_LIBS"
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -4620,33 +4601,39 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char readline ();
-+char add_history ();
- int
- main ()
- {
--return readline ();
-+return add_history ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_readline_readline=yes
-+  READLINE="-lreadline -lncurses"
- else
--  ac_cv_lib_readline_readline=no
-+  as_fn_error "unable to detect readline" "$LINENO" 5
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
--$as_echo "$ac_cv_lib_readline_readline" >&6; }
--if test "x$ac_cv_lib_readline_readline" = x""yes; then :
--  READLINE=-lreadline
--else
--  as_fn_error "the required \"readline\" library is missing" "$LINENO" 5
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  LIBS="$save_LIBS"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
-+$as_echo "$READLINE" >&6; }
-+  READLINE_DEPS=
-+  READLINE_CFLAGS=
-+else
-+  READLINE='../../readline/libreadline.a -lncurses'
-+  READLINE_DEPS='$(READLINE)'
-+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
- fi
- 
--fi
-+
-+
- 
- 
- ac_sources="$sim_link_files"
-diff -Naur gdb-7.3.1.orig/sim/erc32/configure.ac gdb-7.3.1/sim/erc32/configure.ac
---- gdb-7.3.1.orig/sim/erc32/configure.ac	2006-12-20 23:35:51.000000000 +0100
-+++ gdb-7.3.1/sim/erc32/configure.ac	2011-09-05 05:15:58.075770156 +0200
-@@ -11,27 +11,32 @@
- 
- AC_CHECK_HEADERS(stdlib.h)
- 
--# In the Cygwin environment, we need some additional flags.
--AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
--[AC_EGREP_CPP(lose, [
--#ifdef __CYGWIN__
--lose
--#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])])
-+AC_ARG_WITH([system-readline],
-+  [AS_HELP_STRING([--with-system-readline],
-+                  [use installed readline library])])
- 
--if test x$sim_cv_os_cygwin = xyes; then
--  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
-+if test "$with_system_readline" = yes; then
-+  AC_MSG_CHECKING([for readline])
-+  save_LIBS="$LIBS"
-+  LIBS="-lreadline $save_LIBS"
-+  AC_LINK_IFELSE([AC_LANG_CALL([],
-+    [add_history])], [READLINE=-lreadline], 
-+    [ LIBS="-lreadline -lncurses $save_LIBS"
-+      AC_LINK_IFELSE([AC_LANG_CALL([],
-+        [add_history])], [READLINE="-lreadline -lncurses"],
-+        [AC_MSG_ERROR([unable to detect readline])])
-+    ])
-+  LIBS="$save_LIBS"
-+  AC_MSG_RESULT($READLINE)
-+  READLINE_DEPS=
-+  READLINE_CFLAGS=
- else
--  AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="")
--fi
--AC_SUBST(TERMCAP)
--
--# We prefer the in-tree readline.  Top-level dependencies make sure
--# src/readline (if it's there) is configured before src/sim.
--if test -r ../../readline/Makefile; then
--  READLINE=../../readline/libreadline.a
--else
--  AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
--	       AC_ERROR([the required "readline" library is missing]), $TERMCAP)
-+  READLINE='../../readline/libreadline.a -lncurses'
-+  READLINE_DEPS='$(READLINE)'
-+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
- fi
- AC_SUBST(READLINE)
-+AC_SUBST(READLINE_DEPS)
-+AC_SUBST(READLINE_CFLAGS)
-+
- SIM_AC_OUTPUT
-diff -Naur gdb-7.3.1.orig/sim/erc32/erc32.c gdb-7.3.1/sim/erc32/erc32.c
---- gdb-7.3.1.orig/sim/erc32/erc32.c	2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.3.1/sim/erc32/erc32.c	2011-09-05 05:15:58.076770172 +0200
-@@ -414,7 +414,7 @@
-     if (rom8) mec_memcfg &= ~0x20000;
-     else mec_memcfg |= 0x20000;
- 
--    mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
-+    mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
-     mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
- 
-     if (sparclite_board) {
-diff -Naur gdb-7.3.1.orig/sim/erc32/Makefile.in gdb-7.3.1/sim/erc32/Makefile.in
---- gdb-7.3.1.orig/sim/erc32/Makefile.in	2011-01-01 16:33:58.000000000 +0100
-+++ gdb-7.3.1/sim/erc32/Makefile.in	2011-09-05 05:15:58.076770172 +0200
-@@ -19,12 +19,12 @@
- 
- ## COMMON_PRE_CONFIG_FRAG
- 
--TERMCAP_LIB = @TERMCAP@
-+# TERMCAP_LIB = -lncurses
- READLINE_LIB = @READLINE@
- 
- SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
- SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
--SIM_EXTRA_ALL = sis
-+SIM_EXTRA_ALL = sis$(EXEEXT)
- SIM_EXTRA_INSTALL = install-sis
- SIM_EXTRA_CLEAN = clean-sis
- 
-@@ -38,8 +38,8 @@
- # `sis' doesn't need interf.o.
- SIS_OFILES = exec.o erc32.o func.o help.o float.o
- 
--sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
--	$(CC) $(ALL_CFLAGS) -o sis \
-+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
-+	$(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
- 	  sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
- 
- # FIXME: This computes the build host's endianness, doesn't it?
-@@ -52,11 +52,11 @@
- 
- # Copy the files into directories where they will be run.
- install-sis: installdirs
--	n=`echo sis | sed '$(program_transform_name)'`; \
--	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
-+	n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \
-+	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n
- 
- clean-sis:
--	rm -f sis end end.h
-+	rm -f sis$(EXEEXT) end end.h
- 
- configure:
- 	@echo "Rebuilding configure..."
-diff -Naur gdb-7.3.1.orig/sim/h8300/compile.c gdb-7.3.1/sim/h8300/compile.c
---- gdb-7.3.1.orig/sim/h8300/compile.c	2011-01-11 15:19:32.000000000 +0100
-+++ gdb-7.3.1/sim/h8300/compile.c	2011-09-05 05:15:58.085770319 +0200
-@@ -38,6 +38,12 @@
- # define SIGTRAP 5
- #endif
- 
-+#ifdef _WIN32
-+#ifndef SIGBUS
-+#define SIGBUS 10
-+#endif
-+#endif
-+
- int debug;
- 
- host_callback *sim_callback;
-diff -Naur gdb-7.3.1.orig/sim/m32c/Makefile.in gdb-7.3.1/sim/m32c/Makefile.in
---- gdb-7.3.1.orig/sim/m32c/Makefile.in	2011-01-01 16:34:01.000000000 +0100
-+++ gdb-7.3.1/sim/m32c/Makefile.in	2011-09-05 05:15:58.098770530 +0200
-@@ -56,7 +56,7 @@
- 	./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c
- 
- opc2c : opc2c.o safe-fgets.o
--	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^ -o $@ $(BUILD_LIBS)
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ $(BUILD_LIBS)
- 
- sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
- 	../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
-@@ -90,8 +90,8 @@
- r8c.o : cpu.h mem.h misc.h int.h
- 
- opc2c.o : opc2c.c safe-fgets.h
--	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/opc2c.c
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c
- 
- safe-fgets.o : safe-fgets.c safe-fgets.h
--	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/safe-fgets.c
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c
- 
-diff -Naur gdb-7.3.1.orig/sim/ppc/device.c gdb-7.3.1/sim/ppc/device.c
---- gdb-7.3.1.orig/sim/ppc/device.c	2011-02-14 06:14:27.000000000 +0100
-+++ gdb-7.3.1/sim/ppc/device.c	2011-09-05 05:15:58.112770758 +0200
-@@ -1816,7 +1816,7 @@
- /* I/O */
- 
- EXTERN_DEVICE\
--(void volatile)
-+(void)
- device_error(device *me,
- 	     const char *fmt,
- 	     ...)
-diff -Naur gdb-7.3.1.orig/sim/ppc/device.h gdb-7.3.1/sim/ppc/device.h
---- gdb-7.3.1.orig/sim/ppc/device.h	2001-12-14 01:22:12.000000000 +0100
-+++ gdb-7.3.1/sim/ppc/device.h	2011-09-05 05:15:58.112770758 +0200
-@@ -727,7 +727,7 @@
-    */
- 
- EXTERN_DEVICE\
--(void volatile) device_error
-+(void) device_error
- (device *me,
-  const char *fmt,
-  ...) __attribute__ ((format (printf, 2, 3)));
-diff -Naur gdb-7.3.1.orig/sim/ppc/hw_glue.c gdb-7.3.1/sim/ppc/hw_glue.c
---- gdb-7.3.1.orig/sim/ppc/hw_glue.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-7.3.1/sim/ppc/hw_glue.c	2011-09-05 05:15:58.112770758 +0200
-@@ -194,13 +194,13 @@
-     if (glue->sizeof_output == 0)
-       device_error(me, "at least one reg property size must be nonzero");
-     if (glue->sizeof_output % sizeof(unsigned_word) != 0)
--      device_error(me, "reg property size must be %d aligned", sizeof(unsigned_word));
-+      device_error(me, "reg property size must be %zd aligned", sizeof(unsigned_word));
-     /* and the address */
-     device_address_to_attach_address(device_parent(me),
- 				     &unit.address, &glue->space, &glue->address,
- 				     me);
-     if (glue->address % (sizeof(unsigned_word) * max_nr_interrupts) != 0)
--      device_error(me, "reg property address must be %d aligned",
-+      device_error(me, "reg property address must be %zd aligned",
- 		   sizeof(unsigned_word) * max_nr_interrupts);
-     glue->nr_outputs = glue->sizeof_output / sizeof(unsigned_word);
-     glue->output = zalloc(glue->sizeof_output);
diff --git a/contrib/crossrpms/patches/gdb-7.3.91-rtems4.11-20111213.diff b/contrib/crossrpms/patches/gdb-7.3.91-rtems4.11-20111213.diff
deleted file mode 100644
index 1f4a0a9..0000000
--- a/contrib/crossrpms/patches/gdb-7.3.91-rtems4.11-20111213.diff
+++ /dev/null
@@ -1,417 +0,0 @@
-diff -Naur gdb-7.3.91.orig/gdb/lm32-tdep.c gdb-7.3.91/gdb/lm32-tdep.c
---- gdb-7.3.91.orig/gdb/lm32-tdep.c	2011-03-18 19:52:30.000000000 +0100
-+++ gdb-7.3.91/gdb/lm32-tdep.c	2011-12-13 17:35:04.906547124 +0100
-@@ -35,7 +35,7 @@
- #include "regcache.h"
- #include "trad-frame.h"
- #include "reggroups.h"
--#include "opcodes/lm32-desc.h"
-+#include "../opcodes/lm32-desc.h"
- 
- #include "gdb_string.h"
- 
-diff -Naur gdb-7.3.91.orig/gdb/sparc-tdep.c gdb-7.3.91/gdb/sparc-tdep.c
---- gdb-7.3.91.orig/gdb/sparc-tdep.c	2011-09-28 19:59:42.000000000 +0200
-+++ gdb-7.3.91/gdb/sparc-tdep.c	2011-12-13 17:35:04.906547126 +0100
-@@ -1306,7 +1306,7 @@
- sparc32_store_return_value (struct type *type, struct regcache *regcache,
- 			    const gdb_byte *valbuf)
- {
--  int len = TYPE_LENGTH (type);
-+  size_t len = TYPE_LENGTH (type);
-   gdb_byte buf[8];
- 
-   gdb_assert (!sparc_structure_or_union_p (type));
-diff -Naur gdb-7.3.91.orig/sim/common/gentmap.c gdb-7.3.91/sim/common/gentmap.c
---- gdb-7.3.91.orig/sim/common/gentmap.c	2006-11-07 20:29:59.000000000 +0100
-+++ gdb-7.3.91/sim/common/gentmap.c	2011-12-13 17:35:16.241735413 +0100
-@@ -2,6 +2,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- struct tdefs {
-   char *symbol;
-diff -Naur gdb-7.3.91.orig/sim/erc32/configure gdb-7.3.91/sim/erc32/configure
---- gdb-7.3.91.orig/sim/erc32/configure	2011-12-03 19:23:45.000000000 +0100
-+++ gdb-7.3.91/sim/erc32/configure	2011-12-13 17:42:52.505312868 +0100
-@@ -591,8 +591,9 @@
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- cgen_breaks
-+READLINE_CFLAGS
-+READLINE_DEPS
- READLINE
--TERMCAP
- REPORT_BUGS_TEXI
- REPORT_BUGS_TO
- PKGVERSION
-@@ -722,6 +723,7 @@
- enable_sim_profile
- with_pkgversion
- with_bugurl
-+with_system_readline
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1364,6 +1366,7 @@
-   --with-zlib             include zlib support (auto/yes/no) default=auto
-   --with-pkgversion=PKG   Use PKG in the version string in place of "GDB"
-   --with-bugurl=URL       Direct users to URL to report a bug
-+  --with-system-readline  use installed readline library
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -4737,86 +4740,41 @@
- done
- 
- 
--# In the Cygwin environment, we need some additional flags.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin" >&5
--$as_echo_n "checking for cygwin... " >&6; }
--if test "${sim_cv_os_cygwin+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
- 
--#ifdef __CYGWIN__
--lose
--#endif
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "lose" >/dev/null 2>&1; then :
--  sim_cv_os_cygwin=yes
--else
--  sim_cv_os_cygwin=no
-+# Check whether --with-system-readline was given.
-+if test "${with_system_readline+set}" = set; then :
-+  withval=$with_system_readline;
- fi
--rm -f conftest*
- 
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_cv_os_cygwin" >&5
--$as_echo "$sim_cv_os_cygwin" >&6; }
- 
--if test x$sim_cv_os_cygwin = xyes; then
--  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltermcap" >&5
--$as_echo_n "checking for main in -ltermcap... " >&6; }
--if test "${ac_cv_lib_termcap_main+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltermcap  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+if test "$with_system_readline" = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
-+$as_echo_n "checking for readline... " >&6; }
-+  save_LIBS="$LIBS"
-+  LIBS="-lreadline $save_LIBS"
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char add_history ();
- int
- main ()
- {
--return main ();
-+return add_history ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_termcap_main=yes
--else
--  ac_cv_lib_termcap_main=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_main" >&5
--$as_echo "$ac_cv_lib_termcap_main" >&6; }
--if test "x$ac_cv_lib_termcap_main" = x""yes; then :
--  TERMCAP=-ltermcap
--else
--  TERMCAP=""
--fi
--
--fi
--
--
--# We prefer the in-tree readline.  Top-level dependencies make sure
--# src/readline (if it's there) is configured before src/sim.
--if test -r ../../readline/Makefile; then
--  READLINE=../../readline/libreadline.a
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
--$as_echo_n "checking for readline in -lreadline... " >&6; }
--if test "${ac_cv_lib_readline_readline+set}" = set; then :
--  $as_echo_n "(cached) " >&6
-+  READLINE=-lreadline
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline $TERMCAP $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+   LIBS="-lreadline -lncurses $save_LIBS"
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -4825,33 +4783,39 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char readline ();
-+char add_history ();
- int
- main ()
- {
--return readline ();
-+return add_history ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_readline_readline=yes
-+  READLINE="-lreadline -lncurses"
- else
--  ac_cv_lib_readline_readline=no
-+  as_fn_error "unable to detect readline" "$LINENO" 5
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
--$as_echo "$ac_cv_lib_readline_readline" >&6; }
--if test "x$ac_cv_lib_readline_readline" = x""yes; then :
--  READLINE=-lreadline
--else
--  as_fn_error "the required \"readline\" library is missing" "$LINENO" 5
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  LIBS="$save_LIBS"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
-+$as_echo "$READLINE" >&6; }
-+  READLINE_DEPS=
-+  READLINE_CFLAGS=
-+else
-+  READLINE='../../readline/libreadline.a -lncurses'
-+  READLINE_DEPS='$(READLINE)'
-+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
- fi
- 
--fi
-+
-+
- 
- 
- ac_sources="$sim_link_files"
-diff -Naur gdb-7.3.91.orig/sim/erc32/configure.ac gdb-7.3.91/sim/erc32/configure.ac
---- gdb-7.3.91.orig/sim/erc32/configure.ac	2011-10-18 02:30:57.000000000 +0200
-+++ gdb-7.3.91/sim/erc32/configure.ac	2011-12-13 17:37:22.804837337 +0100
-@@ -7,27 +7,32 @@
- 
- AC_CHECK_HEADERS(stdlib.h)
- 
--# In the Cygwin environment, we need some additional flags.
--AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
--[AC_EGREP_CPP(lose, [
--#ifdef __CYGWIN__
--lose
--#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])])
-+AC_ARG_WITH([system-readline],
-+  [AS_HELP_STRING([--with-system-readline],
-+                  [use installed readline library])])
- 
--if test x$sim_cv_os_cygwin = xyes; then
--  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
-+if test "$with_system_readline" = yes; then
-+  AC_MSG_CHECKING([for readline])
-+  save_LIBS="$LIBS"
-+  LIBS="-lreadline $save_LIBS"
-+  AC_LINK_IFELSE([AC_LANG_CALL([],
-+    [add_history])], [READLINE=-lreadline], 
-+    [ LIBS="-lreadline -lncurses $save_LIBS"
-+      AC_LINK_IFELSE([AC_LANG_CALL([],
-+        [add_history])], [READLINE="-lreadline -lncurses"],
-+        [AC_MSG_ERROR([unable to detect readline])])
-+    ])
-+  LIBS="$save_LIBS"
-+  AC_MSG_RESULT($READLINE)
-+  READLINE_DEPS=
-+  READLINE_CFLAGS=
- else
--  AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="")
--fi
--AC_SUBST(TERMCAP)
--
--# We prefer the in-tree readline.  Top-level dependencies make sure
--# src/readline (if it's there) is configured before src/sim.
--if test -r ../../readline/Makefile; then
--  READLINE=../../readline/libreadline.a
--else
--  AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
--	       AC_ERROR([the required "readline" library is missing]), $TERMCAP)
-+  READLINE='../../readline/libreadline.a -lncurses'
-+  READLINE_DEPS='$(READLINE)'
-+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
- fi
- AC_SUBST(READLINE)
-+AC_SUBST(READLINE_DEPS)
-+AC_SUBST(READLINE_CFLAGS)
-+
- SIM_AC_OUTPUT
-diff -Naur gdb-7.3.91.orig/sim/erc32/erc32.c gdb-7.3.91/sim/erc32/erc32.c
---- gdb-7.3.91.orig/sim/erc32/erc32.c	2010-05-11 16:18:20.000000000 +0200
-+++ gdb-7.3.91/sim/erc32/erc32.c	2011-12-13 17:35:48.790276105 +0100
-@@ -414,7 +414,7 @@
-     if (rom8) mec_memcfg &= ~0x20000;
-     else mec_memcfg |= 0x20000;
- 
--    mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
-+    mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
-     mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
- 
-     if (sparclite_board) {
-diff -Naur gdb-7.3.91.orig/sim/erc32/Makefile.in gdb-7.3.91/sim/erc32/Makefile.in
---- gdb-7.3.91.orig/sim/erc32/Makefile.in	2011-01-01 16:33:58.000000000 +0100
-+++ gdb-7.3.91/sim/erc32/Makefile.in	2011-12-13 17:37:09.463615921 +0100
-@@ -19,12 +19,12 @@
- 
- ## COMMON_PRE_CONFIG_FRAG
- 
--TERMCAP_LIB = @TERMCAP@
-+# TERMCAP_LIB = -lncurses
- READLINE_LIB = @READLINE@
- 
- SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
- SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
--SIM_EXTRA_ALL = sis
-+SIM_EXTRA_ALL = sis$(EXEEXT)
- SIM_EXTRA_INSTALL = install-sis
- SIM_EXTRA_CLEAN = clean-sis
- 
-@@ -38,8 +38,8 @@
- # `sis' doesn't need interf.o.
- SIS_OFILES = exec.o erc32.o func.o help.o float.o
- 
--sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
--	$(CC) $(ALL_CFLAGS) -o sis \
-+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
-+	$(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
- 	  sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
- 
- # FIXME: This computes the build host's endianness, doesn't it?
-@@ -52,11 +52,11 @@
- 
- # Copy the files into directories where they will be run.
- install-sis: installdirs
--	n=`echo sis | sed '$(program_transform_name)'`; \
--	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
-+	n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \
-+	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n
- 
- clean-sis:
--	rm -f sis end end.h
-+	rm -f sis$(EXEEXT) end end.h
- 
- configure:
- 	@echo "Rebuilding configure..."
-diff -Naur gdb-7.3.91.orig/sim/h8300/compile.c gdb-7.3.91/sim/h8300/compile.c
---- gdb-7.3.91.orig/sim/h8300/compile.c	2011-07-05 21:06:37.000000000 +0200
-+++ gdb-7.3.91/sim/h8300/compile.c	2011-12-13 17:36:05.713557225 +0100
-@@ -38,6 +38,12 @@
- # define SIGTRAP 5
- #endif
- 
-+#ifdef _WIN32
-+#ifndef SIGBUS
-+#define SIGBUS 10
-+#endif
-+#endif
-+
- int debug;
- 
- host_callback *sim_callback;
-diff -Naur gdb-7.3.91.orig/sim/m32c/Makefile.in gdb-7.3.91/sim/m32c/Makefile.in
---- gdb-7.3.91.orig/sim/m32c/Makefile.in	2011-01-01 16:34:01.000000000 +0100
-+++ gdb-7.3.91/sim/m32c/Makefile.in	2011-12-13 17:36:55.055376384 +0100
-@@ -56,7 +56,7 @@
- 	./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c
- 
- opc2c : opc2c.o safe-fgets.o
--	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^ -o $@ $(BUILD_LIBS)
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ $(BUILD_LIBS)
- 
- sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
- 	../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
-@@ -90,8 +90,8 @@
- r8c.o : cpu.h mem.h misc.h int.h
- 
- opc2c.o : opc2c.c safe-fgets.h
--	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/opc2c.c
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c
- 
- safe-fgets.o : safe-fgets.c safe-fgets.h
--	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/safe-fgets.c
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c
- 
-diff -Naur gdb-7.3.91.orig/sim/ppc/device.c gdb-7.3.91/sim/ppc/device.c
---- gdb-7.3.91.orig/sim/ppc/device.c	2011-02-14 06:14:27.000000000 +0100
-+++ gdb-7.3.91/sim/ppc/device.c	2011-12-13 17:36:22.300832500 +0100
-@@ -1816,7 +1816,7 @@
- /* I/O */
- 
- EXTERN_DEVICE\
--(void volatile)
-+(void)
- device_error(device *me,
- 	     const char *fmt,
- 	     ...)
-diff -Naur gdb-7.3.91.orig/sim/ppc/device.h gdb-7.3.91/sim/ppc/device.h
---- gdb-7.3.91.orig/sim/ppc/device.h	2001-12-14 01:22:12.000000000 +0100
-+++ gdb-7.3.91/sim/ppc/device.h	2011-12-13 17:36:22.301832531 +0100
-@@ -727,7 +727,7 @@
-    */
- 
- EXTERN_DEVICE\
--(void volatile) device_error
-+(void) device_error
- (device *me,
-  const char *fmt,
-  ...) __attribute__ ((format (printf, 2, 3)));
-diff -Naur gdb-7.3.91.orig/sim/ppc/hw_glue.c gdb-7.3.91/sim/ppc/hw_glue.c
---- gdb-7.3.91.orig/sim/ppc/hw_glue.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-7.3.91/sim/ppc/hw_glue.c	2011-12-13 17:36:40.455134200 +0100
-@@ -194,13 +194,13 @@
-     if (glue->sizeof_output == 0)
-       device_error(me, "at least one reg property size must be nonzero");
-     if (glue->sizeof_output % sizeof(unsigned_word) != 0)
--      device_error(me, "reg property size must be %d aligned", sizeof(unsigned_word));
-+      device_error(me, "reg property size must be %zd aligned", sizeof(unsigned_word));
-     /* and the address */
-     device_address_to_attach_address(device_parent(me),
- 				     &unit.address, &glue->space, &glue->address,
- 				     me);
-     if (glue->address % (sizeof(unsigned_word) * max_nr_interrupts) != 0)
--      device_error(me, "reg property address must be %d aligned",
-+      device_error(me, "reg property address must be %zd aligned",
- 		   sizeof(unsigned_word) * max_nr_interrupts);
-     glue->nr_outputs = glue->sizeof_output / sizeof(unsigned_word);
-     glue->output = zalloc(glue->sizeof_output);
diff --git a/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110724.diff b/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110724.diff
deleted file mode 100644
index 279c57f..0000000
--- a/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110724.diff
+++ /dev/null
@@ -1,5988 +0,0 @@
-diff -Naur newlib-1.19.0.orig/.cvsignore newlib-1.19.0/.cvsignore
---- newlib-1.19.0.orig/.cvsignore	2007-02-13 16:25:58.000000000 +0100
-+++ newlib-1.19.0/.cvsignore	1970-01-01 01:00:00.000000000 +0100
-@@ -1,33 +0,0 @@
--*-all
--*-co
--*-dirs
--*-done
--*-install-info
--*-src
--*-stamp-*
--*-tagged
--blockit
--cfg-paper.info
--config.status
--configure.aux
--configure.cp
--configure.cps
--configure.dvi
--configure.fn
--configure.fns
--configure.ky
--configure.kys
--configure.log
--configure.pg
--configure.pgs
--configure.toc
--configure.tp
--configure.tps
--configure.vr
--configure.vrs
--dir.info
--Makefile
--lost+found
--update.out
--update.sourceware
--autom4te.cache
-diff -Naur newlib-1.19.0.orig/newlib/ChangeLog newlib-1.19.0/newlib/ChangeLog
---- newlib-1.19.0.orig/newlib/ChangeLog	2010-12-16 22:58:38.000000000 +0100
-+++ newlib-1.19.0/newlib/ChangeLog	2011-07-24 06:43:01.625138903 +0200
-@@ -1,3 +1,381 @@
-+2011-07-19  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/sys/unistd.h (_CS_XBS5_WIDTH_RESTRICTED_ENVS): Define.
-+	(_CS_V6_ENV): Fix definition.
-+
-+2011-07-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/locale/lmessages.c (_C_messages_locale):
-+	Move __HAVE_LOCALE_INFO_EXTENDED__ before codeset.
-+
-+2011-07-19  Matt Johnson  <johnso87 at crhc.illinois.edu>
-+
-+	* libc/reent/sbrkr.c: Define _sbrk_r independently of the definition
-+	of MALLOC_PROVIDED.
-+
-+2011-07-15  Yufeng Zhang  <yufeng.zhang at arm.com>
-+
-+	* libc/stdio/vfwprintf.c (wcvt): Add a new parameter len of type
-+	int.  *length is set to the value of (rev - digits) regardless
-+	of whether _MB_CAPABLE is defined or not.  Replace BUF with len
-+	in calling _mbsnrtowcs_r and also in the loop where _MB_CAPABLE
-+	is not defined.
-+	(_VFWPRINTF_R): Call wcvt with an extra argument.  Call wcvt
-+	again with allocated new buffer if buf is not large enough for
-+	the conversion.
-+	* testsuite/newlib.stdio/stdio.exp: New.
-+	* testsuite/newlib.stdio/swprintf.c: Likewise.
-+
-+2011-07-15  Matt Johnson  <johnso87 at crhc.illinois.edu>
-+
-+	* libc/stdio/fscanf.c (fscanf): Call _vfscanf_r instead of __svfscanf_r
-+	to make sure CHECK_INIT is called.
-+	(_fscanf_r): Ditto.
-+	* /libc/stdio/scanf.c (scanf): Ditto.
-+	(_scanf_r): Ditto.
-+	* libc/stdio/fwscanf.c (fwscanf): Call _vfwscanf_r instead of
-+	__svfwscanf_r to make sure CHECK_INIT is called.
-+	(_fwscanf_r): Ditto.
-+	* libc/stdio/wscanf.c (wscanf): Ditto.
-+	(_wscanf_r): Ditto.
-+
-+2011-07-13  Hans-Peter Nilsson <hp at axis.com>
-+
-+	* libm/complex/cacos.c: Use temporaries and correct sequencing
-+	error in previous reordering change.
-+
-+2011-06-25  Andreas Becker  <becker at se-elektronic.de>
-+
-+	* libc/time/mktime.c (mktime): Lock global timezone info while
-+	accessing it.
-+
-+2011-06-14  Philip Munts  <phil at munts.net>
-+
-+	* libc/time/asctime_r.c (asctime_r): Replace call to sprintf with call
-+	to siprintf.
-+	* libc/time/strftime.c: Define snprintf to sniprintf in multibyte case.
-+	* libc/time/tzset_r.c: Define sscanf to siscanf.
-+
-+2011-06-14  Joseph Myers  <joseph at codesourcery.com>
-+
-+	* configure.host: Don't handle ep9312, strongarm, xscale and thumb
-+	target names.
-+	* libc/machine/configure.in: Don't handle xscale target names.
-+	* libc/machine/configure: Regenerate.
-+
-+2011-06-14  Craig Howland <howland at LGSInnovations.com>
-+
-+	* libc/time/tzset_r.c (tzset_r):  Correct behavior for changing from
-+	non-GMT to GMT, when un-setting TZ.  Set _timezone and _daylight even
-+	if no DST is given in TZ.
-+
-+2011-06-13  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/stdio/wsetup.c (__swsetup_r): Set errno on failure.
-+	* libc/stdio/fvwrite.c (__sfvwrite_r): Simplify.
-+	* libc/stdio/wbuf.c (__swbuf_r): Likewise.
-+	* libc/stdio/local.h (cantwrite): Adjust comment.
-+
-+2011-06-09  Yaakov Selkowitz  <yselkowitz at ...>
-+
-+	* libc/include/string.h (strdupa): New macro function.
-+	(strndupa): New macro function.
-+
-+2011-05-27  Nick Clifton  <nickc at redhat.com>
-+
-+	* libc/sys/sysnecv850/sbrk.c (_sbrk): Tidy code.
-+	Base start of heap on the "heap_start" symbol.
-+
-+2011-05-25  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/string/strerror.c (_strerror_r): Report "Success" for 0.
-+
-+2011-05-25  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/string/strerror.c (strerror): Split body into...
-+	(_strerror_r): ...new reentrant function.
-+	* libc/string/u_strerr.c (_user_strerror): Update signature.
-+	* libc/include/string.h (_strerror_r): New prototype.
-+	* libc/posix/collate.c (__collate_err): Adjust callers.
-+	* libc/stdio/perror.c (_perror_r): Likewise.
-+	* libc/string/strerror_r.c (strerror_r): Likewise.
-+	* libc/string/xpg_strerror_r.c (__xpg_strerror_r): Likewise.
-+
-+2011-05-19  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/stdio_ext.h: New header.
-+	* libc/stdio/fpurge.c [!__rtems__] (__fpurge): New function.
-+
-+2011-05-19  Matthew Gretton-Dann  <matthew.gretton-dann at arm.com>
-+
-+	* Makefile.am (install-data-local): Fix condition and rm call.
-+	* Makefile.in: Regenerate.
-+
-+2011-05-16  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/time.h (CLOCK_PROCESS_CPUTIME_ID): Rename from
-+	CLOCK_PROCESS_CPUTIME.
-+	(CLOCK_THREAD_CPUTIME_ID): Rename from CLOCK_THREAD_CPUTIME.
-+	* libc/include/sys/features.h [__CYGWIN__] (_POSIX_CPUTIME): Define.
-+	(_POSIX_THREAD_CPUTIME): Define.
-+
-+2011-05-16  Christian Bruel  <christian.bruel at st.com>
-+
-+	* libc/stdlib/strtod.c (_strtod_r): Fix nf/nd counts to not exceed
-+	DBL_DIG.
-+
-+2011-05-15  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/features.h (_POSIX_THREAD_ATTR_STACKADDR): Define
-+	to 200112L for Cygwin.
-+
-+2011-05-12  Peter Rosin  <peda at lysator.liu.se>
-+
-+	* libc/time/strptime.c (strptime): Fill in tm_yday when all of tm_year,
-+	tm_mon and tm_mday are updated. Fill in tm_mon, tm_mday and tm_wday
-+	when both of tm_year and tm_yday are updated.
-+
-+2011-05-12  Peter Rosin  <peda at lysator.liu.se>
-+
-+	* libc/time/strptime.c (first_day): Actually return the wday
-+	of the first day of the year.
-+
-+2011-05-10  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/locale/lmessages.c (_C_messages_locale): Add missing comma.
-+
-+2011-05-04  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/signal.h (psignal): Declare.
-+	* libc/sys/linux/psignal.c: Move from here...
-+	* libc/signal/psignal.c: ... to here. Document.
-+	* libc/sys/linux/Makefile.am (GENERAL_SOURCES): Move psignal.c from here...
-+	* libc/signal/Makefile.am (LIB_SOURCES): ... to here.
-+	(CHEWOUT_FILES): Add psignal.def.
-+	* libc/sys/linux/Makefile.in: Regenerate.
-+	* libc/signal/Makefile.in: Ditto.
-+	* libc/signal/signal.tex: Add references to psignal.
-+
-+2011-05-04  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/locale/lmessages.h (__messages_load_locale): Declare.  Remove
-+	accidental declaration of __numeric_load_locale.
-+	* libc/locale/locale.c: Include timelocal.h to get declaration of
-+	__time_load_locale.
-+	(__set_locale_from_locale_alias): Fix return type.
-+	(__locale_msgcharset): Avoid compiler warnings.
-+	(_localeconv_r): Ditto.
-+
-+2011-05-04  Andy Koppe  <andy.koppe at gmail.com>
-+
-+	* libc/locale/locale.c (current_categories): On Cygwin, set LC_CTYPE 
-+	to C.UTF-8 to match initial __wctomb and __mbtowc settings.
-+	(lc_ctype_charset): On Cygwin, initialize to "UTF-8".
-+	(loadlocale): Remove unused Cygwin-specifc code.
-+
-+2011-05-02  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/sys/features.h [__CYGWIN__] (_POSIX_SPIN_LOCKS): Define.
-+	* libc/include/sys/types.h: Cygwin provides its own pthread_spinlock_t
-+	typedef.
-+
-+2011-04-20  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/include/limits.h: Compute SSIZE_MAX on __SIZE_MAX__.
-+
-+2011-04-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/include/stdint.h: Rework SIZE_MAX.
-+	* libc/sys/rtems/include/limits.h: Rework SSIZE_MAX.
-+
-+2011-04-19  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/signal.h (_sig_func_ptr): Define with int parameter
-+	per POSIX.  Explain in comment.
-+
-+2011-04-15  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/string/strchrnul.c (strchrnul): Fix strchrnul.
-+
-+2011-03-27  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/string.h (strchrnul): Declare.
-+	* libc/string/strchrnul.c: New file.
-+	* libc/string/Makefile.am (ELIX_2_SOURCES): Add strchrnul.c.
-+	* libc/string/Makefile.in: Regenerate.
-+
-+2011-03-23  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/sys/dirent.h: Add const to "select" parameter.
-+
-+2011-03-23  Nick Clifton  <nickc at redhat.com>
-+
-+	* libc/machine/frv/setjmp.S: Fix typo in .size directive.
-+
-+2011-03-21  Kevin Buettner  <kevinb at redhat.com>
-+
-+	* libc/sys/sysnecv850/trap.S (___trap0): Fix errno handling.
-+	* libc/sys/sysnecv850/rename.c: New file.
-+	* libc/sys/sysnecv850/Makefile.am (lib_a_SOURCES): Add rename.c
-+	* libc/sys/sysnecv850/Makefile.in: Regenerate.
-+	* libc/sys/sysnecv850/fstat.c (_fstat): Invoke trap for SYS_fstat.
-+	* libc/sys/sysnecv850/unlink.c (_unlink): Invoke trap for SYS_unlink.
-+
-+2011-03-03  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/string.h: Include sys/cdefs.h.
-+
-+2011-03-03  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/cdefs.h (__CONCAT1): Define.
-+	(__CONCAT): Define.
-+	(__STRING): Define.
-+	(__XSTRING): Define.
-+	(__ASMNAME): Define.
-+	* libc/include/string.h (strerror_r): Use __ASMNAME to take target
-+	specific label prefixes into account.
-+
-+2011-03-01  Aaron Landwehr <snaphat at gmail.com>
-+
-+	* libm/complex/cproj.c: Fix typo.
-+	* libm/complex/cprojf.c: Ditto.
-+
-+2011-02-22  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/stdio/fmemopen.c (fmemopen): Fix EINVAL condition.  Avoid SEGV
-+	if incoming buffer is NULL.
-+
-+2011-02-09  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/include/string.h (strerror_r): Update declaration.
-+	* libc/string/strerror.c (strerror): Update documentation.
-+	* libc/string/strerror_r.c (strerror_r): Always return
-+	NUL-terminated string; don't overwrite too-short buf.
-+	* libc/string/xpg_strerror_r.c (__xpg_strerror_r): Implement POSIX
-+	variant.
-+	* libc/string/Makefile.am (GENERAL_SOURCES): Build new file.
-+	* libc/string/Makefile.in: Regenerate.
-+
-+2011-02-07	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/stdlib.h: More ansi-compliance.
-+
-+2011-02-01	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+	
-+	* libc/include/stdio.h: More ansi-compliance.
-+
-+	* libc/include/stdlib.h: Remove atoff.
-+	* libc/stdlib/atoff.c: Remove.
-+	* libc/stdlib/atof.c: Remove atoff.
-+	* libc/stdlib/Makefile.am: Remove atoff.
-+	* libc/stdlib/Makefile.in: Regenerate.
-+
-+	* libc/include/stdio.h: Make fdopen accessible to c99.
-+
-+2011-01-31	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/crt0.c: Add clock_gettime, gettimeofday,
-+	sched_yield.
-+
-+2011-01-28  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/stdio/fclose.c: Only use sfp lock to guard non-atomic
-+	changes of flags and fp lock.
-+	* libc/stdio/freopen.c: Ditto.
-+	* libc/stdio64/freopen64.c: Ditto.
-+	* libc/stdio/fgetc.c: Revert change from 2009-04-24, remove sfp locks
-+	which guard entire function to avoid potential deadlocks when using
-+	stdio functions in multiple thraeds.
-+	* libc/stdio/fgets.c: Ditto.
-+	* libc/stdio/fgetwc.c: Ditto.
-+	* libc/stdio/fgetws.c: Ditto.
-+	* libc/stdio/fread.c: Ditto.
-+	* libc/stdio/fseek.c: Ditto.
-+	* libc/stdio/getc.c: Ditto.
-+	* libc/stdio/getdelim.c: Ditto.
-+	* libc/stdio/gets.c: Ditto.
-+	* libc/stdio/vfscanf.c: Ditto.
-+	* libc/stdio/vfwscanf.c: Ditto.
-+
-+	* libc/stdio/fflush.c (_fflush_r): Split out core functionality into
-+	new function __sflush_r.  Just lock file and call __sflush_r from here.
-+	* libc/stdio/fwalk.c (_fwalk): Remove static helper function and move
-+	functionality back into main function. Don't walk a file with flags
-+	value of 1.  Add comment.
-+	(_fwalk_reent): Ditto.
-+	* libc/stdio/local.h (__sflush_r): Declare.
-+	* libc/stdio/refill.c (__srefill): Before calling fwalk, set flags
-+	value to 1 so this file pointer isn't walked.  Revert flags afterwards
-+	and call __sflush_r for this fp if necessary.  Add comments.
-+
-+2011-01-27  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/features.h: Define __STDC_ISO_10646__ for Cygwin.
-+	* libc/include/wchar.h: Include features.h.
-+
-+2011-01-15  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/sys/types.h (ulong): Add typedef.
-+
-+2011-01-12  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libm/math/w_tgamma.c: Only build ifndef _DOUBLE_IS_32BITS.
-+	* libm/math/wf_tgamma.c: Map tgamma to tgammaf, ifdef _DOUBLE_IS_32BITS.
-+
-+2011-01-11	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/string.h: Remove Cygwin DEFS_H kludge.
-+
-+2011-01-10  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/machine/mips/strlen.c (strlen): Add delay slot for R3000.
-+
-+2011-01-10  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+	* libc/include/string.h: Make strsignal() available unconditionally.
-+
-+2011-01-07  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/crt0.c: Adjust free() and calloc() to match their
-+	public decls.
-+
-+2011-01-05  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* Makefile.am: Move cleaning targ-include to clean-local.
-+	* Makefile.in: Regenerate.
-+
-+2011-01-05  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/open_memstream.c (internal_open_memstream_r):
-+	Don't limit c->max to 64*1024 on targets with SIZE_MAX < 64*1024.
-+
-+2011-01-05  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/xdr/xdr.c: Fix typos in #errors.
-+
-+2011-01-05  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/xdr/xdr_private.h: Include <stdint.h>
-+	* libc/xdr/xdr_rec.c: Include limits.h
-+
-+2011-01-05  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/Makefile.am (SUBDEFS): Remove redundant posix/stmp-def.
-+	* libc/Makefile.in: Regenerate.
-+
-+2011-01-05  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/configure.in: Remove redundant posix_dir processing.
-+	* libc/configure: Regenerate.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* doc/makedoc.c: Add cludge to make makedoc 64bit compliant.
-+
-+2010-12-31  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* MAINTAINERS: Change corinna at vinchen.de to corinna at vinschen.de.
-+
- 2010-12-16  Jeff Johnston  <jjohnstn at redhat.com>
- 
- 	* NEWS: Update with 1.19.0 info.
-@@ -28,12 +406,12 @@
- 
- 	* libm/mathfp/sf_logarithm.c: Change isfinitef reference to isfinite.
- 
--2010-12-08      Ralf Corsepius <ralf.corsepius at rtems.org>
-+2010-12-08  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* include/sys/types.h: Add #if defined(__rtems__) around
- 	pthread_attr_t.guardsize.
- 
--2010-12-08      Joel Sherrill <joel at OARcorp.com>
-+2010-12-08  Joel Sherrill <joel at OARcorp.com>
- 
- 	* include/pthread.h: Add pthread_attr_setstack, pthread_attr_getstack,
- 	pthread_attr_getguardsize, pthread_attr_setguardsize.
-@@ -847,7 +1225,7 @@
- 	(__cp_index): Map invalid Windows codepage number 101 to
- 	GEORGIAN-PS conversion array, 102 to PT154 conversion array.
- 
--2010-02-06  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+2010-02-06  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/posix/telldir.c: Remove bogus nested prototype of lseek().
- 
-@@ -1005,6 +1383,18 @@
- 	* libc/include/sys/unistd.h (suboptarg, getsubopt): Move...
- 	* libc/include/stdlib.h: ...here, to match POSIX for getsubopt.
- 
-+2009-12-18	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/search/db_local.h:
-+	Use __uint32_t instead of u_int (prototype mismatches).
-+	* libc/search/extern.h (__buf_init): 
-+	Use __uint32_t instead of int (16 bit target portability).
-+	* libc/search/hash_buf.c: Use ptrdiff_t instead of __uint32_t,
-+	use __uint32_t instead of int (16 bit target portability).
-+	* libc/search/hash.h: Use __uint32_it instead of int
-+	(16 bit target portability).
-+	* libm/common/modfl.c: Add cast to (double*) to avoid GCC warning.
-+
- 2009-12-17  Jeff Johnston  <jjohnstn at redhat.com>
- 
- 	* NEWS: Update with 1.18.0 info.
-@@ -1048,17 +1438,17 @@
- 	* libc/stdlib/atexit.c: Ditto.
- 	* libc/stdlib/on_exit.c: Ditto.
- 
--2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/machine/ieeefp.h: Rework __IEEE_*_ENDIAN handling.
- 	* libc/machine/arm/machine/endian.h: Remove (Conflicts with
- 	libc/include/machine/endian.h)
- 
--2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/machine/setjmp.h: Set up _JBLEN #ifdef __m68k__.
- 
--2009-12-17  Ralf Corsepius <ralf.corsepius at rtems.org>
-+2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/pthread.h: Add pthread_atfork, pthread_rwlock_unlock
- 	* libc/include/sys/stat.h: Use struct timespec st_*tim,
-@@ -1076,11 +1466,11 @@
- 	and ETOOMANYREFS into general list as they are referenced
- 	by OpenGroup and needed by RTEMS.
- 
--2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/search/hcreate.c: Don't include <sys/queue.h> (Unused).
- 
--2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/sys/rtems/machine/_types.h: New (Derived from
- 	machine/_default_types.h).
-@@ -1204,6 +1594,18 @@
- 	rather check for return value of -1 and errno.  Handle EINVAL
- 	just like ESPIPE.  Only set fp->_offset if errno is 0.
- 
-+2009-10-29	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/include/inttypes.h: 
-+	Rework logic to determine PRI*PTR.
-+	Prefer long64 over longlong64.
-+	* libc/include/machine/_default_types.h: 
-+	Sync logic for __int32 with stdint.h (Prefer long over int).
-+	* libc/include/stdint.h:
-+	Remove __SPU__ hack.
-+	Prefer int for int16_t (sync with _default_types.h).
-+	Rework intptr_t determination.
-+
- 2009-10-27  Nick Clifton  <nickc at redhat.com>
- 
- 	* MAINTAINERS (ARM): Add myself as an ARM maintainer.
-@@ -1368,16 +1770,16 @@
- 	* libc/locale/locale.c: Drop Cygwin-specific windows.h include.
- 	(loadlocale): Call __set_charset_from_codepage with 0 codepage.
- 
--2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/stdlib.h: Add posix_memalign.
- 
--2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* configure.host (*-rtems*): Remove -DMISSING_SYSCALL_NAMES.
- 	Add -DHAVE_BLKSIZE, -D_NO_WORDEXP -D_NO_POPEN.
- 
--2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* configure.host (m32c): Move setting -DABORT_PROVIDED to second
- 	"case $host".
-@@ -2576,6 +2978,12 @@
- 	* libc/stdio/vfprintf.c: Ditto.
- 	* libc/stdio/vswprintf.c: Ditto.
- 
-+2009-03-09	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/machine/powerpc/times.c: Remove.
-+	* libc/machine/powerpc/Makefile.am: Remove times.c.
-+	* libc/machine/powerpc/Makefile.in: Regenerate.
-+
- 2009-03-09  Brooks Moses  <brooks at codesourcery.com>
- 
- 	* libc/machine/arm/arm_asm.h: Fix typo.
-@@ -2673,7 +3081,7 @@
- 
- 	* libc/machine/arm/strcpy.c: Add missing comma.
- 
--2009-02-26  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+2009-02-26  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/machine/lm32/configure.in: Let
- 	AC_CONFIG_SRCDIR point to setjmp.S instead of setjmp.s
-@@ -2859,24 +3267,24 @@
- 	* libc/string/wcstrings.tex: Ditto.
- 	* libc/string/Makefile.in: Regenerated.
- 
--2008-12-12  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+2008-12-12  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/stdio/fputws.c: Fix documentation.
- 	* libc/stdio/getwchar.c: Ditto.
- 	* libc/stdio/putwchar.c: Ditto.
- 
--2008-12-12  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+2008-12-12  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/include/sys/features.h: Set RTEMS's _POSIX_MONOTONIC_CLOCK to
- 	200112L (SUSv3 compliance).
- 	Comment out RTEMS's _POSIX_SHARED_MEMORY_OBJECTS (Unsupported).
- 
--2008-12-12  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+2008-12-12  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/sys/rtems/crt0.c: Add stubs for getdents(), nanosleep(),
- 	_execve(), _exit().
- 
--2008-12-12  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+2008-12-12  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* configure.host: Let *rtems* default to c99-formats.
- 
-@@ -3026,7 +3434,7 @@
- 	<linux/dirent.h>.
- 	* libc/sys/linux/io64.c: Add weak alias for _stat64.
- 
--2008-11-27  Ralf Corsepius <ralf.corsepius at rtems.org>
-+2008-11-27  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/posix/telldir.c: Use #if !defined() instead of #ifndef
- 	to fix GCC warning.
-@@ -3198,17 +3606,17 @@
- 	* libc/unix/collate.c (__collate_err): simplify to remove unnecessary
- 	strdup() and strlen() calls, also getting rid of a compiler warning.
- 
--2008-11-19  Ralf Corsepius <ralf.corsepius at rtems.org>
-+2008-11-19  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/sys/config.h: Don't put
- 	__ATTRIBUTE_IMPURE_PTR__ into .sdata section for mips-rtems.
- 
--2008-11-19  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+2008-11-19  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/posix/runetype.h: Add include of stddef.h and remove
- 	defining standard types: size_t and wchar_t.
- 
--2008-11-19  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+2008-11-19  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/include/pthread.h: Remove prototypes for
- 	pthread_attr_getcputime and pthread_attr_setcputime which
-@@ -5263,7 +5671,7 @@
- 	* libc/machine/spu/sprintf.c: Ditto.
- 	* libc/machine/spu/sscanf.c: Ditto.
- 
--2007-08-03  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+2007-08-03  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/include/tar.h: New.
- 
-@@ -6455,7 +6863,7 @@
- 	* libc/include/sys/unistd.h: Define all _SC_xxx values as
- 	required by SUSv3.  Unify formatting.
- 
--2007-02-02  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2007-02-02  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/sys/errno.h: Add ECANCELED.
- 
-@@ -7248,7 +7656,7 @@
- 	* libc/include/sys/signal.h (sigdelset, sigfillset, sigismember): New macros.
- 	(sigaddset, sigemptyset): Add return code.
- 
--2006-04-13  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+2006-04-13  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* acinclude.m4: New _NEWLIB_VERSION.
- 	* acinclude.m4(NEWLIB_CONFIGURE): AC_REQUIRE(_NEWLIB_VERSION).
-@@ -7737,7 +8145,7 @@
- 	* libc/sys/linux/sys/stat.h: Change *stat64 prototypes to
- 	take a pointer to struct stat64 rather than struct stat.
- 
--2005-12-16  Ralf Corsepius <ralf.corsepius at rtems.org>
-+2005-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/stdint.h: Prefer long over int for int32_t.
- 	Use __have_long32 to set up int32_t.
-@@ -7766,7 +8174,7 @@
- 	* libc/include/sys/types.h: Remove the ifdef armour around
- 	standard POSIX types.
- 
--2005-12-06  Ralf Corsepius <ralf.corsepius at rtems.org>
-+2005-12-06  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/sys/rtems/crt0.c: Add rtems_gxx_key_create,
- 	rtems_gxx_key_delete, rtems_gxx_getspecific,
-@@ -7845,7 +8253,7 @@
- 	* libc/sys/linux/sys/unistd.h (readlink, symlink): New
- 	prototypes.
- 
--2005-11-01  Ralf Corsepius <ralf.corsepius at rtems.org>
-+2005-11-01  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/stdint.h: Cleanup #if vs. #ifdef.
- 
-@@ -8069,11 +8477,11 @@
- 	* libc/stdlib/mallocr.c (mALLOc, rEALLOCc, mEMALIGn): Set errno
- 	to ENOMEM on failure.
- 
--2005-10-06  Ralf Corsepius <ralf.corsepius at rtems.org>
-+2005-10-06  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/stdint.h: Add [u]int_fast<N>_t types.
- 
--2005-10-04  Ralf Corsepius <ralf.corsepius at rtems.org>
-+2005-10-04  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/stdint.h: Move magic to set __have_long* to the
- 	beginning.  Use #if __have* instead of #if defined(__have*).
-@@ -8089,14 +8497,14 @@
- 	* libc/sys/linux/include/stdint.h: Include <sys/types.h> and
- 	incorporate Ralf's change below.
- 
--2005-10-03  Ralf Corsepius <ralf.corsepius at rtems.org>
-+2005-10-03  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/stdint.h:
- 	Use __INTMAX_TYPE__ to derive intmax_t.
- 	Use __UINTMAX_TYPE__ to derive uintmax_t.
- 	Fix minor typo.
- 
--2005-09-27  Ralf Corsepius <ralf.corsepius at rtems.org>
-+2005-09-27  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/stdint.h: Correct __STDINT_EXP macro incorrectly
- 	handling GCC >= 4.
-@@ -8432,16 +8840,16 @@
- 	* configure.host (newlib_cflags) <cris-*-*, crisv32-*-*>: Add
- 	-DCOMPACT_CTYPE.
- 
--2005-03-06  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-03-06  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/sys/rtems/include/inttypes.h: New file.
- 	* libc/sys/rtems/include/stdint.h: Ditto.
- 
--2005-03-06  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-03-06  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/string/memcmp.c: Fix to avoid pointer signedness warning.
- 
--2005-03-06  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-03-06  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/include/machine/_types.h: New file.
- 	* libc/include/sys/types.h: Do not check for __rtems__
-@@ -8450,7 +8858,7 @@
- 	* libc/sys/rtems/machine/_types.h: Removed.  Replaced with
- 	shared header file.
- 
--2005-02-25  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-02-25  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libm/common/fdlibm.h (FLT_UWORD_MAX, FLT_UWORD_HALF_MAX): Add
- 	L qualifier for these long constants.
-@@ -8466,13 +8874,13 @@
- 	* libc/time/strftime.c (strftime): Fix '%x' to deal with negative
- 	years.  Fix '%z' to use long, not int.
- 
--2005-02-24  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-02-24  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libm/common/s_fpclassify.c: Use __uint32_t instead of int to
- 	manipulate float values in integer form.
- 	* libm/common/sf_round.c: Ditto.
- 
--2005-02-24  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-02-24  Ralf Corsépius  <ralf.corsepius at rtems.org>
- 
- 	* libc/include/sys/types.h [__rtems__]: Include new
- 	header file machine/_types.h.
-@@ -8836,7 +9244,7 @@
- 	* libc/stdio/fread.c (fread): Fix return value for unbuffered
- 	fread.
- 
--2004-10-25  Ralf Corsepius <corsepiu at faw.uni-ulm.de>
-+2004-10-25  Ralf Corsépius <corsepiu at faw.uni-ulm.de>
- 
- 	* libc/include/machine/setjmp.h: Add AVR support.
- 	* libc/sys/rtems/crt0.S [__AVR__]: Add __stack.
-@@ -15068,7 +15476,7 @@
- 
- 	* libc/include/sys/unistd.h: Prototype chroot() for RTEMS.
- 
--2001-08-29  Ralf Corsepius <corsepiu at faw.uni-ulm.de>
-+2001-08-29  Ralf Corsépius <corsepiu at faw.uni-ulm.de>
- 
- 	* libc/machine/i386/f_atan2.S, libc/machine/i386/f_atan2f.S,
- 	  libc/machine/i386/f_exp.c, libc/machine/i386/f_expf.c,
-@@ -15745,7 +16153,7 @@
- 	* libc/sys/linux/sys/utsname.h: Ditto.
- 	* libc/sys/linux/sys/wait.h: Ditto.
- 
--2000-12-08  Ralf Corsepius <corsepiu at faw.uni-ulm.de>
-+2000-12-08  Ralf Corsépius <corsepiu at faw.uni-ulm.de>
- 
- 	* Makefile.am: $(INSTALL), $(INSTALL_DATA), and $(INSTALL_PROGRAM)
- 	can be a relative path to $(top_srcdir)/install.sh so ensure the
-@@ -16650,7 +17058,7 @@
- 	* libc/include/stdlib.h: add ptsname, grantpt, unlockpt to cygwin
- 	section
- 
--Sat Oct  2 02:02:00 MEST 1999  Ralf Corsepius <corsepiu at faw.uni-ulm.de>
-+Sat Oct  2 02:02:00 MEST 1999  Ralf Corsépius <corsepiu at faw.uni-ulm.de>
- 
- 	* libc/machine/sh/asm.h: Added __SH4_SINGLE__ to DELAYED_BRANCHES
- 	* libc/machine/sh/memcpy.S: Fix line wrapping in SL macro
-diff -Naur newlib-1.19.0.orig/newlib/ChangeLog.rtems newlib-1.19.0/newlib/ChangeLog.rtems
---- newlib-1.19.0.orig/newlib/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/ChangeLog.rtems	2011-07-24 06:43:01.627138933 +0200
-@@ -0,0 +1,88 @@
-+2011-07-24	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/iconv/iconv.tex: Rename node "Introduction" into
-+	"Introduction to iconv".
-+
-+2011-01-07	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/open_memstream.c: Replace 64 * 1024 with 0x10000 to 
-+	avoid integer overflow on h8300.
-+
-+2011-01-05	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/tmpnam.c: Include <stdint.h>.
-+	Use intptr_t instead of _POINTER_INT for improved portability.
-+	* libc/misc/__dprintf.c: Include <stdint.h>
-+	Use intptr_t instead of _POINTER_INT for improved portability.
-+
-+2011-01-05	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libm/common/s_round.c: Cast const int to __int32_t.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libm/math/e_scalb.c: Include <limits.h>.
-+	Don't rely on 65000 being a valid int.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/posix/readdir.c:	Include <stdint.h>.
-+	Cast to intptr_t instead of int.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/string/memccpy.c, libc/string/memchr.c,
-+	libc/string/memcmp.c, libc/string/memcpy.c,
-+	libc/string/memmove.c, libc/string/mempcpy.c,
-+	libc/string/memset.c, libc/string/stpcpy.c,
-+	libc/string/stpncpy.c, libc/string/strcpy.c,
-+	libc/string/strlen.c, libc/string/strncat.c,
-+	libc/string/strncpy.c (UNALIGNED):
-+	Include <stdint.h>.
-+	Cast to intptr_t instead of long.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* Makefile.am: Don't install include/rpc/*.h.
-+	* Makefile.in: Regenerate.
-+	* libc/Makefile.am: Install include/rpc/xdr.h include/rpc/types.h. 
-+	* libc/Makefile.in: Regenerate.
-+
-+2010-12-30	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/signal.h: Don't provide sighandler_t.
-+
-+2010-12-29	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/sys/dir.h: Remove.
-+
-+2010-08-10	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	PR 1475/newlib:
-+	* libc/include/stdint.h: Fall back to compute SIZE_MAX based on
-+	__SIZEOF_SIZE_T__ and __CHAR_BIT__ if available.
-+
-+2010-08-04	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/string/strcat.c: 
-+	Include <stdint.h>. Use uintptr_t instead of long in ALIGNED.
-+	* libc/string/strchr.c, libc/string/strcmp.c, libc/string/strncmp.c:
-+	Include <stdint.h>. Use uintptr_t instead of long in UNALIGNED.
-+
-+2010-07-08	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/string/index.c, libc/string/rindex.c: Include <string.h>.
-+	* libc/stdlib/putenv_r.c: Include <strings.h>
-+
-+2010-03-25	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/include/string.h: Remove bcmp, bcopy, bzero, ffs, index, rindex,
-+	strcasecmp, strncasecmp (Moved to strings.h).
-+	Remove strcmpi, stricmp, strncmpi, strnicmp.
-+	* libc/misc/ffs.c: Use <strings.h> instead of <string.h>.
-+	* libc/string/bcmp.c: Use <strings.h> instead of <string.h>.
-+	* libc/string/bzero.c: Use <strings.h> instead of <string.h>.
-+	* libc/string/rindex.c: Use <strings.h> instead of <string.h>.
-+	* libc/string/strcasecmp.c: Use <strings.h> instead of <string.h>.
-+	* libc/string/strncasecmp.c: Use <strings.h> instead of <string.h>.
-+
-diff -Naur newlib-1.19.0.orig/newlib/configure.host newlib-1.19.0/newlib/configure.host
---- newlib-1.19.0.orig/newlib/configure.host	2010-12-02 20:30:46.000000000 +0100
-+++ newlib-1.19.0/newlib/configure.host	2011-07-24 06:43:01.628138948 +0200
-@@ -120,9 +120,6 @@
-   d30v*)
- 	machine_dir=d30v
- 	;;
--  ep9312)
--	machine_dir=arm
--	;;
-   fido)
- 	machine_dir=m68k
- 	newlib_cflags="${newlib_cflags} -DCOMPACT_CTYPE"
-@@ -240,15 +237,6 @@
- 	# FIXME: Might wish to make MALLOC_ALIGNMENT more generic.
- 	newlib_cflags="${newlib_cflags} -DMALLOC_ALIGNMENT=8"
- 	;;
--  strongarm)
--	machine_dir=arm
--	;;
--  xscale)
--	machine_dir=xscale
--	;;
--  thumb)
--	machine_dir=arm
--	;;
-   tic4x|c4x)
- 	machine_dir=tic4x
- 	;;
-@@ -391,12 +379,6 @@
-   d30v*)
- 	sys_dir=
- 	;;
--  ep9312-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
-   frv*)
-         sys_dir=
-         ;;
-@@ -493,18 +475,6 @@
- 	default_newlib_io_long_long="yes"
- 	default_newlib_atexit_dynamic_alloc="no"
- 	;;
--  strongarm-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
--  thumb-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
-   tic6x*)
- 	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
- 	have_crt0="no"
-@@ -527,12 +497,6 @@
-   w65-*-*)
- 	sys_dir=w65
- 	;;
--  xscale-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
-   z8k-*-coff)
- 	sys_dir=z8ksim
- 	;;
-@@ -594,7 +558,6 @@
- # to create the program's environment.
- # If --disable-newlib-supplied-syscalls is specified, then the end-user
- # may specify the protocol via gcc spec files supplied by libgloss.
--# See also thumb below.
- 	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
- #         newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
- 	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
-@@ -629,12 +592,6 @@
- 	newlib_cflags="${newlib_cflags} -DABORT_MESSAGE -DSMALL_MEMORY -DMISSING_SYSCALL_NAMES"
- 	syscall_dir=
- 	;;
--  ep9312-*-*)
--	syscall_dir=syscalls
--	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
--	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
--	fi
--	;;
-   fido-*-elf)
- 	newlib_cflags="${newlib_cflags} -DHAVE_RENAME -DHAVE_SYSTEM -DMISSING_SYSCALL_NAMES"
- 	syscall_dir=
-@@ -758,27 +715,6 @@
- 		newlib_cflags="${newlib_cflags} -DTARGET_PTR_SIZE=64" ;;
- 	esac
- 	;;
--  strongarm-*-*)
--	syscall_dir=syscalls
--	;;
--  thumb-*-pe)
--	syscall_dir=syscalls
--# Don't use the debugging protocols just yet.
--	;;
--  thumb-*-*)
--	syscall_dir=syscalls
--# If newlib is supplying syscalls, select which debug protocol is being used.
--# ARM_RDP_MONITOR selects the Demon monitor.
--# ARM_RDI_MONITOR selects the Angel monitor.
--# If neither are defined, then hard coded defaults will be used
--# to create the program's environment.
--# If --disable-newlib-supplied-syscalls is specified, then the end-user
--# may specify the protocol via gcc spec files supplied by libgloss.
--	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
--#         newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
--	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
--	fi
--	;;
-   tic6x*)
- 	syscall_dir=
- 	newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED"
-@@ -796,13 +732,6 @@
-   xc16x-*)
-           syscall_dir=syscalls
-         ;;
--  xscale-*-*)
--	syscall_dir=syscalls
--	newlib_cflags="${newlib_cflags} -DHAVE_SYSTEM -DHAVE_RENAME"
--	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
--	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
--	fi
--	;;
-   xstormy16-*-*)
- 	syscall_dir=syscalls
- 	;;
-diff -Naur newlib-1.19.0.orig/newlib/doc/makedoc.c newlib-1.19.0/newlib/doc/makedoc.c
---- newlib-1.19.0.orig/newlib/doc/makedoc.c	2009-03-25 22:16:04.000000000 +0100
-+++ newlib-1.19.0/newlib/doc/makedoc.c	2011-07-24 06:43:01.681139767 +0200
-@@ -57,7 +57,7 @@
- {
-     char *ptr;
-     unsigned int write_idx;
--    unsigned int size;
-+    size_t size;
- } string_type;
- 
- 
-@@ -68,7 +68,7 @@
- 
- static void DEFUN(init_string_with_size,(buffer, size),
- 	   string_type *buffer AND
--	   unsigned int size )
-+	   size_t size )
- {
-   buffer->write_idx = 0;
-   buffer->size = size;
-@@ -219,8 +219,8 @@
- stinst_type *pc;
- stinst_type sstack[STACK];
- stinst_type *ssp = &sstack[0];
--int istack[STACK];
--int *isp = &istack[0];
-+long istack[STACK];
-+long *isp = &istack[0];
- 
- typedef int *word_type;
- 
-@@ -270,7 +270,7 @@
- {
-     isp++;
-     pc++;
--    *isp = (int)(*pc);
-+    *isp = (long)(*pc);
-     pc++;
-     
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/configure newlib-1.19.0/newlib/libc/configure
---- newlib-1.19.0.orig/newlib/libc/configure	2010-12-16 22:58:39.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/configure	2011-07-24 06:43:01.702140072 +0200
-@@ -625,7 +625,10 @@
- HAVE_XDR_DIR_TRUE
- LIBC_XDR_DEF
- LIBC_XDR_LIB
-+HAVE_POSIX_DIR_FALSE
-+HAVE_POSIX_DIR_TRUE
- LIBC_POSIX_DEF
-+LIBC_POSIX_LIB
- HAVE_STDIO64_DIR_FALSE
- HAVE_STDIO64_DIR_TRUE
- LIBC_STDIO64_DEF
-@@ -638,9 +641,6 @@
- HAVE_SIGNAL_DIR_TRUE
- LIBC_SIGNAL_DEF
- LIBC_SIGNAL_LIB
--HAVE_POSIX_DIR_FALSE
--HAVE_POSIX_DIR_TRUE
--LIBC_POSIX_LIB
- CRT0
- subdirs
- CPP
-@@ -11805,24 +11805,6 @@
- 
- 
- 
--LIBC_POSIX_LIB=
--if test -n "${posix_dir}"; then
--  if test "${use_libtool}" = "yes"; then
--    LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext}
--  else
--    LIBC_POSIX_LIB=${posix_dir}/lib.${aext}
--  fi
--fi
--
-- if test x${posix_dir} != x; then
--  HAVE_POSIX_DIR_TRUE=
--  HAVE_POSIX_DIR_FALSE='#'
--else
--  HAVE_POSIX_DIR_TRUE='#'
--  HAVE_POSIX_DIR_FALSE=
--fi
--
--
- LIBC_SIGNAL_LIB=
- LIBC_SIGNAL_DEF=
- if test -n "${signal_dir}"; then
-@@ -12225,10 +12207,6 @@
-   as_fn_error "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
--if test -z "${HAVE_POSIX_DIR_TRUE}" && test -z "${HAVE_POSIX_DIR_FALSE}"; then
--  as_fn_error "conditional \"HAVE_POSIX_DIR\" was never defined.
--Usually this means the macro was only invoked conditionally." "$LINENO" 5
--fi
- if test -z "${HAVE_SIGNAL_DIR_TRUE}" && test -z "${HAVE_SIGNAL_DIR_FALSE}"; then
-   as_fn_error "conditional \"HAVE_SIGNAL_DIR\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-diff -Naur newlib-1.19.0.orig/newlib/libc/configure.in newlib-1.19.0/newlib/libc/configure.in
---- newlib-1.19.0.orig/newlib/libc/configure.in	2010-04-23 01:32:40.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/configure.in	2011-07-24 06:43:01.702140072 +0200
-@@ -41,17 +41,6 @@
- dnl for the library and an automake conditional for whether we should
- dnl build the library.
- 
--LIBC_POSIX_LIB=
--if test -n "${posix_dir}"; then
--  if test "${use_libtool}" = "yes"; then
--    LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext}
--  else
--    LIBC_POSIX_LIB=${posix_dir}/lib.${aext}
--  fi
--fi
--AC_SUBST(LIBC_POSIX_LIB)
--AM_CONDITIONAL(HAVE_POSIX_DIR, test x${posix_dir} != x)
--
- LIBC_SIGNAL_LIB=
- LIBC_SIGNAL_DEF=
- if test -n "${signal_dir}"; then
-diff -Naur newlib-1.19.0.orig/newlib/libc/iconv/iconv.tex newlib-1.19.0/newlib/libc/iconv/iconv.tex
---- newlib-1.19.0.orig/newlib/libc/iconv/iconv.tex	2004-09-13 19:10:20.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/iconv/iconv.tex	2011-07-24 06:43:01.705140119 +0200
-@@ -7,7 +7,7 @@
- 
- @menu
- * iconv::                           Encoding conversion routines
--* Introduction::                    Introduction to iconv and encodings
-+* Introduction to iconv::           Introduction to iconv and encodings
- * Supported encodings::             The list of currently supported encodings
- * iconv design decisions::          General iconv library design issues
- * iconv configuration::             iconv-related configure script options
-@@ -24,8 +24,8 @@
- @include iconv/iconv.def
- 
- @page
-- at node Introduction
-- at section Introduction
-+ at node Introduction to iconv
-+ at section Introduction to iconv
- @findex encoding
- @findex character set
- @findex charset
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/inttypes.h newlib-1.19.0/newlib/libc/include/inttypes.h
---- newlib-1.19.0.orig/newlib/libc/include/inttypes.h	2009-01-19 23:02:06.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/inttypes.h	2011-07-24 06:43:01.705140119 +0200
-@@ -242,15 +242,17 @@
- #define SCNxMAX		__SCNMAX(x)
- 
- /* ptr types */
--#if __have_long64
--#define __PRIPTR(x) __STRINGIFY(l##x)
--#define __SCNPTR(x) __STRINGIFY(l##x)
--#elif __have_longlong64
--#define __PRIPTR(x) __STRINGIFY(ll##x)
--#define __SCNPTR(x) __STRINGIFY(ll##x)
-+#if INTPTR_MAX == INT64_MAX
-+#define __PRIPTR(x) __PRI64(x)
-+#define __SCNPTR(x) __SCN64(x)
-+#elif INTPTR_MAX == INT32_MAX
-+#define __PRIPTR(x) __PRI32(x)
-+#define __SCNPTR(x) __SCN32(x)
-+#elif INTPTR_MAX == INT16_MAX
-+#define __PRIPTR(x) __PRI16(x)
-+#define __SCNPTR(x) __SCN16(x)
- #else
--#define __PRIPTR(x) __STRINGIFY(x)
--#define __SCNPTR(x) __STRINGIFY(x)
-+#error cannot determine PRI*PTR
- #endif
- 
- #define PRIdPTR		__PRIPTR(d)
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/machine/_default_types.h newlib-1.19.0/newlib/libc/include/machine/_default_types.h
---- newlib-1.19.0.orig/newlib/libc/include/machine/_default_types.h	2008-06-12 00:14:54.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/machine/_default_types.h	2011-07-24 06:43:01.705140119 +0200
-@@ -54,14 +54,14 @@
- #endif
- #endif
- 
--#if __EXP(INT_MAX) == 0x7fffffffL
--typedef signed int __int32_t;
--typedef unsigned int __uint32_t;
--#define ___int32_t_defined 1
--#elif __EXP(LONG_MAX) == 0x7fffffffL
-+#if __EXP(LONG_MAX) == 0x7fffffffL
- typedef signed long __int32_t;
- typedef unsigned long __uint32_t;
- #define ___int32_t_defined 1
-+#elif __EXP(INT_MAX) == 0x7fffffffL
-+typedef signed int __int32_t;
-+typedef unsigned int __uint32_t;
-+#define ___int32_t_defined 1
- #elif __EXP(SHRT_MAX) == 0x7fffffffL
- typedef signed short __int32_t;
- typedef unsigned short __uint32_t;
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/signal.h newlib-1.19.0/newlib/libc/include/signal.h
---- newlib-1.19.0.orig/newlib/libc/include/signal.h	2010-07-13 13:18:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/signal.h	2011-07-24 06:43:01.706140134 +0200
-@@ -7,9 +7,6 @@
- _BEGIN_STD_C
- 
- typedef int	sig_atomic_t;		/* Atomic entity type (ANSI) */
--#ifndef _POSIX_SOURCE
--typedef _sig_func_ptr sighandler_t;	/* glibc naming */
--#endif /* !_POSIX_SOURCE */
- 
- #define SIG_DFL ((_sig_func_ptr)0)	/* Default action */
- #define SIG_IGN ((_sig_func_ptr)1)	/* Ignore action */
-@@ -23,6 +20,7 @@
- #ifndef _REENT_ONLY
- _sig_func_ptr _EXFUN(signal, (int, _sig_func_ptr));
- int	_EXFUN(raise, (int));
-+void	_EXFUN(psignal, (int, const char *));
- #endif
- 
- _END_STD_C
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdint.h newlib-1.19.0/newlib/libc/include/stdint.h
---- newlib-1.19.0.orig/newlib/libc/include/stdint.h	2009-04-24 23:55:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/stdint.h	2011-07-24 06:43:01.706140134 +0200
-@@ -33,7 +33,7 @@
- /* Check if "long" is 64bit or 32bit wide */
- #if __STDINT_EXP(LONG_MAX) > 0x7fffffff
- #define __have_long64 1
--#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff && !defined(__SPU__)
-+#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff
- #define __have_long32 1
- #endif
- 
-@@ -49,14 +49,14 @@
- #define __int_least8_t_defined 1
- #endif
- 
--#if __STDINT_EXP(SHRT_MAX) == 0x7fff
--typedef signed short int16_t;
--typedef unsigned short uint16_t;
--#define __int16_t_defined 1
--#elif __STDINT_EXP(INT_MAX) == 0x7fff
-+#if __STDINT_EXP(INT_MAX) == 0x7fff
- typedef signed int int16_t;
- typedef unsigned int uint16_t;
- #define __int16_t_defined 1
-+#elif __STDINT_EXP(SHRT_MAX) == 0x7fff
-+typedef signed short int16_t;
-+typedef unsigned short uint16_t;
-+#define __int16_t_defined 1
- #elif __STDINT_EXP(SCHAR_MAX) == 0x7fff
- typedef signed char int16_t;
- typedef unsigned char uint16_t;
-@@ -239,6 +239,29 @@
-  * GCC doesn't provide an appropriate macro for [u]intptr_t
-  * For now, use __PTRDIFF_TYPE__
-  */
-+#if defined(__SIZEOF_POINTER__)
-+#if __SIZEOF_POINTER__ == 8
-+  typedef int64_t intptr_t;
-+  typedef uint64_t uintptr_t;
-+#define INTPTR_MAX INT64_MAX
-+#define INTPTR_MIN INT64_MIN
-+#define UINTPTR_MAX UINT64_MAX
-+#elif __SIZEOF_POINTER__ == 4
-+  typedef int32_t intptr_t;
-+  typedef uint32_t uintptr_t;
-+#define INTPTR_MAX INT32_MAX
-+#define INTPTR_MIN INT32_MIN
-+#define UINTPTR_MAX UINT32_MAX
-+#elif __SIZEOF_POINTER__ == 2
-+  typedef int16_t intptr_t;
-+  typedef uint16_t uintptr_t;
-+#define INTPTR_MAX INT16_MAX
-+#define INTPTR_MIN INT16_MIN
-+#define UINTPTR_MAX UINT16_MAX
-+#else
-+#error cannot determine intptr_t
-+#endif
-+#else
- #if defined(__PTRDIFF_TYPE__)
- typedef signed __PTRDIFF_TYPE__ intptr_t;
- typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
-@@ -260,6 +283,7 @@
- #define INTPTR_MIN (-__STDINT_EXP(LONG_MAX) - 1)
- #define UINTPTR_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1)
- #endif
-+#endif
- 
- /* Limits of Specified-Width Integer Types */
- 
-@@ -408,6 +432,8 @@
- /* This must match size_t in stddef.h, currently long unsigned int */
- #ifdef __SIZE_MAX__
- #define SIZE_MAX __SIZE_MAX__
-+#elif defined(__SIZEOF_SIZE_T__) && defined(__CHAR_BIT__)
-+#define SIZE_MAX (((1UL << (__SIZEOF_SIZE_T__ * __CHAR_BIT__ - 1)) - 1) * 2 + 1)
- #else
- #define SIZE_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1)
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdio_ext.h newlib-1.19.0/newlib/libc/include/stdio_ext.h
---- newlib-1.19.0.orig/newlib/libc/include/stdio_ext.h	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/stdio_ext.h	2011-07-24 06:43:01.706140134 +0200
-@@ -0,0 +1,22 @@
-+/*
-+ * stdio_ext.h
-+ *
-+ * Definitions for I/O internal operations, originally from Solaris.
-+ */
-+
-+#ifndef _STDIO_EXT_H_
-+#define _STDIO_EXT_H_
-+
-+#ifdef __rtems__
-+#error "<stdio_ext.h> not supported"
-+#endif
-+
-+#include <stdio.h>
-+
-+_BEGIN_STD_C
-+
-+void	 _EXFUN(__fpurge,(FILE *));
-+
-+_END_STD_C
-+
-+#endif /* _STDIO_EXT_H_ */
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdio.h newlib-1.19.0/newlib/libc/include/stdio.h
---- newlib-1.19.0.orig/newlib/libc/include/stdio.h	2010-02-26 10:41:43.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/stdio.h	2011-07-24 06:43:01.706140134 +0200
-@@ -308,7 +308,7 @@
-  * Routines in POSIX 1003.1:2001.
-  */
- 
--#ifndef __STRICT_ANSI__
-+#if (!defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L))
- #ifndef _REENT_ONLY
- FILE *	_EXFUN(fdopen, (int, const char *));
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdlib.h newlib-1.19.0/newlib/libc/include/stdlib.h
---- newlib-1.19.0.orig/newlib/libc/include/stdlib.h	2010-07-19 20:21:11.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/stdlib.h	2011-07-24 06:43:01.707140149 +0200
-@@ -38,7 +38,7 @@
-   long rem; /* remainder */
- } ldiv_t;
- 
--#ifndef __STRICT_ANSI__
-+#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L)
- typedef struct
- {
-   long long int quot; /* quotient */
-@@ -63,13 +63,12 @@
- int	_EXFUN(abs,(int));
- int	_EXFUN(atexit,(_VOID (*__func)(_VOID)));
- double	_EXFUN(atof,(const char *__nptr));
--#ifndef __STRICT_ANSI__
--float	_EXFUN(atoff,(const char *__nptr));
--#endif
- int	_EXFUN(atoi,(const char *__nptr));
--int	_EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
- long	_EXFUN(atol,(const char *__nptr));
-+#ifndef __STRICT_ANSI__
-+int	_EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
- long	_EXFUN(_atol_r,(struct _reent *, const char *__nptr));
-+#endif /* ! __STRICT_ANSI__ */
- _PTR	_EXFUN(bsearch,(const _PTR __key,
- 		       const _PTR __base,
- 		       size_t __nmemb,
-@@ -80,10 +79,10 @@
- _VOID	_EXFUN(exit,(int __status) _ATTRIBUTE ((noreturn)));
- _VOID	_EXFUN_NOTHROW(free,(_PTR));
- char *  _EXFUN(getenv,(const char *__string));
-+#ifndef __STRICT_ANSI__
- char *	_EXFUN(_getenv_r,(struct _reent *, const char *__string));
- char *	_EXFUN(_findenv,(_CONST char *, int *));
- char *	_EXFUN(_findenv_r,(struct _reent *, _CONST char *, int *));
--#ifndef __STRICT_ANSI__
- extern char *suboptarg;			/* getsubopt(3) external variable */
- int	_EXFUN(getsubopt,(char **, char * const *, char **));
- #endif
-@@ -91,16 +90,16 @@
- ldiv_t	_EXFUN(ldiv,(long __numer, long __denom));
- _PTR	_EXFUN_NOTHROW(malloc,(size_t __size));
- int	_EXFUN(mblen,(const char *, size_t));
--int	_EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
- int	_EXFUN(mbtowc,(wchar_t *, const char *, size_t));
--int	_EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
- int	_EXFUN(wctomb,(char *, wchar_t));
--int	_EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *));
- size_t	_EXFUN(mbstowcs,(wchar_t *, const char *, size_t));
--size_t	_EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
- size_t	_EXFUN(wcstombs,(char *, const wchar_t *, size_t));
--size_t	_EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *));
- #ifndef __STRICT_ANSI__
-+int	_EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
-+int	_EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
-+int	_EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *));
-+size_t	_EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
-+size_t	_EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *));
- #ifndef _REENT_ONLY
- char *	_EXFUN(mkdtemp,(char *));
- int	_EXFUN(mkostemp,(char *, int));
-@@ -133,10 +132,11 @@
- # endif
- #endif
- long	_EXFUN(strtol,(const char *__n, char **__end_PTR, int __base));
--long	_EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base));
- unsigned long _EXFUN(strtoul,(const char *__n, char **__end_PTR, int __base));
-+#ifndef __STRICT_ANSI__
- unsigned long _EXFUN(_strtoul_r,(struct _reent *,const char *__n, char **__end_PTR, int __base));
--
-+long	_EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base));
-+#endif /* !__STRICT_ANSI__ */
- int	_EXFUN(system,(const char *__string));
- 
- #ifndef __STRICT_ANSI__
-@@ -163,33 +163,39 @@
- int	_EXFUN(rand_r,(unsigned *__seed));
- 
- double _EXFUN(drand48,(_VOID));
--double _EXFUN(_drand48_r,(struct _reent *));
- double _EXFUN(erand48,(unsigned short [3]));
--double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3]));
- long   _EXFUN(jrand48,(unsigned short [3]));
--long   _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3]));
- _VOID  _EXFUN(lcong48,(unsigned short [7]));
--_VOID  _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
- long   _EXFUN(lrand48,(_VOID));
--long   _EXFUN(_lrand48_r,(struct _reent *));
- long   _EXFUN(mrand48,(_VOID));
--long   _EXFUN(_mrand48_r,(struct _reent *));
- long   _EXFUN(nrand48,(unsigned short [3]));
--long   _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3]));
- unsigned short *
-        _EXFUN(seed48,(unsigned short [3]));
-+_VOID  _EXFUN(srand48,(long));
-+long long _EXFUN(atoll,(const char *__nptr));
-+#ifndef __STRICT_ANSI__
-+double _EXFUN(_drand48_r,(struct _reent *));
-+double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3]));
-+long   _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3]));
-+_VOID  _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
-+long   _EXFUN(_lrand48_r,(struct _reent *));
-+long   _EXFUN(_mrand48_r,(struct _reent *));
-+long   _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3]));
- unsigned short *
-        _EXFUN(_seed48_r,(struct _reent *, unsigned short [3]));
--_VOID  _EXFUN(srand48,(long));
- _VOID  _EXFUN(_srand48_r,(struct _reent *, long));
--long long _EXFUN(atoll,(const char *__nptr));
- long long _EXFUN(_atoll_r,(struct _reent *, const char *__nptr));
-+#endif /* ! __STRICT_ANSI__ */
-+#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L)
- long long _EXFUN(llabs,(long long));
- lldiv_t	_EXFUN(lldiv,(long long __numer, long long __denom));
- long long _EXFUN(strtoll,(const char *__n, char **__end_PTR, int __base));
--long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base));
- unsigned long long _EXFUN(strtoull,(const char *__n, char **__end_PTR, int __base));
-+#endif
-+#ifndef __STRICT_ANSI__
-+long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base));
- unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__n, char **__end_PTR, int __base));
-+#endif /* ! __STRICT_ANSI__ */
- 
- #ifndef __CYGWIN__
- _VOID	_EXFUN(cfree,(_PTR));
-@@ -203,6 +209,7 @@
- 
- #endif /* ! __STRICT_ANSI__ */
- 
-+#ifndef __STRICT_ANSI__
- char *	_EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**));
- #ifndef __CYGWIN__
- _PTR	_EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t));
-@@ -214,6 +221,7 @@
- int	_EXFUN(_system_r,(struct _reent *, const char *));
- 
- _VOID	_EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
-+#endif /* ! __STRICT_ANSI__ */
- 
- /* On platforms where long double equals double.  */
- #ifdef _LDBL_EQ_DBL
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/string.h newlib-1.19.0/newlib/libc/include/string.h
---- newlib-1.19.0.orig/newlib/libc/include/string.h	2008-06-18 17:27:27.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/string.h	2011-07-24 06:43:01.707140149 +0200
-@@ -9,6 +9,7 @@
- 
- #include "_ansi.h"
- #include <sys/reent.h>
-+#include <sys/cdefs.h>
- 
- #define __need_size_t
- #include <stddef.h>
-@@ -49,51 +50,58 @@
- #ifndef __STRICT_ANSI__
- char 	*_EXFUN(strtok_r,(char *, const char *, char **));
- 
--int	 _EXFUN(bcmp,(const void *, const void *, size_t));
--void	 _EXFUN(bcopy,(const void *, void *, size_t));
--void	 _EXFUN(bzero,(void *, size_t));
--int	 _EXFUN(ffs,(int));
--char 	*_EXFUN(index,(const char *, int));
- _PTR	 _EXFUN(memccpy,(_PTR, const _PTR, int, size_t));
- _PTR	 _EXFUN(mempcpy,(_PTR, const _PTR, size_t));
- _PTR	 _EXFUN(memmem, (const _PTR, size_t, const _PTR, size_t));
--char 	*_EXFUN(rindex,(const char *, int));
- char 	*_EXFUN(stpcpy,(char *, const char *));
- char 	*_EXFUN(stpncpy,(char *, const char *, size_t));
--int	 _EXFUN(strcasecmp,(const char *, const char *));
- char	*_EXFUN(strcasestr,(const char *, const char *));
-+char 	*_EXFUN(strchrnul,(const char *, int));
- char 	*_EXFUN(strdup,(const char *));
- char 	*_EXFUN(_strdup_r,(struct _reent *, const char *));
- char 	*_EXFUN(strndup,(const char *, size_t));
- char 	*_EXFUN(_strndup_r,(struct _reent *, const char *, size_t));
--char 	*_EXFUN(strerror_r,(int, char *, size_t));
-+/* There are two common strerror_r variants.  If you request
-+   _GNU_SOURCE, you get the GNU version; otherwise you get the POSIX
-+   version.  POSIX requires that #undef strerror_r will still let you
-+   invoke the underlying function, but that requires gcc support.  */
-+#ifdef _GNU_SOURCE
-+char    *_EXFUN(strerror_r,(int, char *, size_t));
-+#else
-+# ifdef __GNUC__
-+int      _EXFUN(strerror_r,(int, char *, size_t)) __asm__ (__ASMNAME ("__xpg_strerror_r"));
-+# else
-+int      _EXFUN(__xpg_strerror_r,(int, char *, size_t));
-+#  define strerror_r __xpg_strerror_r
-+# endif
-+#endif
- size_t	 _EXFUN(strlcat,(char *, const char *, size_t));
- size_t	 _EXFUN(strlcpy,(char *, const char *, size_t));
--int	 _EXFUN(strncasecmp,(const char *, const char *, size_t));
- size_t	 _EXFUN(strnlen,(const char *, size_t));
- char 	*_EXFUN(strsep,(char **, const char *));
- char	*_EXFUN(strlwr,(char *));
- char	*_EXFUN(strupr,(char *));
-+char	*_EXFUN(strsignal, (int __signo));
- #ifdef __CYGWIN__
--#ifndef DEFS_H	/* Kludge to work around problem compiling in gdb */
--char  *_EXFUN(strsignal, (int __signo));
--#endif
- int     _EXFUN(strtosigno, (const char *__name));
- #endif
- 
--/* These function names are used on Windows and perhaps other systems.  */
--#ifndef strcmpi
--#define strcmpi strcasecmp
--#endif
--#ifndef stricmp
--#define stricmp strcasecmp
--#endif
--#ifndef strncmpi
--#define strncmpi strncasecmp
--#endif
--#ifndef strnicmp
--#define strnicmp strncasecmp
--#endif
-+/* Recursive version of strerror.  */
-+char *	_EXFUN(_strerror_r, (struct _reent *, int, int, int *));
-+
-+#if defined _GNU_SOURCE && defined __GNUC__
-+#define strdupa(__s) \
-+	(__extension__ ({const char *__in = (__s); \
-+			 size_t __len = strlen (__in) + 1; \
-+			 char * __out = (char *) __builtin_alloca (__len); \
-+			 (char *) memcpy (__out, __in, __len);}))
-+#define strndupa(__s, __n) \
-+	(__extension__ ({const char *__in = (__s); \
-+			 size_t __len = strnlen (__in, (__n)) + 1; \
-+			 char *__out = (char *) __builtin_alloca (__len); \
-+			 __out[__len-1] = '\0'; \
-+			 (char *) memcpy (__out, __in, __len-1);}))
-+#endif /* _GNU_SOURCE && __GNUC__ */
- 
- #endif /* ! __STRICT_ANSI__ */
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/cdefs.h newlib-1.19.0/newlib/libc/include/sys/cdefs.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/cdefs.h	2002-06-20 21:51:24.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/cdefs.h	2011-07-24 06:43:01.713140239 +0200
-@@ -58,6 +58,27 @@
- #define __DOTS    	, ...
- #define __THROW
- 
-+/*
-+ * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
-+ * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
-+ * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI
-+ * mode -- there must be no spaces between its arguments, and for nested
-+ * __CONCAT's, all the __CONCAT's must be at the left.  __CONCAT can also
-+ * concatenate double-quoted strings produced by the __STRING macro, but
-+ * this only works with ANSI C.
-+ *
-+ * __XSTRING is like __STRING, but it expands any macros in its argument
-+ * first.  It is only available with ANSI C.
-+ */
-+#define __CONCAT1(x,y)  x ## y
-+#define __CONCAT(x,y)   __CONCAT1(x,y)
-+#define __STRING(x)     #x              /* stringify without expanding x */
-+#define __XSTRING(x)    __STRING(x)     /* expand x, then stringify */
-+
-+#ifdef __GNUC__
-+# define __ASMNAME(cname)  __XSTRING (__USER_LABEL_PREFIX__) cname
-+#endif
-+
- #define __ptr_t void *
- #define __long_double_t  long double
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/_default_fcntl.h newlib-1.19.0/newlib/libc/include/sys/_default_fcntl.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/_default_fcntl.h	2010-01-14 19:49:13.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/sys/_default_fcntl.h	2011-07-24 06:43:01.713140239 +0200
-@@ -51,8 +51,6 @@
- #define O_BINARY	_FBINARY
- #define O_TEXT		_FTEXT
- #define O_NOINHERIT	_FNOINHERIT
--/* O_CLOEXEC is the Linux equivalent to O_NOINHERIT */
--#define O_CLOEXEC	_FNOINHERIT
- 
- /* The windows header files define versions with a leading underscore.  */
- #define _O_RDONLY	O_RDONLY
-@@ -124,9 +122,6 @@
- #define	F_CNVT 		12	/* Convert a fhandle to an open fd */
- #define	F_RSETLKW 	13	/* Set or Clear remote record-lock(Blocking) */
- #endif	/* !_POSIX_SOURCE */
--#ifdef __CYGWIN__
--#define	F_DUPFD_CLOEXEC	14	/* As F_DUPFD, but set close-on-exec flag */
--#endif
- 
- /* fcntl(2) flags (l_type field of flock structure) */
- #define	F_RDLCK		1	/* read lock */
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/dir.h newlib-1.19.0/newlib/libc/include/sys/dir.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/dir.h	2010-08-11 20:14:54.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/dir.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,10 +0,0 @@
--/* BSD predecessor of POSIX.1 <dirent.h> and struct dirent */
--
--#ifndef _SYS_DIR_H_
--#define _SYS_DIR_H_
--
--#include <dirent.h>
--
--#define direct dirent
--
--#endif /*_SYS_DIR_H_*/
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/features.h newlib-1.19.0/newlib/libc/include/sys/features.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/features.h	2010-08-09 10:29:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/features.h	2011-07-24 06:43:01.717140301 +0200
-@@ -15,7 +15,7 @@
-  *  OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS
-  *  SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
-  *
-- *  $Id$
-+ *  $Id$
-  */
- 
- #ifndef _SYS_FEATURES_H
-@@ -103,7 +103,7 @@
- /* #define _POSIX_BARRIERS			    -1 */
- #define _POSIX_CHOWN_RESTRICTED			     1
- /* #define _POSIX_CLOCK_SELECTION		    -1 */
--/* #define _POSIX_CPUTIME			    -1 */
-+#define _POSIX_CPUTIME			    	200112L
- #define _POSIX_FSYNC				200112L
- #define _POSIX_IPV6				200112L
- #define _POSIX_JOB_CONTROL			     1
-@@ -125,12 +125,12 @@
- #define _POSIX_SHARED_MEMORY_OBJECTS		200112L 
- #define _POSIX_SHELL				     1
- /* #define _POSIX_SPAWN				    -1 */
--/* #define _POSIX_SPIN_LOCKS			    -1 */
-+#define _POSIX_SPIN_LOCKS			    200112L
- /* #define _POSIX_SPORADIC_SERVER		    -1 */
- #define _POSIX_SYNCHRONIZED_IO			200112L
--/* #define _POSIX_THREAD_ATTR_STACKADDR		    -1 */
-+#define _POSIX_THREAD_ATTR_STACKADDR		200112L
- #define _POSIX_THREAD_ATTR_STACKSIZE		200112L
--/* #define _POSIX_THREAD_CPUTIME		    -1 */
-+#define _POSIX_THREAD_CPUTIME			200112L
- /* #define _POSIX_THREAD_PRIO_INHERIT		    -1 */
- /* #define _POSIX_THREAD_PRIO_PROTECT		    -1 */
- #define _POSIX_THREAD_PRIORITY_SCHEDULING	200112L
-@@ -178,6 +178,12 @@
- /* #define _XOPEN_UNIX				    -1 */
- 
- #endif /* !__STRICT_ANSI__ || __cplusplus || __STDC_VERSION__ >= 199901L */
-+
-+/* The value corresponds to UNICODE version 4.0, which is the version
-+   supported by XP.  Newlib supports 5.2 (2011) but so far Cygwin needs
-+   the MS conversions for double-byte charsets. */
-+#define __STDC_ISO_10646__ 200305L
-+
- #endif /* __CYGWIN__ */
- 
- /* Per the permission given in POSIX.1-2008 section 2.2.1, define
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/signal.h newlib-1.19.0/newlib/libc/include/sys/signal.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/signal.h	2009-10-13 19:31:49.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/signal.h	2011-07-24 06:43:01.717140301 +0200
-@@ -76,11 +76,12 @@
-  *
-  *  (1) Routines stored in sa_handler should take a single int as
-  *      their argument although the POSIX standard does not require this.
-+ *      This is not longer true since at least POSIX.1-2008
-  *  (2) The fields sa_handler and sa_sigaction may overlap, and a conforming
-  *      application should not use both simultaneously.
-  */
- 
--typedef void (*_sig_func_ptr)();
-+typedef void (*_sig_func_ptr)(int);
- 
- struct sigaction {
-   int         sa_flags;       /* Special flags to affect behavior of signal */
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/types.h newlib-1.19.0/newlib/libc/include/sys/types.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/types.h	2010-12-08 15:44:06.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/sys/types.h	2011-07-24 06:43:01.717140301 +0200
-@@ -98,6 +98,7 @@
- 
- typedef	unsigned short	ushort;		/* System V compatibility */
- typedef	unsigned int	uint;		/* System V compatibility */
-+typedef	unsigned long	ulong;		/* System V compatibility */
- # endif	/*!_POSIX_SOURCE */
- 
- #ifndef __clock_t_defined
-@@ -462,13 +463,13 @@
- 
- /* POSIX Spin Lock Types */
- 
-+#if !defined (__CYGWIN__)
- #if defined(_POSIX_SPIN_LOCKS)
- typedef __uint32_t pthread_spinlock_t;        /* POSIX Spin Lock Object */
- #endif /* defined(_POSIX_SPIN_LOCKS) */
- 
- /* POSIX Reader/Writer Lock Types */
- 
--#if !defined (__CYGWIN__)
- #if defined(_POSIX_READER_WRITER_LOCKS)
- typedef __uint32_t pthread_rwlock_t;         /* POSIX RWLock Object */
- typedef struct {
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/unistd.h newlib-1.19.0/newlib/libc/include/sys/unistd.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/unistd.h	2010-10-08 17:28:49.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/unistd.h	2011-07-24 06:43:01.718140316 +0200
-@@ -487,10 +487,11 @@
- #define _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS       16
- #define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS    17
- #define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS    _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS
-+#define _CS_XBS5_WIDTH_RESTRICTED_ENVS        _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS
- #define _CS_POSIX_V7_THREADS_CFLAGS           18
- #define _CS_POSIX_V7_THREADS_LDFLAGS          19
- #define _CS_V7_ENV                            20
--#define _CS_V6_ENV                           _CS_V6_ENV
-+#define _CS_V6_ENV                            _CS_V7_ENV
- #endif
- 
- #ifndef __CYGWIN__
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/time.h newlib-1.19.0/newlib/libc/include/time.h
---- newlib-1.19.0.orig/newlib/libc/include/time.h	2008-10-16 23:53:58.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/time.h	2011-07-24 06:43:01.718140316 +0200
-@@ -212,7 +212,7 @@
-    the identifier of the CPU_time clock associated with the PROCESS
-    making the function call.  */
- 
--#define CLOCK_PROCESS_CPUTIME (clockid_t)2
-+#define CLOCK_PROCESS_CPUTIME_ID (clockid_t)2
- 
- #endif
- 
-@@ -222,7 +222,7 @@
-     the identifier of the CPU_time clock associated with the THREAD
-     making the function call.  */
- 
--#define CLOCK_THREAD_CPUTIME (clockid_t)3
-+#define CLOCK_THREAD_CPUTIME_ID (clockid_t)3
- 
- #endif
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/wchar.h newlib-1.19.0/newlib/libc/include/wchar.h
---- newlib-1.19.0.orig/newlib/libc/include/wchar.h	2009-10-15 10:23:27.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/wchar.h	2011-07-24 06:43:01.718140316 +0200
-@@ -16,6 +16,9 @@
- /* For _mbstate_t definition. */
- #include <sys/_types.h>
- 
-+/* For __STDC_ISO_10646__ */
-+#include <sys/features.h>
-+
- #ifndef NULL
- #define NULL	0
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/locale/lmessages.c newlib-1.19.0/newlib/libc/locale/lmessages.c
---- newlib-1.19.0.orig/newlib/libc/locale/lmessages.c	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/locale/lmessages.c	2011-07-24 06:43:01.726140437 +0200
-@@ -42,9 +42,9 @@
- 	"^[nN]" ,	/* noexpr */
- 	"yes" , 	/* yesstr */
- 	"no"		/* nostr */
--	"ASCII"		/* codeset */
- #ifdef __HAVE_LOCALE_INFO_EXTENDED__
--	, L"^[yY]" ,	/* wyesexpr */
-+	, "ASCII" ,	/* codeset */
-+	L"^[yY]" ,	/* wyesexpr */
- 	L"^[nN]" ,	/* wnoexpr */
- 	L"yes" , 	/* wyesstr */
- 	L"no"		/* wnostr */
-diff -Naur newlib-1.19.0.orig/newlib/libc/locale/lmessages.h newlib-1.19.0/newlib/libc/locale/lmessages.h
---- newlib-1.19.0.orig/newlib/libc/locale/lmessages.h	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/locale/lmessages.h	2011-07-24 06:43:01.726140437 +0200
-@@ -50,7 +50,7 @@
- };
- 
- struct lc_messages_T *__get_current_messages_locale(void);
--int __numeric_load_locale(const char *, void *, const char *);
-+int __messages_load_locale(const char *, void *, const char *);
- 
- __END_DECLS
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/locale/locale.c newlib-1.19.0/newlib/libc/locale/locale.c
---- newlib-1.19.0.orig/newlib/libc/locale/locale.c	2010-11-19 11:02:36.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/locale/locale.c	2011-07-24 06:43:01.727140453 +0200
-@@ -182,6 +182,7 @@
- #include "lmonetary.h"
- #include "lnumeric.h"
- #include "lctype.h"
-+#include "timelocal.h"
- #include "../stdlib/local.h"
- 
- #define _LC_LAST      7
-@@ -235,7 +236,11 @@
- static char current_categories[_LC_LAST][ENCODING_LEN + 1] = {
-     "C",
-     "C",
-+#ifdef __CYGWIN__ /* Cygwin starts with LC_CTYPE set to "C.UTF-8". */
-+    "C.UTF-8",
-+#else
-     "C",
-+#endif
-     "C",
-     "C",
-     "C",
-@@ -255,13 +260,12 @@
- 
- #endif /* _MB_CAPABLE */
- 
--#if 0 /*def __CYGWIN__  TODO: temporarily(?) disable C == UTF-8 */
-+#ifdef __CYGWIN__
- static char lc_ctype_charset[ENCODING_LEN + 1] = "UTF-8";
--static char lc_message_charset[ENCODING_LEN + 1] = "UTF-8";
- #else
- static char lc_ctype_charset[ENCODING_LEN + 1] = "ASCII";
--static char lc_message_charset[ENCODING_LEN + 1] = "ASCII";
- #endif
-+static char lc_message_charset[ENCODING_LEN + 1] = "ASCII";
- static int lc_ctype_cjk_lang = 0;
- 
- char *
-@@ -432,7 +436,7 @@
- #ifdef _MB_CAPABLE
- #ifdef __CYGWIN__
- extern void __set_charset_from_locale (const char *locale, char *charset);
--extern int __set_locale_from_locale_alias (const char *, char *);
-+extern char *__set_locale_from_locale_alias (const char *, char *);
- extern int __collate_load_locale (const char *, void *, const char *);
- #endif /* __CYGWIN__ */
- 
-@@ -495,11 +499,7 @@
-   if (!strcmp (locale, "POSIX"))
-     strcpy (locale, "C");
-   if (!strcmp (locale, "C"))				/* Default "C" locale */
--#if 0 /*def __CYGWIN__  TODO: temporarily(?) disable C == UTF-8 */
--    strcpy (charset, "UTF-8");
--#else
-     strcpy (charset, "ASCII");
--#endif
-   else if (locale[0] == 'C'
- 	   && (locale[1] == '-'		/* Old newlib style */
- 	       || locale[1] == '.'))	/* Extension for the C locale to allow
-@@ -952,7 +952,7 @@
- _DEFUN_VOID(__locale_msgcharset)
- {
- #ifdef __HAVE_LOCALE_INFO__
--  return __get_current_messages_locale ()->codeset;
-+  return (char *) __get_current_messages_locale ()->codeset;
- #else
-   return lc_message_charset;
- #endif
-@@ -972,21 +972,21 @@
-   if (__nlocale_changed)
-     {
-       struct lc_numeric_T *n = __get_current_numeric_locale ();
--      lconv.decimal_point = n->decimal_point;
--      lconv.thousands_sep = n->thousands_sep;
--      lconv.grouping = n->grouping;
-+      lconv.decimal_point = (char *) n->decimal_point;
-+      lconv.thousands_sep = (char *) n->thousands_sep;
-+      lconv.grouping = (char *) n->grouping;
-       __nlocale_changed = 0;
-     }
-   if (__mlocale_changed)
-     {
-       struct lc_monetary_T *m = __get_current_monetary_locale ();
--      lconv.int_curr_symbol = m->int_curr_symbol;
--      lconv.currency_symbol = m->currency_symbol;
--      lconv.mon_decimal_point = m->mon_decimal_point;
--      lconv.mon_thousands_sep = m->mon_thousands_sep;
--      lconv.mon_grouping = m->mon_grouping;
--      lconv.positive_sign = m->positive_sign;
--      lconv.negative_sign = m->negative_sign;
-+      lconv.int_curr_symbol = (char *) m->int_curr_symbol;
-+      lconv.currency_symbol = (char *) m->currency_symbol;
-+      lconv.mon_decimal_point = (char *) m->mon_decimal_point;
-+      lconv.mon_thousands_sep = (char *) m->mon_thousands_sep;
-+      lconv.mon_grouping = (char *) m->mon_grouping;
-+      lconv.positive_sign = (char *) m->positive_sign;
-+      lconv.negative_sign = (char *) m->negative_sign;
-       lconv.int_frac_digits = m->int_frac_digits[0];
-       lconv.frac_digits = m->frac_digits[0];
-       lconv.p_cs_precedes = m->p_cs_precedes[0];
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/configure newlib-1.19.0/newlib/libc/machine/configure
---- newlib-1.19.0.orig/newlib/libc/machine/configure	2010-12-16 22:58:42.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/configure	2011-07-24 06:43:01.730140498 +0200
-@@ -651,6 +651,7 @@
- ELIX_LEVEL_0_FALSE
- ELIX_LEVEL_0_TRUE
- LDFLAGS
-+NO_INCLUDE_LIST
- NEWLIB_CFLAGS
- CCASFLAGS
- CCAS
-@@ -816,7 +817,6 @@
- w65
- x86_64
- xc16x
--xscale
- xstormy16
- z8k'
- 
-@@ -3694,6 +3694,9 @@
- NEWLIB_CFLAGS=${newlib_cflags}
- 
- 
-+NO_INCLUDE_LIST=${noinclude}
-+
-+
- LDFLAGS=${ldflags}
- 
- 
-@@ -9660,10 +9663,6 @@
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
--      ld_shlibs=no
--      ;;
--
-     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-     # support.  Future versions do this automatically, but an explicit c++rt0.o
-     # does not break anything, and helps significantly (at the cost of a little
-@@ -10582,10 +10581,6 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -11445,7 +11440,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11448 "configure"
-+#line 11443 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11551,7 +11546,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11554 "configure"
-+#line 11549 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11878,8 +11873,6 @@
-  ;;
- 	xc16x) subdirs="$subdirs xc16x"
-  ;;
--	xscale) subdirs="$subdirs xscale"
-- ;;
- 	xstormy16) subdirs="$subdirs xstormy16"
-  ;;
- 	z8k) subdirs="$subdirs z8k"
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/configure.in newlib-1.19.0/newlib/libc/machine/configure.in
---- newlib-1.19.0.orig/newlib/libc/machine/configure.in	2010-12-02 20:30:47.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/configure.in	2011-07-24 06:43:01.730140498 +0200
-@@ -65,7 +65,6 @@
- 	w65) AC_CONFIG_SUBDIRS(w65) ;;
- 	x86_64) AC_CONFIG_SUBDIRS(x86_64) ;;
- 	xc16x) AC_CONFIG_SUBDIRS(xc16x) ;;
--	xscale) AC_CONFIG_SUBDIRS(xscale) ;;
- 	xstormy16) AC_CONFIG_SUBDIRS(xstormy16) ;;
- 	z8k) AC_CONFIG_SUBDIRS(z8k) ;;
-   esac;
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/frv/setjmp.S newlib-1.19.0/newlib/libc/machine/frv/setjmp.S
---- newlib-1.19.0.orig/newlib/libc/machine/frv/setjmp.S	2002-06-18 23:20:28.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/machine/frv/setjmp.S	2011-07-24 06:43:01.731140513 +0200
-@@ -123,4 +123,4 @@
- 	cmov	gr9, gr8, cc4, 1
- 	ret
- .Lend2:
--	.size	EXT(longjmp),.Lend2-EXT(longjmp2)
-+	.size	EXT(longjmp),.Lend2-EXT(longjmp)
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S
---- newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S	2010-02-08 18:24:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S	2011-07-24 06:43:01.731140513 +0200
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mcpu32__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/mips/strlen.c newlib-1.19.0/newlib/libc/machine/mips/strlen.c
---- newlib-1.19.0.orig/newlib/libc/machine/mips/strlen.c	2002-03-14 03:41:43.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/mips/strlen.c	2011-07-24 06:43:01.731140513 +0200
-@@ -60,6 +60,9 @@
- 	"	addiu	$2,$4,1\n"
- 	"\n"
- 	"1:	lbu	$3,0($4)\n"
-+#if defined(_R3000)
-+	"	nop	\n"
-+#endif
- 	"	bnez	$3,1b\n"
- 	"	addiu	$4,$4,1\n"
- 	"\n"
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.am newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.am	2007-05-24 19:33:35.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.am	2011-07-24 06:43:01.731140513 +0200
-@@ -10,7 +10,7 @@
- 
- AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
- 
--lib_a_SOURCES = setjmp.S times.c
-+lib_a_SOURCES = setjmp.S
- lib_a_CCASFLAGS=$(AM_CCASFLAGS)
- lib_a_CFLAGS=$(AM_CFLAGS)
- lib_a_LIBADD = @extra_objs@
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.in newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.in	2011-07-20 08:45:15.913332235 +0200
-+++ newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.in	2011-07-24 06:43:01.731140513 +0200
-@@ -51,7 +51,7 @@
- LIBRARIES = $(noinst_LIBRARIES)
- ARFLAGS = cru
- lib_a_AR = $(AR) $(ARFLAGS)
--am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-times.$(OBJEXT)
-+am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT)
- lib_a_OBJECTS = $(am_lib_a_OBJECTS)
- DEFAULT_INCLUDES = -I. at am__isrc@
- depcomp =
-@@ -174,7 +174,7 @@
- AM_CCASFLAGS = $(INCLUDES)
- noinst_LIBRARIES = lib.a
- AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
--lib_a_SOURCES = setjmp.S times.c
-+lib_a_SOURCES = setjmp.S
- lib_a_CCASFLAGS = $(AM_CCASFLAGS)
- lib_a_CFLAGS = $(AM_CFLAGS)
- lib_a_LIBADD = @extra_objs@
-@@ -185,7 +185,7 @@
- all: all-am
- 
- .SUFFIXES:
--.SUFFIXES: .S .c .o .obj
-+.SUFFIXES: .S .o .obj
- am--refresh:
- 	@:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-@@ -246,18 +246,6 @@
- lib_a-setjmp.obj: setjmp.S
- 	$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi`
- 
--.c.o:
--	$(COMPILE) -c $<
--
--.c.obj:
--	$(COMPILE) -c `$(CYGPATH_W) '$<'`
--
--lib_a-times.o: times.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.o `test -f 'times.c' || echo '$(srcdir)/'`times.c
--
--lib_a-times.obj: times.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.obj `if test -f 'times.c'; then $(CYGPATH_W) 'times.c'; else $(CYGPATH_W) '$(srcdir)/times.c'; fi`
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/times.c newlib-1.19.0/newlib/libc/machine/powerpc/times.c
---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/times.c	2002-07-22 22:26:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/machine/powerpc/times.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,36 +0,0 @@
--/* Time support routines for PowerPC.
-- *
-- * Written by Aldy Hernandez.
-- */
--
--#include <_ansi.h>
--#include <reent.h>
--#include <sys/time.h>
--#include <sys/times.h>
--#include <sys/resource.h>
--
--clock_t
--times (struct tms *tp)
--{
--  struct rusage usage;
--  union {
--    struct rusage r;
--    /* Newlib's rusage has only 2 fields.  We need to make room for
--       when we call the system's rusage.  This should be enough.  */
--    int filler[32];
--  } host_ru;
--
--  getrusage (RUSAGE_SELF, (void *)&host_ru);
--
--  if (tp)
--    {
--      tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000
--	+ host_ru.r.ru_utime.tv_usec;
--      tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000
--	+ host_ru.r.ru_stime.tv_usec;
--      tp->tms_cutime = 0;	/* user time, children */
--      tp->tms_cstime = 0;	/* system time, children */
--    }
--
--  return tp->tms_utime;
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/Makefile.am newlib-1.19.0/newlib/libc/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/Makefile.am	2010-05-07 01:25:16.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/Makefile.am	2011-07-24 06:43:01.698140024 +0200
-@@ -36,6 +36,8 @@
- 
- if HAVE_XDR_DIR
- XDR_SUBDIR = xdr
-+rpcincludedir = $(tooldir)
-+nobase_rpcinclude_HEADERS = include/rpc/xdr.h include/rpc/types.h
- endif
- 
- # The order of SUBDIRS is important for the integrated documentation.
-@@ -140,8 +142,7 @@
- 	locale/stmp-def \
- 	reent/stmp-def \
- 	$(LIBC_EXTRA_DEF) \
--	misc/stmp-def \
--	posix/stmp-def
-+	misc/stmp-def
- 
- libc.info: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \
- 	targetdep.tex $(SUBDEFS)
-diff -Naur newlib-1.19.0.orig/newlib/libc/Makefile.in newlib-1.19.0/newlib/libc/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/Makefile.in	2011-07-20 08:45:15.822330771 +0200
-+++ newlib-1.19.0/newlib/libc/Makefile.in	2011-07-24 06:43:01.698140024 +0200
-@@ -17,6 +17,7 @@
- 
- 
- 
-+
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -39,7 +40,8 @@
- subdir = .
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(top_srcdir)/configure $(am__configure_deps) \
--	$(srcdir)/../../mkinstalldirs $(libc_TEXINFOS)
-+	$(srcdir)/../../mkinstalldirs $(libc_TEXINFOS) \
-+	$(am__nobase_rpcinclude_HEADERS_DIST)
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \
- 	$(top_srcdir)/../../ltoptions.m4 \
-@@ -155,6 +157,10 @@
-   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- DATA = $(noinst_DATA)
-+am__nobase_rpcinclude_HEADERS_DIST = include/rpc/xdr.h \
-+	include/rpc/types.h
-+am__installdirs = "$(DESTDIR)$(rpcincludedir)"
-+HEADERS = $(nobase_rpcinclude_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -319,6 +325,8 @@
- @ENABLE_NEWLIB_ICONV_FALSE at NEWLIB_ICONV_LIBS = 
- @ENABLE_NEWLIB_ICONV_TRUE at NEWLIB_ICONV_LIBS = iconv/ces/lib.$(aext) iconv/ccs/lib.$(aext) iconv/lib/lib.$(aext)
- @HAVE_XDR_DIR_TRUE at XDR_SUBDIR = xdr
-+ at HAVE_XDR_DIR_TRUE@rpcincludedir = $(tooldir)
-+ at HAVE_XDR_DIR_TRUE@nobase_rpcinclude_HEADERS = include/rpc/xdr.h include/rpc/types.h
- 
- # The order of SUBDIRS is important for the integrated documentation.
- # Do not change the order without considering the doc impact.
-@@ -396,8 +404,7 @@
- 	locale/stmp-def \
- 	reent/stmp-def \
- 	$(LIBC_EXTRA_DEF) \
--	misc/stmp-def \
--	posix/stmp-def
-+	misc/stmp-def
- 
- info_TEXINFOS = libc.texinfo
- libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \
-@@ -638,6 +645,29 @@
- 	done
- 
- clean-info: mostlyclean-aminfo clean-aminfo
-+install-nobase_rpcincludeHEADERS: $(nobase_rpcinclude_HEADERS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(rpcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(rpcincludedir)"
-+	@list='$(nobase_rpcinclude_HEADERS)'; test -n "$(rpcincludedir)" || list=; \
-+	$(am__nobase_list) | while read dir files; do \
-+	  xfiles=; for file in $$files; do \
-+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-+	  test -z "$$xfiles" || { \
-+	    test "x$$dir" = x. || { \
-+	      echo "$(MKDIR_P) '$(DESTDIR)$(rpcincludedir)/$$dir'"; \
-+	      $(MKDIR_P) "$(DESTDIR)$(rpcincludedir)/$$dir"; }; \
-+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(rpcincludedir)/$$dir'"; \
-+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(rpcincludedir)/$$dir" || exit $$?; }; \
-+	done
-+
-+uninstall-nobase_rpcincludeHEADERS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(nobase_rpcinclude_HEADERS)'; test -n "$(rpcincludedir)" || list=; \
-+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(rpcincludedir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(rpcincludedir)" && rm -f $$files
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -775,9 +805,12 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- check-am:
- check: check-recursive
--all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) $(HEADERS)
- installdirs: installdirs-recursive
- installdirs-am:
-+	for dir in "$(DESTDIR)$(rpcincludedir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -827,7 +860,7 @@
- 
- info-am: $(INFO_DEPS)
- 
--install-data-am:
-+install-data-am: install-nobase_rpcincludeHEADERS
- 
- install-dvi: install-dvi-recursive
- 
-@@ -952,7 +985,8 @@
- ps-am: $(PSS)
- 
- uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
--	uninstall-pdf-am uninstall-ps-am
-+	uninstall-nobase_rpcincludeHEADERS uninstall-pdf-am \
-+	uninstall-ps-am
- 
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- 	install-am install-strip tags-recursive
-@@ -966,14 +1000,16 @@
- 	info-am install install-am install-data install-data-am \
- 	install-dvi install-dvi-am install-exec install-exec-am \
- 	install-html install-html-am install-info install-info-am \
--	install-man install-pdf install-pdf-am install-ps \
--	install-ps-am install-strip installcheck installcheck-am \
--	installdirs installdirs-am maintainer-clean \
--	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
--	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-dvi-am uninstall-html-am \
--	uninstall-info-am uninstall-pdf-am uninstall-ps-am
-+	install-man install-nobase_rpcincludeHEADERS install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs installdirs-am \
-+	maintainer-clean maintainer-clean-aminfo \
-+	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	uninstall-dvi-am uninstall-html-am uninstall-info-am \
-+	uninstall-nobase_rpcincludeHEADERS uninstall-pdf-am \
-+	uninstall-ps-am
- 
- @USE_LIBTOOL_FALSE at libc.a: $(SUBLIBS)
- @USE_LIBTOOL_FALSE@	rm -f $@
-diff -Naur newlib-1.19.0.orig/newlib/libc/misc/__dprintf.c newlib-1.19.0/newlib/libc/misc/__dprintf.c
---- newlib-1.19.0.orig/newlib/libc/misc/__dprintf.c	2008-12-11 18:27:55.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/misc/__dprintf.c	2011-07-24 06:43:01.732140528 +0200
-@@ -5,6 +5,7 @@
- */
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include "ctype.h"
- #include "reent.h"
- #include "string.h"
-@@ -131,7 +132,7 @@
- 	      write_string (unctrl (c));
- 	      break;
- 	    case 'p' :
--	      l = (_POINTER_INT) va_arg (args, char *);
-+	      l = (intptr_t) va_arg (args, char *);
- 	      print_number (16, 1, l);
- 	      break;
- 	    case 'd' :
-diff -Naur newlib-1.19.0.orig/newlib/libc/misc/ffs.c newlib-1.19.0/newlib/libc/misc/ffs.c
---- newlib-1.19.0.orig/newlib/libc/misc/ffs.c	2003-06-06 21:57:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/misc/ffs.c	2011-07-24 06:43:01.732140528 +0200
-@@ -6,9 +6,11 @@
- 	ffs
- 
- ANSI_SYNOPSIS
-+	#include <strings.h>
- 	int ffs(int <[word]>);
- 
- TRAD_SYNOPSIS
-+	#include <strings.h>
- 	int ffs(<[word]>);
- 
- DESCRIPTION
-@@ -24,7 +26,7 @@
- 
- No supporting OS subroutines are required.  */
- 
--#include <_ansi.h>
-+#include <strings.h>
- 
- int
- _DEFUN(ffs, (word),
-diff -Naur newlib-1.19.0.orig/newlib/libc/posix/collate.c newlib-1.19.0/newlib/libc/posix/collate.c
---- newlib-1.19.0.orig/newlib/libc/posix/collate.c	2008-11-19 21:04:09.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/posix/collate.c	2011-07-24 06:43:01.732140528 +0200
-@@ -177,12 +177,13 @@
- {
- 	const char *s;
- 	int serrno = errno;
-+	int dummy;
- 
- 	/* Be careful to change write counts if you change the strings */
- 	write(STDERR_FILENO, "collate_error: ", 15);
- 	write(STDERR_FILENO, f, strlen(f));
- 	write(STDERR_FILENO, ": ", 2);
--	s = strerror(serrno);
-+	s = _strerror_r(_REENT, serrno, 1, &dummy);
- 	write(STDERR_FILENO, s, strlen(s));
- 	write(STDERR_FILENO, "\n", 1);
- 	exit(ex);
-diff -Naur newlib-1.19.0.orig/newlib/libc/posix/readdir.c newlib-1.19.0/newlib/libc/posix/readdir.c
---- newlib-1.19.0.orig/newlib/libc/posix/readdir.c	2003-06-06 21:57:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/posix/readdir.c	2011-07-24 06:43:01.732140528 +0200
-@@ -37,6 +37,7 @@
- static char sccsid[] = "@(#)readdir.c	5.7 (Berkeley) 6/1/90";
- #endif /* LIBC_SCCS and not lint */
- 
-+#include <stdint.h>
- #include <dirent.h>
- 
- extern int getdents (int fd, void *dp, int count);
-@@ -75,7 +76,7 @@
-       continue;
-     }
-     dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
--    if ((int)dp & 03) {	/* bogus pointer check */
-+    if ((intptr_t)dp & 03) {	/* bogus pointer check */
- #ifdef HAVE_DD_LOCK
-       __lock_release_recursive(dirp->dd_lock);
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/reent/sbrkr.c newlib-1.19.0/newlib/libc/reent/sbrkr.c
---- newlib-1.19.0.orig/newlib/libc/reent/sbrkr.c	2003-06-03 21:48:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/reent/sbrkr.c	2011-07-24 06:43:01.733140543 +0200
-@@ -13,9 +13,7 @@
- #endif
- #endif
- 
--/* If MALLOC_PROVIDED is defined, we don't need this function.  */
--
--#if defined (REENTRANT_SYSCALLS_PROVIDED) || defined (MALLOC_PROVIDED)
-+#if defined (REENTRANT_SYSCALLS_PROVIDED)
- 
- int _dummy_sbrk_syscalls = 1;
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/db_local.h newlib-1.19.0/newlib/libc/search/db_local.h
---- newlib-1.19.0.orig/newlib/libc/search/db_local.h	2010-03-05 09:55:15.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/search/db_local.h	2011-07-24 06:43:01.733140543 +0200
-@@ -102,11 +102,11 @@
- typedef struct __db {
- 	DBTYPE type;			/* Underlying db type. */
- 	int (*close)(struct __db *);
--	int (*del)(const struct __db *, const DBT *, u_int);
--	int (*get)(const struct __db *, const DBT *, DBT *, u_int);
--	int (*put)(const struct __db *, DBT *, const DBT *, u_int);
--	int (*seq)(const struct __db *, DBT *, DBT *, u_int);
--	int (*sync)(const struct __db *, u_int);
-+	int (*del)(const struct __db *, const DBT *, __uint32_t);
-+	int (*get)(const struct __db *, const DBT *, DBT *, __uint32_t);
-+	int (*put)(const struct __db *, DBT *, const DBT *, __uint32_t);
-+	int (*seq)(const struct __db *, DBT *, DBT *, __uint32_t);
-+	int (*sync)(const struct __db *, __uint32_t);
- 	void *internal;			/* Access method private. */
- 	int (*fd)(const struct __db *);
- } DB;
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/extern.h newlib-1.19.0/newlib/libc/search/extern.h
---- newlib-1.19.0.orig/newlib/libc/search/extern.h	2002-06-20 21:51:31.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/extern.h	2011-07-24 06:43:01.733140543 +0200
-@@ -43,7 +43,7 @@
- int	 __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
- 		int, __uint32_t, SPLIT_RETURN *);
- int	 __buf_free(HTAB *, int, int);
--void	 __buf_init(HTAB *, int);
-+void	 __buf_init(HTAB *, __uint32_t);
- __uint32_t	 __call_hash(HTAB *, char *, int);
- int	 __delpair(HTAB *, BUFHEAD *, int);
- int	 __expand_table(HTAB *);
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/hash_buf.c newlib-1.19.0/newlib/libc/search/hash_buf.c
---- newlib-1.19.0.orig/newlib/libc/search/hash_buf.c	2004-05-26 19:57:10.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/hash_buf.c	2011-07-24 06:43:01.733140543 +0200
-@@ -118,7 +118,7 @@
- 	int newpage;	/* If prev_bp set, indicates a new overflow page. */
- {
- 	BUFHEAD *bp;
--	__uint32_t is_disk_mask;
-+	ptrdiff_t is_disk_mask;
- 	int is_disk, segment_ndx;
- 	SEGMENT segp;
- 
-@@ -298,7 +298,7 @@
- extern void
- __buf_init(hashp, nbytes)
- 	HTAB *hashp;
--	int nbytes;
-+	__uint32_t nbytes;
- {
- 	BUFHEAD *bfp;
- 	int npages;
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/hash.h newlib-1.19.0/newlib/libc/search/hash.h
---- newlib-1.19.0.orig/newlib/libc/search/hash.h	2008-07-02 20:38:45.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/hash.h	2011-07-24 06:43:01.733140543 +0200
-@@ -82,7 +82,7 @@
- 
- /* Hash Table Information */
- typedef struct hashhdr {		/* Disk resident portion */
--	int		magic;		/* Magic NO for hash tables */
-+	__uint32_t	magic;		/* Magic NO for hash tables */
- 	int		version;	/* Version ID */
- 	__uint32_t	lorder;		/* Byte Order */
- 	int		bsize;		/* Bucket/Page Size */
-@@ -97,7 +97,7 @@
- 	int		high_mask;	/* Mask to modulo into entire table */
- 	int		low_mask;	/* Mask to modulo into lower half of 
- 					 * table */
--	int		ffactor;	/* Fill factor */
-+	__uint32_t	ffactor;	/* Fill factor */
- 	int		nkeys;		/* Number of keys in hash table */
- 	int		hdrpages;	/* Size of table header */
- 	int		h_charkey;	/* value of hash(CHARKEY) */
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/Makefile.am newlib-1.19.0/newlib/libc/signal/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/signal/Makefile.am	2006-04-11 21:02:09.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/signal/Makefile.am	2011-07-24 06:43:01.734140558 +0200
-@@ -4,7 +4,7 @@
- 
- INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
- 
--LIB_SOURCES = raise.c signal.c
-+LIB_SOURCES = psignal.c raise.c signal.c
- 
- libsignal_la_LDFLAGS = -Xcompiler -nostdlib
- 
-@@ -21,7 +21,7 @@
- 
- include $(srcdir)/../../Makefile.shared
- 
--CHEWOUT_FILES = raise.def signal.def
-+CHEWOUT_FILES = psignal.def raise.def signal.def
- 
- SUFFIXES = .def
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/Makefile.in newlib-1.19.0/newlib/libc/signal/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/signal/Makefile.in	2011-07-20 08:45:15.831330915 +0200
-+++ newlib-1.19.0/newlib/libc/signal/Makefile.in	2011-07-24 06:43:01.734140558 +0200
-@@ -55,12 +55,13 @@
- ARFLAGS = cru
- lib_a_AR = $(AR) $(ARFLAGS)
- lib_a_LIBADD =
--am__objects_1 = lib_a-raise.$(OBJEXT) lib_a-signal.$(OBJEXT)
-+am__objects_1 = lib_a-psignal.$(OBJEXT) lib_a-raise.$(OBJEXT) \
-+	lib_a-signal.$(OBJEXT)
- @USE_LIBTOOL_FALSE at am_lib_a_OBJECTS = $(am__objects_1)
- lib_a_OBJECTS = $(am_lib_a_OBJECTS)
- LTLIBRARIES = $(noinst_LTLIBRARIES)
- libsignal_la_LIBADD =
--am__objects_2 = raise.lo signal.lo
-+am__objects_2 = psignal.lo raise.lo signal.lo
- @USE_LIBTOOL_TRUE at am_libsignal_la_OBJECTS = $(am__objects_2)
- libsignal_la_OBJECTS = $(am_libsignal_la_OBJECTS)
- libsignal_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -228,7 +229,7 @@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = cygnus
- INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
--LIB_SOURCES = raise.c signal.c
-+LIB_SOURCES = psignal.c raise.c signal.c
- libsignal_la_LDFLAGS = -Xcompiler -nostdlib
- @USE_LIBTOOL_TRUE at noinst_LTLIBRARIES = libsignal.la
- @USE_LIBTOOL_TRUE at libsignal_la_SOURCES = $(LIB_SOURCES)
-@@ -237,7 +238,7 @@
- @USE_LIBTOOL_FALSE at noinst_LIBRARIES = lib.a
- @USE_LIBTOOL_FALSE at lib_a_SOURCES = $(LIB_SOURCES)
- @USE_LIBTOOL_FALSE at lib_a_CFLAGS = $(AM_CFLAGS)
--CHEWOUT_FILES = raise.def signal.def
-+CHEWOUT_FILES = psignal.def raise.def signal.def
- SUFFIXES = .def
- CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
- TARGETDOC = ../tmp.texi
-@@ -310,6 +311,12 @@
- .c.lo:
- 	$(LTCOMPILE) -c -o $@ $<
- 
-+lib_a-psignal.o: psignal.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.o `test -f 'psignal.c' || echo '$(srcdir)/'`psignal.c
-+
-+lib_a-psignal.obj: psignal.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.obj `if test -f 'psignal.c'; then $(CYGPATH_W) 'psignal.c'; else $(CYGPATH_W) '$(srcdir)/psignal.c'; fi`
-+
- lib_a-raise.o: raise.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-raise.o `test -f 'raise.c' || echo '$(srcdir)/'`raise.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/psignal.c newlib-1.19.0/newlib/libc/signal/psignal.c
---- newlib-1.19.0.orig/newlib/libc/signal/psignal.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/signal/psignal.c	2011-07-24 06:43:01.734140558 +0200
-@@ -0,0 +1,51 @@
-+/* Copyright 2002, 2011 Red Hat Inc. */
-+/*
-+FUNCTION
-+<<psignal>>---print a signal message on standard error
-+
-+INDEX
-+	psignal
-+
-+ANSI_SYNOPSIS
-+	#include <stdio.h>
-+	void psignal(int <[signal]>, const char *<[prefix]>);
-+
-+TRAD_SYNOPSIS
-+	#include <stdio.h>
-+	void psignal(<[signal]>, <[prefix]>)
-+	int <[signal]>;
-+	const char *<[prefix]>;
-+
-+DESCRIPTION
-+Use <<psignal>> to print (on standard error) a signal message
-+corresponding to the value of the signal number <[signal]>.
-+Unless you use <<NULL>> as the value of the argument <[prefix]>, the
-+signal message will begin with the string at <[prefix]>, followed by a
-+colon and a space (<<: >>). The remainder of the signal message is one
-+of the strings described for <<strsignal>>.
-+
-+RETURNS
-+<<psignal>> returns no result.
-+
-+PORTABILITY
-+POSIX.1-2008 requires <<psignal>>, but the strings issued vary from one
-+implementation to another.
-+
-+Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-+<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-+*/
-+
-+#include <_ansi.h>
-+#include <stdio.h>
-+#include <string.h>
-+
-+_VOID
-+_DEFUN(psignal, (sig, s),
-+       int sig _AND
-+       _CONST char *s)
-+{
-+  if (s != NULL && *s != '\0')
-+    fprintf (stderr, "%s: %s\n", s, strsignal (sig));
-+  else
-+    fprintf (stderr, "%s\n", strsignal (sig));
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/signal.tex newlib-1.19.0/newlib/libc/signal/signal.tex
---- newlib-1.19.0.orig/newlib/libc/signal/signal.tex	2000-02-17 20:39:47.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/signal/signal.tex	2011-07-24 06:43:01.734140558 +0200
-@@ -59,11 +59,15 @@
- reliable from signal handlers.)
- 
- @menu
-+* psignal:: Print a signal message to standard error
- * raise::   Send a signal
- * signal::  Specify handler subroutine for a signal
- @end menu
- 
- @page
-+ at include signal/psignal.def
-+
-+ at page
- @include signal/raise.def
- 
- @page
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fclose.c newlib-1.19.0/newlib/libc/stdio/fclose.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fclose.c	2007-07-13 22:37:53.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fclose.c	2011-07-24 06:43:01.735140574 +0200
-@@ -74,8 +74,6 @@
-   if (fp == NULL)
-     return (0);			/* on NULL */
- 
--  __sfp_lock_acquire ();
--
-   CHECK_INIT (rptr, fp);
- 
-   _flockfile (fp);
-@@ -83,7 +81,6 @@
-   if (fp->_flags == 0)		/* not open! */
-     {
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return (0);
-     }
-   /* Unconditionally flush to allow special handling for seekable read
-@@ -98,6 +95,7 @@
-     FREEUB (rptr, fp);
-   if (HASLB (fp))
-     FREELB (rptr, fp);
-+  __sfp_lock_acquire ();
-   fp->_flags = 0;		/* release this FILE for reuse */
-   _funlockfile (fp);
- #ifndef __SINGLE_THREAD__
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fflush.c newlib-1.19.0/newlib/libc/stdio/fflush.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fflush.c	2009-10-30 09:26:41.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fflush.c	2011-07-24 06:43:01.735140574 +0200
-@@ -67,37 +67,16 @@
- 
- /* Flush a single file, or (if fp is NULL) all files.  */
- 
-+/* Core function which does not lock file pointer.  This gets called
-+   directly from __srefill. */
- int
--_DEFUN(_fflush_r, (ptr, fp),
-+_DEFUN(__sflush_r, (ptr, fp),
-        struct _reent *ptr _AND
-        register FILE * fp)
- {
-   register unsigned char *p;
-   register int n, t;
- 
--#ifdef _REENT_SMALL
--  /* For REENT_SMALL platforms, it is possible we are being
--     called for the first time on a std stream.  This std
--     stream can belong to a reentrant struct that is not
--     _REENT.  If CHECK_INIT gets called below based on _REENT,
--     we will end up changing said file pointers to the equivalent
--     std stream off of _REENT.  This causes unexpected behavior if
--     there is any data to flush on the _REENT std stream.  There
--     are two alternatives to fix this:  1) make a reentrant fflush
--     or 2) simply recognize that this file has nothing to flush
--     and return immediately before performing a CHECK_INIT.  Choice
--     2 is implemented here due to its simplicity.  */
--  if (fp->_bf._base == NULL)
--    return 0;
--#endif /* _REENT_SMALL  */
--
--  CHECK_INIT (ptr, fp);
--
--  if (!fp->_flags)
--    return 0;
--
--  _flockfile (fp);
--
-   t = fp->_flags;
-   if ((t & __SWR) == 0)
-     {
-@@ -150,7 +129,6 @@
- 		    }
- 		  else
- 		    fp->_flags |= __SERR;
--		  _funlockfile (fp);
- 		  return result;
- 		}
-             }
-@@ -186,17 +164,14 @@
- 	  else
- 	    {
- 	      fp->_flags |= __SERR;
--	      _funlockfile (fp);
- 	      return EOF;
- 	    }
- 	}
--      _funlockfile (fp);
-       return 0;
-     }
-   if ((p = fp->_bf._base) == NULL)
-     {
-       /* Nothing to flush.  */
--      _funlockfile (fp);
-       return 0;
-     }
-   n = fp->_p - p;		/* write this much */
-@@ -215,16 +190,48 @@
-       if (t <= 0)
- 	{
-           fp->_flags |= __SERR;
--          _funlockfile (fp);
-           return EOF;
- 	}
-       p += t;
-       n -= t;
-     }
--  _funlockfile (fp);
-   return 0;
- }
- 
-+int
-+_DEFUN(_fflush_r, (ptr, fp),
-+       struct _reent *ptr _AND
-+       register FILE * fp)
-+{
-+  int ret;
-+
-+#ifdef _REENT_SMALL
-+  /* For REENT_SMALL platforms, it is possible we are being
-+     called for the first time on a std stream.  This std
-+     stream can belong to a reentrant struct that is not
-+     _REENT.  If CHECK_INIT gets called below based on _REENT,
-+     we will end up changing said file pointers to the equivalent
-+     std stream off of _REENT.  This causes unexpected behavior if
-+     there is any data to flush on the _REENT std stream.  There
-+     are two alternatives to fix this:  1) make a reentrant fflush
-+     or 2) simply recognize that this file has nothing to flush
-+     and return immediately before performing a CHECK_INIT.  Choice
-+     2 is implemented here due to its simplicity.  */
-+  if (fp->_bf._base == NULL)
-+    return 0;
-+#endif /* _REENT_SMALL  */
-+
-+  CHECK_INIT (ptr, fp);
-+
-+  if (!fp->_flags)
-+    return 0;
-+
-+  _flockfile (fp);
-+  ret = __sflush_r (ptr, fp);
-+  _funlockfile (fp);
-+  return ret;
-+}
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetc.c newlib-1.19.0/newlib/libc/stdio/fgetc.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgetc.c	2009-04-25 00:52:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgetc.c	2011-07-24 06:43:01.735140574 +0200
-@@ -93,11 +93,9 @@
- #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
-   int result;
-   CHECK_INIT(_REENT, fp);
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   result = __sgetc_r (_REENT, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return result;
- #else
-   return _fgetc_r (_REENT, fp);
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgets.c newlib-1.19.0/newlib/libc/stdio/fgets.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgets.c	2009-04-25 00:52:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgets.c	2011-07-24 06:43:01.735140574 +0200
-@@ -98,7 +98,6 @@
- 
-   CHECK_INIT(ptr, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- #ifdef __SCLE
-   if (fp->_flags & __SCLE)
-@@ -114,12 +113,10 @@
-       if (c == EOF && s == buf)
-         {
-           _funlockfile (fp);
--	  __sfp_lock_release ();
-           return NULL;
-         }
-       *s = 0;
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return buf;
-     }
- #endif
-@@ -138,7 +135,6 @@
- 	      if (s == buf)
-                 {
-                   _funlockfile (fp);
--		  __sfp_lock_release ();
-                   return 0;
-                 }
- 	      break;
-@@ -164,7 +160,6 @@
- 	  _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len);
- 	  s[len] = 0;
-           _funlockfile (fp);
--	  __sfp_lock_release ();
- 	  return (buf);
- 	}
-       fp->_r -= len;
-@@ -175,7 +170,6 @@
-   while ((n -= len) != 0);
-   *s = 0;
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return buf;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetwc.c newlib-1.19.0/newlib/libc/stdio/fgetwc.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgetwc.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgetwc.c	2011-07-24 06:43:01.735140574 +0200
-@@ -164,12 +164,10 @@
- {
-   wint_t r;
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   ORIENT(fp, 1);
-   r = __fgetwc (ptr, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return r;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetws.c newlib-1.19.0/newlib/libc/stdio/fgetws.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgetws.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgetws.c	2011-07-24 06:43:01.736140590 +0200
-@@ -93,7 +93,6 @@
-   const char *src;
-   unsigned char *nl;
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   ORIENT (fp, 1);
- 
-@@ -144,12 +143,10 @@
-     goto error;
-   *wsp++ = L'\0';
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return ws;
- 
- error:
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return NULL;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fmemopen.c newlib-1.19.0/newlib/libc/stdio/fmemopen.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fmemopen.c	2007-08-02 22:23:06.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fmemopen.c	2011-07-24 06:43:01.736140590 +0200
-@@ -281,7 +281,7 @@
- 
-   if ((flags = __sflags (ptr, mode, &dummy)) == 0)
-     return NULL;
--  if (!size || !(buf || flags & __SAPP))
-+  if (!size || !(buf || flags & __SRW))
-     {
-       ptr->_errno = EINVAL;
-       return NULL;
-@@ -310,7 +310,7 @@
-     {
-       /* r+/w+/a+, and no buf: file starts empty.  */
-       c->buf = (char *) (c + 1);
--      *(char *) buf = '\0';
-+      c->buf[0] = '\0';
-       c->pos = c->eof = 0;
-       c->append = (flags & __SAPP) != 0;
-     }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fpurge.c newlib-1.19.0/newlib/libc/stdio/fpurge.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fpurge.c	2009-07-03 13:58:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fpurge.c	2011-07-24 06:43:01.736140590 +0200
-@@ -11,6 +11,8 @@
- 	fpurge
- INDEX
- 	_fpurge_r
-+INDEX
-+	__fpurge
- 
- ANSI_SYNOPSIS
- 	#include <stdio.h>
-@@ -18,6 +20,11 @@
- 
- 	int _fpurge_r(struct _reent *<[reent]>, FILE *<[fp]>);
- 
-+	#include <stdio.h>
-+	#include <stdio_ext.h>
-+	void  __fpurge(FILE *<[fp]>);
-+
-+
- DESCRIPTION
- Use <<fpurge>> to clear all buffers of the given stream.  For output
- streams, this discards data not yet written to disk.  For input streams,
-@@ -26,6 +33,8 @@
- and generally is only needed when manually altering the underlying file
- descriptor of a stream.
- 
-+<<__fpurge>> behaves exactly like <<fpurge>> but does not return a value.
-+
- The alternate function <<_fpurge_r>> is a reentrant version, where the
- extra argument <[reent]> is a pointer to a reentrancy structure, and
- <[fp]> must not be NULL.
-@@ -42,6 +51,9 @@
- 
- #include <_ansi.h>
- #include <stdio.h>
-+#ifndef __rtems__
-+#include <stdio_ext.h>
-+#endif
- #include <errno.h>
- #include "local.h"
- 
-@@ -87,4 +99,15 @@
-   return _fpurge_r (_REENT, fp);
- }
- 
-+#ifndef __rtems__
-+
-+void
-+_DEFUN(__fpurge, (fp),
-+       register FILE * fp)
-+{
-+  _fpurge_r (_REENT, fp);
-+}
-+
-+#endif
-+
- #endif /* _REENT_ONLY */
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fread.c newlib-1.19.0/newlib/libc/stdio/fread.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fread.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fread.c	2011-07-24 06:43:01.736140590 +0200
-@@ -146,7 +146,6 @@
- 
-   CHECK_INIT(ptr, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   ORIENT (fp, -1);
-   if (fp->_r < 0)
-@@ -197,12 +196,10 @@
-               if (fp->_flags & __SCLE)
- 	        {
- 	          _funlockfile (fp);
--		  __sfp_lock_release ();
- 	          return crlf_r (ptr, fp, buf, total-resid, 1) / size;
- 	        }
- #endif
- 	      _funlockfile (fp);
--	      __sfp_lock_release ();
- 	      return (total - resid) / size;
- 	    }
- 	}
-@@ -224,12 +221,10 @@
- 	      if (fp->_flags & __SCLE)
- 		{
- 		  _funlockfile (fp);
--		  __sfp_lock_release ();
- 		  return crlf_r (ptr, fp, buf, total-resid, 1) / size;
- 		}
- #endif
- 	      _funlockfile (fp);
--	      __sfp_lock_release ();
- 	      return (total - resid) / size;
- 	    }
- 	}
-@@ -243,12 +238,10 @@
-   if (fp->_flags & __SCLE)
-     {
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return crlf_r(ptr, fp, buf, total, 0) / size;
-     }
- #endif
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return count;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/freopen.c newlib-1.19.0/newlib/libc/stdio/freopen.c
---- newlib-1.19.0.orig/newlib/libc/stdio/freopen.c	2008-12-12 16:45:19.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/freopen.c	2011-07-24 06:43:01.736140590 +0200
-@@ -98,8 +98,6 @@
-   int flags, oflags;
-   int e = 0;
- 
--  __sfp_lock_acquire ();
--
-   CHECK_INIT (ptr, fp);
- 
-   _flockfile (fp);
-@@ -108,7 +106,6 @@
-     {
-       _funlockfile (fp);
-       _fclose_r (ptr, fp);
--      __sfp_lock_release ();
-       return NULL;
-     }
- 
-@@ -208,6 +205,7 @@
- 
-   if (f < 0)
-     {				/* did not get it after all */
-+      __sfp_lock_acquire ();
-       fp->_flags = 0;		/* set it free */
-       ptr->_errno = e;		/* restore in case _close clobbered */
-       _funlockfile (fp);
-@@ -232,7 +230,6 @@
- #endif
- 
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return fp;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fscanf.c newlib-1.19.0/newlib/libc/stdio/fscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fscanf.c	2004-04-23 22:01:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fscanf.c	2011-07-24 06:43:01.736140590 +0200
-@@ -45,7 +45,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (_REENT, fp, fmt, ap);
-+  ret = _vfscanf_r (_REENT, fp, fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -71,7 +71,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (ptr, fp, fmt, ap);
-+  ret = _vfscanf_r (ptr, fp, fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fseek.c newlib-1.19.0/newlib/libc/stdio/fseek.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fseek.c	2009-12-17 20:43:43.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fseek.c	2011-07-24 06:43:01.737140605 +0200
-@@ -138,7 +138,6 @@
- 
-   CHECK_INIT (ptr, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   /* If we've been doing some writing, and we're in append mode
-@@ -156,7 +155,6 @@
-     {
-       ptr->_errno = ESPIPE;	/* ??? */
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return EOF;
-     }
- 
-@@ -182,7 +180,6 @@
- 	  if (curoff == -1L)
- 	    {
- 	      _funlockfile (fp);
--	      __sfp_lock_release ();
- 	      return EOF;
- 	    }
- 	}
-@@ -208,7 +205,6 @@
-     default:
-       ptr->_errno = EINVAL;
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return (EOF);
-     }
- 
-@@ -268,7 +264,6 @@
-     {
-       ptr->_errno = EOVERFLOW;
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return EOF;
-     }
- 
-@@ -325,7 +320,6 @@
-       fp->_flags &= ~__SEOF;
-       memset (&fp->_mbstate, 0, sizeof (_mbstate_t));
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return 0;
-     }
- 
-@@ -356,7 +350,6 @@
-     }
-   memset (&fp->_mbstate, 0, sizeof (_mbstate_t));
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return 0;
- 
-   /*
-@@ -369,7 +362,6 @@
-       || seekfn (ptr, fp->_cookie, offset, whence) == POS_ERR)
-     {
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return EOF;
-     }
-   /* success: clear EOF indicator and discard ungetc() data */
-@@ -388,7 +380,6 @@
-   fp->_flags &= ~__SNPT;
-   memset (&fp->_mbstate, 0, sizeof (_mbstate_t));
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return 0;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fvwrite.c newlib-1.19.0/newlib/libc/stdio/fvwrite.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fvwrite.c	2007-07-13 22:37:53.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fvwrite.c	2011-07-24 06:43:01.737140605 +0200
-@@ -61,11 +61,7 @@
- 
-   /* make sure we can write */
-   if (cantwrite (ptr, fp))
--    {
--      fp->_flags |= __SERR;
--      ptr->_errno = EBADF;
--      return EOF;
--    }
-+    return EOF;
- 
-   iov = uio->uio_iov;
-   len = 0;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fwalk.c newlib-1.19.0/newlib/libc/stdio/fwalk.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fwalk.c	2009-01-12 23:19:11.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fwalk.c	2011-07-24 06:43:01.737140605 +0200
-@@ -27,8 +27,8 @@
- #include <errno.h>
- #include "local.h"
- 
--static int
--_DEFUN(__fwalk, (ptr, function),
-+int
-+_DEFUN(_fwalk, (ptr, function),
-        struct _reent *ptr _AND
-        register int (*function) (FILE *))
- {
-@@ -36,11 +36,19 @@
-   register int n, ret = 0;
-   register struct _glue *g;
- 
-+  /*
-+   * It should be safe to walk the list without locking it;
-+   * new nodes are only added to the end and none are ever
-+   * removed.
-+   *
-+   * Avoid locking this list while walking it or else you will
-+   * introduce a potential deadlock in [at least] refill.c.
-+   */
-   for (g = &ptr->__sglue; g != NULL; g = g->_next)
-     for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
-       if (fp->_flags != 0)
-         {
--          if (fp->_flags != 0 && fp->_file != -1)
-+          if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1)
-             ret |= (*function) (fp);
-         }
- 
-@@ -49,8 +57,8 @@
- 
- /* Special version of __fwalk where the function pointer is a reentrant
-    I/O function (e.g. _fclose_r).  */
--static int
--_DEFUN(__fwalk_reent, (ptr, reent_function),
-+int
-+_DEFUN(_fwalk_reent, (ptr, reent_function),
-        struct _reent *ptr _AND
-        register int (*reent_function) (struct _reent *, FILE *))
- {
-@@ -58,51 +66,21 @@
-   register int n, ret = 0;
-   register struct _glue *g;
- 
-+  /*
-+   * It should be safe to walk the list without locking it;
-+   * new nodes are only added to the end and none are ever
-+   * removed.
-+   *
-+   * Avoid locking this list while walking it or else you will
-+   * introduce a potential deadlock in [at least] refill.c.
-+   */
-   for (g = &ptr->__sglue; g != NULL; g = g->_next)
-     for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
-       if (fp->_flags != 0)
-         {
--          if (fp->_flags != 0 && fp->_file != -1)
-+          if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1)
-             ret |= (*reent_function) (ptr, fp);
-         }
- 
-   return ret;
- }
--
--int
--_DEFUN(_fwalk, (ptr, function),
--       struct _reent *ptr _AND
--       register int (*function)(FILE *))
--{
--  register int ret = 0;
--
--  __sfp_lock_acquire ();
--
--  /* Must traverse given list for streams.  Note that _GLOBAL_REENT
--     only walked once in exit().  */
--  ret |= __fwalk (ptr, function);
--
--  __sfp_lock_release ();
--
--  return ret;
--}
--
--/* Special version of _fwalk which handles a function pointer to a
--   reentrant I/O function (e.g. _fclose_r).  */
--int
--_DEFUN(_fwalk_reent, (ptr, reent_function),
--       struct _reent *ptr _AND
--       register int (*reent_function) (struct _reent *, FILE *))
--{
--  register int ret = 0;
--
--  __sfp_lock_acquire ();
--
--  /* Must traverse given list for streams.  Note that _GLOBAL_REENT
--     only walked once in exit().  */
--  ret |= __fwalk_reent (ptr, reent_function);
--
--  __sfp_lock_release ();
--
--  return ret;
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fwscanf.c newlib-1.19.0/newlib/libc/stdio/fwscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fwscanf.c	2009-03-11 12:53:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fwscanf.c	2011-07-24 06:43:01.737140605 +0200
-@@ -31,7 +31,7 @@
-   va_list ap;
- 
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (_REENT, fp, fmt, ap);
-+  ret = _vfwscanf_r (_REENT, fp, fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -45,7 +45,7 @@
-   va_list ap;
- 
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (ptr, fp, fmt, ap);
-+  ret = _vfwscanf_r (ptr, fp, fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/getc.c newlib-1.19.0/newlib/libc/stdio/getc.c
---- newlib-1.19.0.orig/newlib/libc/stdio/getc.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/getc.c	2011-07-24 06:43:01.737140605 +0200
-@@ -92,11 +92,9 @@
- {
-   int result;
-   CHECK_INIT (ptr, fp);
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   result = __sgetc_r (ptr, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return result;
- }
- 
-@@ -108,11 +106,9 @@
- {
-   int result;
-   CHECK_INIT (_REENT, fp);
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   result = __sgetc_r (_REENT, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return result;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/getdelim.c newlib-1.19.0/newlib/libc/stdio/getdelim.c
---- newlib-1.19.0.orig/newlib/libc/stdio/getdelim.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/getdelim.c	2011-07-24 06:43:01.738140620 +0200
-@@ -81,7 +81,6 @@
- 
-   CHECK_INIT (_REENT, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   numbytes = *n;
-@@ -131,7 +130,6 @@
-     }
- 
-   _funlockfile (fp);
--  __sfp_lock_release ();
- 
-   /* if no input data, return failure */
-   if (ptr == buf)
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/gets.c newlib-1.19.0/newlib/libc/stdio/gets.c
---- newlib-1.19.0.orig/newlib/libc/stdio/gets.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/gets.c	2011-07-24 06:43:01.738140620 +0200
-@@ -79,14 +79,12 @@
-   register int c;
-   register char *s = buf;
- 
--  __sfp_lock_acquire ();
-   _flockfile (stdin);
-   while ((c = __sgetc_r (ptr, stdin)) != '\n')
-     if (c == EOF)
-       if (s == buf)
- 	{
- 	  _funlockfile (stdin);
--	  __sfp_lock_release ();
- 	  return NULL;
- 	}
-       else
-@@ -95,7 +93,6 @@
-       *s++ = c;
-   *s = 0;
-   _funlockfile (stdin);
--  __sfp_lock_release ();
-   return buf;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/local.h newlib-1.19.0/newlib/libc/stdio/local.h
---- newlib-1.19.0.orig/newlib/libc/stdio/local.h	2009-04-22 10:30:03.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/local.h	2011-07-24 06:43:01.738140620 +0200
-@@ -54,6 +54,7 @@
- 				  va_list));
- extern FILE  *_EXFUN(__sfp,(struct _reent *));
- extern int    _EXFUN(__sflags,(struct _reent *,_CONST char*, int*));
-+extern int    _EXFUN(__sflush_r,(struct _reent *,FILE *));
- extern int    _EXFUN(__srefill_r,(struct _reent *,FILE *));
- extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(struct _reent *, void *, char *,
- 					       int));
-@@ -112,7 +113,8 @@
-     }						\
-   while (0)
- 
--/* Return true iff the given FILE cannot be written now.  */
-+/* Return true and set errno and stream error flag iff the given FILE
-+   cannot be written now.  */
- 
- #define	cantwrite(ptr, fp)                                     \
-   ((((fp)->_flags & __SWR) == 0 || (fp)->_bf._base == NULL) && \
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/open_memstream.c newlib-1.19.0/newlib/libc/stdio/open_memstream.c
---- newlib-1.19.0.orig/newlib/libc/stdio/open_memstream.c	2009-02-25 05:00:05.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/open_memstream.c	2011-07-24 06:43:01.738140620 +0200
-@@ -330,8 +330,10 @@
-     c->max *= sizeof(wchar_t);
-   if (c->max < 64)
-     c->max = 64;
--  else if (c->max > 64 * 1024)
--    c->max = 64 * 1024;
-+#if (SIZE_MAX >= 0x10000)
-+  else if (c->max > 0x10000)
-+    c->max = 0x10000;
-+#endif
-   *size = 0;
-   *buf = _malloc_r (ptr, c->max);
-   if (!*buf)
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/perror.c newlib-1.19.0/newlib/libc/stdio/perror.c
---- newlib-1.19.0.orig/newlib/libc/stdio/perror.c	2005-02-08 02:33:17.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/perror.c	2011-07-24 06:43:01.738140620 +0200
-@@ -73,6 +73,7 @@
-        _CONST char *s)
- {
-   char *error;
-+  int dummy;
- 
-   _REENT_SMALL_CHECK_INIT (ptr);
-   if (s != NULL && *s != '\0')
-@@ -81,7 +82,7 @@
-       fputs (": ", _stderr_r (ptr));
-     }
- 
--  if ((error = strerror (ptr->_errno)) != NULL)
-+  if ((error = _strerror_r (ptr, ptr->_errno, 1, &dummy)) != NULL)
-     fputs (error, _stderr_r (ptr));
- 
-   fputc ('\n', _stderr_r (ptr));
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/refill.c newlib-1.19.0/newlib/libc/stdio/refill.c
---- newlib-1.19.0.orig/newlib/libc/stdio/refill.c	2008-12-11 00:43:12.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/refill.c	2011-07-24 06:43:01.739140635 +0200
-@@ -102,9 +102,19 @@
-    * flush all line buffered output files, per the ANSI C
-    * standard.
-    */
--
-   if (fp->_flags & (__SLBF | __SNBF))
--    _CAST_VOID _fwalk (_GLOBAL_REENT, lflush);
-+    {
-+      /* Ignore this file in _fwalk to avoid potential deadlock. */
-+      short orig_flags = fp->_flags;
-+      fp->_flags = 1;
-+      _CAST_VOID _fwalk (_GLOBAL_REENT, lflush);
-+      fp->_flags = orig_flags;
-+
-+      /* Now flush this file without locking it. */
-+      if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR))
-+	__sflush_r (ptr, fp);
-+    }
-+
-   fp->_p = fp->_bf._base;
-   fp->_r = fp->_read (ptr, fp->_cookie, (char *) fp->_p, fp->_bf._size);
- #ifndef __CYGWIN__
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/scanf.c newlib-1.19.0/newlib/libc/stdio/scanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/scanf.c	2005-02-08 02:33:17.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/scanf.c	2011-07-24 06:43:01.739140635 +0200
-@@ -45,7 +45,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-+  ret = _vfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -71,7 +71,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-+  ret = _vfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/tmpnam.c newlib-1.19.0/newlib/libc/stdio/tmpnam.c
---- newlib-1.19.0.orig/newlib/libc/stdio/tmpnam.c	2004-04-23 22:01:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/tmpnam.c	2011-07-24 06:43:01.739140635 +0200
-@@ -94,6 +94,7 @@
- #include <_ansi.h>
- #include <reent.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
- #include <fcntl.h>
-@@ -109,7 +110,7 @@
-        char *result       _AND
-        _CONST char *part1 _AND
-        _CONST char *part2 _AND
--       int part3          _AND
-+       intptr_t part3     _AND
-        int *part4)
- {
-   /*  Generate the filename and make sure that there isn't one called
-@@ -183,7 +184,7 @@
-   if (filename)
-     {
-       if (! worker (p, filename, dir, prefix,
--		    _getpid_r (p) ^ (int) (_POINTER_INT) p, &p->_inc))
-+		    _getpid_r (p) ^ (intptr_t) p, &p->_inc))
- 	return NULL;
-     }
-   return filename;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfscanf.c newlib-1.19.0/newlib/libc/stdio/vfscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vfscanf.c	2010-01-20 00:16:45.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/vfscanf.c	2011-07-24 06:43:01.739140635 +0200
-@@ -494,7 +494,6 @@
- # define GET_ARG(n, ap, type) (va_arg (ap, type))
- #endif
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   ORIENT (fp, -1);
-@@ -795,7 +794,6 @@
- 	   */
- 	case '\0':		/* compat */
- 	  _funlockfile (fp);
--	  __sfp_lock_release ();
- 	  return EOF;
- 
- 	default:		/* compat */
-@@ -1596,13 +1594,11 @@
-      invalid format string), return EOF if no matches yet, else number
-      of matches made prior to failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF;
- match_failure:
- all_done:
-   /* Return number of matches, which can be 0 on match failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfwprintf.c newlib-1.19.0/newlib/libc/stdio/vfwprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vfwprintf.c	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vfwprintf.c	2011-07-24 06:43:01.740140650 +0200
-@@ -240,7 +240,7 @@
- # endif /* !_NO_LONGDBL */
- 
- static wchar_t *wcvt(struct _reent *, _PRINTF_FLOAT_TYPE, int, int, wchar_t *,
--		    int *, int, int *, wchar_t *);
-+		    int *, int, int *, wchar_t *, int);
- 
- static int wexponent(wchar_t *, int, int);
- 
-@@ -996,7 +996,23 @@
- 			flags |= FPT;
- 
- 			cp = wcvt (data, _fpvalue, prec, flags, &softsign,
--				   &expt, ch, &ndig, cp);
-+				   &expt, ch, &ndig, cp, BUF);
-+
-+			/* If buf is not large enough for the converted wchar_t
-+			   sequence, call wcvt again with a malloced new buffer.
-+			   This should happen fairly rarely.
-+			 */
-+			if (cp == buf && ndig > BUF && malloc_buf == NULL) {
-+				if ((malloc_buf =
-+				    (wchar_t *)_malloc_r (data, ndig * sizeof (wchar_t)))
-+				    == NULL)
-+				  {
-+				    fp->_flags |= __SERR;
-+				    goto error;
-+				  }
-+				cp = wcvt (data, _fpvalue, prec, flags, &softsign,
-+					   &expt, ch, &ndig, malloc_buf, ndig);
-+			}
- 
- 			if (ch == L'g' || ch == L'G') {
- 				if (expt <= -4 || expt > prec)
-@@ -1450,11 +1466,15 @@
-    to whether trailing zeros must be included.  Set *SIGN to nonzero
-    if VALUE was negative.  Set *DECPT to the exponent plus one.  Set
-    *LENGTH to the length of the returned string.  CH must be one of
--   [aAeEfFgG]; if it is [aA], then the return string lives in BUF,
--   otherwise the return value shares the mprec reentrant storage.  */
-+   [aAeEfFgG]; different from vfprintf.c:cvt(), the return string
-+   lives in BUF regardless of CH.  LEN is the length of BUF, except
-+   when CH is [aA], in which case LEN is not in use.  If BUF is not
-+   large enough for the converted string, only the first LEN number
-+   of characters will be returned in BUF, but *LENGTH will be set to
-+   the full length of the string before the truncation.  */
- static wchar_t *
- wcvt(struct _reent *data, _PRINTF_FLOAT_TYPE value, int ndigits, int flags,
--     wchar_t *sign, int *decpt, int ch, int *length, wchar_t *buf)
-+     wchar_t *sign, int *decpt, int ch, int *length, wchar_t *buf, int len)
- {
- 	int mode, dsgn;
- # ifdef _NO_LONGDBL
-@@ -1548,12 +1568,13 @@
- 		while (rve < bp)
- 			*rve++ = '0';
- 	  }
-+
-+	  *length = rve - digits; /* full length of the string */
- #ifdef _MB_CAPABLE
--	  *length = _mbsnrtowcs_r (data, buf, (const char **) &digits,
--				   rve - digits, BUF, NULL);
-+	  _mbsnrtowcs_r (data, buf, (const char **) &digits, *length,
-+			 len, NULL);
- #else
--	  *length = rve - digits;
--	  for (i = 0; i < *length && i < BUF; ++i)
-+	  for (i = 0; i < *length && i < len; ++i)
- 	    buf[i] = (wchar_t) digits[i];
- #endif
- 	  return buf;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfwscanf.c newlib-1.19.0/newlib/libc/stdio/vfwscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vfwscanf.c	2009-03-11 12:53:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/vfwscanf.c	2011-07-24 06:43:01.740140650 +0200
-@@ -434,7 +434,6 @@
- # define GET_ARG(n, ap, type) (va_arg (ap, type))
- #endif
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   ORIENT (fp, 1);
-@@ -714,7 +713,6 @@
- 	   */
- 	case L'\0':		/* compat */
- 	  _funlockfile (fp);
--	  __sfp_lock_release ();
- 	  return EOF;
- 
- 	default:		/* compat */
-@@ -1443,13 +1441,11 @@
-      invalid format string), return EOF if no matches yet, else number
-      of matches made prior to failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF;
- match_failure:
- all_done:
-   /* Return number of matches, which can be 0 on match failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/wbuf.c newlib-1.19.0/newlib/libc/stdio/wbuf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/wbuf.c	2008-12-11 00:43:12.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/wbuf.c	2011-07-24 06:43:01.740140650 +0200
-@@ -54,11 +54,7 @@
- 
-   fp->_w = fp->_lbfsize;
-   if (cantwrite (ptr, fp))
--    {
--      fp->_flags |= __SERR;
--      ptr->_errno = EBADF;
--      return EOF;
--    }
-+    return EOF;
-   c = (unsigned char) c;
- 
-   ORIENT (fp, -1);
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/wscanf.c newlib-1.19.0/newlib/libc/stdio/wscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/wscanf.c	2009-03-11 12:53:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/wscanf.c	2011-07-24 06:43:01.741140665 +0200
-@@ -32,7 +32,7 @@
- 
-   _REENT_SMALL_CHECK_INIT (_REENT);
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-+  ret = _vfwscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -47,7 +47,7 @@
- 
-   _REENT_SMALL_CHECK_INIT (ptr);
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-+  ret = _vfwscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/wsetup.c newlib-1.19.0/newlib/libc/stdio/wsetup.c
---- newlib-1.19.0.orig/newlib/libc/stdio/wsetup.c	2007-03-15 19:40:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/wsetup.c	2011-07-24 06:43:01.741140665 +0200
-@@ -20,12 +20,13 @@
- #include <_ansi.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <errno.h>
- #include "local.h"
- 
- /*
-  * Various output routines call wsetup to be sure it is safe to write,
-  * because either _flags does not include __SWR, or _buf is NULL.
-- * _wsetup returns 0 if OK to write, nonzero otherwise.
-+ * _wsetup returns 0 if OK to write, nonzero and set errno otherwise.
-  */
- 
- int
-@@ -44,7 +45,11 @@
-   if ((fp->_flags & __SWR) == 0)
-     {
-       if ((fp->_flags & __SRW) == 0)
--	return EOF;
-+        {
-+	  ptr->_errno = EBADF;
-+	  fp->_flags |= __SERR;
-+	  return EOF;
-+        }
-       if (fp->_flags & __SRD)
- 	{
- 	  /* clobber any ungetc data */
-@@ -62,7 +67,7 @@
-    * A string I/O file should not explicitly allocate a buffer
-    * unless asprintf is being used.
-    */
--  if (fp->_bf._base == NULL 
-+  if (fp->_bf._base == NULL
-         && (!(fp->_flags & __SSTR) || (fp->_flags & __SMBF)))
-     __smakebuf_r (ptr, fp);
- 
-@@ -79,5 +84,11 @@
-   else
-     fp->_w = fp->_flags & __SNBF ? 0 : fp->_bf._size;
- 
--  return (!fp->_bf._base && (fp->_flags & __SMBF)) ? EOF : 0;
-+  if (!fp->_bf._base && (fp->_flags & __SMBF))
-+    {
-+      /* __smakebuf_r set errno, but not flag */
-+      fp->_flags |= __SERR;
-+      return EOF;
-+    }
-+  return 0;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio64/freopen64.c newlib-1.19.0/newlib/libc/stdio64/freopen64.c
---- newlib-1.19.0.orig/newlib/libc/stdio64/freopen64.c	2007-07-13 22:37:53.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio64/freopen64.c	2011-07-24 06:43:01.741140665 +0200
-@@ -97,7 +97,6 @@
-   int flags, oflags;
-   int e = 0;
- 
--  __sfp_lock_acquire ();
- 
-   CHECK_INIT (ptr, fp);
- 
-@@ -107,7 +106,6 @@
-     {
-       _funlockfile(fp);
-       _fclose_r (ptr, fp);
--      __sfp_lock_release ();
-       return NULL;
-     }
- 
-@@ -204,6 +202,7 @@
- 
-   if (f < 0)
-     {				/* did not get it after all */
-+      __sfp_lock_acquire ();
-       fp->_flags = 0;		/* set it free */
-       ptr->_errno = e;		/* restore in case _close clobbered */
-       _funlockfile(fp);
-@@ -231,7 +230,6 @@
-   fp->_flags |= __SL64;
- 
-   _funlockfile(fp);
--  __sfp_lock_release ();
-   return fp;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/atof.c newlib-1.19.0/newlib/libc/stdlib/atof.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/atof.c	2003-10-20 20:46:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/atof.c	2011-07-24 06:43:01.742140680 +0200
-@@ -1,6 +1,6 @@
- /*
- FUNCTION
--   <<atof>>, <<atoff>>---string to double or float
-+   <<atof>> ---string to double
- 
- INDEX
- 	atof
-@@ -10,19 +10,14 @@
- ANSI_SYNOPSIS
- 	#include <stdlib.h>
-         double atof(const char *<[s]>);
--        float atoff(const char *<[s]>);
- 
- TRAD_SYNOPSIS
- 	#include <stdlib.h>
-         double atof(<[s]>)
-         char *<[s]>;
- 
--        float atoff(<[s]>)
--        char *<[s]>;
--
- DESCRIPTION
- <<atof>> converts the initial portion of a string to a <<double>>.
--<<atoff>> converts the initial portion of a string to a <<float>>.
- 
- The functions parse the character string <[s]>,
- locating a substring which can be converted to a floating-point
-@@ -36,7 +31,6 @@
- something other than <<+>>, <<->>, <<.>>, or a digit.
- 
- <<atof(<[s]>)>> is implemented as <<strtod(<[s]>, NULL)>>.
--<<atoff(<[s]>)>> is implemented as <<strtof(<[s]>, NULL)>>.
- 
- RETURNS
- <<atof>> returns the converted substring value, if any, as a
-@@ -47,12 +41,9 @@
- If the correct value would cause underflow, <<0.0>> is returned
- and <<ERANGE>> is stored in <<errno>>.
- 
--<<atoff>> obeys the same rules as <<atof>>, except that it
--returns a <<float>>.
--
- PORTABILITY
--<<atof>> is ANSI C. <<atof>>, <<atoi>>, and <<atol>> are subsumed by <<strod>>
--and <<strol>>, but are used extensively in existing code. These functions are
-+<<atof>> is ANSI C. <<atof>>, <<atoi>>, and <<atol>> are subsumed by <<strtod>>
-+and <<strtol>>, but are used extensively in existing code. These functions are
- less reliable, but may be faster if the argument is verified to be in a valid
- range.
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/atoff.c newlib-1.19.0/newlib/libc/stdlib/atoff.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/atoff.c	2002-12-06 19:58:51.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdlib/atoff.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,9 +0,0 @@
--#include <stdlib.h>
--#include <_ansi.h>
--
--float
--_DEFUN (atoff, (s),
--	_CONST char *s)
--{
--  return strtof (s, NULL);
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.am newlib-1.19.0/newlib/libc/stdlib/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.am	2009-04-16 20:24:35.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/Makefile.am	2011-07-24 06:43:01.741140665 +0200
-@@ -16,7 +16,6 @@
- 	assert.c  	\
- 	atexit.c	\
- 	atof.c 		\
--	atoff.c		\
- 	atoi.c  	\
- 	atol.c		\
- 	calloc.c	\
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.in newlib-1.19.0/newlib/libc/stdlib/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.in	2011-07-20 08:45:15.846331158 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/Makefile.in	2011-07-24 06:43:01.742140680 +0200
-@@ -69,8 +69,7 @@
- 	lib_a-__ten_mu.$(OBJEXT) lib_a-_Exit.$(OBJEXT) \
- 	lib_a-abort.$(OBJEXT) lib_a-abs.$(OBJEXT) \
- 	lib_a-assert.$(OBJEXT) lib_a-atexit.$(OBJEXT) \
--	lib_a-atof.$(OBJEXT) lib_a-atoff.$(OBJEXT) \
--	lib_a-atoi.$(OBJEXT) lib_a-atol.$(OBJEXT) \
-+	lib_a-atof.$(OBJEXT) lib_a-atoi.$(OBJEXT) lib_a-atol.$(OBJEXT) \
- 	lib_a-calloc.$(OBJEXT) lib_a-div.$(OBJEXT) \
- 	lib_a-dtoa.$(OBJEXT) lib_a-dtoastub.$(OBJEXT) \
- 	lib_a-environ.$(OBJEXT) lib_a-envlock.$(OBJEXT) \
-@@ -132,15 +131,15 @@
- @HAVE_LONG_DOUBLE_TRUE at am__objects_8 = strtold.lo wcstold.lo
- am__objects_9 = __adjust.lo __atexit.lo __call_atexit.lo __exp10.lo \
- 	__ten_mu.lo _Exit.lo abort.lo abs.lo assert.lo atexit.lo \
--	atof.lo atoff.lo atoi.lo atol.lo calloc.lo div.lo dtoa.lo \
--	dtoastub.lo environ.lo envlock.lo eprintf.lo exit.lo \
--	gdtoa-gethex.lo gdtoa-hexnan.lo getenv.lo getenv_r.lo labs.lo \
--	ldiv.lo ldtoa.lo malloc.lo mblen.lo mblen_r.lo mbstowcs.lo \
--	mbstowcs_r.lo mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo \
--	mstats.lo rand.lo rand_r.lo realloc.lo reallocf.lo \
--	sb_charsets.lo strtod.lo strtol.lo strtoul.lo wcstod.lo \
--	wcstol.lo wcstoul.lo wcstombs.lo wcstombs_r.lo wctomb.lo \
--	wctomb_r.lo $(am__objects_8)
-+	atof.lo atoi.lo atol.lo calloc.lo div.lo dtoa.lo dtoastub.lo \
-+	environ.lo envlock.lo eprintf.lo exit.lo gdtoa-gethex.lo \
-+	gdtoa-hexnan.lo getenv.lo getenv_r.lo labs.lo ldiv.lo ldtoa.lo \
-+	malloc.lo mblen.lo mblen_r.lo mbstowcs.lo mbstowcs_r.lo \
-+	mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo mstats.lo rand.lo \
-+	rand_r.lo realloc.lo reallocf.lo sb_charsets.lo strtod.lo \
-+	strtol.lo strtoul.lo wcstod.lo wcstol.lo wcstoul.lo \
-+	wcstombs.lo wcstombs_r.lo wctomb.lo wctomb_r.lo \
-+	$(am__objects_8)
- am__objects_10 = cxa_atexit.lo cxa_finalize.lo drand48.lo ecvtbuf.lo \
- 	efgcvt.lo erand48.lo jrand48.lo lcong48.lo lrand48.lo \
- 	mrand48.lo msize.lo mtrim.lo nrand48.lo rand48.lo seed48.lo \
-@@ -330,13 +329,13 @@
- INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
- GENERAL_SOURCES = __adjust.c __atexit.c __call_atexit.c __exp10.c \
- 	__ten_mu.c _Exit.c abort.c abs.c assert.c atexit.c atof.c \
--	atoff.c atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c \
--	environ.c envlock.c eprintf.c exit.c gdtoa-gethex.c \
--	gdtoa-hexnan.c getenv.c getenv_r.c labs.c ldiv.c ldtoa.c \
--	malloc.c mblen.c mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c \
--	mbtowc_r.c mlock.c mprec.c mstats.c rand.c rand_r.c realloc.c \
--	reallocf.c sb_charsets.c strtod.c strtol.c strtoul.c wcstod.c \
--	wcstol.c wcstoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c \
-+	atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c environ.c \
-+	envlock.c eprintf.c exit.c gdtoa-gethex.c gdtoa-hexnan.c \
-+	getenv.c getenv_r.c labs.c ldiv.c ldtoa.c malloc.c mblen.c \
-+	mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c mbtowc_r.c mlock.c \
-+	mprec.c mstats.c rand.c rand_r.c realloc.c reallocf.c \
-+	sb_charsets.c strtod.c strtol.c strtoul.c wcstod.c wcstol.c \
-+	wcstoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c \
- 	$(am__append_1)
- EXTENDED_SOURCES = \
- 	cxa_atexit.c	\
-@@ -616,12 +615,6 @@
- lib_a-atof.obj: atof.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atof.obj `if test -f 'atof.c'; then $(CYGPATH_W) 'atof.c'; else $(CYGPATH_W) '$(srcdir)/atof.c'; fi`
- 
--lib_a-atoff.o: atoff.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoff.o `test -f 'atoff.c' || echo '$(srcdir)/'`atoff.c
--
--lib_a-atoff.obj: atoff.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoff.obj `if test -f 'atoff.c'; then $(CYGPATH_W) 'atoff.c'; else $(CYGPATH_W) '$(srcdir)/atoff.c'; fi`
--
- lib_a-atoi.o: atoi.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoi.o `test -f 'atoi.c' || echo '$(srcdir)/'`atoi.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/putenv_r.c newlib-1.19.0/newlib/libc/stdlib/putenv_r.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/putenv_r.c	2004-11-24 23:34:14.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdlib/putenv_r.c	2011-07-24 06:43:01.742140680 +0200
-@@ -24,6 +24,7 @@
- #include <reent.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <strings.h>
- 
- #include "envlock.h"
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/strtod.c newlib-1.19.0/newlib/libc/stdlib/strtod.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/strtod.c	2010-12-07 22:26:45.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdlib/strtod.c	2011-07-24 06:43:01.743140695 +0200
-@@ -309,8 +309,7 @@
-         }
- 	nd0 = nd;
- 	if (strncmp (s, _localeconv_r (ptr)->decimal_point,
--		     strlen (_localeconv_r (ptr)->decimal_point)) == 0)
--		{
-+		     strlen (_localeconv_r (ptr)->decimal_point)) == 0) {
- 		decpt = 1;
- 		c = *(s += strlen (_localeconv_r (ptr)->decimal_point));
- 		if (!nd) {
-@@ -328,25 +327,28 @@
-  have_dig:
- 			nz++;
- 			if (c -= '0') {
--				nf += nz;
- 				for(i = 1; i < nz; i++) {
--					if (nd++ <= DBL_DIG + 1) {
--						if (nd < 10)
-+					if (nd <= DBL_DIG + 1) {
-+						if (nd + i < 10)
- 							y *= 10;
- 						else
- 							z *= 10;
- 					}
- 				}
--				if (nd++ <= DBL_DIG + 1) {
--					if (nd < 10)
-+				if (nd <= DBL_DIG + 1) {
-+					if (nd + i < 10)
- 						y = 10*y + c;
- 					else
- 						z = 10*z + c;
- 				}
--				nz = 0;
-+				if (nd <= DBL_DIG + 1) {
-+					nf += nz;
-+					nd += nz;
- 				}
-+				nz = 0;
- 			}
- 		}
-+	}
-  dig_done:
- 	e = 0;
- 	if (c == 'e' || c == 'E') {
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/bcmp.c newlib-1.19.0/newlib/libc/string/bcmp.c
---- newlib-1.19.0.orig/newlib/libc/string/bcmp.c	2005-10-28 23:21:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/bcmp.c	2011-07-24 06:43:01.744140710 +0200
-@@ -6,11 +6,11 @@
- 	bcmp
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int bcmp(const void *<[s1]>, const void *<[s2]>, size_t <[n]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int bcmp(<[s1]>, <[s2]>, <[n]>)
- 	const void *<[s1]>;
- 	const void *<[s2]>;
-@@ -35,7 +35,7 @@
- 	bcmp ansi pure
- */
- 
--#include <string.h>
-+#include <strings.h>
- 
- int
- _DEFUN (bcmp, (m1, m2, n),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/bcopy.c newlib-1.19.0/newlib/libc/string/bcopy.c
---- newlib-1.19.0.orig/newlib/libc/string/bcopy.c	2002-05-23 20:46:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/bcopy.c	2011-07-24 06:43:01.744140710 +0200
-@@ -3,7 +3,7 @@
- 	<<bcopy>>---copy memory regions
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	void bcopy(const void *<[in]>, void *<[out]>, size_t <[n]>);
- 
- TRAD_SYNOPSIS
-@@ -26,7 +26,7 @@
- 	bcopy - pure
- */
- 
--#include <string.h>
-+#include <strings.h>
- 
- void
- _DEFUN (bcopy, (b1, b2, length),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/bzero.c newlib-1.19.0/newlib/libc/string/bzero.c
---- newlib-1.19.0.orig/newlib/libc/string/bzero.c	2002-05-23 20:46:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/bzero.c	2011-07-24 06:43:01.744140710 +0200
-@@ -6,11 +6,11 @@
- 	bzero
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	void bzero(void *<[b]>, size_t <[length]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	void bzero(<[b]>, <[length]>)
- 	void *<[b]>;
- 	size_t <[length]>;
-@@ -30,7 +30,7 @@
- <<bzero>> requires no supporting OS subroutines.
- */
- 
--#include <string.h>
-+#include <strings.h>
- 
- _VOID
- _DEFUN (bzero, (b, length),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/index.c newlib-1.19.0/newlib/libc/string/index.c
---- newlib-1.19.0.orig/newlib/libc/string/index.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/index.c	2011-07-24 06:43:01.744140710 +0200
-@@ -6,11 +6,11 @@
- 	index
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	char * index(const char *<[string]>, int <[c]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	char * index(<[string]>, <[c]>);
- 	char *<[string]>;
- 	int *<[c]>;
-@@ -33,7 +33,8 @@
- 	index - pure
- */
- 
--#include <string.h>
-+#include <strings.h>
-+#include <string.h> /* strchr */
- 
- char *
- _DEFUN (index, (s, c),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/Makefile.am newlib-1.19.0/newlib/libc/string/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/string/Makefile.am	2010-05-11 22:27:20.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/Makefile.am	2011-07-24 06:43:01.743140695 +0200
-@@ -71,7 +71,8 @@
- 	wmemcmp.c \
- 	wmemcpy.c \
- 	wmemmove.c \
--	wmemset.c
-+	wmemset.c \
-+	xpg_strerror_r.c
- 
- if ELIX_LEVEL_1
- ELIX_2_SOURCES =
-@@ -84,6 +85,7 @@
- 	stpncpy.c \
- 	strndup.c \
- 	strcasestr.c \
-+	strchrnul.c \
- 	strndup_r.c \
- 	wcpcpy.c \
- 	wcpncpy.c \
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/Makefile.in newlib-1.19.0/newlib/libc/string/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/string/Makefile.in	2011-07-20 08:45:15.826330835 +0200
-+++ newlib-1.19.0/newlib/libc/string/Makefile.in	2011-07-24 06:43:01.744140710 +0200
-@@ -88,7 +88,7 @@
- 	lib_a-wcsxfrm.$(OBJEXT) lib_a-wcwidth.$(OBJEXT) \
- 	lib_a-wmemchr.$(OBJEXT) lib_a-wmemcmp.$(OBJEXT) \
- 	lib_a-wmemcpy.$(OBJEXT) lib_a-wmemmove.$(OBJEXT) \
--	lib_a-wmemset.$(OBJEXT)
-+	lib_a-wmemset.$(OBJEXT) lib_a-xpg_strerror_r.$(OBJEXT)
- @ELIX_LEVEL_1_FALSE at am__objects_2 = lib_a-bcmp.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-memccpy.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-mempcpy.$(OBJEXT) \
-@@ -96,6 +96,7 @@
- @ELIX_LEVEL_1_FALSE@	lib_a-stpncpy.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-strndup.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-strcasestr.$(OBJEXT) \
-+ at ELIX_LEVEL_1_FALSE@	lib_a-strchrnul.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-strndup_r.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-wcpcpy.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-wcpncpy.$(OBJEXT) \
-@@ -120,11 +121,11 @@
- 	wcslcpy.lo wcslen.lo wcsncat.lo wcsncmp.lo wcsncpy.lo \
- 	wcsnlen.lo wcspbrk.lo wcsrchr.lo wcsspn.lo wcsstr.lo wcstok.lo \
- 	wcswidth.lo wcsxfrm.lo wcwidth.lo wmemchr.lo wmemcmp.lo \
--	wmemcpy.lo wmemmove.lo wmemset.lo
-+	wmemcpy.lo wmemmove.lo wmemset.lo xpg_strerror_r.lo
- @ELIX_LEVEL_1_FALSE at am__objects_5 = bcmp.lo memccpy.lo mempcpy.lo \
- @ELIX_LEVEL_1_FALSE@	stpcpy.lo stpncpy.lo strndup.lo \
-- at ELIX_LEVEL_1_FALSE@	strcasestr.lo strndup_r.lo wcpcpy.lo \
-- at ELIX_LEVEL_1_FALSE@	wcpncpy.lo wcsdup.lo
-+ at ELIX_LEVEL_1_FALSE@	strcasestr.lo strchrnul.lo strndup_r.lo \
-+ at ELIX_LEVEL_1_FALSE@	wcpcpy.lo wcpncpy.lo wcsdup.lo
- @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE at am__objects_6 = memmem.lo \
- @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	wcscasecmp.lo \
- @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	wcsncasecmp.lo
-@@ -363,7 +364,8 @@
- 	wmemcmp.c \
- 	wmemcpy.c \
- 	wmemmove.c \
--	wmemset.c
-+	wmemset.c \
-+	xpg_strerror_r.c
- 
- @ELIX_LEVEL_1_FALSE at ELIX_2_SOURCES = \
- @ELIX_LEVEL_1_FALSE@	bcmp.c \
-@@ -373,6 +375,7 @@
- @ELIX_LEVEL_1_FALSE@	stpncpy.c \
- @ELIX_LEVEL_1_FALSE@	strndup.c \
- @ELIX_LEVEL_1_FALSE@	strcasestr.c \
-+ at ELIX_LEVEL_1_FALSE@	strchrnul.c \
- @ELIX_LEVEL_1_FALSE@	strndup_r.c \
- @ELIX_LEVEL_1_FALSE@	wcpcpy.c \
- @ELIX_LEVEL_1_FALSE@	wcpncpy.c \
-@@ -887,6 +890,12 @@
- lib_a-wmemset.obj: wmemset.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wmemset.obj `if test -f 'wmemset.c'; then $(CYGPATH_W) 'wmemset.c'; else $(CYGPATH_W) '$(srcdir)/wmemset.c'; fi`
- 
-+lib_a-xpg_strerror_r.o: xpg_strerror_r.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-xpg_strerror_r.o `test -f 'xpg_strerror_r.c' || echo '$(srcdir)/'`xpg_strerror_r.c
-+
-+lib_a-xpg_strerror_r.obj: xpg_strerror_r.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-xpg_strerror_r.obj `if test -f 'xpg_strerror_r.c'; then $(CYGPATH_W) 'xpg_strerror_r.c'; else $(CYGPATH_W) '$(srcdir)/xpg_strerror_r.c'; fi`
-+
- lib_a-bcmp.o: bcmp.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-bcmp.o `test -f 'bcmp.c' || echo '$(srcdir)/'`bcmp.c
- 
-@@ -929,6 +938,12 @@
- lib_a-strcasestr.obj: strcasestr.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strcasestr.obj `if test -f 'strcasestr.c'; then $(CYGPATH_W) 'strcasestr.c'; else $(CYGPATH_W) '$(srcdir)/strcasestr.c'; fi`
- 
-+lib_a-strchrnul.o: strchrnul.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strchrnul.o `test -f 'strchrnul.c' || echo '$(srcdir)/'`strchrnul.c
-+
-+lib_a-strchrnul.obj: strchrnul.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strchrnul.obj `if test -f 'strchrnul.c'; then $(CYGPATH_W) 'strchrnul.c'; else $(CYGPATH_W) '$(srcdir)/strchrnul.c'; fi`
-+
- lib_a-strndup_r.o: strndup_r.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strndup_r.o `test -f 'strndup_r.c' || echo '$(srcdir)/'`strndup_r.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memccpy.c newlib-1.19.0/newlib/libc/string/memccpy.c
---- newlib-1.19.0.orig/newlib/libc/string/memccpy.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memccpy.c	2011-07-24 06:43:01.744140710 +0200
-@@ -35,13 +35,14 @@
- 	*/
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include <stddef.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the word copy loop.  */
- #define LITTLEBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memchr.c newlib-1.19.0/newlib/libc/string/memchr.c
---- newlib-1.19.0.orig/newlib/libc/string/memchr.c	2008-05-27 01:31:08.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memchr.c	2011-07-24 06:43:01.744140710 +0200
-@@ -38,10 +38,11 @@
- 
- #include <_ansi.h>
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
--#define UNALIGNED(X) ((long)X & (sizeof (long) - 1))
-+#define UNALIGNED(X) ((intptr_t)X & (sizeof (long) - 1))
- 
- /* How many bytes are loaded each iteration of the word copy loop.  */
- #define LBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memcmp.c newlib-1.19.0/newlib/libc/string/memcmp.c
---- newlib-1.19.0.orig/newlib/libc/string/memcmp.c	2005-03-06 21:40:05.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/memcmp.c	2011-07-24 06:43:01.745140726 +0200
-@@ -37,11 +37,11 @@
- */
- 
- #include <string.h>
--
-+#include <stdint.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the word copy loop.  */
- #define LBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memcpy.c newlib-1.19.0/newlib/libc/string/memcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/memcpy.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memcpy.c	2011-07-24 06:43:01.745140726 +0200
-@@ -34,11 +34,12 @@
- 	*/
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include <string.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the 4X unrolled loop.  */
- #define BIGBLOCKSIZE    (sizeof (long) << 2)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memmove.c newlib-1.19.0/newlib/libc/string/memmove.c
---- newlib-1.19.0.orig/newlib/libc/string/memmove.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memmove.c	2011-07-24 06:43:01.745140726 +0200
-@@ -36,13 +36,14 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <_ansi.h>
- #include <stddef.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the 4X unrolled loop.  */
- #define BIGBLOCKSIZE    (sizeof (long) << 2)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/mempcpy.c newlib-1.19.0/newlib/libc/string/mempcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/mempcpy.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/mempcpy.c	2011-07-24 06:43:01.745140726 +0200
-@@ -34,10 +34,11 @@
- #include <stddef.h>
- #include <limits.h>
- #include <string.h>
-+#include <stdint.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the 4X unrolled loop.  */
- #define BIGBLOCKSIZE    (sizeof (long) << 2)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memset.c newlib-1.19.0/newlib/libc/string/memset.c
---- newlib-1.19.0.orig/newlib/libc/string/memset.c	2008-05-27 20:44:40.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memset.c	2011-07-24 06:43:01.745140726 +0200
-@@ -34,9 +34,10 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- 
- #define LBLOCKSIZE (sizeof(long))
--#define UNALIGNED(X)   ((long)X & (LBLOCKSIZE - 1))
-+#define UNALIGNED(X)   ((intptr_t)X & (LBLOCKSIZE - 1))
- #define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE)
- 
- _PTR
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/rindex.c newlib-1.19.0/newlib/libc/string/rindex.c
---- newlib-1.19.0.orig/newlib/libc/string/rindex.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/rindex.c	2011-07-24 06:43:01.745140726 +0200
-@@ -10,7 +10,7 @@
- 	char * rindex(const char *<[string]>, int <[c]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	char * rindex(<[string]>, <[c]>);
- 	char *<[string]>;
- 	int *<[c]>;
-@@ -33,7 +33,8 @@
- 	rindex - pure
- */
- 
--#include <string.h>
-+#include <strings.h>
-+#include <string.h> /* strchr */
- 
- char *
- _DEFUN (rindex, (s, c),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/stpcpy.c newlib-1.19.0/newlib/libc/string/stpcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/stpcpy.c	2007-06-28 19:07:23.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/stpcpy.c	2011-07-24 06:43:01.746140742 +0200
-@@ -34,6 +34,7 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /*SUPPRESS 560*/
-@@ -41,7 +42,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/stpncpy.c newlib-1.19.0/newlib/libc/string/stpncpy.c
---- newlib-1.19.0.orig/newlib/libc/string/stpncpy.c	2007-06-28 19:07:23.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/stpncpy.c	2011-07-24 06:43:01.746140742 +0200
-@@ -40,6 +40,7 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /*SUPPRESS 560*/
-@@ -47,7 +48,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcasecmp.c newlib-1.19.0/newlib/libc/string/strcasecmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strcasecmp.c	2009-04-23 20:11:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strcasecmp.c	2011-07-24 06:43:01.746140742 +0200
-@@ -6,11 +6,11 @@
- 	strcasecmp
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strcasecmp(const char *<[a]>, const char *<[b]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strcasecmp(<[a]>, <[b]>)
- 	char *<[a]>;
- 	char *<[b]>;
-@@ -38,7 +38,7 @@
- 	strcasecmp
- */
- 
--#include <string.h>
-+#include <strings.h>
- #include <ctype.h>
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcat.c newlib-1.19.0/newlib/libc/string/strcat.c
---- newlib-1.19.0.orig/newlib/libc/string/strcat.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strcat.c	2011-07-24 06:43:01.746140742 +0200
-@@ -33,12 +33,13 @@
- 	strcat ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if X is aligned on a "long" boundary.  */
- #define ALIGNED(X) \
--  (((long)X & (sizeof (long) - 1)) == 0)
-+  (((uintptr_t)X & (sizeof (long) - 1)) == 0)
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strchr.c newlib-1.19.0/newlib/libc/string/strchr.c
---- newlib-1.19.0.orig/newlib/libc/string/strchr.c	2008-05-22 04:31:46.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strchr.c	2011-07-24 06:43:01.746140742 +0200
-@@ -33,11 +33,12 @@
- 	strchr ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if X is not aligned on a "long" boundary.  */
--#define UNALIGNED(X) ((long)X & (sizeof (long) - 1))
-+#define UNALIGNED(X) ((uintptr_t)X & (sizeof (long) - 1))
- 
- /* How many bytes are loaded each iteration of the word copy loop.  */
- #define LBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strchrnul.c newlib-1.19.0/newlib/libc/string/strchrnul.c
---- newlib-1.19.0.orig/newlib/libc/string/strchrnul.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strchrnul.c	2011-07-24 06:43:01.746140742 +0200
-@@ -0,0 +1,47 @@
-+/*
-+FUNCTION
-+	<<strchrnul>>---search for character in string
-+
-+INDEX
-+	strchrnul
-+
-+ANSI_SYNOPSIS
-+	#include <string.h>
-+	char * strchrnul(const char *<[string]>, int <[c]>);
-+
-+TRAD_SYNOPSIS
-+	#include <string.h>
-+	char * strchrnul(<[string]>, <[c]>);
-+	const char *<[string]>;
-+	int <[c]>;
-+
-+DESCRIPTION
-+	This function finds the first occurence of <[c]> (converted to
-+	a char) in the string pointed to by <[string]> (including the
-+	terminating null character).
-+
-+RETURNS
-+	Returns a pointer to the located character, or a pointer
-+	to the concluding null byte if <[c]> does not occur in <[string]>.
-+
-+PORTABILITY
-+<<strchrnul>> is a GNU extension.
-+
-+<<strchrnul>> requires no supporting OS subroutines.  It uses
-+strchr() and strlen() from elsewhere in this library.
-+
-+QUICKREF
-+	strchrnul
-+*/
-+
-+#include <string.h>
-+
-+char *
-+_DEFUN (strchrnul, (s1, i),
-+	_CONST char *s1 _AND
-+	int i)
-+{
-+  char *s = strchr(s1, i);
-+
-+  return s ? s : (char *)s1 + strlen(s1);
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcmp.c newlib-1.19.0/newlib/libc/string/strcmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strcmp.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strcmp.c	2011-07-24 06:43:01.746140742 +0200
-@@ -35,12 +35,13 @@
- 	strcmp ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((uintptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1)))
- 
- /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */
- #if LONG_MAX == 2147483647L
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcpy.c newlib-1.19.0/newlib/libc/string/strcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/strcpy.c	2007-05-29 23:26:59.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strcpy.c	2011-07-24 06:43:01.747140757 +0200
-@@ -32,6 +32,7 @@
- 	strcpy ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
-@@ -40,7 +41,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strerror.c newlib-1.19.0/newlib/libc/string/strerror.c
---- newlib-1.19.0.orig/newlib/libc/string/strerror.c	2009-03-15 14:41:46.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strerror.c	2011-07-24 06:43:01.747140757 +0200
-@@ -15,6 +15,8 @@
- ANSI_SYNOPSIS
- 	#include <string.h>
- 	char *strerror(int <[errnum]>);
-+	char *_strerror_r(struct _reent <[ptr]>, int <[errnum]>,
-+			  int <[internal]>, int *<[error]>);
- 
- TRAD_SYNOPSIS
- 	#include <string.h>
-@@ -31,6 +33,9 @@
- for each of the values defined in `<<errno.h>>':
- 
- o+
-+o 0
-+Success
-+
- o E2BIG
- Arg list too long
- 
-@@ -288,6 +293,8 @@
- 
- o-
- 
-+<<_strerror_r>> is a reentrant version of the above.
-+
- RETURNS
- This function returns a pointer to a string.  Your application must
- not modify that string.
-@@ -296,22 +303,45 @@
- ANSI C requires <<strerror>>, but does not specify the strings used
- for each error number.
- 
--Although this implementation of <<strerror>> is reentrant, ANSI C
--declares that subsequent calls to <<strerror>> may overwrite the
--result string; therefore portable code cannot depend on the reentrancy
--of this subroutine.
-+Although this implementation of <<strerror>> is reentrant (depending
-+on <<_user_strerror>>), ANSI C declares that subsequent calls to
-+<<strerror>> may overwrite the result string; therefore portable
-+code cannot depend on the reentrancy of this subroutine.
-+
-+Although this implementation of <<strerror>> guarantees a non-null
-+result with a NUL-terminator, some implementations return <<NULL>>
-+on failure.  Although POSIX allows <<strerror>> to set <<errno>>
-+to EINVAL on failure, this implementation does not do so (unless
-+you provide <<_user_strerror>>).
-+
-+POSIX recommends that unknown <[errnum]> result in a message
-+including that value, however it is not a requirement and this
-+implementation does not provide that information (unless you
-+provide <<_user_strerror>>).
- 
- This implementation of <<strerror>> provides for user-defined
- extensibility.  <<errno.h>> defines <[__ELASTERROR]>, which can be
- used as a base for user-defined error values.  If the user supplies a
- routine named <<_user_strerror>>, and <[errnum]> passed to
- <<strerror>> does not match any of the supported values,
--<<_user_strerror>> is called with <[errnum]> as its argument.
--
--<<_user_strerror>> takes one argument of type <[int]>, and returns a
--character pointer.  If <[errnum]> is unknown to <<_user_strerror>>,
--<<_user_strerror>> returns <[NULL]>.  The default <<_user_strerror>>
--returns <[NULL]> for all input values.
-+<<_user_strerror>> is called with three arguments.  The first is of
-+type <[int]>, and is the <[errnum]> value unknown to <<strerror>>.
-+The second is of type <[int]>, and matches the <[internal]> argument
-+of <<_strerror_r>>; this should be zero if called from <<strerror>>
-+and non-zero if called from any other function; <<_user_strerror>> can
-+use this information to satisfy the POSIX rule that no other
-+standardized function can overwrite a static buffer reused by
-+<<strerror>>.  The third is of type <[int *]>, and matches the
-+<[error]> argument of <<_strerror_r>>; if a non-zero value is stored
-+into that location (usually <[EINVAL]>), then <<strerror>> will set
-+<<errno>> to that value, and the XPG variant of <<strerror_r>> will
-+return that value instead of zero or <[ERANGE]>.  <<_user_strerror>>
-+returns a <[char *]> value; returning <[NULL]> implies that the user
-+function did not choose to handle <[errnum]>.  The default
-+<<_user_strerror>> returns <[NULL]> for all input values.  Note that
-+<<_user_sterror>> must be thread-safe, and only denote errors via the
-+third argument rather than modifying <<errno>>, if <<strerror>> and
-+<<strerror_r>> are are to comply with POSIX.
- 
- <<strerror>> requires no supporting OS subroutines.
- 
-@@ -323,14 +353,20 @@
- #include <string.h>
- 
- char *
--_DEFUN (strerror, (errnum),
--	int errnum)
-+_DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
-+	struct _reent *ptr _AND
-+	int errnum _AND
-+	int internal _AND
-+	int *errptr)
- {
-   char *error;
--  extern char *_user_strerror _PARAMS ((int));
-+  extern char *_user_strerror _PARAMS ((int, int, int *));
- 
-   switch (errnum)
-     {
-+    case 0:
-+      error = "Success";
-+      break;
- /* go32 defines EPERM as EACCES */
- #if defined (EPERM) && (!defined (EACCES) || (EPERM != EACCES))
-     case EPERM:
-@@ -784,10 +820,19 @@
-         break;
- #endif
-     default:
--      if ((error = _user_strerror (errnum)) == 0)
--	error = "";
-+      if (!errptr)
-+        errptr = &ptr->_errno;
-+      if ((error = _user_strerror (errnum, internal, errptr)) == 0)
-+        error = "";
-       break;
-     }
- 
-   return error;
- }
-+
-+char *
-+_DEFUN(strerror, (int),
-+       int errnum)
-+{
-+  return _strerror_r (_REENT, errnum, 0, NULL);
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strerror_r.c newlib-1.19.0/newlib/libc/string/strerror_r.c
---- newlib-1.19.0.orig/newlib/libc/string/strerror_r.c	2005-10-28 23:21:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strerror_r.c	2011-07-24 06:43:01.747140757 +0200
-@@ -1,3 +1,4 @@
-+/* GNU variant of strerror_r. */
- /*
- FUNCTION
- 	<<strerror_r>>---convert error number to string and copy to buffer
-@@ -7,7 +8,11 @@
- 
- ANSI_SYNOPSIS
- 	#include <string.h>
-+	#ifdef _GNU_SOURCE
- 	char *strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>);
-+	#else
-+	int strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>);
-+	#endif
- 
- TRAD_SYNOPSIS
- 	#include <string.h>
-@@ -19,35 +24,62 @@
- DESCRIPTION
- <<strerror_r>> converts the error number <[errnum]> into a
- string and copies the result into the supplied <[buffer]> for
--a length up to <[n]>, including the NUL terminator. The value of 
--<[errnum]> is usually a copy of <<errno>>.  If <<errnum>> is not a known 
-+a length up to <[n]>, including the NUL terminator. The value of
-+<[errnum]> is usually a copy of <<errno>>.  If <<errnum>> is not a known
- error number, the result is the empty string.
- 
- See <<strerror>> for how strings are mapped to <<errnum>>.
- 
- RETURNS
--This function returns a pointer to a string.  Your application must
--not modify that string.
-+There are two variants: the GNU version always returns a NUL-terminated
-+string, which is <[buffer]> if all went well, but which is another
-+pointer if <[n]> was too small (leaving <[buffer]> untouched).  If the
-+return is not <[buffer]>, your application must not modify that string.
-+The POSIX version returns 0 on success, <[EINVAL]> if <<errnum>> was not
-+recognized, and <[ERANGE]> if <[n]> was too small.  The variant chosen
-+depends on macros that you define before inclusion of <<string.h>>.
- 
- PORTABILITY
--<<strerror_r>> is a GNU extension.
-+<<strerror_r>> with a <[char *]> result is a GNU extension.
-+<<strerror_r>> with an <[int]> result is required by POSIX 2001.
-+This function is compliant only if <<_user_strerror>> is not provided,
-+or if it is thread-safe and uses separate storage according to whether
-+the second argument of that function is non-zero.  For more details
-+on <<_user_strerror>>, see the <<strerror>> documentation.
-+
-+POSIX states that the contents of <[buf]> are unspecified on error,
-+although this implementation guarantees a NUL-terminated string for
-+all except <[n]> of 0.
-+
-+POSIX recommends that unknown <[errnum]> result in a message including
-+that value, however it is not a requirement and this implementation
-+provides only an empty string (unless you provide <<_user_strerror>>).
-+POSIX also recommends that unknown <[errnum]> fail with EINVAL even
-+when providing such a message, however it is not a requirement and
-+this implementation will return success if <<_user_strerror>> provided
-+a non-empty alternate string without assigning into its third argument.
- 
- <<strerror_r>> requires no supporting OS subroutines.
- 
- */
- 
- #undef __STRICT_ANSI__
-+#define _GNU_SOURCE
- #include <errno.h>
- #include <string.h>
-+#undef strerror_r
- 
-+/* For backwards-compatible linking, this must be the GNU signature;
-+   see xpg_strerror_r.c for the POSIX version.  */
- char *
- _DEFUN (strerror_r, (errnum, buffer, n),
- 	int errnum _AND
- 	char *buffer _AND
- 	size_t n)
- {
--  char *error;
--  error = strerror (errnum);
-+  char *error = _strerror_r (_REENT, errnum, 1, NULL);
- 
--  return strncpy (buffer, (const char *)error, n);
-+  if (strlen (error) >= n)
-+    return error;
-+  return strcpy (buffer, error);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strlen.c newlib-1.19.0/newlib/libc/string/strlen.c
---- newlib-1.19.0.orig/newlib/libc/string/strlen.c	2008-05-27 00:56:14.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strlen.c	2011-07-24 06:43:01.747140757 +0200
-@@ -32,11 +32,12 @@
- */
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- #define LBLOCKSIZE   (sizeof (long))
--#define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1))
-+#define UNALIGNED(X) ((intptr_t)X & (LBLOCKSIZE - 1))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncasecmp.c newlib-1.19.0/newlib/libc/string/strncasecmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strncasecmp.c	2009-04-23 20:11:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strncasecmp.c	2011-07-24 06:43:01.747140757 +0200
-@@ -6,11 +6,11 @@
- 	strncasecmp
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strncasecmp(const char *<[a]>, const char * <[b]>, size_t <[length]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strncasecmp(<[a]>, <[b]>, <[length]>)
- 	char *<[a]>;
- 	char *<[b]>;
-@@ -40,7 +40,7 @@
- 	strncasecmp
- */
- 
--#include <string.h>
-+#include <strings.h>
- #include <ctype.h>
- 
- int 
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncat.c newlib-1.19.0/newlib/libc/string/strncat.c
---- newlib-1.19.0.orig/newlib/libc/string/strncat.c	2005-10-28 23:21:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strncat.c	2011-07-24 06:43:01.748140772 +0200
-@@ -42,11 +42,12 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /* Nonzero if X is aligned on a "long" boundary.  */
- #define ALIGNED(X) \
--  (((long)X & (sizeof (long) - 1)) == 0)
-+  (((intptr_t)X & (sizeof (long) - 1)) == 0)
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncmp.c newlib-1.19.0/newlib/libc/string/strncmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strncmp.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strncmp.c	2011-07-24 06:43:01.748140772 +0200
-@@ -36,12 +36,13 @@
- 	strncmp ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((uintptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1)))
- 
- /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */
- #if LONG_MAX == 2147483647L
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncpy.c newlib-1.19.0/newlib/libc/string/strncpy.c
---- newlib-1.19.0.orig/newlib/libc/string/strncpy.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strncpy.c	2011-07-24 06:43:01.748140772 +0200
-@@ -38,6 +38,7 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /*SUPPRESS 560*/
-@@ -45,7 +46,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/u_strerr.c newlib-1.19.0/newlib/libc/string/u_strerr.c
---- newlib-1.19.0.orig/newlib/libc/string/u_strerr.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/u_strerr.c	2011-07-24 06:43:01.748140772 +0200
-@@ -1,8 +1,10 @@
- #include <_ansi.h>
- 
- char *
--_DEFUN(_user_strerror, (errnum),
--       int errnum)
-+_DEFUN(_user_strerror, (errnum, internal, errptr),
-+       int errnum _AND
-+       int internal _AND
-+       int *errptr)
- {
-   return 0;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/xpg_strerror_r.c newlib-1.19.0/newlib/libc/string/xpg_strerror_r.c
---- newlib-1.19.0.orig/newlib/libc/string/xpg_strerror_r.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/xpg_strerror_r.c	2011-07-24 06:43:01.748140772 +0200
-@@ -0,0 +1,26 @@
-+/* POSIX variant of strerror_r. */
-+#undef __STRICT_ANSI__
-+#include <errno.h>
-+#include <string.h>
-+
-+int
-+_DEFUN (__xpg_strerror_r, (errnum, buffer, n),
-+	int errnum _AND
-+	char *buffer _AND
-+	size_t n)
-+{
-+  char *error;
-+  int result = 0;
-+
-+  if (!n)
-+    return ERANGE;
-+  error = _strerror_r (_REENT, errnum, 1, &result);
-+  if (strlen (error) >= n)
-+    {
-+      memcpy (buffer, error, n - 1);
-+      buffer[n - 1] = '\0';
-+      return ERANGE;
-+    }
-+  strcpy (buffer, error);
-+  return (result || *error) ? result : EINVAL;
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.am newlib-1.19.0/newlib/libc/sys/linux/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.am	2009-08-19 22:04:43.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/Makefile.am	2011-07-24 06:43:01.754140861 +0200
-@@ -72,7 +72,6 @@
- 	process.c \
- 	prof-freq.c \
- 	profile.c \
--	psignal.c \
- 	pwrite.c \
- 	raise.c \
- 	realloc.c \
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.in newlib-1.19.0/newlib/libc/sys/linux/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.in	2011-07-20 08:45:15.805330498 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/Makefile.in	2011-07-24 06:43:01.754140861 +0200
-@@ -82,24 +82,23 @@
- 	lib_a-mtrim.$(OBJEXT) lib_a-mtrimr.$(OBJEXT) \
- 	lib_a-ntp_gettime.$(OBJEXT) lib_a-pread.$(OBJEXT) \
- 	lib_a-process.$(OBJEXT) lib_a-prof-freq.$(OBJEXT) \
--	lib_a-profile.$(OBJEXT) lib_a-psignal.$(OBJEXT) \
--	lib_a-pwrite.$(OBJEXT) lib_a-raise.$(OBJEXT) \
--	lib_a-realloc.$(OBJEXT) lib_a-reallocr.$(OBJEXT) \
--	lib_a-rename.$(OBJEXT) lib_a-resource.$(OBJEXT) \
--	lib_a-sched.$(OBJEXT) lib_a-select.$(OBJEXT) \
--	lib_a-seteuid.$(OBJEXT) lib_a-sethostid.$(OBJEXT) \
--	lib_a-sethostname.$(OBJEXT) lib_a-shm_open.$(OBJEXT) \
--	lib_a-shm_unlink.$(OBJEXT) lib_a-sig.$(OBJEXT) \
--	lib_a-sigaction.$(OBJEXT) lib_a-sigqueue.$(OBJEXT) \
--	lib_a-signal.$(OBJEXT) lib_a-siglongjmp.$(OBJEXT) \
--	lib_a-sigset.$(OBJEXT) lib_a-sigwait.$(OBJEXT) \
--	lib_a-socket.$(OBJEXT) lib_a-sleep.$(OBJEXT) \
--	lib_a-strsignal.$(OBJEXT) lib_a-strverscmp.$(OBJEXT) \
--	lib_a-sysconf.$(OBJEXT) lib_a-sysctl.$(OBJEXT) \
--	lib_a-systat.$(OBJEXT) lib_a-tcdrain.$(OBJEXT) \
--	lib_a-tcsendbrk.$(OBJEXT) lib_a-termios.$(OBJEXT) \
--	lib_a-time.$(OBJEXT) lib_a-usleep.$(OBJEXT) \
--	lib_a-versionsort.$(OBJEXT)
-+	lib_a-profile.$(OBJEXT) lib_a-pwrite.$(OBJEXT) \
-+	lib_a-raise.$(OBJEXT) lib_a-realloc.$(OBJEXT) \
-+	lib_a-reallocr.$(OBJEXT) lib_a-rename.$(OBJEXT) \
-+	lib_a-resource.$(OBJEXT) lib_a-sched.$(OBJEXT) \
-+	lib_a-select.$(OBJEXT) lib_a-seteuid.$(OBJEXT) \
-+	lib_a-sethostid.$(OBJEXT) lib_a-sethostname.$(OBJEXT) \
-+	lib_a-shm_open.$(OBJEXT) lib_a-shm_unlink.$(OBJEXT) \
-+	lib_a-sig.$(OBJEXT) lib_a-sigaction.$(OBJEXT) \
-+	lib_a-sigqueue.$(OBJEXT) lib_a-signal.$(OBJEXT) \
-+	lib_a-siglongjmp.$(OBJEXT) lib_a-sigset.$(OBJEXT) \
-+	lib_a-sigwait.$(OBJEXT) lib_a-socket.$(OBJEXT) \
-+	lib_a-sleep.$(OBJEXT) lib_a-strsignal.$(OBJEXT) \
-+	lib_a-strverscmp.$(OBJEXT) lib_a-sysconf.$(OBJEXT) \
-+	lib_a-sysctl.$(OBJEXT) lib_a-systat.$(OBJEXT) \
-+	lib_a-tcdrain.$(OBJEXT) lib_a-tcsendbrk.$(OBJEXT) \
-+	lib_a-termios.$(OBJEXT) lib_a-time.$(OBJEXT) \
-+	lib_a-usleep.$(OBJEXT) lib_a-versionsort.$(OBJEXT)
- am__objects_2 = lib_a-aio64.$(OBJEXT) lib_a-confstr.$(OBJEXT) \
- 	lib_a-ctermid.$(OBJEXT) lib_a-fclean.$(OBJEXT) \
- 	lib_a-fpathconf.$(OBJEXT) lib_a-fstab.$(OBJEXT) \
-@@ -141,8 +140,8 @@
- 	mq_close.lo mq_getattr.lo mq_notify.lo mq_open.lo \
- 	mq_receive.lo mq_send.lo mq_setattr.lo mq_unlink.lo msize.lo \
- 	msizer.lo mstats.lo mtrim.lo mtrimr.lo ntp_gettime.lo pread.lo \
--	process.lo prof-freq.lo profile.lo psignal.lo pwrite.lo \
--	raise.lo realloc.lo reallocr.lo rename.lo resource.lo sched.lo \
-+	process.lo prof-freq.lo profile.lo pwrite.lo raise.lo \
-+	realloc.lo reallocr.lo rename.lo resource.lo sched.lo \
- 	select.lo seteuid.lo sethostid.lo sethostname.lo shm_open.lo \
- 	shm_unlink.lo sig.lo sigaction.lo sigqueue.lo signal.lo \
- 	siglongjmp.lo sigset.lo sigwait.lo socket.lo sleep.lo \
-@@ -396,7 +395,6 @@
- 	process.c \
- 	prof-freq.c \
- 	profile.c \
--	psignal.c \
- 	pwrite.c \
- 	raise.c \
- 	realloc.c \
-@@ -865,12 +863,6 @@
- lib_a-profile.obj: profile.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-profile.obj `if test -f 'profile.c'; then $(CYGPATH_W) 'profile.c'; else $(CYGPATH_W) '$(srcdir)/profile.c'; fi`
- 
--lib_a-psignal.o: psignal.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.o `test -f 'psignal.c' || echo '$(srcdir)/'`psignal.c
--
--lib_a-psignal.obj: psignal.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.obj `if test -f 'psignal.c'; then $(CYGPATH_W) 'psignal.c'; else $(CYGPATH_W) '$(srcdir)/psignal.c'; fi`
--
- lib_a-pwrite.o: pwrite.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-pwrite.o `test -f 'pwrite.c' || echo '$(srcdir)/'`pwrite.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/psignal.c newlib-1.19.0/newlib/libc/sys/linux/psignal.c
---- newlib-1.19.0.orig/newlib/libc/sys/linux/psignal.c	2002-06-05 22:58:58.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/psignal.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,15 +0,0 @@
--/* libc/sys/linux/psignal.c - print signal message to stderr */
--
--/* Copyright 2002, Red Hat Inc. */
--
--#include <stdio.h>
--#include <string.h>
--
--void
--psignal (int sig, const char *s)
--{
--  if (s != NULL)
--    fprintf (stderr, "%s: %s\n", s, strsignal (sig));
--  else
--    fprintf (stderr, "%s\n", strsignal (sig));
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/sys/signal.h newlib-1.19.0/newlib/libc/sys/linux/sys/signal.h
---- newlib-1.19.0.orig/newlib/libc/sys/linux/sys/signal.h	2002-07-24 20:18:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/sys/signal.h	2011-07-24 06:43:01.755140877 +0200
-@@ -37,7 +37,6 @@
- #include <_ansi.h>
- 
- int 	_EXFUN(kill, (int, int));
--_VOID 	_EXFUN(psignal, (int, const char *));
- int 	_EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
- int 	_EXFUN(sigaddset, (sigset_t *, const int));
- int 	_EXFUN(sigdelset, (sigset_t *, const int));
-@@ -50,7 +49,6 @@
- 
- #ifndef _POSIX_SOURCE
- extern const char *const sys_siglist[];
--typedef __sighandler_t sig_t; /* BSDism */
- #endif
- 
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/crt0.c newlib-1.19.0/newlib/libc/sys/rtems/crt0.c
---- newlib-1.19.0.orig/newlib/libc/sys/rtems/crt0.c	2009-12-16 19:28:14.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/rtems/crt0.c	2011-07-24 06:43:01.755140877 +0200
-@@ -24,8 +24,8 @@
- /* RTEMS provides some of its own routines including a Malloc family */
- RTEMS_STUB(void *,malloc(size_t s)) { return 0; }
- RTEMS_STUB(void *,realloc(void* p, size_t s)) { return 0; }
--RTEMS_STUB(void, free(void)) { ; }
--RTEMS_STUB(_PTR, calloc(struct _reent *r, size_t s1, size_t s2)) {}
-+RTEMS_STUB(void, free(void* ptr)) { ; }
-+RTEMS_STUB(_PTR, calloc(size_t s1, size_t s2)) {}
- 
- #if defined(__GNUC__)
- /*
-@@ -49,6 +49,7 @@
- #endif
- 
- /* stubs for functions RTEMS provides */
-+RTEMS_STUB(int, clock_gettime(clockid_t clk_id, struct timespec *tp)) { return -1; }
- RTEMS_STUB(int, close (int fd)) { return -1; }
- RTEMS_STUB(int, dup2(int oldfd, int newfd)) { return -1; }
- RTEMS_STUB(int, fcntl( int fd, int cmd, ... /* arg */ )) { return -1; }
-@@ -56,6 +57,7 @@
- RTEMS_STUB(int, fstat(int fd, struct stat *buf)) { return -1; }
- RTEMS_STUB(int, getdents(int fd, void *dp, int count)) { return -1; }
- RTEMS_STUB(char *, getlogin(void)) { return 0; }
-+RTEMS_STUB(int, gettimeofday(struct timeval *tv, struct timezone *tz)) { return -1; }
- RTEMS_STUB(struct passwd *, getpwnam(const char *name)) { return 0; }
- RTEMS_STUB(struct passwd *, getpwuid(uid_t uid)) { return 0; }
- RTEMS_STUB(uid_t, getuid(void)) { return 0; }
-@@ -65,6 +67,7 @@
- RTEMS_STUB(int, open(const char *pathname, int flags, int mode)) { return -1; }
- RTEMS_STUB(int, pipe(int pipefd[2])) { return -1; }
- RTEMS_STUB(_ssize_t, read(int fd, void *buf, size_t count)) { return -1; }
-+RTEMS_STUB(int, sched_yield(void)) { return -1; }
- RTEMS_STUB(int, sigfillset(sigset_t *set)) { return -1; }
- RTEMS_STUB(int, sigprocmask(int how, const sigset_t *set, sigset_t *oldset)) { return -1; }
- RTEMS_STUB(int, stat(const char *path, struct stat *buf)) { return -1; }
-@@ -95,7 +98,7 @@
- RTEMS_STUB(int, _kill_r (struct _reent *r, int pid, int sig )) { return -1; }
- #if !defined(REENTRANT_SYSCALLS_PROVIDED)
- /* cf. newlib/libc/reent/linkr.c */
--RTEMS_STUB(int, _link_r (struct _reent *, const char *, const char *)) { return -1; }
-+RTEMS_STUB(int, _link_r (struct _reent *r, const char *oldpath, const char *newpath)) { return -1; }
- #endif
- RTEMS_STUB(_off_t, _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence )) { return -1; }
- RTEMS_STUB(int, _open_r (struct _reent *r, const char *buf, int flags, int mode)) { return -1; }
-@@ -103,14 +106,14 @@
- RTEMS_STUB(int, _rename_r (struct _reent *r, const char *a, const char *b)){ return -1; }
- #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (MALLOC_PROVIDED))
- /* cf. newlib/libc/reent/sbrkr.c */
--RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t)) { return -1; }
-+RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t addr)) { return 0; }
- #endif
- RTEMS_STUB(int, _stat_r (struct _reent *r, const char *path, struct stat *buf)) { return -1; }
- RTEMS_STUB(_CLOCK_T_, _times_r (struct _reent *r, struct tms *ptms)) { return -1; }
- RTEMS_STUB(int, _unlink_r (struct _reent *r, const char *path)) { return -1; }
- #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC))
- /* cf. newlib/libc/reent/execr.c */
--RTEMS_STUB(int, _wait_r (struct _reent *r, int *)) { return -1; }
-+RTEMS_STUB(int, _wait_r (struct _reent *r, int *status)) { return -1; }
- #endif
- RTEMS_STUB(_ssize_t, _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes)) { return -1; }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/include/limits.h newlib-1.19.0/newlib/libc/sys/rtems/include/limits.h
---- newlib-1.19.0.orig/newlib/libc/sys/rtems/include/limits.h	2008-11-17 23:05:12.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/rtems/include/limits.h	2011-07-24 06:43:01.755140877 +0200
-@@ -78,7 +78,13 @@
-  *  Invariant values
-  */
- 
-+#ifdef __SIZE_MAX__
-+#define SSIZE_MAX		(__SIZE_MAX__ >> 1)
-+#elif defined(__SIZEOF_SIZE_T__) && defined(__CHAR_BIT__)
-+#define SSIZE_MAX               ((1UL << (__SIZEOF_SIZE_T__ * __CHAR_BIT__ - 1)) - 1)
-+#else /* historic fallback, wrong in most cases */
- #define SSIZE_MAX               32767
-+#endif
- 
- /*
-  *  Maximum Values
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/sys/dirent.h newlib-1.19.0/newlib/libc/sys/rtems/sys/dirent.h
---- newlib-1.19.0.orig/newlib/libc/sys/rtems/sys/dirent.h	2010-07-06 17:23:27.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/rtems/sys/dirent.h	2011-07-24 06:43:01.755140877 +0200
-@@ -50,7 +50,7 @@
- 
- int scandir ( const char *dirname,
-    struct dirent *** namelist,
--   int (*select)(struct dirent *),
-+   int (*select)(const struct dirent *),
-    int (*dcomp)(const struct dirent **, const struct dirent **)
- );
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/fstat.c newlib-1.19.0/newlib/libc/sys/sysnecv850/fstat.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/fstat.c	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/fstat.c	2011-07-24 06:43:01.756140893 +0200
-@@ -13,6 +13,5 @@
- _fstat (int file,
- 	struct stat *st)
- {
--  st->st_mode = S_IFCHR;
--  return 0;
-+  return TRAP0 (SYS_fstat, file, st, 0);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.am newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.am	2010-09-09 16:54:24.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.am	2011-07-24 06:43:01.756140893 +0200
-@@ -16,7 +16,7 @@
- 	$(lpfx)open.o $(lpfx)pipe.o $(lpfx)read.o $(lpfx)link.o \
- 	$(lpfx)sbrk.o $(lpfx)stat.o $(lpfx)time.o $(lpfx)trap.o \
- 	$(lpfx)unlink.o $(lpfx)utime.o $(lpfx)wait.o $(lpfx)write.o \
--	$(lpfx)times.o $(lpfx)gettime.o
-+	$(lpfx)times.o $(lpfx)gettime.o $(lpfx)rename.o
- else
- extra_objs =
- endif
-@@ -27,7 +27,7 @@
- 	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
- 	kill.c lseek.c open.c pipe.c read.c link.c \
- 	sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c \
--	times.c gettime.c
-+	times.c gettime.c rename.c
- lib_a_SOURCES =
- lib_a_DEPENDENCIES = $(extra_objs)
- lib_a_CCASFLAGS = $(AM_CCASFLAGS)
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.in newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.in	2011-07-20 08:45:15.796330353 +0200
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.in	2011-07-24 06:43:01.756140893 +0200
-@@ -65,7 +65,8 @@
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)time.o $(lpfx)trap.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)unlink.o $(lpfx)utime.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)wait.o $(lpfx)write.o \
-- at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o
-+ at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o \
-+ at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)rename.o
- am_lib_a_OBJECTS =
- lib_a_OBJECTS = $(am_lib_a_OBJECTS)
- DEFAULT_INCLUDES = -I. at am__isrc@
-@@ -111,6 +112,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-+NO_INCLUDE_LIST = @NO_INCLUDE_LIST@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -194,7 +196,7 @@
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)open.o $(lpfx)pipe.o $(lpfx)read.o $(lpfx)link.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)sbrk.o $(lpfx)stat.o $(lpfx)time.o $(lpfx)trap.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)unlink.o $(lpfx)utime.o $(lpfx)wait.o $(lpfx)write.o \
-- at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o
-+ at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o $(lpfx)rename.o
- 
- lib_a_LIBADD = $(extra_objs)
- EXTRA_lib_a_SOURCES = \
-@@ -202,7 +204,7 @@
- 	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
- 	kill.c lseek.c open.c pipe.c read.c link.c \
- 	sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c \
--	times.c gettime.c
-+	times.c gettime.c rename.c
- 
- lib_a_SOURCES = 
- lib_a_DEPENDENCIES = $(extra_objs)
-@@ -448,6 +450,12 @@
- lib_a-gettime.obj: gettime.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-gettime.obj `if test -f 'gettime.c'; then $(CYGPATH_W) 'gettime.c'; else $(CYGPATH_W) '$(srcdir)/gettime.c'; fi`
- 
-+lib_a-rename.o: rename.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rename.o `test -f 'rename.c' || echo '$(srcdir)/'`rename.c
-+
-+lib_a-rename.obj: rename.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rename.obj `if test -f 'rename.c'; then $(CYGPATH_W) 'rename.c'; else $(CYGPATH_W) '$(srcdir)/rename.c'; fi`
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/rename.c newlib-1.19.0/newlib/libc/sys/sysnecv850/rename.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/rename.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/rename.c	2011-07-24 06:43:01.756140893 +0200
-@@ -0,0 +1,17 @@
-+#include <_ansi.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include "sys/syscall.h"
-+
-+int errno;
-+
-+int __trap0 (int function, int p1, int p2, int p3);
-+
-+#define TRAP0(f, p1, p2, p3) __trap0(f, (int)(p1), (int)(p2), (int)(p3))
-+
-+int
-+rename (const char *oldpath,
-+	 const char *newpath)
-+{
-+  return TRAP0 (SYS_rename, oldpath, newpath, 0);
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sbrk.c newlib-1.19.0/newlib/libc/sys/sysnecv850/sbrk.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sbrk.c	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/sbrk.c	2011-07-24 06:43:01.756140893 +0200
-@@ -3,34 +3,27 @@
- #include <sys/stat.h>
- #include "sys/syscall.h"
- 
--int errno;
--
--int __trap0 (int function, int p1, int p2, int p3);
--
--#define TRAP0(f, p1, p2, p3) __trap0(f, (int)(p1), (int)(p2), (int)(p3))
--
- caddr_t
- _sbrk (int incr)
- {
--  extern char end;		/* Defined by the linker */
--  static char *heap_end;
--  char *prev_heap_end;
--#if 0
--  char *sp = (char *)stack_ptr;
--#else
--  char *sp = (char *)&sp;
--#endif
-+  extern char   heap_start;	/* Defined by the linker script.  */
-+  static char * heap_end = NULL;
-+  char *        prev_heap_end;
-+  char *        sp = (char *) & sp;
-+
-+  if (heap_end == NULL)
-+    heap_end = & heap_start;
- 
--  if (heap_end == 0)
--    {
--      heap_end = &end;
--    }
-   prev_heap_end = heap_end;
-+
-   if (heap_end + incr > sp)
-     {
--      _write (1, "Heap and stack collision\n", 25);
-+#define MESSAGE "Heap and stack collision\n"
-+      _write (1, MESSAGE, sizeof MESSAGE);
-       abort ();
-     }
-+
-   heap_end += incr;
-+
-   return (caddr_t) prev_heap_end;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sys/syscall.h newlib-1.19.0/newlib/libc/sys/sysnecv850/sys/syscall.h
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sys/syscall.h	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/sys/syscall.h	2011-07-24 06:43:01.757140909 +0200
-@@ -29,6 +29,7 @@
- #define	SYS_execve	59
- #define   SYS_times       43
- #define SYS_gettimeofday 116
-+#define SYS_rename	134
- 
- #define SYS_utime       201 /* not really a system call */
- #define SYS_wait        202 /* nor is this */
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/trap.S newlib-1.19.0/newlib/libc/sys/sysnecv850/trap.S
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/trap.S	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/trap.S	2011-07-24 06:43:01.757140909 +0200
-@@ -2,9 +2,9 @@
- 	.global	___trap0
- ___trap0:
- 	trap 31
--	tst r10,r10
-+	tst r11,r11
- 	bz .L0
- 	movhi hi(_errno),r0,r6
--	st.w r10,lo(_errno)[r6]
-+	st.w r11,lo(_errno)[r6]
- .L0:
- 	jmp [r31]
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/unlink.c newlib-1.19.0/newlib/libc/sys/sysnecv850/unlink.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/unlink.c	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/unlink.c	2011-07-24 06:43:01.757140909 +0200
-@@ -10,7 +10,7 @@
- #define TRAP0(f, p1, p2, p3) __trap0(f, (int)(p1), (int)(p2), (int)(p3))
- 
- int
--_unlink ()
-+_unlink (const char *path)
- {
--  return -1;
-+  return TRAP0 (SYS_unlink, path, 0, 0);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/asctime_r.c newlib-1.19.0/newlib/libc/time/asctime_r.c
---- newlib-1.19.0.orig/newlib/libc/time/asctime_r.c	2000-05-10 19:58:29.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/time/asctime_r.c	2011-07-24 06:43:01.757140909 +0200
-@@ -18,10 +18,10 @@
- 	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-   };
- 
--  sprintf (result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
--	   day_name[tim_p->tm_wday], 
--	   mon_name[tim_p->tm_mon],
--	   tim_p->tm_mday, tim_p->tm_hour, tim_p->tm_min,
--	   tim_p->tm_sec, 1900 + tim_p->tm_year);
-+  siprintf (result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
-+	    day_name[tim_p->tm_wday], 
-+	    mon_name[tim_p->tm_mon],
-+	    tim_p->tm_mday, tim_p->tm_hour, tim_p->tm_min,
-+	    tim_p->tm_sec, 1900 + tim_p->tm_year);
-   return result;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/mktime.c newlib-1.19.0/newlib/libc/time/mktime.c
---- newlib-1.19.0.orig/newlib/libc/time/mktime.c	2008-12-11 18:27:56.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/time/mktime.c	2011-07-24 06:43:01.757140909 +0200
-@@ -208,6 +208,8 @@
-   tm_isdst = tim_p->tm_isdst > 0  ?  1 : tim_p->tm_isdst;
-   isdst = tm_isdst;
- 
-+  TZ_LOCK;
-+
-   if (_daylight)
-     {
-       int y = tim_p->tm_year + YEAR_BASE;
-@@ -257,6 +259,8 @@
-   else /* otherwise assume std time */
-     tim += (time_t) tz->__tzrule[0].offset;
- 
-+  TZ_UNLOCK;
-+
-   /* reset isdst flag to what we have calculated */
-   tim_p->tm_isdst = isdst;
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/strftime.c newlib-1.19.0/newlib/libc/time/strftime.c
---- newlib-1.19.0.orig/newlib/libc/time/strftime.c	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/time/strftime.c	2011-07-24 06:43:01.758140924 +0200
-@@ -285,6 +285,7 @@
- #  define CQ(a)		a		/* character constant qualifier */
- #  define SFLG				/* %s flag (null for normal char) */
- #  define _ctloc(x) (ctloclen = strlen (ctloc = _CurrentTimeLocale->x), ctloc)
-+#  define snprintf	sniprintf	/* avoid to pull in FP functions. */
- #  define TOLOWER(c)	tolower((int)(unsigned char)(c))
- #  define STRTOUL(c,p,b) strtoul((c),(p),(b))
- #  define STRCPY(a,b)	strcpy((a),(b))
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/strptime.c newlib-1.19.0/newlib/libc/time/strptime.c
---- newlib-1.19.0.orig/newlib/libc/time/strptime.c	2010-01-22 14:03:42.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/time/strptime.c	2011-07-24 06:43:01.758140924 +0200
-@@ -40,6 +40,16 @@
- 
- #define _ctloc(x) (_CurrentTimeLocale->x)
- 
-+static _CONST int _DAYS_BEFORE_MONTH[12] =
-+{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-+
-+#define SET_MDAY 1
-+#define SET_MON  2
-+#define SET_YEAR 4
-+#define SET_WDAY 8
-+#define SET_YDAY 16
-+#define SET_YMD  (SET_YEAR | SET_MON | SET_MDAY)
-+
- /*
-  * tm_year is relative this year 
-  */
-@@ -78,8 +88,8 @@
- {
-     int ret = 4;
- 
--    for (; year > 1970; --year)
--	ret = (ret + 365 + is_leap_year (year) ? 1 : 0) % 7;
-+    while (--year >= 1970)
-+	ret = (ret + 365 + is_leap_year (year)) % 7;
-     return ret;
- }
- 
-@@ -147,6 +157,7 @@
- 	struct tm *timeptr)
- {
-     char c;
-+    int ymd = 0;
- 
-     struct lc_time_T *_CurrentTimeLocale = __get_current_time_locale ();
-     for (; (c = *format) != '\0'; ++format) {
-@@ -166,18 +177,21 @@
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_wday = ret;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'a' :
- 		ret = match_string (&buf, _ctloc (wday));
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_wday = ret;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'B' :
- 		ret = match_string (&buf, _ctloc (month));
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_mon = ret;
-+		ymd |= SET_MON;
- 		break;
- 	    case 'b' :
- 	    case 'h' :
-@@ -185,6 +199,7 @@
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_mon = ret;
-+		ymd |= SET_MON;
- 		break;
- 	    case 'C' :
- 		ret = strtol (buf, &s, 10);
-@@ -192,18 +207,21 @@
- 		    return NULL;
- 		timeptr->tm_year = (ret * 100) - tm_year_base;
- 		buf = s;
-+		ymd |= SET_YEAR;
- 		break;
- 	    case 'c' :		/* %a %b %e %H:%M:%S %Y */
- 		s = strptime (buf, _ctloc (c_fmt), timeptr);
- 		if (s == NULL)
- 		    return NULL;
- 		buf = s;
-+		ymd |= SET_WDAY | SET_YMD;
- 		break;
- 	    case 'D' :		/* %m/%d/%y */
- 		s = strptime (buf, "%m/%d/%y", timeptr);
- 		if (s == NULL)
- 		    return NULL;
- 		buf = s;
-+		ymd |= SET_YMD;
- 		break;
- 	    case 'd' :
- 	    case 'e' :
-@@ -212,6 +230,7 @@
- 		    return NULL;
- 		timeptr->tm_mday = ret;
- 		buf = s;
-+		ymd |= SET_MDAY;
- 		break;
- 	    case 'H' :
- 	    case 'k' :
-@@ -238,6 +257,7 @@
- 		    return NULL;
- 		timeptr->tm_yday = ret - 1;
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'm' :
- 		ret = strtol (buf, &s, 10);
-@@ -245,6 +265,7 @@
- 		    return NULL;
- 		timeptr->tm_mon = ret - 1;
- 		buf = s;
-+		ymd |= SET_MON;
- 		break;
- 	    case 'M' :
- 		ret = strtol (buf, &s, 10);
-@@ -306,6 +327,7 @@
- 		    return NULL;
- 		timeptr->tm_wday = ret - 1;
- 		buf = s;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'w' :
- 		ret = strtol (buf, &s, 10);
-@@ -313,6 +335,7 @@
- 		    return NULL;
- 		timeptr->tm_wday = ret;
- 		buf = s;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'U' :
- 		ret = strtol (buf, &s, 10);
-@@ -320,6 +343,7 @@
- 		    return NULL;
- 		set_week_number_sun (timeptr, ret);
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'V' :
- 		ret = strtol (buf, &s, 10);
-@@ -327,6 +351,7 @@
- 		    return NULL;
- 		set_week_number_mon4 (timeptr, ret);
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'W' :
- 		ret = strtol (buf, &s, 10);
-@@ -334,12 +359,14 @@
- 		    return NULL;
- 		set_week_number_mon (timeptr, ret);
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'x' :
- 		s = strptime (buf, _ctloc (x_fmt), timeptr);
- 		if (s == NULL)
- 		    return NULL;
- 		buf = s;
-+		ymd |= SET_YMD;
- 		break;
- 	    case 'X' :
- 		s = strptime (buf, _ctloc (X_fmt), timeptr);
-@@ -356,6 +383,7 @@
- 		else
- 		    timeptr->tm_year = ret;
- 		buf = s;
-+		ymd |= SET_YEAR;
- 		break;
- 	    case 'Y' :
- 		ret = strtol (buf, &s, 10);
-@@ -363,6 +391,7 @@
- 		    return NULL;
- 		timeptr->tm_year = ret - tm_year_base;
- 		buf = s;
-+		ymd |= SET_YEAR;
- 		break;
- 	    case 'Z' :
- 		/* Unsupported. Just ignore.  */
-@@ -390,6 +419,58 @@
- 		return NULL;
- 	}
-     }
-+
-+    if ((ymd & SET_YMD) == SET_YMD) {
-+	/* all of tm_year, tm_mon and tm_mday, but... */
-+
-+	if (!(ymd & SET_YDAY)) {
-+	    /* ...not tm_yday, so fill it in */
-+	    timeptr->tm_yday = _DAYS_BEFORE_MONTH[timeptr->tm_mon]
-+		+ timeptr->tm_mday;
-+	    if (!is_leap_year (timeptr->tm_year + tm_year_base)
-+		|| timeptr->tm_mon < 2)
-+	    {
-+		timeptr->tm_yday--;
-+	    }
-+	    ymd |= SET_YDAY;
-+	}
-+    }
-+    else if ((ymd & (SET_YEAR | SET_YDAY)) == (SET_YEAR | SET_YDAY)) {
-+	/* both of tm_year and tm_yday, but... */
-+
-+	if (!(ymd & SET_MON)) {
-+	    /* ...not tm_mon, so fill it in, and/or... */
-+	    if (timeptr->tm_yday < _DAYS_BEFORE_MONTH[1])
-+		timeptr->tm_mon = 0;
-+	    else {
-+		int leap = is_leap_year (timeptr->tm_year + tm_year_base);
-+		int i;
-+		for (i = 2; i < 12; ++i) {
-+		    if (timeptr->tm_yday < _DAYS_BEFORE_MONTH[i] + leap)
-+			break;
-+		}
-+		timeptr->tm_mon = i - 1;
-+	    }
-+	}
-+
-+	if (!(ymd & SET_MDAY)) {
-+	    /* ...not tm_mday, so fill it in */
-+	    timeptr->tm_mday = timeptr->tm_yday
-+		- _DAYS_BEFORE_MONTH[timeptr->tm_mon];
-+	    if (!is_leap_year (timeptr->tm_year + tm_year_base)
-+		|| timeptr->tm_mon < 2)
-+	    {
-+		timeptr->tm_mday++;
-+	    }
-+	}
-+    }
-+
-+    if ((ymd & (SET_YEAR | SET_YDAY | SET_WDAY)) == (SET_YEAR | SET_YDAY)) {
-+	/* fill in tm_wday */
-+	int fday = first_day (timeptr->tm_year + tm_year_base);
-+	timeptr->tm_wday = (fday + timeptr->tm_yday) % 7;
-+    }
-+
-     return (char *)buf;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/tzset_r.c newlib-1.19.0/newlib/libc/time/tzset_r.c
---- newlib-1.19.0.orig/newlib/libc/time/tzset_r.c	2008-10-06 21:21:29.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/time/tzset_r.c	2011-07-24 06:43:01.758140924 +0200
-@@ -7,6 +7,8 @@
- #include <sys/time.h>
- #include "local.h"
- 
-+#define sscanf siscanf	/* avoid to pull in FP functions. */
-+
- static char __tzname_std[11];
- static char __tzname_dst[11];
- static char *prev_tzenv = NULL;
-@@ -28,6 +30,8 @@
- 	_daylight = 0;
- 	_tzname[0] = "GMT";
- 	_tzname[1] = "GMT";
-+	free(prev_tzenv);
-+	prev_tzenv = NULL;
- 	TZ_UNLOCK;
- 	return;
-       }
-@@ -80,8 +84,10 @@
-   tzenv += n;
-   
-   if (sscanf (tzenv, "%10[^0-9,+-]%n", __tzname_dst, &n) <= 0)
--    {
-+    { /* No dst */
-       _tzname[1] = _tzname[0];
-+      _timezone = tz->__tzrule[0].offset;
-+      _daylight = 0;
-       TZ_UNLOCK;
-       return;
-     }
-diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr.c newlib-1.19.0/newlib/libc/xdr/xdr.c
---- newlib-1.19.0.orig/newlib/libc/xdr/xdr.c	2010-03-02 13:05:18.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/xdr/xdr.c	2011-07-24 06:43:01.759140939 +0200
-@@ -113,7 +113,7 @@
- #elif INT_MAX == LONG_MAX
-   return xdr_long (xdrs, (long *) ip);
- #else
--# error Unexpeced integer sizes in xdr_int()
-+# error Unexpected integer sizes in xdr_int()
- #endif
- }
- 
-@@ -148,7 +148,7 @@
- #elif UINT_MAX == ULONG_MAX
-   return xdr_u_long (xdrs, (u_long *) up);
- #else
--# error Unexpeced integer sizes in xdr_int()
-+# error Unexpected integer sizes in xdr_int()
- #endif
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr_private.h newlib-1.19.0/newlib/libc/xdr/xdr_private.h
---- newlib-1.19.0.orig/newlib/libc/xdr/xdr_private.h	2010-03-02 13:05:18.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/xdr/xdr_private.h	2011-07-24 06:43:01.759140939 +0200
-@@ -25,6 +25,7 @@
- 
- #include <_ansi.h>
- #include <stdarg.h>
-+#include <stdint.h>
- #include <sys/param.h>
- 
- /* avoid including stdio header here */
-diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr_rec.c newlib-1.19.0/newlib/libc/xdr/xdr_rec.c
---- newlib-1.19.0.orig/newlib/libc/xdr/xdr_rec.c	2010-03-02 13:05:18.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/xdr/xdr_rec.c	2011-07-24 06:43:01.759140939 +0200
-@@ -51,6 +51,7 @@
- #include <assert.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <limits.h>
- 
- #include <rpc/types.h>
- #include <rpc/xdr.h>
-diff -Naur newlib-1.19.0.orig/newlib/libm/common/modfl.c newlib-1.19.0/newlib/libm/common/modfl.c
---- newlib-1.19.0.orig/newlib/libm/common/modfl.c	2009-04-18 00:15:43.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/common/modfl.c	2011-07-24 06:43:01.760140954 +0200
-@@ -36,7 +36,7 @@
- long double
- modfl (long double x, long double *iptr)
- {
--  return modf(x, iptr);
-+  return modf(x, (double*) iptr);
- }
- #endif
- 
-diff -Naur newlib-1.19.0.orig/newlib/libm/common/s_round.c newlib-1.19.0/newlib/libm/common/s_round.c
---- newlib-1.19.0.orig/newlib/libm/common/s_round.c	2009-03-25 20:13:01.000000000 +0100
-+++ newlib-1.19.0/newlib/libm/common/s_round.c	2011-07-24 06:43:01.760140954 +0200
-@@ -68,7 +68,7 @@
-           msw &= 0x80000000;
-           if (exponent_less_1023 == -1)
-             /* Result is +1.0 or -1.0. */
--            msw |= (1023 << 20);
-+            msw |= ((__int32_t)1023 << 20);
-           lsw = 0;
-         }
-       else
-diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cacos.c newlib-1.19.0/newlib/libm/complex/cacos.c
---- newlib-1.19.0.orig/newlib/libm/complex/cacos.c	2010-11-04 19:27:13.000000000 +0100
-+++ newlib-1.19.0/newlib/libm/complex/cacos.c	2011-07-24 06:43:01.760140954 +0200
-@@ -82,8 +82,18 @@
- {
- 	double complex w;
- 
-+	/* FIXME: The original NetBSD code results in an ICE when trying to
-+	   build this function on ARM/Thumb using gcc 4.5.1.  For now we use
-+	   a hopefully temporary workaround. */
-+#if 0
- 	w = casin(z);
--	w = M_PI_2 - creal(w);
--	w -= (cimag(w) * I);
-+	w = (M_PI_2 - creal(w)) - cimag(w) * I;
-+#else
-+	double complex tmp0, tmp1;
-+
-+	tmp0 = casin(z);
-+	tmp1 = M_PI_2 - creal(tmp0);
-+	w = tmp1 - (cimag(tmp0) * I);
-+#endif
- 	return w;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cproj.c newlib-1.19.0/newlib/libm/complex/cproj.c
---- newlib-1.19.0.orig/newlib/libm/complex/cproj.c	2010-10-19 00:40:24.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/complex/cproj.c	2011-07-24 06:43:01.760140954 +0200
-@@ -93,7 +93,7 @@
- {
- 	double_complex w = { .z = z };
- 
--	if (isinf(creal(z) || isinf(cimag(z)))) {
-+	if (isinf(creal(z)) || isinf(cimag(z))) {
- #ifdef __INFINITY
- 		REAL_PART(w) = __INFINITY;
- #else
-diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cprojf.c newlib-1.19.0/newlib/libm/complex/cprojf.c
---- newlib-1.19.0.orig/newlib/libm/complex/cprojf.c	2010-10-08 12:35:14.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/complex/cprojf.c	2011-07-24 06:43:01.761140969 +0200
-@@ -55,7 +55,7 @@
- {
- 	float_complex w = { .z = z };
- 
--	if (isinf(crealf(z) || isinf(cimagf(z)))) {
-+	if (isinf(crealf(z)) || isinf(cimagf(z))) {
- #ifdef __INFINITY
- 		REAL_PART(w) = __INFINITY;
- #else
-diff -Naur newlib-1.19.0.orig/newlib/libm/math/e_scalb.c newlib-1.19.0/newlib/libm/math/e_scalb.c
---- newlib-1.19.0.orig/newlib/libm/math/e_scalb.c	2000-02-17 20:39:51.000000000 +0100
-+++ newlib-1.19.0/newlib/libm/math/e_scalb.c	2011-07-24 06:43:01.761140969 +0200
-@@ -17,6 +17,7 @@
-  * should use scalbn() instead.
-  */
- 
-+#include <limits.h>
- #include "fdlibm.h"
- 
- #ifndef _DOUBLE_IS_32BITS
-@@ -46,8 +47,17 @@
- 	    else       return x/(-fn);
- 	}
- 	if (rint(fn)!=fn) return (fn-fn)/(fn-fn);
-+#if (INT_MAX < 65000)
-+	if ( fn > (double) INT_MAX) return scalbn(x, INT_MAX);
-+#else
- 	if ( fn > 65000.0) return scalbn(x, 65000);
--	if (-fn > 65000.0) return scalbn(x,-65000);
-+#endif
-+
-+#if (INT_MIN > -65000)
-+        if (fn < (double) INT_MIN) return scalbn(x,INT_MIN);
-+#else
-+	if (fn < -65000.0) return scalbn(x,-65000);
-+#endif
- 	return scalbn(x,(int)fn);
- #endif
- }
-diff -Naur newlib-1.19.0.orig/newlib/libm/math/wf_tgamma.c newlib-1.19.0/newlib/libm/math/wf_tgamma.c
---- newlib-1.19.0.orig/newlib/libm/math/wf_tgamma.c	2007-09-04 19:33:10.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/math/wf_tgamma.c	2011-07-24 06:43:01.761140969 +0200
-@@ -43,3 +43,17 @@
- 	return y;
- #endif
- }
-+
-+#ifdef _DOUBLE_IS_32BITS
-+
-+#ifdef __STDC__
-+	double tgamma(double x)
-+#else
-+	double tgamma(x)
-+	double x;
-+#endif
-+{
-+	return (double) tgammaf((float) x);
-+}
-+
-+#endif /* defined(_DOUBLE_IS_32BITS) */
-diff -Naur newlib-1.19.0.orig/newlib/libm/math/w_tgamma.c newlib-1.19.0/newlib/libm/math/w_tgamma.c
---- newlib-1.19.0.orig/newlib/libm/math/w_tgamma.c	2002-06-07 23:59:56.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/math/w_tgamma.c	2011-07-24 06:43:01.761140969 +0200
-@@ -17,6 +17,8 @@
- 
- #include "fdlibm.h"
- 
-+#ifndef _DOUBLE_IS_32BITS
-+
- #ifdef __STDC__
- 	double tgamma(double x)
- #else
-@@ -42,3 +44,5 @@
- 	return y;
- #endif
- }
-+
-+#endif /* defined(_DOUBLE_IS_32BITS) */
-diff -Naur newlib-1.19.0.orig/newlib/MAINTAINERS newlib-1.19.0/newlib/MAINTAINERS
---- newlib-1.19.0.orig/newlib/MAINTAINERS	2010-12-16 22:58:38.000000000 +0100
-+++ newlib-1.19.0/newlib/MAINTAINERS	2011-07-24 06:43:01.627138933 +0200
-@@ -6,7 +6,7 @@
- The official maintainers of newlib:
- 
- Jeff Johnston			jjohnstn at redhat.com
--Corinna	Vinschen		corinna at vinchen.de
-+Corinna Vinschen		corinna at vinschen.de
- 
- 
- 		     Various Domain Maintainers
-diff -Naur newlib-1.19.0.orig/newlib/Makefile.am newlib-1.19.0/newlib/Makefile.am
---- newlib-1.19.0.orig/newlib/Makefile.am	2010-12-16 22:58:38.000000000 +0100
-+++ newlib-1.19.0/newlib/Makefile.am	2011-07-24 06:43:01.627138933 +0200
-@@ -81,7 +81,7 @@
- 	libc.a
- endif
- 
--noinst_DATA = stmp-targ-include
-+BUILT_SOURCES = stmp-targ-include
- 
- toollib_DATA = $(CRT0) $(CRT1)
- 
-@@ -255,7 +255,7 @@
- 	  done
- 	touch $@
- 
--CLEANFILES = targ-include stmp-targ-include
-+CLEANFILES = stmp-targ-include
- 
- install-data-local:	install-toollibLIBRARIES
- if USE_LIBTOOL
-@@ -279,10 +279,6 @@
- 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
- 	    else true; fi ; \
- 	  done; \
--	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \
--	  for i in $(srcdir)/libc/include/rpc/*.h; do \
--	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \
--	  done; \
- 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \
- 	  for i in $(srcdir)/libc/include/sys/*.h; do \
- 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
-@@ -430,3 +426,6 @@
- 	else \
- 	   echo "WARNING: could not find \`runtest'" 1>&2 ; \
- 	fi
-+
-+clean-local:
-+	-rm -rf targ-include
-diff -Naur newlib-1.19.0.orig/newlib/Makefile.in newlib-1.19.0/newlib/Makefile.in
---- newlib-1.19.0.orig/newlib/Makefile.in	2011-07-20 08:45:15.622327553 +0200
-+++ newlib-1.19.0/newlib/Makefile.in	2011-07-24 06:43:01.628138948 +0200
-@@ -122,7 +122,7 @@
- 	install-pdf-recursive install-ps-recursive install-recursive \
- 	installcheck-recursive installdirs-recursive pdf-recursive \
- 	ps-recursive uninstall-recursive
--DATA = $(noinst_DATA) $(toollib_DATA)
-+DATA = $(toollib_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -351,7 +351,7 @@
- @USE_LIBTOOL_FALSE at toollib_LIBRARIES = libm.a \
- @USE_LIBTOOL_FALSE@	libc.a
- 
--noinst_DATA = stmp-targ-include
-+BUILT_SOURCES = stmp-targ-include
- toollib_DATA = $(CRT0) $(CRT1)
- 
- # The functions ldexp, frexp and modf are traditionally supplied in
-@@ -405,13 +405,13 @@
- @USE_LIBTOOL_TRUE at libm_la_DEPENDENCIES = libm-libtool-objectlist
- @USE_LIBTOOL_TRUE at libc_la_SOURCES = 
- @USE_LIBTOOL_TRUE at libc_la_DEPENDENCIES = libc-libtool-objectlist
--CLEANFILES = targ-include stmp-targ-include
-+CLEANFILES = stmp-targ-include
- CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
- MAKEOVERRIDES = 
- 
- # dejagnu support
- RUNTESTFLAGS = 
--all: newlib.h
-+all: $(BUILT_SOURCES) newlib.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
- .SUFFIXES:
-@@ -725,14 +725,16 @@
- 	done
- check-am:
- 	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
--check: check-recursive
-+check: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
- all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
--install: install-recursive
-+install: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
-@@ -758,10 +760,11 @@
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
-+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- clean: clean-recursive
- 
--clean-am: clean-generic clean-libtool clean-toollibLIBRARIES \
--	clean-toollibLTLIBRARIES mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-local \
-+	clean-toollibLIBRARIES clean-toollibLTLIBRARIES mostlyclean-am
- 
- distclean: distclean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-@@ -833,12 +836,13 @@
- uninstall-am: uninstall-toollibDATA uninstall-toollibLIBRARIES \
- 	uninstall-toollibLTLIBRARIES
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
--	ctags-recursive install-am install-strip tags-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-+	check-am ctags-recursive install install-am install-strip \
-+	tags-recursive
- 
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- 	all all-am am--refresh check check-DEJAGNU check-am clean \
--	clean-generic clean-libtool clean-toollibLIBRARIES \
-+	clean-generic clean-libtool clean-local clean-toollibLIBRARIES \
- 	clean-toollibLTLIBRARIES ctags ctags-recursive distclean \
- 	distclean-DEJAGNU distclean-compile distclean-generic \
- 	distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \
-@@ -985,10 +989,6 @@
- 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
- 	    else true; fi ; \
- 	  done; \
--	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \
--	  for i in $(srcdir)/libc/include/rpc/*.h; do \
--	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \
--	  done; \
- 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \
- 	  for i in $(srcdir)/libc/include/sys/*.h; do \
- 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
-@@ -1129,6 +1129,9 @@
- 	   echo "WARNING: could not find \`runtest'" 1>&2 ; \
- 	fi
- 
-+clean-local:
-+	-rm -rf targ-include
-+
- # 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.19.0.orig/newlib/testsuite/newlib.stdio/stdio.exp newlib-1.19.0/newlib/testsuite/newlib.stdio/stdio.exp
---- newlib-1.19.0.orig/newlib/testsuite/newlib.stdio/stdio.exp	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/testsuite/newlib.stdio/stdio.exp	2011-07-24 06:43:01.761140969 +0200
-@@ -0,0 +1,12 @@
-+# Copyright (C) 2011 by ARM Ltd. All rights reserved.
-+#
-+# Permission to use, copy, modify, and distribute this software
-+# is freely granted, provided that this notice is preserved.
-+#
-+
-+load_lib passfail.exp
-+
-+set exclude_list {
-+}
-+
-+newlib_pass_fail_all -x $exclude_list
-diff -Naur newlib-1.19.0.orig/newlib/testsuite/newlib.stdio/swprintf.c newlib-1.19.0/newlib/testsuite/newlib.stdio/swprintf.c
---- newlib-1.19.0.orig/newlib/testsuite/newlib.stdio/swprintf.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/testsuite/newlib.stdio/swprintf.c	2011-07-24 06:43:01.762140984 +0200
-@@ -0,0 +1,30 @@
-+/*
-+ * Copyright (C) 2011 by ARM Ltd. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and distribute this software
-+ * is freely granted, provided that this notice is preserved.
-+ */
-+
-+#include <stdio.h>
-+#include <newlib.h>
-+#include <stdlib.h>
-+#include <wchar.h>
-+#include "check.h"
-+
-+int main()
-+{
-+#if defined(INTEGER_ONLY) || defined(NO_FLOATING_POINT)
-+
-+#else
-+  char cbuf[512];
-+  wchar_t wcbuf[512], wcbuf2[512];
-+  double val = 1E+308;
-+  snprintf(cbuf, 512, "%.*f", 3, val);
-+  swprintf(wcbuf, 512, L"%.*f", 3, val);
-+  mbstowcs(wcbuf2, cbuf, 512);
-+
-+  CHECK (wcscmp(wcbuf, wcbuf2) == 0);
-+#endif
-+
-+  exit (0);
-+}
diff --git a/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110826.diff b/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110826.diff
deleted file mode 100644
index 7cd8184..0000000
--- a/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110826.diff
+++ /dev/null
@@ -1,6311 +0,0 @@
-diff -Naur newlib-1.19.0.orig/newlib/ChangeLog newlib-1.19.0/newlib/ChangeLog
---- newlib-1.19.0.orig/newlib/ChangeLog	2010-12-16 22:58:38.000000000 +0100
-+++ newlib-1.19.0/newlib/ChangeLog	2011-08-26 07:21:01.247516228 +0200
-@@ -1,3 +1,439 @@
-+2011-08-23  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdlib/putenv_r.c: Use "strchr" instead of obsolete "index".
-+	* libc/stdlib/setenv_r.c: Use "memcpy" instead of obsolete "bcopy".
-+
-+2011-08-23  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/misc/ffs.c, libc/string/bcmp.c, libc/string/bcopy.c,
-+	libc/string/bzero.c, libc/string/index.c, libc/string/rindex.c,
-+	libc/string/strcasecmp.c, libc/string/strncasecmp.c:
-+	Let synopsis reference "#include <strings.h>".
-+
-+2011-08-23  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/posix/regexec.c: Define "nope" only #ifndef NDEBUG.
-+	* libc/stdio/vfscanf.c: Define "state" only #ifdef _MB_CAPABLE.
-+	* libc/string/wcwidth.c: Include <wctypes.h> for "iswprint" and
-+	"iswcntrl".
-+
-+2011-08-23  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/include/limits.h: Compute SSIZE_MAX based on
-+	__SIZE_MAX__, __SIZEOF_SIZE_T__ and __CHAR_BIT__.
-+
-+2011-08-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/string/index.c: Include <strings.h> for "index".
-+	* libc/string/rindex.c: Include <strings.h> for "rindex".
-+	* libc/string/strcasecmp.c: Include <strings.h> for "strcasecmp".
-+	Don't include <string.h>.
-+	* libc/string/strncasecmp.c: Include <strings.h> for "strncasecmp".
-+	Don't include <string.h>.
-+	* libc/string/bzero.c: Include <strings.h> for "bzero".
-+	Don't include <string.h>
-+	* libc/misc/ffs.c: Include <strings.h> for "ffs".
-+	Don't include <_ansi.h>.
-+
-+2011-08-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/crt0.c: Rework RTEMS_STUB macro.
-+	Include <unistd.h>.
-+	Remove C++-style comments.
-+	Remove hppa, a29k.
-+	Add clock_gettime, gettimeofday, sched_yield.
-+
-+2011-08-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/vasiprintf.c: Include "local.h" for "_svfiprintf_r".
-+	* libc/stdio/vasprintf.c Include "local.h" for "_svfprintf_r".
-+	* libc/stdio/vsiprintf.c: Include "local.h" for "_svfiprintf_r".
-+	* libc/stdio/vsniprintf.c: Include "local.h" for "_svfiprintf_r".
-+	* libc/stdio/vsnprintf.c: Include "local.h" for "_svfprintf_r"
-+	* libc/stdio/vsprintf.c: Include "local.h" for "_svfprintf_r"
-+
-+2011-08-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/string/bcmp.c: Include <strings.h> for "bcmp".
-+	* libc/string/bcopy.c: Include <strings.h> for "bcopy".
-+	* libc/string/strcasestr.c: Include <strings.h> for "strncasecmp".
-+	* libc/time/strptime.c: Include <strings.h> for "strncasecmp".
-+
-+2011-08-19  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/process.h: Remove exec family function declarations.
-+	Add comment.
-+	* libc/include/sys/unistd.h (execlpe): Declare for Cygwin.
-+
-+2011-08-19  Craig Howland  <howland at LGSInnovations.com>
-+
-+	* libc/time/mktime.c (validate_structure): Account for tm_mon possibly
-+	being given as negative.
-+	(mktime): Set tm_isdst=0 when !daylight.
-+
-+2011-08-01  Sebastian Huber <sebastian.huber at embedded-brains.de>
-+
-+	* libc/include/sys/types.h: XML and RTEMS define
-+	_UNIX98_THREAD_MUTEX_ATTRIBUTES and can use the standard
-+	definitions. This avoids redefinition warnings.
-+
-+2011-07-26  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/sys/dirent.h (scandir):
-+	Add const to "select" parameter.
-+
-+2011-07-25  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/iconv/iconv.tex: Rename node "Introduction" into
-+	"Introduction to iconv".
-+
-+2011-07-20  Yaakov Selkowitz  <yselkowitz at ...>
-+
-+	* libc/include/time.h [_POSIX_CLOCK_SELECTION] (clock_nanosleep):
-+	Declare.
-+	* libc/include/sys/features.h [__CYGWIN__] (_POSIX_CLOCK_SELECTION):
-+	Define.
-+
-+2011-07-19  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/sys/unistd.h (_CS_XBS5_WIDTH_RESTRICTED_ENVS): Define.
-+	(_CS_V6_ENV): Fix definition.
-+
-+2011-07-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/locale/lmessages.c (_C_messages_locale):
-+	Move __HAVE_LOCALE_INFO_EXTENDED__ before codeset.
-+
-+2011-07-19  Matt Johnson  <johnso87 at crhc.illinois.edu>
-+
-+	* libc/reent/sbrkr.c: Define _sbrk_r independently of the definition
-+	of MALLOC_PROVIDED.
-+
-+2011-07-15  Yufeng Zhang  <yufeng.zhang at arm.com>
-+
-+	* libc/stdio/vfwprintf.c (wcvt): Add a new parameter len of type
-+	int.  *length is set to the value of (rev - digits) regardless
-+	of whether _MB_CAPABLE is defined or not.  Replace BUF with len
-+	in calling _mbsnrtowcs_r and also in the loop where _MB_CAPABLE
-+	is not defined.
-+	(_VFWPRINTF_R): Call wcvt with an extra argument.  Call wcvt
-+	again with allocated new buffer if buf is not large enough for
-+	the conversion.
-+	* testsuite/newlib.stdio/stdio.exp: New.
-+	* testsuite/newlib.stdio/swprintf.c: Likewise.
-+
-+2011-07-15  Matt Johnson  <johnso87 at crhc.illinois.edu>
-+
-+	* libc/stdio/fscanf.c (fscanf): Call _vfscanf_r instead of __svfscanf_r
-+	to make sure CHECK_INIT is called.
-+	(_fscanf_r): Ditto.
-+	* /libc/stdio/scanf.c (scanf): Ditto.
-+	(_scanf_r): Ditto.
-+	* libc/stdio/fwscanf.c (fwscanf): Call _vfwscanf_r instead of
-+	__svfwscanf_r to make sure CHECK_INIT is called.
-+	(_fwscanf_r): Ditto.
-+	* libc/stdio/wscanf.c (wscanf): Ditto.
-+	(_wscanf_r): Ditto.
-+
-+2011-07-13  Hans-Peter Nilsson <hp at axis.com>
-+
-+	* libm/complex/cacos.c: Use temporaries and correct sequencing
-+	error in previous reordering change.
-+
-+2011-06-25  Andreas Becker  <becker at se-elektronic.de>
-+
-+	* libc/time/mktime.c (mktime): Lock global timezone info while
-+	accessing it.
-+
-+2011-06-14  Philip Munts  <phil at munts.net>
-+
-+	* libc/time/asctime_r.c (asctime_r): Replace call to sprintf with call
-+	to siprintf.
-+	* libc/time/strftime.c: Define snprintf to sniprintf in multibyte case.
-+	* libc/time/tzset_r.c: Define sscanf to siscanf.
-+
-+2011-06-14  Joseph Myers  <joseph at codesourcery.com>
-+
-+	* configure.host: Don't handle ep9312, strongarm, xscale and thumb
-+	target names.
-+	* libc/machine/configure.in: Don't handle xscale target names.
-+	* libc/machine/configure: Regenerate.
-+
-+2011-06-14  Craig Howland <howland at LGSInnovations.com>
-+
-+	* libc/time/tzset_r.c (tzset_r):  Correct behavior for changing from
-+	non-GMT to GMT, when un-setting TZ.  Set _timezone and _daylight even
-+	if no DST is given in TZ.
-+
-+2011-06-13  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/stdio/wsetup.c (__swsetup_r): Set errno on failure.
-+	* libc/stdio/fvwrite.c (__sfvwrite_r): Simplify.
-+	* libc/stdio/wbuf.c (__swbuf_r): Likewise.
-+	* libc/stdio/local.h (cantwrite): Adjust comment.
-+
-+2011-06-09  Yaakov Selkowitz  <yselkowitz at ...>
-+
-+	* libc/include/string.h (strdupa): New macro function.
-+	(strndupa): New macro function.
-+
-+2011-05-27  Nick Clifton  <nickc at redhat.com>
-+
-+	* libc/sys/sysnecv850/sbrk.c (_sbrk): Tidy code.
-+	Base start of heap on the "heap_start" symbol.
-+
-+2011-05-25  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/string/strerror.c (_strerror_r): Report "Success" for 0.
-+
-+2011-05-25  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/string/strerror.c (strerror): Split body into...
-+	(_strerror_r): ...new reentrant function.
-+	* libc/string/u_strerr.c (_user_strerror): Update signature.
-+	* libc/include/string.h (_strerror_r): New prototype.
-+	* libc/posix/collate.c (__collate_err): Adjust callers.
-+	* libc/stdio/perror.c (_perror_r): Likewise.
-+	* libc/string/strerror_r.c (strerror_r): Likewise.
-+	* libc/string/xpg_strerror_r.c (__xpg_strerror_r): Likewise.
-+
-+2011-05-19  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/stdio_ext.h: New header.
-+	* libc/stdio/fpurge.c [!__rtems__] (__fpurge): New function.
-+
-+2011-05-19  Matthew Gretton-Dann  <matthew.gretton-dann at arm.com>
-+
-+	* Makefile.am (install-data-local): Fix condition and rm call.
-+	* Makefile.in: Regenerate.
-+
-+2011-05-16  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/time.h (CLOCK_PROCESS_CPUTIME_ID): Rename from
-+	CLOCK_PROCESS_CPUTIME.
-+	(CLOCK_THREAD_CPUTIME_ID): Rename from CLOCK_THREAD_CPUTIME.
-+	* libc/include/sys/features.h [__CYGWIN__] (_POSIX_CPUTIME): Define.
-+	(_POSIX_THREAD_CPUTIME): Define.
-+
-+2011-05-16  Christian Bruel  <christian.bruel at st.com>
-+
-+	* libc/stdlib/strtod.c (_strtod_r): Fix nf/nd counts to not exceed
-+	DBL_DIG.
-+
-+2011-05-15  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/features.h (_POSIX_THREAD_ATTR_STACKADDR): Define
-+	to 200112L for Cygwin.
-+
-+2011-05-12  Peter Rosin  <peda at lysator.liu.se>
-+
-+	* libc/time/strptime.c (strptime): Fill in tm_yday when all of tm_year,
-+	tm_mon and tm_mday are updated. Fill in tm_mon, tm_mday and tm_wday
-+	when both of tm_year and tm_yday are updated.
-+
-+2011-05-12  Peter Rosin  <peda at lysator.liu.se>
-+
-+	* libc/time/strptime.c (first_day): Actually return the wday
-+	of the first day of the year.
-+
-+2011-05-10  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/locale/lmessages.c (_C_messages_locale): Add missing comma.
-+
-+2011-05-04  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/signal.h (psignal): Declare.
-+	* libc/sys/linux/psignal.c: Move from here...
-+	* libc/signal/psignal.c: ... to here. Document.
-+	* libc/sys/linux/Makefile.am (GENERAL_SOURCES): Move psignal.c from here...
-+	* libc/signal/Makefile.am (LIB_SOURCES): ... to here.
-+	(CHEWOUT_FILES): Add psignal.def.
-+	* libc/sys/linux/Makefile.in: Regenerate.
-+	* libc/signal/Makefile.in: Ditto.
-+	* libc/signal/signal.tex: Add references to psignal.
-+
-+2011-05-04  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/locale/lmessages.h (__messages_load_locale): Declare.  Remove
-+	accidental declaration of __numeric_load_locale.
-+	* libc/locale/locale.c: Include timelocal.h to get declaration of
-+	__time_load_locale.
-+	(__set_locale_from_locale_alias): Fix return type.
-+	(__locale_msgcharset): Avoid compiler warnings.
-+	(_localeconv_r): Ditto.
-+
-+2011-05-04  Andy Koppe  <andy.koppe at gmail.com>
-+
-+	* libc/locale/locale.c (current_categories): On Cygwin, set LC_CTYPE 
-+	to C.UTF-8 to match initial __wctomb and __mbtowc settings.
-+	(lc_ctype_charset): On Cygwin, initialize to "UTF-8".
-+	(loadlocale): Remove unused Cygwin-specifc code.
-+
-+2011-05-02  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/sys/features.h [__CYGWIN__] (_POSIX_SPIN_LOCKS): Define.
-+	* libc/include/sys/types.h: Cygwin provides its own pthread_spinlock_t
-+	typedef.
-+
-+2011-04-19  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/signal.h (_sig_func_ptr): Define with int parameter
-+	per POSIX.  Explain in comment.
-+
-+2011-04-15  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/string/strchrnul.c (strchrnul): Fix strchrnul.
-+
-+2011-03-27  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/string.h (strchrnul): Declare.
-+	* libc/string/strchrnul.c: New file.
-+	* libc/string/Makefile.am (ELIX_2_SOURCES): Add strchrnul.c.
-+	* libc/string/Makefile.in: Regenerate.
-+
-+2011-03-23  Nick Clifton  <nickc at redhat.com>
-+
-+	* libc/machine/frv/setjmp.S: Fix typo in .size directive.
-+
-+2011-03-21  Kevin Buettner  <kevinb at redhat.com>
-+
-+	* libc/sys/sysnecv850/trap.S (___trap0): Fix errno handling.
-+	* libc/sys/sysnecv850/rename.c: New file.
-+	* libc/sys/sysnecv850/Makefile.am (lib_a_SOURCES): Add rename.c
-+	* libc/sys/sysnecv850/Makefile.in: Regenerate.
-+	* libc/sys/sysnecv850/fstat.c (_fstat): Invoke trap for SYS_fstat.
-+	* libc/sys/sysnecv850/unlink.c (_unlink): Invoke trap for SYS_unlink.
-+
-+2011-03-03  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/string.h: Include sys/cdefs.h.
-+
-+2011-03-03  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/cdefs.h (__CONCAT1): Define.
-+	(__CONCAT): Define.
-+	(__STRING): Define.
-+	(__XSTRING): Define.
-+	(__ASMNAME): Define.
-+	* libc/include/string.h (strerror_r): Use __ASMNAME to take target
-+	specific label prefixes into account.
-+
-+2011-03-01  Aaron Landwehr <snaphat at gmail.com>
-+
-+	* libm/complex/cproj.c: Fix typo.
-+	* libm/complex/cprojf.c: Ditto.
-+
-+2011-02-22  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/stdio/fmemopen.c (fmemopen): Fix EINVAL condition.  Avoid SEGV
-+	if incoming buffer is NULL.
-+
-+2011-02-09  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/include/string.h (strerror_r): Update declaration.
-+	* libc/string/strerror.c (strerror): Update documentation.
-+	* libc/string/strerror_r.c (strerror_r): Always return
-+	NUL-terminated string; don't overwrite too-short buf.
-+	* libc/string/xpg_strerror_r.c (__xpg_strerror_r): Implement POSIX
-+	variant.
-+	* libc/string/Makefile.am (GENERAL_SOURCES): Build new file.
-+	* libc/string/Makefile.in: Regenerate.
-+
-+2011-01-28  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/stdio/fclose.c: Only use sfp lock to guard non-atomic
-+	changes of flags and fp lock.
-+	* libc/stdio/freopen.c: Ditto.
-+	* libc/stdio64/freopen64.c: Ditto.
-+	* libc/stdio/fgetc.c: Revert change from 2009-04-24, remove sfp locks
-+	which guard entire function to avoid potential deadlocks when using
-+	stdio functions in multiple thraeds.
-+	* libc/stdio/fgets.c: Ditto.
-+	* libc/stdio/fgetwc.c: Ditto.
-+	* libc/stdio/fgetws.c: Ditto.
-+	* libc/stdio/fread.c: Ditto.
-+	* libc/stdio/fseek.c: Ditto.
-+	* libc/stdio/getc.c: Ditto.
-+	* libc/stdio/getdelim.c: Ditto.
-+	* libc/stdio/gets.c: Ditto.
-+	* libc/stdio/vfscanf.c: Ditto.
-+	* libc/stdio/vfwscanf.c: Ditto.
-+
-+	* libc/stdio/fflush.c (_fflush_r): Split out core functionality into
-+	new function __sflush_r.  Just lock file and call __sflush_r from here.
-+	* libc/stdio/fwalk.c (_fwalk): Remove static helper function and move
-+	functionality back into main function. Don't walk a file with flags
-+	value of 1.  Add comment.
-+	(_fwalk_reent): Ditto.
-+	* libc/stdio/local.h (__sflush_r): Declare.
-+	* libc/stdio/refill.c (__srefill): Before calling fwalk, set flags
-+	value to 1 so this file pointer isn't walked.  Revert flags afterwards
-+	and call __sflush_r for this fp if necessary.  Add comments.
-+
-+2011-01-27  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/features.h: Define __STDC_ISO_10646__ for Cygwin.
-+	* libc/include/wchar.h: Include features.h.
-+
-+2011-01-15  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/sys/types.h (ulong): Add typedef.
-+
-+2011-01-12  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libm/math/w_tgamma.c: Only build ifndef _DOUBLE_IS_32BITS.
-+	* libm/math/wf_tgamma.c: Map tgamma to tgammaf, ifdef _DOUBLE_IS_32BITS.
-+
-+2011-01-11  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/string.h: Remove Cygwin DEFS_H kludge.
-+
-+2011-01-10  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/machine/mips/strlen.c (strlen): Add delay slot for R3000.
-+
-+2011-01-10  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+	* libc/include/string.h: Make strsignal() available unconditionally.
-+
-+2011-01-07  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/crt0.c: Adjust free() and calloc() to match their
-+	public decls.
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* Makefile.am: Move cleaning targ-include to clean-local.
-+	* Makefile.in: Regenerate.
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/open_memstream.c (internal_open_memstream_r):
-+	Don't limit c->max to 64*1024 on targets with SIZE_MAX < 64*1024.
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/xdr/xdr.c: Fix typos in #errors.
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/xdr/xdr_private.h: Include <stdint.h>
-+	* libc/xdr/xdr_rec.c: Include limits.h
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/Makefile.am (SUBDEFS): Remove redundant posix/stmp-def.
-+	* libc/Makefile.in: Regenerate.
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/configure.in: Remove redundant posix_dir processing.
-+	* libc/configure: Regenerate.
-+
-+2010-12-31  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* MAINTAINERS: Change corinna at vinchen.de to corinna at vinschen.de.
-+
- 2010-12-16  Jeff Johnston  <jjohnstn at redhat.com>
- 
- 	* NEWS: Update with 1.19.0 info.
-@@ -28,12 +464,12 @@
- 
- 	* libm/mathfp/sf_logarithm.c: Change isfinitef reference to isfinite.
- 
--2010-12-08      Ralf Corsepius <ralf.corsepius at rtems.org>
-+2010-12-08  Ralf Corsepius <ralf.corsepius at rtems.org>
- 
- 	* include/sys/types.h: Add #if defined(__rtems__) around
- 	pthread_attr_t.guardsize.
- 
--2010-12-08      Joel Sherrill <joel at OARcorp.com>
-+2010-12-08  Joel Sherrill <joel at OARcorp.com>
- 
- 	* include/pthread.h: Add pthread_attr_setstack, pthread_attr_getstack,
- 	pthread_attr_getguardsize, pthread_attr_setguardsize.
-@@ -1048,13 +1484,13 @@
- 	* libc/stdlib/atexit.c: Ditto.
- 	* libc/stdlib/on_exit.c: Ditto.
- 
--2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/machine/ieeefp.h: Rework __IEEE_*_ENDIAN handling.
- 	* libc/machine/arm/machine/endian.h: Remove (Conflicts with
- 	libc/include/machine/endian.h)
- 
--2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/machine/setjmp.h: Set up _JBLEN #ifdef __m68k__.
- 
-@@ -1076,11 +1512,11 @@
- 	and ETOOMANYREFS into general list as they are referenced
- 	by OpenGroup and needed by RTEMS.
- 
--2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/search/hcreate.c: Don't include <sys/queue.h> (Unused).
- 
--2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/sys/rtems/machine/_types.h: New (Derived from
- 	machine/_default_types.h).
-@@ -1368,16 +1804,16 @@
- 	* libc/locale/locale.c: Drop Cygwin-specific windows.h include.
- 	(loadlocale): Call __set_charset_from_codepage with 0 codepage.
- 
--2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/stdlib.h: Add posix_memalign.
- 
--2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* configure.host (*-rtems*): Remove -DMISSING_SYSCALL_NAMES.
- 	Add -DHAVE_BLKSIZE, -D_NO_WORDEXP -D_NO_POPEN.
- 
--2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* configure.host (m32c): Move setting -DABORT_PROVIDED to second
- 	"case $host".
-@@ -6455,7 +6891,7 @@
- 	* libc/include/sys/unistd.h: Define all _SC_xxx values as
- 	required by SUSv3.  Unify formatting.
- 
--2007-02-02  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2007-02-02  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/sys/errno.h: Add ECANCELED.
- 
-@@ -8432,16 +8868,16 @@
- 	* configure.host (newlib_cflags) <cris-*-*, crisv32-*-*>: Add
- 	-DCOMPACT_CTYPE.
- 
--2005-03-06  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-03-06  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libc/sys/rtems/include/inttypes.h: New file.
- 	* libc/sys/rtems/include/stdint.h: Ditto.
- 
--2005-03-06  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-03-06  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libc/string/memcmp.c: Fix to avoid pointer signedness warning.
- 
--2005-03-06  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-03-06  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libc/include/machine/_types.h: New file.
- 	* libc/include/sys/types.h: Do not check for __rtems__
-@@ -8450,7 +8886,7 @@
- 	* libc/sys/rtems/machine/_types.h: Removed.  Replaced with
- 	shared header file.
- 
--2005-02-25  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-02-25  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libm/common/fdlibm.h (FLT_UWORD_MAX, FLT_UWORD_HALF_MAX): Add
- 	L qualifier for these long constants.
-@@ -8466,13 +8902,13 @@
- 	* libc/time/strftime.c (strftime): Fix '%x' to deal with negative
- 	years.  Fix '%z' to use long, not int.
- 
--2005-02-24  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-02-24  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libm/common/s_fpclassify.c: Use __uint32_t instead of int to
- 	manipulate float values in integer form.
- 	* libm/common/sf_round.c: Ditto.
- 
--2005-02-24  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-02-24  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libc/include/sys/types.h [__rtems__]: Include new
- 	header file machine/_types.h.
-diff -Naur newlib-1.19.0.orig/newlib/ChangeLog.rtems newlib-1.19.0/newlib/ChangeLog.rtems
---- newlib-1.19.0.orig/newlib/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/ChangeLog.rtems	2011-08-26 07:21:01.247516228 +0200
-@@ -0,0 +1,133 @@
-+2011-08-11	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/tmpnam.c: Use PRIxPTR instead of %x.
-+
-+2011-08-11	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/search/hcreate_r.c: #ifdef 0 unused vars ie, idx.
-+
-+2011-04-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/include/stdint.h: Rework SIZE_MAX.
-+
-+2011-02-07  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/stdlib.h: More ansi-compliance.
-+
-+2011-02-01  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+	
-+	* libc/include/stdio.h: More ansi-compliance.
-+
-+	* libc/include/stdlib.h: Remove atoff.
-+	* libc/stdlib/atoff.c: Remove.
-+	* libc/stdlib/atof.c: Remove atoff.
-+	* libc/stdlib/Makefile.am: Remove atoff.
-+	* libc/stdlib/Makefile.in: Regenerate.
-+
-+	* libc/include/stdio.h: Make fdopen accessible to c99.
-+
-+2011-01-07	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/open_memstream.c: Replace 64 * 1024 with 0x10000 to 
-+	avoid integer overflow on h8300.
-+
-+2011-01-05	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/tmpnam.c: Include <stdint.h>.
-+	Use intptr_t instead of _POINTER_INT for improved portability.
-+	* libc/misc/__dprintf.c: Include <stdint.h>
-+	Use intptr_t instead of _POINTER_INT for improved portability.
-+
-+2011-01-05	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libm/common/s_round.c: Cast const int to __int32_t.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libm/math/e_scalb.c: Include <limits.h>.
-+	Don't rely on 65000 being a valid int.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/posix/readdir.c:	Include <stdint.h>.
-+	Cast to intptr_t instead of int.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/string/memccpy.c, libc/string/memchr.c,
-+	libc/string/memcmp.c, libc/string/memcpy.c,
-+	libc/string/memmove.c, libc/string/mempcpy.c,
-+	libc/string/memset.c, libc/string/stpcpy.c,
-+	libc/string/stpncpy.c, libc/string/strcpy.c,
-+	libc/string/strlen.c, libc/string/strncat.c,
-+	libc/string/strncpy.c (UNALIGNED):
-+	Include <stdint.h>.
-+	Cast to intptr_t instead of long.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* Makefile.am: Don't install include/rpc/*.h.
-+	* Makefile.in: Regenerate.
-+	* libc/Makefile.am: Install include/rpc/xdr.h include/rpc/types.h. 
-+	* libc/Makefile.in: Regenerate.
-+
-+2010-12-31  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* doc/makedoc.c: Add cludge to make makedoc 64bit compliant.
-+
-+2010-12-30	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/signal.h: Don't provide sighandler_t.
-+
-+2010-12-29	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/sys/dir.h: Remove.
-+
-+2010-08-10	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	PR 1475/newlib:
-+	* libc/include/stdint.h: Fall back to compute SIZE_MAX based on
-+	__SIZEOF_SIZE_T__ and __CHAR_BIT__ if available.
-+
-+2010-08-04	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/string/strcat.c: 
-+	Include <stdint.h>. Use uintptr_t instead of long in ALIGNED.
-+	* libc/string/strchr.c, libc/string/strcmp.c, libc/string/strncmp.c:
-+	Include <stdint.h>. Use uintptr_t instead of long in UNALIGNED.
-+
-+2010-03-25	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/include/string.h: Remove bcmp, bcopy, bzero, ffs, index, rindex,
-+	strcasecmp, strncasecmp (Moved to strings.h).
-+	Remove strcmpi, stricmp, strncmpi, strnicmp.
-+
-+2009-12-18  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/search/db_local.h:
-+	Use __uint32_t instead of u_int (prototype mismatches).
-+	* libc/search/extern.h (__buf_init): 
-+	Use __uint32_t instead of int (16 bit target portability).
-+	* libc/search/hash_buf.c: Use ptrdiff_t instead of __uint32_t,
-+	use __uint32_t instead of int (16 bit target portability).
-+	* libc/search/hash.h: Use __uint32_it instead of int
-+	(16 bit target portability).
-+	* libm/common/modfl.c: Add cast to (double*) to avoid GCC warning.
-+
-+2009-10-29  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/include/inttypes.h: 
-+	Rework logic to determine PRI*PTR.
-+	Prefer long64 over longlong64.
-+	* libc/include/machine/_default_types.h: 
-+	Sync logic for __int32 with stdint.h (Prefer long over int).
-+	* libc/include/stdint.h:
-+	Remove __SPU__ hack.
-+	Prefer int for int16_t (sync with _default_types.h).
-+	Rework intptr_t determination.
-+
-+2009-03-09  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/machine/powerpc/times.c: Remove.
-+	* libc/machine/powerpc/Makefile.am: Remove times.c.
-+	* libc/machine/powerpc/Makefile.in: Regenerate.
-diff -Naur newlib-1.19.0.orig/newlib/configure.host newlib-1.19.0/newlib/configure.host
---- newlib-1.19.0.orig/newlib/configure.host	2010-12-02 20:30:46.000000000 +0100
-+++ newlib-1.19.0/newlib/configure.host	2011-08-26 07:21:01.249516217 +0200
-@@ -120,9 +120,6 @@
-   d30v*)
- 	machine_dir=d30v
- 	;;
--  ep9312)
--	machine_dir=arm
--	;;
-   fido)
- 	machine_dir=m68k
- 	newlib_cflags="${newlib_cflags} -DCOMPACT_CTYPE"
-@@ -240,15 +237,6 @@
- 	# FIXME: Might wish to make MALLOC_ALIGNMENT more generic.
- 	newlib_cflags="${newlib_cflags} -DMALLOC_ALIGNMENT=8"
- 	;;
--  strongarm)
--	machine_dir=arm
--	;;
--  xscale)
--	machine_dir=xscale
--	;;
--  thumb)
--	machine_dir=arm
--	;;
-   tic4x|c4x)
- 	machine_dir=tic4x
- 	;;
-@@ -391,12 +379,6 @@
-   d30v*)
- 	sys_dir=
- 	;;
--  ep9312-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
-   frv*)
-         sys_dir=
-         ;;
-@@ -493,18 +475,6 @@
- 	default_newlib_io_long_long="yes"
- 	default_newlib_atexit_dynamic_alloc="no"
- 	;;
--  strongarm-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
--  thumb-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
-   tic6x*)
- 	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
- 	have_crt0="no"
-@@ -527,12 +497,6 @@
-   w65-*-*)
- 	sys_dir=w65
- 	;;
--  xscale-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
-   z8k-*-coff)
- 	sys_dir=z8ksim
- 	;;
-@@ -594,7 +558,6 @@
- # to create the program's environment.
- # If --disable-newlib-supplied-syscalls is specified, then the end-user
- # may specify the protocol via gcc spec files supplied by libgloss.
--# See also thumb below.
- 	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
- #         newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
- 	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
-@@ -629,12 +592,6 @@
- 	newlib_cflags="${newlib_cflags} -DABORT_MESSAGE -DSMALL_MEMORY -DMISSING_SYSCALL_NAMES"
- 	syscall_dir=
- 	;;
--  ep9312-*-*)
--	syscall_dir=syscalls
--	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
--	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
--	fi
--	;;
-   fido-*-elf)
- 	newlib_cflags="${newlib_cflags} -DHAVE_RENAME -DHAVE_SYSTEM -DMISSING_SYSCALL_NAMES"
- 	syscall_dir=
-@@ -758,27 +715,6 @@
- 		newlib_cflags="${newlib_cflags} -DTARGET_PTR_SIZE=64" ;;
- 	esac
- 	;;
--  strongarm-*-*)
--	syscall_dir=syscalls
--	;;
--  thumb-*-pe)
--	syscall_dir=syscalls
--# Don't use the debugging protocols just yet.
--	;;
--  thumb-*-*)
--	syscall_dir=syscalls
--# If newlib is supplying syscalls, select which debug protocol is being used.
--# ARM_RDP_MONITOR selects the Demon monitor.
--# ARM_RDI_MONITOR selects the Angel monitor.
--# If neither are defined, then hard coded defaults will be used
--# to create the program's environment.
--# If --disable-newlib-supplied-syscalls is specified, then the end-user
--# may specify the protocol via gcc spec files supplied by libgloss.
--	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
--#         newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
--	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
--	fi
--	;;
-   tic6x*)
- 	syscall_dir=
- 	newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED"
-@@ -796,13 +732,6 @@
-   xc16x-*)
-           syscall_dir=syscalls
-         ;;
--  xscale-*-*)
--	syscall_dir=syscalls
--	newlib_cflags="${newlib_cflags} -DHAVE_SYSTEM -DHAVE_RENAME"
--	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
--	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
--	fi
--	;;
-   xstormy16-*-*)
- 	syscall_dir=syscalls
- 	;;
-diff -Naur newlib-1.19.0.orig/newlib/doc/makedoc.c newlib-1.19.0/newlib/doc/makedoc.c
---- newlib-1.19.0.orig/newlib/doc/makedoc.c	2009-03-25 22:16:04.000000000 +0100
-+++ newlib-1.19.0/newlib/doc/makedoc.c	2011-08-26 07:21:01.249516217 +0200
-@@ -57,7 +57,7 @@
- {
-     char *ptr;
-     unsigned int write_idx;
--    unsigned int size;
-+    size_t size;
- } string_type;
- 
- 
-@@ -68,7 +68,7 @@
- 
- static void DEFUN(init_string_with_size,(buffer, size),
- 	   string_type *buffer AND
--	   unsigned int size )
-+	   size_t size )
- {
-   buffer->write_idx = 0;
-   buffer->size = size;
-@@ -219,8 +219,8 @@
- stinst_type *pc;
- stinst_type sstack[STACK];
- stinst_type *ssp = &sstack[0];
--int istack[STACK];
--int *isp = &istack[0];
-+long istack[STACK];
-+long *isp = &istack[0];
- 
- typedef int *word_type;
- 
-@@ -270,7 +270,7 @@
- {
-     isp++;
-     pc++;
--    *isp = (int)(*pc);
-+    *isp = (long)(*pc);
-     pc++;
-     
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/configure newlib-1.19.0/newlib/libc/configure
---- newlib-1.19.0.orig/newlib/libc/configure	2010-12-16 22:58:39.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/configure	2011-08-26 07:21:01.253516210 +0200
-@@ -625,7 +625,10 @@
- HAVE_XDR_DIR_TRUE
- LIBC_XDR_DEF
- LIBC_XDR_LIB
-+HAVE_POSIX_DIR_FALSE
-+HAVE_POSIX_DIR_TRUE
- LIBC_POSIX_DEF
-+LIBC_POSIX_LIB
- HAVE_STDIO64_DIR_FALSE
- HAVE_STDIO64_DIR_TRUE
- LIBC_STDIO64_DEF
-@@ -638,9 +641,6 @@
- HAVE_SIGNAL_DIR_TRUE
- LIBC_SIGNAL_DEF
- LIBC_SIGNAL_LIB
--HAVE_POSIX_DIR_FALSE
--HAVE_POSIX_DIR_TRUE
--LIBC_POSIX_LIB
- CRT0
- subdirs
- CPP
-@@ -11805,24 +11805,6 @@
- 
- 
- 
--LIBC_POSIX_LIB=
--if test -n "${posix_dir}"; then
--  if test "${use_libtool}" = "yes"; then
--    LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext}
--  else
--    LIBC_POSIX_LIB=${posix_dir}/lib.${aext}
--  fi
--fi
--
-- if test x${posix_dir} != x; then
--  HAVE_POSIX_DIR_TRUE=
--  HAVE_POSIX_DIR_FALSE='#'
--else
--  HAVE_POSIX_DIR_TRUE='#'
--  HAVE_POSIX_DIR_FALSE=
--fi
--
--
- LIBC_SIGNAL_LIB=
- LIBC_SIGNAL_DEF=
- if test -n "${signal_dir}"; then
-@@ -12225,10 +12207,6 @@
-   as_fn_error "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
--if test -z "${HAVE_POSIX_DIR_TRUE}" && test -z "${HAVE_POSIX_DIR_FALSE}"; then
--  as_fn_error "conditional \"HAVE_POSIX_DIR\" was never defined.
--Usually this means the macro was only invoked conditionally." "$LINENO" 5
--fi
- if test -z "${HAVE_SIGNAL_DIR_TRUE}" && test -z "${HAVE_SIGNAL_DIR_FALSE}"; then
-   as_fn_error "conditional \"HAVE_SIGNAL_DIR\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-diff -Naur newlib-1.19.0.orig/newlib/libc/configure.in newlib-1.19.0/newlib/libc/configure.in
---- newlib-1.19.0.orig/newlib/libc/configure.in	2010-04-23 01:32:40.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/configure.in	2011-08-26 07:21:01.254516197 +0200
-@@ -41,17 +41,6 @@
- dnl for the library and an automake conditional for whether we should
- dnl build the library.
- 
--LIBC_POSIX_LIB=
--if test -n "${posix_dir}"; then
--  if test "${use_libtool}" = "yes"; then
--    LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext}
--  else
--    LIBC_POSIX_LIB=${posix_dir}/lib.${aext}
--  fi
--fi
--AC_SUBST(LIBC_POSIX_LIB)
--AM_CONDITIONAL(HAVE_POSIX_DIR, test x${posix_dir} != x)
--
- LIBC_SIGNAL_LIB=
- LIBC_SIGNAL_DEF=
- if test -n "${signal_dir}"; then
-diff -Naur newlib-1.19.0.orig/newlib/libc/iconv/iconv.tex newlib-1.19.0/newlib/libc/iconv/iconv.tex
---- newlib-1.19.0.orig/newlib/libc/iconv/iconv.tex	2004-09-13 19:10:20.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/iconv/iconv.tex	2011-08-26 07:21:01.254516197 +0200
-@@ -7,7 +7,7 @@
- 
- @menu
- * iconv::                           Encoding conversion routines
--* Introduction::                    Introduction to iconv and encodings
-+* Introduction to iconv::           Introduction to iconv and encodings
- * Supported encodings::             The list of currently supported encodings
- * iconv design decisions::          General iconv library design issues
- * iconv configuration::             iconv-related configure script options
-@@ -24,8 +24,8 @@
- @include iconv/iconv.def
- 
- @page
-- at node Introduction
-- at section Introduction
-+ at node Introduction to iconv
-+ at section Introduction to iconv
- @findex encoding
- @findex character set
- @findex charset
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/inttypes.h newlib-1.19.0/newlib/libc/include/inttypes.h
---- newlib-1.19.0.orig/newlib/libc/include/inttypes.h	2009-01-19 23:02:06.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/inttypes.h	2011-08-26 07:21:01.254516197 +0200
-@@ -242,15 +242,17 @@
- #define SCNxMAX		__SCNMAX(x)
- 
- /* ptr types */
--#if __have_long64
--#define __PRIPTR(x) __STRINGIFY(l##x)
--#define __SCNPTR(x) __STRINGIFY(l##x)
--#elif __have_longlong64
--#define __PRIPTR(x) __STRINGIFY(ll##x)
--#define __SCNPTR(x) __STRINGIFY(ll##x)
-+#if INTPTR_MAX == INT64_MAX
-+#define __PRIPTR(x) __PRI64(x)
-+#define __SCNPTR(x) __SCN64(x)
-+#elif INTPTR_MAX == INT32_MAX
-+#define __PRIPTR(x) __PRI32(x)
-+#define __SCNPTR(x) __SCN32(x)
-+#elif INTPTR_MAX == INT16_MAX
-+#define __PRIPTR(x) __PRI16(x)
-+#define __SCNPTR(x) __SCN16(x)
- #else
--#define __PRIPTR(x) __STRINGIFY(x)
--#define __SCNPTR(x) __STRINGIFY(x)
-+#error cannot determine PRI*PTR
- #endif
- 
- #define PRIdPTR		__PRIPTR(d)
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/machine/_default_types.h newlib-1.19.0/newlib/libc/include/machine/_default_types.h
---- newlib-1.19.0.orig/newlib/libc/include/machine/_default_types.h	2008-06-12 00:14:54.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/machine/_default_types.h	2011-08-26 07:21:01.254516197 +0200
-@@ -54,14 +54,14 @@
- #endif
- #endif
- 
--#if __EXP(INT_MAX) == 0x7fffffffL
--typedef signed int __int32_t;
--typedef unsigned int __uint32_t;
--#define ___int32_t_defined 1
--#elif __EXP(LONG_MAX) == 0x7fffffffL
-+#if __EXP(LONG_MAX) == 0x7fffffffL
- typedef signed long __int32_t;
- typedef unsigned long __uint32_t;
- #define ___int32_t_defined 1
-+#elif __EXP(INT_MAX) == 0x7fffffffL
-+typedef signed int __int32_t;
-+typedef unsigned int __uint32_t;
-+#define ___int32_t_defined 1
- #elif __EXP(SHRT_MAX) == 0x7fffffffL
- typedef signed short __int32_t;
- typedef unsigned short __uint32_t;
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/process.h newlib-1.19.0/newlib/libc/include/process.h
---- newlib-1.19.0.orig/newlib/libc/include/process.h	2002-06-11 04:26:43.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/process.h	2011-08-26 07:21:01.255516185 +0200
-@@ -1,4 +1,5 @@
--/* process.h.  This file comes with MSDOS and WIN32 systems.  */
-+/* process.h.  Define spawn family of functions as provided by Cygwin.
-+   The original file of this name is a MS/DOS invention. */
- 
- #ifndef __PROCESS_H_
- #define __PROCESS_H_
-@@ -7,15 +8,7 @@
- extern "C" {
- #endif
- 
--int execl(const char *path, const char *argv0, ...);
--int execle(const char *path, const char *argv0, ... /*, char * const *envp */);
--int execlp(const char *path, const char *argv0, ...);
--int execlpe(const char *path, const char *argv0, ... /*, char * const *envp */);
--
--int execv(const char *path, char * const *argv);
--int execve(const char *path, char * const *argv, char * const *envp);
--int execvp(const char *path, char * const *argv);
--int execvpe(const char *path, char * const *argv, char * const *envp);
-+/* For the exec functions, include unistd.h. */
- 
- int spawnl(int mode, const char *path, const char *argv0, ...);
- int spawnle(int mode, const char *path, const char *argv0, ... /*, char * const *envp */);
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/signal.h newlib-1.19.0/newlib/libc/include/signal.h
---- newlib-1.19.0.orig/newlib/libc/include/signal.h	2010-07-13 13:18:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/signal.h	2011-08-26 07:21:01.255516185 +0200
-@@ -7,9 +7,6 @@
- _BEGIN_STD_C
- 
- typedef int	sig_atomic_t;		/* Atomic entity type (ANSI) */
--#ifndef _POSIX_SOURCE
--typedef _sig_func_ptr sighandler_t;	/* glibc naming */
--#endif /* !_POSIX_SOURCE */
- 
- #define SIG_DFL ((_sig_func_ptr)0)	/* Default action */
- #define SIG_IGN ((_sig_func_ptr)1)	/* Ignore action */
-@@ -23,6 +20,7 @@
- #ifndef _REENT_ONLY
- _sig_func_ptr _EXFUN(signal, (int, _sig_func_ptr));
- int	_EXFUN(raise, (int));
-+void	_EXFUN(psignal, (int, const char *));
- #endif
- 
- _END_STD_C
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdint.h newlib-1.19.0/newlib/libc/include/stdint.h
---- newlib-1.19.0.orig/newlib/libc/include/stdint.h	2009-04-24 23:55:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/stdint.h	2011-08-26 07:21:01.255516185 +0200
-@@ -33,7 +33,7 @@
- /* Check if "long" is 64bit or 32bit wide */
- #if __STDINT_EXP(LONG_MAX) > 0x7fffffff
- #define __have_long64 1
--#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff && !defined(__SPU__)
-+#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff
- #define __have_long32 1
- #endif
- 
-@@ -49,14 +49,14 @@
- #define __int_least8_t_defined 1
- #endif
- 
--#if __STDINT_EXP(SHRT_MAX) == 0x7fff
--typedef signed short int16_t;
--typedef unsigned short uint16_t;
--#define __int16_t_defined 1
--#elif __STDINT_EXP(INT_MAX) == 0x7fff
-+#if __STDINT_EXP(INT_MAX) == 0x7fff
- typedef signed int int16_t;
- typedef unsigned int uint16_t;
- #define __int16_t_defined 1
-+#elif __STDINT_EXP(SHRT_MAX) == 0x7fff
-+typedef signed short int16_t;
-+typedef unsigned short uint16_t;
-+#define __int16_t_defined 1
- #elif __STDINT_EXP(SCHAR_MAX) == 0x7fff
- typedef signed char int16_t;
- typedef unsigned char uint16_t;
-@@ -239,6 +239,29 @@
-  * GCC doesn't provide an appropriate macro for [u]intptr_t
-  * For now, use __PTRDIFF_TYPE__
-  */
-+#if defined(__SIZEOF_POINTER__)
-+#if __SIZEOF_POINTER__ == 8
-+  typedef int64_t intptr_t;
-+  typedef uint64_t uintptr_t;
-+#define INTPTR_MAX INT64_MAX
-+#define INTPTR_MIN INT64_MIN
-+#define UINTPTR_MAX UINT64_MAX
-+#elif __SIZEOF_POINTER__ == 4
-+  typedef int32_t intptr_t;
-+  typedef uint32_t uintptr_t;
-+#define INTPTR_MAX INT32_MAX
-+#define INTPTR_MIN INT32_MIN
-+#define UINTPTR_MAX UINT32_MAX
-+#elif __SIZEOF_POINTER__ == 2
-+  typedef int16_t intptr_t;
-+  typedef uint16_t uintptr_t;
-+#define INTPTR_MAX INT16_MAX
-+#define INTPTR_MIN INT16_MIN
-+#define UINTPTR_MAX UINT16_MAX
-+#else
-+#error cannot determine intptr_t
-+#endif
-+#else
- #if defined(__PTRDIFF_TYPE__)
- typedef signed __PTRDIFF_TYPE__ intptr_t;
- typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
-@@ -260,6 +283,7 @@
- #define INTPTR_MIN (-__STDINT_EXP(LONG_MAX) - 1)
- #define UINTPTR_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1)
- #endif
-+#endif
- 
- /* Limits of Specified-Width Integer Types */
- 
-@@ -408,6 +432,8 @@
- /* This must match size_t in stddef.h, currently long unsigned int */
- #ifdef __SIZE_MAX__
- #define SIZE_MAX __SIZE_MAX__
-+#elif defined(__SIZEOF_SIZE_T__) && defined(__CHAR_BIT__)
-+#define SIZE_MAX (((1UL << (__SIZEOF_SIZE_T__ * __CHAR_BIT__ - 1)) - 1) * 2 + 1)
- #else
- #define SIZE_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1)
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdio_ext.h newlib-1.19.0/newlib/libc/include/stdio_ext.h
---- newlib-1.19.0.orig/newlib/libc/include/stdio_ext.h	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/stdio_ext.h	2011-08-26 07:21:01.255516185 +0200
-@@ -0,0 +1,22 @@
-+/*
-+ * stdio_ext.h
-+ *
-+ * Definitions for I/O internal operations, originally from Solaris.
-+ */
-+
-+#ifndef _STDIO_EXT_H_
-+#define _STDIO_EXT_H_
-+
-+#ifdef __rtems__
-+#error "<stdio_ext.h> not supported"
-+#endif
-+
-+#include <stdio.h>
-+
-+_BEGIN_STD_C
-+
-+void	 _EXFUN(__fpurge,(FILE *));
-+
-+_END_STD_C
-+
-+#endif /* _STDIO_EXT_H_ */
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdio.h newlib-1.19.0/newlib/libc/include/stdio.h
---- newlib-1.19.0.orig/newlib/libc/include/stdio.h	2010-02-26 10:41:43.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/stdio.h	2011-08-26 07:21:01.255516185 +0200
-@@ -308,7 +308,7 @@
-  * Routines in POSIX 1003.1:2001.
-  */
- 
--#ifndef __STRICT_ANSI__
-+#if (!defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L))
- #ifndef _REENT_ONLY
- FILE *	_EXFUN(fdopen, (int, const char *));
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdlib.h newlib-1.19.0/newlib/libc/include/stdlib.h
---- newlib-1.19.0.orig/newlib/libc/include/stdlib.h	2010-07-19 20:21:11.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/stdlib.h	2011-08-26 07:21:01.256516173 +0200
-@@ -38,7 +38,7 @@
-   long rem; /* remainder */
- } ldiv_t;
- 
--#ifndef __STRICT_ANSI__
-+#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L)
- typedef struct
- {
-   long long int quot; /* quotient */
-@@ -63,13 +63,12 @@
- int	_EXFUN(abs,(int));
- int	_EXFUN(atexit,(_VOID (*__func)(_VOID)));
- double	_EXFUN(atof,(const char *__nptr));
--#ifndef __STRICT_ANSI__
--float	_EXFUN(atoff,(const char *__nptr));
--#endif
- int	_EXFUN(atoi,(const char *__nptr));
--int	_EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
- long	_EXFUN(atol,(const char *__nptr));
-+#ifndef __STRICT_ANSI__
-+int	_EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
- long	_EXFUN(_atol_r,(struct _reent *, const char *__nptr));
-+#endif /* ! __STRICT_ANSI__ */
- _PTR	_EXFUN(bsearch,(const _PTR __key,
- 		       const _PTR __base,
- 		       size_t __nmemb,
-@@ -80,10 +79,10 @@
- _VOID	_EXFUN(exit,(int __status) _ATTRIBUTE ((noreturn)));
- _VOID	_EXFUN_NOTHROW(free,(_PTR));
- char *  _EXFUN(getenv,(const char *__string));
-+#ifndef __STRICT_ANSI__
- char *	_EXFUN(_getenv_r,(struct _reent *, const char *__string));
- char *	_EXFUN(_findenv,(_CONST char *, int *));
- char *	_EXFUN(_findenv_r,(struct _reent *, _CONST char *, int *));
--#ifndef __STRICT_ANSI__
- extern char *suboptarg;			/* getsubopt(3) external variable */
- int	_EXFUN(getsubopt,(char **, char * const *, char **));
- #endif
-@@ -91,16 +90,16 @@
- ldiv_t	_EXFUN(ldiv,(long __numer, long __denom));
- _PTR	_EXFUN_NOTHROW(malloc,(size_t __size));
- int	_EXFUN(mblen,(const char *, size_t));
--int	_EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
- int	_EXFUN(mbtowc,(wchar_t *, const char *, size_t));
--int	_EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
- int	_EXFUN(wctomb,(char *, wchar_t));
--int	_EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *));
- size_t	_EXFUN(mbstowcs,(wchar_t *, const char *, size_t));
--size_t	_EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
- size_t	_EXFUN(wcstombs,(char *, const wchar_t *, size_t));
--size_t	_EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *));
- #ifndef __STRICT_ANSI__
-+int	_EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
-+int	_EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
-+int	_EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *));
-+size_t	_EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
-+size_t	_EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *));
- #ifndef _REENT_ONLY
- char *	_EXFUN(mkdtemp,(char *));
- int	_EXFUN(mkostemp,(char *, int));
-@@ -133,10 +132,11 @@
- # endif
- #endif
- long	_EXFUN(strtol,(const char *__n, char **__end_PTR, int __base));
--long	_EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base));
- unsigned long _EXFUN(strtoul,(const char *__n, char **__end_PTR, int __base));
-+#ifndef __STRICT_ANSI__
- unsigned long _EXFUN(_strtoul_r,(struct _reent *,const char *__n, char **__end_PTR, int __base));
--
-+long	_EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base));
-+#endif /* !__STRICT_ANSI__ */
- int	_EXFUN(system,(const char *__string));
- 
- #ifndef __STRICT_ANSI__
-@@ -163,33 +163,39 @@
- int	_EXFUN(rand_r,(unsigned *__seed));
- 
- double _EXFUN(drand48,(_VOID));
--double _EXFUN(_drand48_r,(struct _reent *));
- double _EXFUN(erand48,(unsigned short [3]));
--double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3]));
- long   _EXFUN(jrand48,(unsigned short [3]));
--long   _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3]));
- _VOID  _EXFUN(lcong48,(unsigned short [7]));
--_VOID  _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
- long   _EXFUN(lrand48,(_VOID));
--long   _EXFUN(_lrand48_r,(struct _reent *));
- long   _EXFUN(mrand48,(_VOID));
--long   _EXFUN(_mrand48_r,(struct _reent *));
- long   _EXFUN(nrand48,(unsigned short [3]));
--long   _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3]));
- unsigned short *
-        _EXFUN(seed48,(unsigned short [3]));
-+_VOID  _EXFUN(srand48,(long));
-+long long _EXFUN(atoll,(const char *__nptr));
-+#ifndef __STRICT_ANSI__
-+double _EXFUN(_drand48_r,(struct _reent *));
-+double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3]));
-+long   _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3]));
-+_VOID  _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
-+long   _EXFUN(_lrand48_r,(struct _reent *));
-+long   _EXFUN(_mrand48_r,(struct _reent *));
-+long   _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3]));
- unsigned short *
-        _EXFUN(_seed48_r,(struct _reent *, unsigned short [3]));
--_VOID  _EXFUN(srand48,(long));
- _VOID  _EXFUN(_srand48_r,(struct _reent *, long));
--long long _EXFUN(atoll,(const char *__nptr));
- long long _EXFUN(_atoll_r,(struct _reent *, const char *__nptr));
-+#endif /* ! __STRICT_ANSI__ */
-+#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L)
- long long _EXFUN(llabs,(long long));
- lldiv_t	_EXFUN(lldiv,(long long __numer, long long __denom));
- long long _EXFUN(strtoll,(const char *__n, char **__end_PTR, int __base));
--long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base));
- unsigned long long _EXFUN(strtoull,(const char *__n, char **__end_PTR, int __base));
-+#endif
-+#ifndef __STRICT_ANSI__
-+long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base));
- unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__n, char **__end_PTR, int __base));
-+#endif /* ! __STRICT_ANSI__ */
- 
- #ifndef __CYGWIN__
- _VOID	_EXFUN(cfree,(_PTR));
-@@ -203,6 +209,7 @@
- 
- #endif /* ! __STRICT_ANSI__ */
- 
-+#ifndef __STRICT_ANSI__
- char *	_EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**));
- #ifndef __CYGWIN__
- _PTR	_EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t));
-@@ -214,6 +221,7 @@
- int	_EXFUN(_system_r,(struct _reent *, const char *));
- 
- _VOID	_EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
-+#endif /* ! __STRICT_ANSI__ */
- 
- /* On platforms where long double equals double.  */
- #ifdef _LDBL_EQ_DBL
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/string.h newlib-1.19.0/newlib/libc/include/string.h
---- newlib-1.19.0.orig/newlib/libc/include/string.h	2008-06-18 17:27:27.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/string.h	2011-08-26 07:21:01.256516173 +0200
-@@ -9,6 +9,7 @@
- 
- #include "_ansi.h"
- #include <sys/reent.h>
-+#include <sys/cdefs.h>
- 
- #define __need_size_t
- #include <stddef.h>
-@@ -49,51 +50,58 @@
- #ifndef __STRICT_ANSI__
- char 	*_EXFUN(strtok_r,(char *, const char *, char **));
- 
--int	 _EXFUN(bcmp,(const void *, const void *, size_t));
--void	 _EXFUN(bcopy,(const void *, void *, size_t));
--void	 _EXFUN(bzero,(void *, size_t));
--int	 _EXFUN(ffs,(int));
--char 	*_EXFUN(index,(const char *, int));
- _PTR	 _EXFUN(memccpy,(_PTR, const _PTR, int, size_t));
- _PTR	 _EXFUN(mempcpy,(_PTR, const _PTR, size_t));
- _PTR	 _EXFUN(memmem, (const _PTR, size_t, const _PTR, size_t));
--char 	*_EXFUN(rindex,(const char *, int));
- char 	*_EXFUN(stpcpy,(char *, const char *));
- char 	*_EXFUN(stpncpy,(char *, const char *, size_t));
--int	 _EXFUN(strcasecmp,(const char *, const char *));
- char	*_EXFUN(strcasestr,(const char *, const char *));
-+char 	*_EXFUN(strchrnul,(const char *, int));
- char 	*_EXFUN(strdup,(const char *));
- char 	*_EXFUN(_strdup_r,(struct _reent *, const char *));
- char 	*_EXFUN(strndup,(const char *, size_t));
- char 	*_EXFUN(_strndup_r,(struct _reent *, const char *, size_t));
--char 	*_EXFUN(strerror_r,(int, char *, size_t));
-+/* There are two common strerror_r variants.  If you request
-+   _GNU_SOURCE, you get the GNU version; otherwise you get the POSIX
-+   version.  POSIX requires that #undef strerror_r will still let you
-+   invoke the underlying function, but that requires gcc support.  */
-+#ifdef _GNU_SOURCE
-+char    *_EXFUN(strerror_r,(int, char *, size_t));
-+#else
-+# ifdef __GNUC__
-+int      _EXFUN(strerror_r,(int, char *, size_t)) __asm__ (__ASMNAME ("__xpg_strerror_r"));
-+# else
-+int      _EXFUN(__xpg_strerror_r,(int, char *, size_t));
-+#  define strerror_r __xpg_strerror_r
-+# endif
-+#endif
- size_t	 _EXFUN(strlcat,(char *, const char *, size_t));
- size_t	 _EXFUN(strlcpy,(char *, const char *, size_t));
--int	 _EXFUN(strncasecmp,(const char *, const char *, size_t));
- size_t	 _EXFUN(strnlen,(const char *, size_t));
- char 	*_EXFUN(strsep,(char **, const char *));
- char	*_EXFUN(strlwr,(char *));
- char	*_EXFUN(strupr,(char *));
-+char	*_EXFUN(strsignal, (int __signo));
- #ifdef __CYGWIN__
--#ifndef DEFS_H	/* Kludge to work around problem compiling in gdb */
--char  *_EXFUN(strsignal, (int __signo));
--#endif
- int     _EXFUN(strtosigno, (const char *__name));
- #endif
- 
--/* These function names are used on Windows and perhaps other systems.  */
--#ifndef strcmpi
--#define strcmpi strcasecmp
--#endif
--#ifndef stricmp
--#define stricmp strcasecmp
--#endif
--#ifndef strncmpi
--#define strncmpi strncasecmp
--#endif
--#ifndef strnicmp
--#define strnicmp strncasecmp
--#endif
-+/* Recursive version of strerror.  */
-+char *	_EXFUN(_strerror_r, (struct _reent *, int, int, int *));
-+
-+#if defined _GNU_SOURCE && defined __GNUC__
-+#define strdupa(__s) \
-+	(__extension__ ({const char *__in = (__s); \
-+			 size_t __len = strlen (__in) + 1; \
-+			 char * __out = (char *) __builtin_alloca (__len); \
-+			 (char *) memcpy (__out, __in, __len);}))
-+#define strndupa(__s, __n) \
-+	(__extension__ ({const char *__in = (__s); \
-+			 size_t __len = strnlen (__in, (__n)) + 1; \
-+			 char *__out = (char *) __builtin_alloca (__len); \
-+			 __out[__len-1] = '\0'; \
-+			 (char *) memcpy (__out, __in, __len-1);}))
-+#endif /* _GNU_SOURCE && __GNUC__ */
- 
- #endif /* ! __STRICT_ANSI__ */
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/cdefs.h newlib-1.19.0/newlib/libc/include/sys/cdefs.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/cdefs.h	2002-06-20 21:51:24.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/cdefs.h	2011-08-26 07:21:01.256516173 +0200
-@@ -58,6 +58,27 @@
- #define __DOTS    	, ...
- #define __THROW
- 
-+/*
-+ * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
-+ * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
-+ * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI
-+ * mode -- there must be no spaces between its arguments, and for nested
-+ * __CONCAT's, all the __CONCAT's must be at the left.  __CONCAT can also
-+ * concatenate double-quoted strings produced by the __STRING macro, but
-+ * this only works with ANSI C.
-+ *
-+ * __XSTRING is like __STRING, but it expands any macros in its argument
-+ * first.  It is only available with ANSI C.
-+ */
-+#define __CONCAT1(x,y)  x ## y
-+#define __CONCAT(x,y)   __CONCAT1(x,y)
-+#define __STRING(x)     #x              /* stringify without expanding x */
-+#define __XSTRING(x)    __STRING(x)     /* expand x, then stringify */
-+
-+#ifdef __GNUC__
-+# define __ASMNAME(cname)  __XSTRING (__USER_LABEL_PREFIX__) cname
-+#endif
-+
- #define __ptr_t void *
- #define __long_double_t  long double
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/_default_fcntl.h newlib-1.19.0/newlib/libc/include/sys/_default_fcntl.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/_default_fcntl.h	2010-01-14 19:49:13.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/sys/_default_fcntl.h	2011-08-26 07:21:01.256516173 +0200
-@@ -51,8 +51,6 @@
- #define O_BINARY	_FBINARY
- #define O_TEXT		_FTEXT
- #define O_NOINHERIT	_FNOINHERIT
--/* O_CLOEXEC is the Linux equivalent to O_NOINHERIT */
--#define O_CLOEXEC	_FNOINHERIT
- 
- /* The windows header files define versions with a leading underscore.  */
- #define _O_RDONLY	O_RDONLY
-@@ -124,9 +122,6 @@
- #define	F_CNVT 		12	/* Convert a fhandle to an open fd */
- #define	F_RSETLKW 	13	/* Set or Clear remote record-lock(Blocking) */
- #endif	/* !_POSIX_SOURCE */
--#ifdef __CYGWIN__
--#define	F_DUPFD_CLOEXEC	14	/* As F_DUPFD, but set close-on-exec flag */
--#endif
- 
- /* fcntl(2) flags (l_type field of flock structure) */
- #define	F_RDLCK		1	/* read lock */
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/dir.h newlib-1.19.0/newlib/libc/include/sys/dir.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/dir.h	2010-08-11 20:14:54.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/dir.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,10 +0,0 @@
--/* BSD predecessor of POSIX.1 <dirent.h> and struct dirent */
--
--#ifndef _SYS_DIR_H_
--#define _SYS_DIR_H_
--
--#include <dirent.h>
--
--#define direct dirent
--
--#endif /*_SYS_DIR_H_*/
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/features.h newlib-1.19.0/newlib/libc/include/sys/features.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/features.h	2010-08-09 10:29:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/features.h	2011-08-26 07:21:01.260516170 +0200
-@@ -15,7 +15,7 @@
-  *  OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS
-  *  SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
-  *
-- *  $Id$
-+ *  $Id$
-  */
- 
- #ifndef _SYS_FEATURES_H
-@@ -102,8 +102,8 @@
- /* #define _POSIX_ASYNCHRONOUS_IO		    -1 */
- /* #define _POSIX_BARRIERS			    -1 */
- #define _POSIX_CHOWN_RESTRICTED			     1
--/* #define _POSIX_CLOCK_SELECTION		    -1 */
--/* #define _POSIX_CPUTIME			    -1 */
-+#define _POSIX_CLOCK_SELECTION			200112L
-+#define _POSIX_CPUTIME			    	200112L
- #define _POSIX_FSYNC				200112L
- #define _POSIX_IPV6				200112L
- #define _POSIX_JOB_CONTROL			     1
-@@ -125,12 +125,12 @@
- #define _POSIX_SHARED_MEMORY_OBJECTS		200112L 
- #define _POSIX_SHELL				     1
- /* #define _POSIX_SPAWN				    -1 */
--/* #define _POSIX_SPIN_LOCKS			    -1 */
-+#define _POSIX_SPIN_LOCKS			    200112L
- /* #define _POSIX_SPORADIC_SERVER		    -1 */
- #define _POSIX_SYNCHRONIZED_IO			200112L
--/* #define _POSIX_THREAD_ATTR_STACKADDR		    -1 */
-+#define _POSIX_THREAD_ATTR_STACKADDR		200112L
- #define _POSIX_THREAD_ATTR_STACKSIZE		200112L
--/* #define _POSIX_THREAD_CPUTIME		    -1 */
-+#define _POSIX_THREAD_CPUTIME			200112L
- /* #define _POSIX_THREAD_PRIO_INHERIT		    -1 */
- /* #define _POSIX_THREAD_PRIO_PROTECT		    -1 */
- #define _POSIX_THREAD_PRIORITY_SCHEDULING	200112L
-@@ -178,6 +178,12 @@
- /* #define _XOPEN_UNIX				    -1 */
- 
- #endif /* !__STRICT_ANSI__ || __cplusplus || __STDC_VERSION__ >= 199901L */
-+
-+/* The value corresponds to UNICODE version 4.0, which is the version
-+   supported by XP.  Newlib supports 5.2 (2011) but so far Cygwin needs
-+   the MS conversions for double-byte charsets. */
-+#define __STDC_ISO_10646__ 200305L
-+
- #endif /* __CYGWIN__ */
- 
- /* Per the permission given in POSIX.1-2008 section 2.2.1, define
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/signal.h newlib-1.19.0/newlib/libc/include/sys/signal.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/signal.h	2009-10-13 19:31:49.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/signal.h	2011-08-26 07:21:01.261516175 +0200
-@@ -76,11 +76,12 @@
-  *
-  *  (1) Routines stored in sa_handler should take a single int as
-  *      their argument although the POSIX standard does not require this.
-+ *      This is not longer true since at least POSIX.1-2008
-  *  (2) The fields sa_handler and sa_sigaction may overlap, and a conforming
-  *      application should not use both simultaneously.
-  */
- 
--typedef void (*_sig_func_ptr)();
-+typedef void (*_sig_func_ptr)(int);
- 
- struct sigaction {
-   int         sa_flags;       /* Special flags to affect behavior of signal */
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/types.h newlib-1.19.0/newlib/libc/include/sys/types.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/types.h	2010-12-08 15:44:06.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/sys/types.h	2011-08-26 07:21:01.261516175 +0200
-@@ -98,6 +98,7 @@
- 
- typedef	unsigned short	ushort;		/* System V compatibility */
- typedef	unsigned int	uint;		/* System V compatibility */
-+typedef	unsigned long	ulong;		/* System V compatibility */
- # endif	/*!_POSIX_SOURCE */
- 
- #ifndef __clock_t_defined
-@@ -300,39 +301,6 @@
- #define PTHREAD_CREATE_DETACHED 0
- #define PTHREAD_CREATE_JOINABLE  1
- 
--#if defined(__XMK__) || defined(__rtems__)
--/* The following defines are part of the X/Open System Interface (XSI). */
--
--/* This type of mutex does not detect deadlock. A thread attempting to relock this mutex without first unlocking 
-- * it shall deadlock. Attempting to unlock a mutex locked by a different thread results in undefined behavior. 
-- * Attempting to unlock an unlocked mutex results in undefined behavior. 
-- */
--#define PTHREAD_MUTEX_NORMAL  1
--
--/* 
-- * This type of mutex provides error checking. A thread attempting to relock this mutex without first unlocking 
-- * it shall return with an error. A thread attempting to unlock a mutex which another thread has locked shall return 
-- * with an error. A thread attempting to unlock an unlocked mutex shall return with an error. 
-- */
--#define PTHREAD_MUTEX_ERRORCHECK  2 
--
--/* A thread attempting to relock this mutex without first unlocking it shall succeed in locking the mutex. 
-- * The relocking deadlock which can occur with mutexes of type PTHREAD_MUTEX_NORMAL cannot occur with this type of mutex. 
-- * Multiple locks of this mutex shall require the same number of unlocks to release the mutex before another thread can 
-- * acquire the mutex. A thread attempting to unlock a mutex which another thread has locked shall return with an error. 
-- * A thread attempting to unlock an unlocked mutex shall return with an error. 
-- */
--#define PTHREAD_MUTEX_RECURSIVE  3
--
--/* Attempting to recursively lock a mutex of this type results in undefined behavior. Attempting to unlock a 
-- * mutex of this type which was not locked by the calling thread results in undefined behavior. Attempting to 
-- * unlock a mutex of this type which is not locked results in undefined behavior. An implementation may map this 
-- * mutex to one of the other mutex types.
-- */
--#define PTHREAD_MUTEX_DEFAULT  4 
--
--#endif /* defined(__XMK__) || defined(__rtems__) */
--
- #if defined(__XMK__)
- typedef struct pthread_attr_s {
-   int contentionscope;
-@@ -390,12 +358,49 @@
- 
- /* Values for mutex type */
- 
-+/* The following defines are part of the X/Open System Interface (XSI). */
-+
-+/*
-+ * This type of mutex does not detect deadlock. A thread attempting to
-+ * relock this mutex without first unlocking it shall deadlock. Attempting
-+ * to unlock a mutex locked by a different thread results in undefined
-+ * behavior.  Attempting to unlock an unlocked mutex results in undefined
-+ * behavior.
-+ */
- #define PTHREAD_MUTEX_NORMAL     0
-+
-+/*
-+ * A thread attempting to relock this mutex without first unlocking
-+ * it shall succeed in locking the mutex.  The relocking deadlock which
-+ * can occur with mutexes of type PTHREAD_MUTEX_NORMAL cannot occur with
-+ * this type of mutex.  Multiple locks of this mutex shall require the
-+ * same number of unlocks to release the mutex before another thread can
-+ * acquire the mutex. A thread attempting to unlock a mutex which another
-+ * thread has locked shall return with an error.  A thread attempting to
-+ * unlock an unlocked mutex shall return with an error.
-+ */
- #define PTHREAD_MUTEX_RECURSIVE  1
-+
-+/* 
-+ * This type of mutex provides error checking. A thread attempting
-+ * to relock this mutex without first unlocking it shall return with an
-+ * error. A thread attempting to unlock a mutex which another thread has
-+ * locked shall return with an error. A thread attempting to unlock an
-+ * unlocked mutex shall return with an error.
-+ */
- #define PTHREAD_MUTEX_ERRORCHECK 2
-+
-+/*
-+ * Attempting to recursively lock a mutex of this type results
-+ * in undefined behavior. Attempting to unlock a mutex of this type
-+ * which was not locked by the calling thread results in undefined
-+ * behavior. Attempting to unlock a mutex of this type which is not locked
-+ * results in undefined behavior. An implementation may map this mutex to
-+ * one of the other mutex types.
-+ */
- #define PTHREAD_MUTEX_DEFAULT    3
- 
--#endif
-+#endif /* !defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES) */
- 
- #if defined(__XMK__)
- typedef unsigned int pthread_mutex_t;    /* identify a mutex */
-@@ -462,13 +467,13 @@
- 
- /* POSIX Spin Lock Types */
- 
-+#if !defined (__CYGWIN__)
- #if defined(_POSIX_SPIN_LOCKS)
- typedef __uint32_t pthread_spinlock_t;        /* POSIX Spin Lock Object */
- #endif /* defined(_POSIX_SPIN_LOCKS) */
- 
- /* POSIX Reader/Writer Lock Types */
- 
--#if !defined (__CYGWIN__)
- #if defined(_POSIX_READER_WRITER_LOCKS)
- typedef __uint32_t pthread_rwlock_t;         /* POSIX RWLock Object */
- typedef struct {
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/unistd.h newlib-1.19.0/newlib/libc/include/sys/unistd.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/unistd.h	2010-10-08 17:28:49.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/unistd.h	2011-08-26 07:21:01.261516175 +0200
-@@ -46,6 +46,9 @@
- int     _EXFUN(execl, (const char *__path, const char *, ... ));
- int     _EXFUN(execle, (const char *__path, const char *, ... ));
- int     _EXFUN(execlp, (const char *__file, const char *, ... ));
-+#if defined(__CYGWIN__)
-+int     _EXFUN(execlpe, (const char *__file, const char *, ... ));
-+#endif
- int     _EXFUN(execv, (const char *__path, char * const __argv[] ));
- int     _EXFUN(execve, (const char *__path, char * const __argv[], char * const __envp[] ));
- int     _EXFUN(execvp, (const char *__file, char * const __argv[] ));
-@@ -487,10 +490,11 @@
- #define _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS       16
- #define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS    17
- #define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS    _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS
-+#define _CS_XBS5_WIDTH_RESTRICTED_ENVS        _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS
- #define _CS_POSIX_V7_THREADS_CFLAGS           18
- #define _CS_POSIX_V7_THREADS_LDFLAGS          19
- #define _CS_V7_ENV                            20
--#define _CS_V6_ENV                           _CS_V6_ENV
-+#define _CS_V6_ENV                            _CS_V7_ENV
- #endif
- 
- #ifndef __CYGWIN__
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/time.h newlib-1.19.0/newlib/libc/include/time.h
---- newlib-1.19.0.orig/newlib/libc/include/time.h	2008-10-16 23:53:58.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/time.h	2011-08-26 07:21:01.261516175 +0200
-@@ -175,6 +175,22 @@
- #endif
- #endif /* _POSIX_TIMERS */
- 
-+#if defined(_POSIX_CLOCK_SELECTION)
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+int _EXFUN(clock_nanosleep,
-+  (clockid_t clock_id, int flags, const struct timespec *rqtp,
-+   struct timespec *rmtp));
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _POSIX_CLOCK_SELECTION */
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -212,7 +228,7 @@
-    the identifier of the CPU_time clock associated with the PROCESS
-    making the function call.  */
- 
--#define CLOCK_PROCESS_CPUTIME (clockid_t)2
-+#define CLOCK_PROCESS_CPUTIME_ID (clockid_t)2
- 
- #endif
- 
-@@ -222,7 +238,7 @@
-     the identifier of the CPU_time clock associated with the THREAD
-     making the function call.  */
- 
--#define CLOCK_THREAD_CPUTIME (clockid_t)3
-+#define CLOCK_THREAD_CPUTIME_ID (clockid_t)3
- 
- #endif
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/wchar.h newlib-1.19.0/newlib/libc/include/wchar.h
---- newlib-1.19.0.orig/newlib/libc/include/wchar.h	2009-10-15 10:23:27.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/wchar.h	2011-08-26 07:21:01.262516186 +0200
-@@ -16,6 +16,9 @@
- /* For _mbstate_t definition. */
- #include <sys/_types.h>
- 
-+/* For __STDC_ISO_10646__ */
-+#include <sys/features.h>
-+
- #ifndef NULL
- #define NULL	0
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/locale/lmessages.c newlib-1.19.0/newlib/libc/locale/lmessages.c
---- newlib-1.19.0.orig/newlib/libc/locale/lmessages.c	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/locale/lmessages.c	2011-08-26 07:21:01.262516186 +0200
-@@ -42,9 +42,9 @@
- 	"^[nN]" ,	/* noexpr */
- 	"yes" , 	/* yesstr */
- 	"no"		/* nostr */
--	"ASCII"		/* codeset */
- #ifdef __HAVE_LOCALE_INFO_EXTENDED__
--	, L"^[yY]" ,	/* wyesexpr */
-+	, "ASCII" ,	/* codeset */
-+	L"^[yY]" ,	/* wyesexpr */
- 	L"^[nN]" ,	/* wnoexpr */
- 	L"yes" , 	/* wyesstr */
- 	L"no"		/* wnostr */
-diff -Naur newlib-1.19.0.orig/newlib/libc/locale/lmessages.h newlib-1.19.0/newlib/libc/locale/lmessages.h
---- newlib-1.19.0.orig/newlib/libc/locale/lmessages.h	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/locale/lmessages.h	2011-08-26 07:21:01.262516186 +0200
-@@ -50,7 +50,7 @@
- };
- 
- struct lc_messages_T *__get_current_messages_locale(void);
--int __numeric_load_locale(const char *, void *, const char *);
-+int __messages_load_locale(const char *, void *, const char *);
- 
- __END_DECLS
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/locale/locale.c newlib-1.19.0/newlib/libc/locale/locale.c
---- newlib-1.19.0.orig/newlib/libc/locale/locale.c	2010-11-19 11:02:36.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/locale/locale.c	2011-08-26 07:21:01.262516186 +0200
-@@ -182,6 +182,7 @@
- #include "lmonetary.h"
- #include "lnumeric.h"
- #include "lctype.h"
-+#include "timelocal.h"
- #include "../stdlib/local.h"
- 
- #define _LC_LAST      7
-@@ -235,7 +236,11 @@
- static char current_categories[_LC_LAST][ENCODING_LEN + 1] = {
-     "C",
-     "C",
-+#ifdef __CYGWIN__ /* Cygwin starts with LC_CTYPE set to "C.UTF-8". */
-+    "C.UTF-8",
-+#else
-     "C",
-+#endif
-     "C",
-     "C",
-     "C",
-@@ -255,13 +260,12 @@
- 
- #endif /* _MB_CAPABLE */
- 
--#if 0 /*def __CYGWIN__  TODO: temporarily(?) disable C == UTF-8 */
-+#ifdef __CYGWIN__
- static char lc_ctype_charset[ENCODING_LEN + 1] = "UTF-8";
--static char lc_message_charset[ENCODING_LEN + 1] = "UTF-8";
- #else
- static char lc_ctype_charset[ENCODING_LEN + 1] = "ASCII";
--static char lc_message_charset[ENCODING_LEN + 1] = "ASCII";
- #endif
-+static char lc_message_charset[ENCODING_LEN + 1] = "ASCII";
- static int lc_ctype_cjk_lang = 0;
- 
- char *
-@@ -432,7 +436,7 @@
- #ifdef _MB_CAPABLE
- #ifdef __CYGWIN__
- extern void __set_charset_from_locale (const char *locale, char *charset);
--extern int __set_locale_from_locale_alias (const char *, char *);
-+extern char *__set_locale_from_locale_alias (const char *, char *);
- extern int __collate_load_locale (const char *, void *, const char *);
- #endif /* __CYGWIN__ */
- 
-@@ -495,11 +499,7 @@
-   if (!strcmp (locale, "POSIX"))
-     strcpy (locale, "C");
-   if (!strcmp (locale, "C"))				/* Default "C" locale */
--#if 0 /*def __CYGWIN__  TODO: temporarily(?) disable C == UTF-8 */
--    strcpy (charset, "UTF-8");
--#else
-     strcpy (charset, "ASCII");
--#endif
-   else if (locale[0] == 'C'
- 	   && (locale[1] == '-'		/* Old newlib style */
- 	       || locale[1] == '.'))	/* Extension for the C locale to allow
-@@ -952,7 +952,7 @@
- _DEFUN_VOID(__locale_msgcharset)
- {
- #ifdef __HAVE_LOCALE_INFO__
--  return __get_current_messages_locale ()->codeset;
-+  return (char *) __get_current_messages_locale ()->codeset;
- #else
-   return lc_message_charset;
- #endif
-@@ -972,21 +972,21 @@
-   if (__nlocale_changed)
-     {
-       struct lc_numeric_T *n = __get_current_numeric_locale ();
--      lconv.decimal_point = n->decimal_point;
--      lconv.thousands_sep = n->thousands_sep;
--      lconv.grouping = n->grouping;
-+      lconv.decimal_point = (char *) n->decimal_point;
-+      lconv.thousands_sep = (char *) n->thousands_sep;
-+      lconv.grouping = (char *) n->grouping;
-       __nlocale_changed = 0;
-     }
-   if (__mlocale_changed)
-     {
-       struct lc_monetary_T *m = __get_current_monetary_locale ();
--      lconv.int_curr_symbol = m->int_curr_symbol;
--      lconv.currency_symbol = m->currency_symbol;
--      lconv.mon_decimal_point = m->mon_decimal_point;
--      lconv.mon_thousands_sep = m->mon_thousands_sep;
--      lconv.mon_grouping = m->mon_grouping;
--      lconv.positive_sign = m->positive_sign;
--      lconv.negative_sign = m->negative_sign;
-+      lconv.int_curr_symbol = (char *) m->int_curr_symbol;
-+      lconv.currency_symbol = (char *) m->currency_symbol;
-+      lconv.mon_decimal_point = (char *) m->mon_decimal_point;
-+      lconv.mon_thousands_sep = (char *) m->mon_thousands_sep;
-+      lconv.mon_grouping = (char *) m->mon_grouping;
-+      lconv.positive_sign = (char *) m->positive_sign;
-+      lconv.negative_sign = (char *) m->negative_sign;
-       lconv.int_frac_digits = m->int_frac_digits[0];
-       lconv.frac_digits = m->frac_digits[0];
-       lconv.p_cs_precedes = m->p_cs_precedes[0];
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/configure newlib-1.19.0/newlib/libc/machine/configure
---- newlib-1.19.0.orig/newlib/libc/machine/configure	2010-12-16 22:58:42.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/configure	2011-08-26 07:21:01.266516201 +0200
-@@ -651,6 +651,7 @@
- ELIX_LEVEL_0_FALSE
- ELIX_LEVEL_0_TRUE
- LDFLAGS
-+NO_INCLUDE_LIST
- NEWLIB_CFLAGS
- CCASFLAGS
- CCAS
-@@ -816,7 +817,6 @@
- w65
- x86_64
- xc16x
--xscale
- xstormy16
- z8k'
- 
-@@ -3694,6 +3694,9 @@
- NEWLIB_CFLAGS=${newlib_cflags}
- 
- 
-+NO_INCLUDE_LIST=${noinclude}
-+
-+
- LDFLAGS=${ldflags}
- 
- 
-@@ -9660,10 +9663,6 @@
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
--      ld_shlibs=no
--      ;;
--
-     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-     # support.  Future versions do this automatically, but an explicit c++rt0.o
-     # does not break anything, and helps significantly (at the cost of a little
-@@ -10582,10 +10581,6 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -11445,7 +11440,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11448 "configure"
-+#line 11443 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11551,7 +11546,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11554 "configure"
-+#line 11549 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11878,8 +11873,6 @@
-  ;;
- 	xc16x) subdirs="$subdirs xc16x"
-  ;;
--	xscale) subdirs="$subdirs xscale"
-- ;;
- 	xstormy16) subdirs="$subdirs xstormy16"
-  ;;
- 	z8k) subdirs="$subdirs z8k"
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/configure.in newlib-1.19.0/newlib/libc/machine/configure.in
---- newlib-1.19.0.orig/newlib/libc/machine/configure.in	2010-12-02 20:30:47.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/configure.in	2011-08-26 07:21:01.267516210 +0200
-@@ -65,7 +65,6 @@
- 	w65) AC_CONFIG_SUBDIRS(w65) ;;
- 	x86_64) AC_CONFIG_SUBDIRS(x86_64) ;;
- 	xc16x) AC_CONFIG_SUBDIRS(xc16x) ;;
--	xscale) AC_CONFIG_SUBDIRS(xscale) ;;
- 	xstormy16) AC_CONFIG_SUBDIRS(xstormy16) ;;
- 	z8k) AC_CONFIG_SUBDIRS(z8k) ;;
-   esac;
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/frv/setjmp.S newlib-1.19.0/newlib/libc/machine/frv/setjmp.S
---- newlib-1.19.0.orig/newlib/libc/machine/frv/setjmp.S	2002-06-18 23:20:28.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/machine/frv/setjmp.S	2011-08-26 07:21:01.267516210 +0200
-@@ -123,4 +123,4 @@
- 	cmov	gr9, gr8, cc4, 1
- 	ret
- .Lend2:
--	.size	EXT(longjmp),.Lend2-EXT(longjmp2)
-+	.size	EXT(longjmp),.Lend2-EXT(longjmp)
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S
---- newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S	2010-02-08 18:24:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S	2011-08-26 07:21:01.267516210 +0200
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mcpu32__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/mips/strlen.c newlib-1.19.0/newlib/libc/machine/mips/strlen.c
---- newlib-1.19.0.orig/newlib/libc/machine/mips/strlen.c	2002-03-14 03:41:43.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/mips/strlen.c	2011-08-26 07:21:01.267516210 +0200
-@@ -60,6 +60,9 @@
- 	"	addiu	$2,$4,1\n"
- 	"\n"
- 	"1:	lbu	$3,0($4)\n"
-+#if defined(_R3000)
-+	"	nop	\n"
-+#endif
- 	"	bnez	$3,1b\n"
- 	"	addiu	$4,$4,1\n"
- 	"\n"
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.am newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.am	2007-05-24 19:33:35.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.am	2011-08-26 07:21:01.267516210 +0200
-@@ -10,7 +10,7 @@
- 
- AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
- 
--lib_a_SOURCES = setjmp.S times.c
-+lib_a_SOURCES = setjmp.S
- lib_a_CCASFLAGS=$(AM_CCASFLAGS)
- lib_a_CFLAGS=$(AM_CFLAGS)
- lib_a_LIBADD = @extra_objs@
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.in newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.in	2011-07-20 08:45:15.913332235 +0200
-+++ newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.in	2011-08-26 07:21:01.268516216 +0200
-@@ -51,7 +51,7 @@
- LIBRARIES = $(noinst_LIBRARIES)
- ARFLAGS = cru
- lib_a_AR = $(AR) $(ARFLAGS)
--am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-times.$(OBJEXT)
-+am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT)
- lib_a_OBJECTS = $(am_lib_a_OBJECTS)
- DEFAULT_INCLUDES = -I. at am__isrc@
- depcomp =
-@@ -174,7 +174,7 @@
- AM_CCASFLAGS = $(INCLUDES)
- noinst_LIBRARIES = lib.a
- AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
--lib_a_SOURCES = setjmp.S times.c
-+lib_a_SOURCES = setjmp.S
- lib_a_CCASFLAGS = $(AM_CCASFLAGS)
- lib_a_CFLAGS = $(AM_CFLAGS)
- lib_a_LIBADD = @extra_objs@
-@@ -185,7 +185,7 @@
- all: all-am
- 
- .SUFFIXES:
--.SUFFIXES: .S .c .o .obj
-+.SUFFIXES: .S .o .obj
- am--refresh:
- 	@:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-@@ -246,18 +246,6 @@
- lib_a-setjmp.obj: setjmp.S
- 	$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi`
- 
--.c.o:
--	$(COMPILE) -c $<
--
--.c.obj:
--	$(COMPILE) -c `$(CYGPATH_W) '$<'`
--
--lib_a-times.o: times.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.o `test -f 'times.c' || echo '$(srcdir)/'`times.c
--
--lib_a-times.obj: times.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.obj `if test -f 'times.c'; then $(CYGPATH_W) 'times.c'; else $(CYGPATH_W) '$(srcdir)/times.c'; fi`
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/times.c newlib-1.19.0/newlib/libc/machine/powerpc/times.c
---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/times.c	2002-07-22 22:26:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/machine/powerpc/times.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,36 +0,0 @@
--/* Time support routines for PowerPC.
-- *
-- * Written by Aldy Hernandez.
-- */
--
--#include <_ansi.h>
--#include <reent.h>
--#include <sys/time.h>
--#include <sys/times.h>
--#include <sys/resource.h>
--
--clock_t
--times (struct tms *tp)
--{
--  struct rusage usage;
--  union {
--    struct rusage r;
--    /* Newlib's rusage has only 2 fields.  We need to make room for
--       when we call the system's rusage.  This should be enough.  */
--    int filler[32];
--  } host_ru;
--
--  getrusage (RUSAGE_SELF, (void *)&host_ru);
--
--  if (tp)
--    {
--      tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000
--	+ host_ru.r.ru_utime.tv_usec;
--      tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000
--	+ host_ru.r.ru_stime.tv_usec;
--      tp->tms_cutime = 0;	/* user time, children */
--      tp->tms_cstime = 0;	/* system time, children */
--    }
--
--  return tp->tms_utime;
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/Makefile.am newlib-1.19.0/newlib/libc/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/Makefile.am	2010-05-07 01:25:16.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/Makefile.am	2011-08-26 07:21:01.250516213 +0200
-@@ -36,6 +36,8 @@
- 
- if HAVE_XDR_DIR
- XDR_SUBDIR = xdr
-+rpcincludedir = $(tooldir)
-+nobase_rpcinclude_HEADERS = include/rpc/xdr.h include/rpc/types.h
- endif
- 
- # The order of SUBDIRS is important for the integrated documentation.
-@@ -140,8 +142,7 @@
- 	locale/stmp-def \
- 	reent/stmp-def \
- 	$(LIBC_EXTRA_DEF) \
--	misc/stmp-def \
--	posix/stmp-def
-+	misc/stmp-def
- 
- libc.info: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \
- 	targetdep.tex $(SUBDEFS)
-diff -Naur newlib-1.19.0.orig/newlib/libc/Makefile.in newlib-1.19.0/newlib/libc/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/Makefile.in	2011-07-20 08:45:15.822330771 +0200
-+++ newlib-1.19.0/newlib/libc/Makefile.in	2011-08-26 07:21:01.250516213 +0200
-@@ -17,6 +17,7 @@
- 
- 
- 
-+
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -39,7 +40,8 @@
- subdir = .
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(top_srcdir)/configure $(am__configure_deps) \
--	$(srcdir)/../../mkinstalldirs $(libc_TEXINFOS)
-+	$(srcdir)/../../mkinstalldirs $(libc_TEXINFOS) \
-+	$(am__nobase_rpcinclude_HEADERS_DIST)
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \
- 	$(top_srcdir)/../../ltoptions.m4 \
-@@ -155,6 +157,10 @@
-   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- DATA = $(noinst_DATA)
-+am__nobase_rpcinclude_HEADERS_DIST = include/rpc/xdr.h \
-+	include/rpc/types.h
-+am__installdirs = "$(DESTDIR)$(rpcincludedir)"
-+HEADERS = $(nobase_rpcinclude_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -319,6 +325,8 @@
- @ENABLE_NEWLIB_ICONV_FALSE at NEWLIB_ICONV_LIBS = 
- @ENABLE_NEWLIB_ICONV_TRUE at NEWLIB_ICONV_LIBS = iconv/ces/lib.$(aext) iconv/ccs/lib.$(aext) iconv/lib/lib.$(aext)
- @HAVE_XDR_DIR_TRUE at XDR_SUBDIR = xdr
-+ at HAVE_XDR_DIR_TRUE@rpcincludedir = $(tooldir)
-+ at HAVE_XDR_DIR_TRUE@nobase_rpcinclude_HEADERS = include/rpc/xdr.h include/rpc/types.h
- 
- # The order of SUBDIRS is important for the integrated documentation.
- # Do not change the order without considering the doc impact.
-@@ -396,8 +404,7 @@
- 	locale/stmp-def \
- 	reent/stmp-def \
- 	$(LIBC_EXTRA_DEF) \
--	misc/stmp-def \
--	posix/stmp-def
-+	misc/stmp-def
- 
- info_TEXINFOS = libc.texinfo
- libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \
-@@ -638,6 +645,29 @@
- 	done
- 
- clean-info: mostlyclean-aminfo clean-aminfo
-+install-nobase_rpcincludeHEADERS: $(nobase_rpcinclude_HEADERS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(rpcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(rpcincludedir)"
-+	@list='$(nobase_rpcinclude_HEADERS)'; test -n "$(rpcincludedir)" || list=; \
-+	$(am__nobase_list) | while read dir files; do \
-+	  xfiles=; for file in $$files; do \
-+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-+	  test -z "$$xfiles" || { \
-+	    test "x$$dir" = x. || { \
-+	      echo "$(MKDIR_P) '$(DESTDIR)$(rpcincludedir)/$$dir'"; \
-+	      $(MKDIR_P) "$(DESTDIR)$(rpcincludedir)/$$dir"; }; \
-+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(rpcincludedir)/$$dir'"; \
-+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(rpcincludedir)/$$dir" || exit $$?; }; \
-+	done
-+
-+uninstall-nobase_rpcincludeHEADERS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(nobase_rpcinclude_HEADERS)'; test -n "$(rpcincludedir)" || list=; \
-+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(rpcincludedir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(rpcincludedir)" && rm -f $$files
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -775,9 +805,12 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- check-am:
- check: check-recursive
--all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) $(HEADERS)
- installdirs: installdirs-recursive
- installdirs-am:
-+	for dir in "$(DESTDIR)$(rpcincludedir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -827,7 +860,7 @@
- 
- info-am: $(INFO_DEPS)
- 
--install-data-am:
-+install-data-am: install-nobase_rpcincludeHEADERS
- 
- install-dvi: install-dvi-recursive
- 
-@@ -952,7 +985,8 @@
- ps-am: $(PSS)
- 
- uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
--	uninstall-pdf-am uninstall-ps-am
-+	uninstall-nobase_rpcincludeHEADERS uninstall-pdf-am \
-+	uninstall-ps-am
- 
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- 	install-am install-strip tags-recursive
-@@ -966,14 +1000,16 @@
- 	info-am install install-am install-data install-data-am \
- 	install-dvi install-dvi-am install-exec install-exec-am \
- 	install-html install-html-am install-info install-info-am \
--	install-man install-pdf install-pdf-am install-ps \
--	install-ps-am install-strip installcheck installcheck-am \
--	installdirs installdirs-am maintainer-clean \
--	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
--	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-dvi-am uninstall-html-am \
--	uninstall-info-am uninstall-pdf-am uninstall-ps-am
-+	install-man install-nobase_rpcincludeHEADERS install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs installdirs-am \
-+	maintainer-clean maintainer-clean-aminfo \
-+	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	uninstall-dvi-am uninstall-html-am uninstall-info-am \
-+	uninstall-nobase_rpcincludeHEADERS uninstall-pdf-am \
-+	uninstall-ps-am
- 
- @USE_LIBTOOL_FALSE at libc.a: $(SUBLIBS)
- @USE_LIBTOOL_FALSE@	rm -f $@
-diff -Naur newlib-1.19.0.orig/newlib/libc/misc/__dprintf.c newlib-1.19.0/newlib/libc/misc/__dprintf.c
---- newlib-1.19.0.orig/newlib/libc/misc/__dprintf.c	2008-12-11 18:27:55.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/misc/__dprintf.c	2011-08-26 07:21:01.268516216 +0200
-@@ -5,6 +5,7 @@
- */
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include "ctype.h"
- #include "reent.h"
- #include "string.h"
-@@ -131,7 +132,7 @@
- 	      write_string (unctrl (c));
- 	      break;
- 	    case 'p' :
--	      l = (_POINTER_INT) va_arg (args, char *);
-+	      l = (intptr_t) va_arg (args, char *);
- 	      print_number (16, 1, l);
- 	      break;
- 	    case 'd' :
-diff -Naur newlib-1.19.0.orig/newlib/libc/misc/ffs.c newlib-1.19.0/newlib/libc/misc/ffs.c
---- newlib-1.19.0.orig/newlib/libc/misc/ffs.c	2003-06-06 21:57:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/misc/ffs.c	2011-08-26 07:21:01.268516216 +0200
-@@ -6,9 +6,11 @@
- 	ffs
- 
- ANSI_SYNOPSIS
-+	#include <strings.h>
- 	int ffs(int <[word]>);
- 
- TRAD_SYNOPSIS
-+	#include <strings.h>
- 	int ffs(<[word]>);
- 
- DESCRIPTION
-@@ -24,7 +26,7 @@
- 
- No supporting OS subroutines are required.  */
- 
--#include <_ansi.h>
-+#include <strings.h>
- 
- int
- _DEFUN(ffs, (word),
-diff -Naur newlib-1.19.0.orig/newlib/libc/posix/collate.c newlib-1.19.0/newlib/libc/posix/collate.c
---- newlib-1.19.0.orig/newlib/libc/posix/collate.c	2008-11-19 21:04:09.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/posix/collate.c	2011-08-26 07:21:01.268516216 +0200
-@@ -177,12 +177,13 @@
- {
- 	const char *s;
- 	int serrno = errno;
-+	int dummy;
- 
- 	/* Be careful to change write counts if you change the strings */
- 	write(STDERR_FILENO, "collate_error: ", 15);
- 	write(STDERR_FILENO, f, strlen(f));
- 	write(STDERR_FILENO, ": ", 2);
--	s = strerror(serrno);
-+	s = _strerror_r(_REENT, serrno, 1, &dummy);
- 	write(STDERR_FILENO, s, strlen(s));
- 	write(STDERR_FILENO, "\n", 1);
- 	exit(ex);
-diff -Naur newlib-1.19.0.orig/newlib/libc/posix/readdir.c newlib-1.19.0/newlib/libc/posix/readdir.c
---- newlib-1.19.0.orig/newlib/libc/posix/readdir.c	2003-06-06 21:57:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/posix/readdir.c	2011-08-26 07:21:01.268516216 +0200
-@@ -37,6 +37,7 @@
- static char sccsid[] = "@(#)readdir.c	5.7 (Berkeley) 6/1/90";
- #endif /* LIBC_SCCS and not lint */
- 
-+#include <stdint.h>
- #include <dirent.h>
- 
- extern int getdents (int fd, void *dp, int count);
-@@ -75,7 +76,7 @@
-       continue;
-     }
-     dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
--    if ((int)dp & 03) {	/* bogus pointer check */
-+    if ((intptr_t)dp & 03) {	/* bogus pointer check */
- #ifdef HAVE_DD_LOCK
-       __lock_release_recursive(dirp->dd_lock);
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/posix/regexec.c newlib-1.19.0/newlib/libc/posix/regexec.c
---- newlib-1.19.0.orig/newlib/libc/posix/regexec.c	2008-10-31 22:03:41.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/posix/regexec.c	2011-08-26 07:21:01.269516229 +0200
-@@ -58,7 +58,9 @@
- #include "utils.h"
- #include "regex2.h"
- 
-+#ifndef NDEBUG
- static int nope = 0;		/* for use in asserts; shuts lint up */
-+#endif
- 
- /* macros for manipulating states, small version */
- #define	states	long
-diff -Naur newlib-1.19.0.orig/newlib/libc/reent/sbrkr.c newlib-1.19.0/newlib/libc/reent/sbrkr.c
---- newlib-1.19.0.orig/newlib/libc/reent/sbrkr.c	2003-06-03 21:48:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/reent/sbrkr.c	2011-08-26 07:21:01.269516229 +0200
-@@ -13,9 +13,7 @@
- #endif
- #endif
- 
--/* If MALLOC_PROVIDED is defined, we don't need this function.  */
--
--#if defined (REENTRANT_SYSCALLS_PROVIDED) || defined (MALLOC_PROVIDED)
-+#if defined (REENTRANT_SYSCALLS_PROVIDED)
- 
- int _dummy_sbrk_syscalls = 1;
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/db_local.h newlib-1.19.0/newlib/libc/search/db_local.h
---- newlib-1.19.0.orig/newlib/libc/search/db_local.h	2010-03-05 09:55:15.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/search/db_local.h	2011-08-26 07:21:01.269516229 +0200
-@@ -102,11 +102,11 @@
- typedef struct __db {
- 	DBTYPE type;			/* Underlying db type. */
- 	int (*close)(struct __db *);
--	int (*del)(const struct __db *, const DBT *, u_int);
--	int (*get)(const struct __db *, const DBT *, DBT *, u_int);
--	int (*put)(const struct __db *, DBT *, const DBT *, u_int);
--	int (*seq)(const struct __db *, DBT *, DBT *, u_int);
--	int (*sync)(const struct __db *, u_int);
-+	int (*del)(const struct __db *, const DBT *, __uint32_t);
-+	int (*get)(const struct __db *, const DBT *, DBT *, __uint32_t);
-+	int (*put)(const struct __db *, DBT *, const DBT *, __uint32_t);
-+	int (*seq)(const struct __db *, DBT *, DBT *, __uint32_t);
-+	int (*sync)(const struct __db *, __uint32_t);
- 	void *internal;			/* Access method private. */
- 	int (*fd)(const struct __db *);
- } DB;
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/extern.h newlib-1.19.0/newlib/libc/search/extern.h
---- newlib-1.19.0.orig/newlib/libc/search/extern.h	2002-06-20 21:51:31.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/extern.h	2011-08-26 07:21:01.269516229 +0200
-@@ -43,7 +43,7 @@
- int	 __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
- 		int, __uint32_t, SPLIT_RETURN *);
- int	 __buf_free(HTAB *, int, int);
--void	 __buf_init(HTAB *, int);
-+void	 __buf_init(HTAB *, __uint32_t);
- __uint32_t	 __call_hash(HTAB *, char *, int);
- int	 __delpair(HTAB *, BUFHEAD *, int);
- int	 __expand_table(HTAB *);
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/hash_buf.c newlib-1.19.0/newlib/libc/search/hash_buf.c
---- newlib-1.19.0.orig/newlib/libc/search/hash_buf.c	2004-05-26 19:57:10.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/hash_buf.c	2011-08-26 07:21:01.270516245 +0200
-@@ -118,7 +118,7 @@
- 	int newpage;	/* If prev_bp set, indicates a new overflow page. */
- {
- 	BUFHEAD *bp;
--	__uint32_t is_disk_mask;
-+	ptrdiff_t is_disk_mask;
- 	int is_disk, segment_ndx;
- 	SEGMENT segp;
- 
-@@ -298,7 +298,7 @@
- extern void
- __buf_init(hashp, nbytes)
- 	HTAB *hashp;
--	int nbytes;
-+	__uint32_t nbytes;
- {
- 	BUFHEAD *bfp;
- 	int npages;
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/hash.h newlib-1.19.0/newlib/libc/search/hash.h
---- newlib-1.19.0.orig/newlib/libc/search/hash.h	2008-07-02 20:38:45.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/hash.h	2011-08-26 07:21:01.269516229 +0200
-@@ -82,7 +82,7 @@
- 
- /* Hash Table Information */
- typedef struct hashhdr {		/* Disk resident portion */
--	int		magic;		/* Magic NO for hash tables */
-+	__uint32_t	magic;		/* Magic NO for hash tables */
- 	int		version;	/* Version ID */
- 	__uint32_t	lorder;		/* Byte Order */
- 	int		bsize;		/* Bucket/Page Size */
-@@ -97,7 +97,7 @@
- 	int		high_mask;	/* Mask to modulo into entire table */
- 	int		low_mask;	/* Mask to modulo into lower half of 
- 					 * table */
--	int		ffactor;	/* Fill factor */
-+	__uint32_t	ffactor;	/* Fill factor */
- 	int		nkeys;		/* Number of keys in hash table */
- 	int		hdrpages;	/* Size of table header */
- 	int		h_charkey;	/* value of hash(CHARKEY) */
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/hcreate_r.c newlib-1.19.0/newlib/libc/search/hcreate_r.c
---- newlib-1.19.0.orig/newlib/libc/search/hcreate_r.c	2002-07-03 02:33:57.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/hcreate_r.c	2011-08-26 07:21:01.270516245 +0200
-@@ -123,9 +123,10 @@
- void
- hdestroy_r(struct hsearch_data *htab)
- {
-+#if 0
- 	struct internal_entry *ie;
- 	size_t idx;
--
-+#endif
- 	if (htab->htable == NULL)
- 		return;
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/Makefile.am newlib-1.19.0/newlib/libc/signal/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/signal/Makefile.am	2006-04-11 21:02:09.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/signal/Makefile.am	2011-08-26 07:21:01.270516245 +0200
-@@ -4,7 +4,7 @@
- 
- INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
- 
--LIB_SOURCES = raise.c signal.c
-+LIB_SOURCES = psignal.c raise.c signal.c
- 
- libsignal_la_LDFLAGS = -Xcompiler -nostdlib
- 
-@@ -21,7 +21,7 @@
- 
- include $(srcdir)/../../Makefile.shared
- 
--CHEWOUT_FILES = raise.def signal.def
-+CHEWOUT_FILES = psignal.def raise.def signal.def
- 
- SUFFIXES = .def
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/Makefile.in newlib-1.19.0/newlib/libc/signal/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/signal/Makefile.in	2011-07-20 08:45:15.831330915 +0200
-+++ newlib-1.19.0/newlib/libc/signal/Makefile.in	2011-08-26 07:21:01.270516245 +0200
-@@ -55,12 +55,13 @@
- ARFLAGS = cru
- lib_a_AR = $(AR) $(ARFLAGS)
- lib_a_LIBADD =
--am__objects_1 = lib_a-raise.$(OBJEXT) lib_a-signal.$(OBJEXT)
-+am__objects_1 = lib_a-psignal.$(OBJEXT) lib_a-raise.$(OBJEXT) \
-+	lib_a-signal.$(OBJEXT)
- @USE_LIBTOOL_FALSE at am_lib_a_OBJECTS = $(am__objects_1)
- lib_a_OBJECTS = $(am_lib_a_OBJECTS)
- LTLIBRARIES = $(noinst_LTLIBRARIES)
- libsignal_la_LIBADD =
--am__objects_2 = raise.lo signal.lo
-+am__objects_2 = psignal.lo raise.lo signal.lo
- @USE_LIBTOOL_TRUE at am_libsignal_la_OBJECTS = $(am__objects_2)
- libsignal_la_OBJECTS = $(am_libsignal_la_OBJECTS)
- libsignal_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -228,7 +229,7 @@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = cygnus
- INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
--LIB_SOURCES = raise.c signal.c
-+LIB_SOURCES = psignal.c raise.c signal.c
- libsignal_la_LDFLAGS = -Xcompiler -nostdlib
- @USE_LIBTOOL_TRUE at noinst_LTLIBRARIES = libsignal.la
- @USE_LIBTOOL_TRUE at libsignal_la_SOURCES = $(LIB_SOURCES)
-@@ -237,7 +238,7 @@
- @USE_LIBTOOL_FALSE at noinst_LIBRARIES = lib.a
- @USE_LIBTOOL_FALSE at lib_a_SOURCES = $(LIB_SOURCES)
- @USE_LIBTOOL_FALSE at lib_a_CFLAGS = $(AM_CFLAGS)
--CHEWOUT_FILES = raise.def signal.def
-+CHEWOUT_FILES = psignal.def raise.def signal.def
- SUFFIXES = .def
- CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
- TARGETDOC = ../tmp.texi
-@@ -310,6 +311,12 @@
- .c.lo:
- 	$(LTCOMPILE) -c -o $@ $<
- 
-+lib_a-psignal.o: psignal.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.o `test -f 'psignal.c' || echo '$(srcdir)/'`psignal.c
-+
-+lib_a-psignal.obj: psignal.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.obj `if test -f 'psignal.c'; then $(CYGPATH_W) 'psignal.c'; else $(CYGPATH_W) '$(srcdir)/psignal.c'; fi`
-+
- lib_a-raise.o: raise.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-raise.o `test -f 'raise.c' || echo '$(srcdir)/'`raise.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/psignal.c newlib-1.19.0/newlib/libc/signal/psignal.c
---- newlib-1.19.0.orig/newlib/libc/signal/psignal.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/signal/psignal.c	2011-08-26 07:21:01.270516245 +0200
-@@ -0,0 +1,51 @@
-+/* Copyright 2002, 2011 Red Hat Inc. */
-+/*
-+FUNCTION
-+<<psignal>>---print a signal message on standard error
-+
-+INDEX
-+	psignal
-+
-+ANSI_SYNOPSIS
-+	#include <stdio.h>
-+	void psignal(int <[signal]>, const char *<[prefix]>);
-+
-+TRAD_SYNOPSIS
-+	#include <stdio.h>
-+	void psignal(<[signal]>, <[prefix]>)
-+	int <[signal]>;
-+	const char *<[prefix]>;
-+
-+DESCRIPTION
-+Use <<psignal>> to print (on standard error) a signal message
-+corresponding to the value of the signal number <[signal]>.
-+Unless you use <<NULL>> as the value of the argument <[prefix]>, the
-+signal message will begin with the string at <[prefix]>, followed by a
-+colon and a space (<<: >>). The remainder of the signal message is one
-+of the strings described for <<strsignal>>.
-+
-+RETURNS
-+<<psignal>> returns no result.
-+
-+PORTABILITY
-+POSIX.1-2008 requires <<psignal>>, but the strings issued vary from one
-+implementation to another.
-+
-+Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-+<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-+*/
-+
-+#include <_ansi.h>
-+#include <stdio.h>
-+#include <string.h>
-+
-+_VOID
-+_DEFUN(psignal, (sig, s),
-+       int sig _AND
-+       _CONST char *s)
-+{
-+  if (s != NULL && *s != '\0')
-+    fprintf (stderr, "%s: %s\n", s, strsignal (sig));
-+  else
-+    fprintf (stderr, "%s\n", strsignal (sig));
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/signal.tex newlib-1.19.0/newlib/libc/signal/signal.tex
---- newlib-1.19.0.orig/newlib/libc/signal/signal.tex	2000-02-17 20:39:47.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/signal/signal.tex	2011-08-26 07:21:01.270516245 +0200
-@@ -59,11 +59,15 @@
- reliable from signal handlers.)
- 
- @menu
-+* psignal:: Print a signal message to standard error
- * raise::   Send a signal
- * signal::  Specify handler subroutine for a signal
- @end menu
- 
- @page
-+ at include signal/psignal.def
-+
-+ at page
- @include signal/raise.def
- 
- @page
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fclose.c newlib-1.19.0/newlib/libc/stdio/fclose.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fclose.c	2007-07-13 22:37:53.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fclose.c	2011-08-26 07:21:01.271516265 +0200
-@@ -74,8 +74,6 @@
-   if (fp == NULL)
-     return (0);			/* on NULL */
- 
--  __sfp_lock_acquire ();
--
-   CHECK_INIT (rptr, fp);
- 
-   _flockfile (fp);
-@@ -83,7 +81,6 @@
-   if (fp->_flags == 0)		/* not open! */
-     {
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return (0);
-     }
-   /* Unconditionally flush to allow special handling for seekable read
-@@ -98,6 +95,7 @@
-     FREEUB (rptr, fp);
-   if (HASLB (fp))
-     FREELB (rptr, fp);
-+  __sfp_lock_acquire ();
-   fp->_flags = 0;		/* release this FILE for reuse */
-   _funlockfile (fp);
- #ifndef __SINGLE_THREAD__
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fflush.c newlib-1.19.0/newlib/libc/stdio/fflush.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fflush.c	2009-10-30 09:26:41.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fflush.c	2011-08-26 07:21:01.271516265 +0200
-@@ -67,37 +67,16 @@
- 
- /* Flush a single file, or (if fp is NULL) all files.  */
- 
-+/* Core function which does not lock file pointer.  This gets called
-+   directly from __srefill. */
- int
--_DEFUN(_fflush_r, (ptr, fp),
-+_DEFUN(__sflush_r, (ptr, fp),
-        struct _reent *ptr _AND
-        register FILE * fp)
- {
-   register unsigned char *p;
-   register int n, t;
- 
--#ifdef _REENT_SMALL
--  /* For REENT_SMALL platforms, it is possible we are being
--     called for the first time on a std stream.  This std
--     stream can belong to a reentrant struct that is not
--     _REENT.  If CHECK_INIT gets called below based on _REENT,
--     we will end up changing said file pointers to the equivalent
--     std stream off of _REENT.  This causes unexpected behavior if
--     there is any data to flush on the _REENT std stream.  There
--     are two alternatives to fix this:  1) make a reentrant fflush
--     or 2) simply recognize that this file has nothing to flush
--     and return immediately before performing a CHECK_INIT.  Choice
--     2 is implemented here due to its simplicity.  */
--  if (fp->_bf._base == NULL)
--    return 0;
--#endif /* _REENT_SMALL  */
--
--  CHECK_INIT (ptr, fp);
--
--  if (!fp->_flags)
--    return 0;
--
--  _flockfile (fp);
--
-   t = fp->_flags;
-   if ((t & __SWR) == 0)
-     {
-@@ -150,7 +129,6 @@
- 		    }
- 		  else
- 		    fp->_flags |= __SERR;
--		  _funlockfile (fp);
- 		  return result;
- 		}
-             }
-@@ -186,17 +164,14 @@
- 	  else
- 	    {
- 	      fp->_flags |= __SERR;
--	      _funlockfile (fp);
- 	      return EOF;
- 	    }
- 	}
--      _funlockfile (fp);
-       return 0;
-     }
-   if ((p = fp->_bf._base) == NULL)
-     {
-       /* Nothing to flush.  */
--      _funlockfile (fp);
-       return 0;
-     }
-   n = fp->_p - p;		/* write this much */
-@@ -215,16 +190,48 @@
-       if (t <= 0)
- 	{
-           fp->_flags |= __SERR;
--          _funlockfile (fp);
-           return EOF;
- 	}
-       p += t;
-       n -= t;
-     }
--  _funlockfile (fp);
-   return 0;
- }
- 
-+int
-+_DEFUN(_fflush_r, (ptr, fp),
-+       struct _reent *ptr _AND
-+       register FILE * fp)
-+{
-+  int ret;
-+
-+#ifdef _REENT_SMALL
-+  /* For REENT_SMALL platforms, it is possible we are being
-+     called for the first time on a std stream.  This std
-+     stream can belong to a reentrant struct that is not
-+     _REENT.  If CHECK_INIT gets called below based on _REENT,
-+     we will end up changing said file pointers to the equivalent
-+     std stream off of _REENT.  This causes unexpected behavior if
-+     there is any data to flush on the _REENT std stream.  There
-+     are two alternatives to fix this:  1) make a reentrant fflush
-+     or 2) simply recognize that this file has nothing to flush
-+     and return immediately before performing a CHECK_INIT.  Choice
-+     2 is implemented here due to its simplicity.  */
-+  if (fp->_bf._base == NULL)
-+    return 0;
-+#endif /* _REENT_SMALL  */
-+
-+  CHECK_INIT (ptr, fp);
-+
-+  if (!fp->_flags)
-+    return 0;
-+
-+  _flockfile (fp);
-+  ret = __sflush_r (ptr, fp);
-+  _funlockfile (fp);
-+  return ret;
-+}
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetc.c newlib-1.19.0/newlib/libc/stdio/fgetc.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgetc.c	2009-04-25 00:52:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgetc.c	2011-08-26 07:21:01.271516265 +0200
-@@ -93,11 +93,9 @@
- #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
-   int result;
-   CHECK_INIT(_REENT, fp);
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   result = __sgetc_r (_REENT, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return result;
- #else
-   return _fgetc_r (_REENT, fp);
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgets.c newlib-1.19.0/newlib/libc/stdio/fgets.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgets.c	2009-04-25 00:52:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgets.c	2011-08-26 07:21:01.271516265 +0200
-@@ -98,7 +98,6 @@
- 
-   CHECK_INIT(ptr, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- #ifdef __SCLE
-   if (fp->_flags & __SCLE)
-@@ -114,12 +113,10 @@
-       if (c == EOF && s == buf)
-         {
-           _funlockfile (fp);
--	  __sfp_lock_release ();
-           return NULL;
-         }
-       *s = 0;
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return buf;
-     }
- #endif
-@@ -138,7 +135,6 @@
- 	      if (s == buf)
-                 {
-                   _funlockfile (fp);
--		  __sfp_lock_release ();
-                   return 0;
-                 }
- 	      break;
-@@ -164,7 +160,6 @@
- 	  _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len);
- 	  s[len] = 0;
-           _funlockfile (fp);
--	  __sfp_lock_release ();
- 	  return (buf);
- 	}
-       fp->_r -= len;
-@@ -175,7 +170,6 @@
-   while ((n -= len) != 0);
-   *s = 0;
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return buf;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetwc.c newlib-1.19.0/newlib/libc/stdio/fgetwc.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgetwc.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgetwc.c	2011-08-26 07:21:01.271516265 +0200
-@@ -164,12 +164,10 @@
- {
-   wint_t r;
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   ORIENT(fp, 1);
-   r = __fgetwc (ptr, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return r;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetws.c newlib-1.19.0/newlib/libc/stdio/fgetws.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgetws.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgetws.c	2011-08-26 07:21:01.272516288 +0200
-@@ -93,7 +93,6 @@
-   const char *src;
-   unsigned char *nl;
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   ORIENT (fp, 1);
- 
-@@ -144,12 +143,10 @@
-     goto error;
-   *wsp++ = L'\0';
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return ws;
- 
- error:
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return NULL;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fmemopen.c newlib-1.19.0/newlib/libc/stdio/fmemopen.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fmemopen.c	2007-08-02 22:23:06.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fmemopen.c	2011-08-26 07:21:01.272516288 +0200
-@@ -281,7 +281,7 @@
- 
-   if ((flags = __sflags (ptr, mode, &dummy)) == 0)
-     return NULL;
--  if (!size || !(buf || flags & __SAPP))
-+  if (!size || !(buf || flags & __SRW))
-     {
-       ptr->_errno = EINVAL;
-       return NULL;
-@@ -310,7 +310,7 @@
-     {
-       /* r+/w+/a+, and no buf: file starts empty.  */
-       c->buf = (char *) (c + 1);
--      *(char *) buf = '\0';
-+      c->buf[0] = '\0';
-       c->pos = c->eof = 0;
-       c->append = (flags & __SAPP) != 0;
-     }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fpurge.c newlib-1.19.0/newlib/libc/stdio/fpurge.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fpurge.c	2009-07-03 13:58:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fpurge.c	2011-08-26 07:21:01.272516288 +0200
-@@ -11,6 +11,8 @@
- 	fpurge
- INDEX
- 	_fpurge_r
-+INDEX
-+	__fpurge
- 
- ANSI_SYNOPSIS
- 	#include <stdio.h>
-@@ -18,6 +20,11 @@
- 
- 	int _fpurge_r(struct _reent *<[reent]>, FILE *<[fp]>);
- 
-+	#include <stdio.h>
-+	#include <stdio_ext.h>
-+	void  __fpurge(FILE *<[fp]>);
-+
-+
- DESCRIPTION
- Use <<fpurge>> to clear all buffers of the given stream.  For output
- streams, this discards data not yet written to disk.  For input streams,
-@@ -26,6 +33,8 @@
- and generally is only needed when manually altering the underlying file
- descriptor of a stream.
- 
-+<<__fpurge>> behaves exactly like <<fpurge>> but does not return a value.
-+
- The alternate function <<_fpurge_r>> is a reentrant version, where the
- extra argument <[reent]> is a pointer to a reentrancy structure, and
- <[fp]> must not be NULL.
-@@ -42,6 +51,9 @@
- 
- #include <_ansi.h>
- #include <stdio.h>
-+#ifndef __rtems__
-+#include <stdio_ext.h>
-+#endif
- #include <errno.h>
- #include "local.h"
- 
-@@ -87,4 +99,15 @@
-   return _fpurge_r (_REENT, fp);
- }
- 
-+#ifndef __rtems__
-+
-+void
-+_DEFUN(__fpurge, (fp),
-+       register FILE * fp)
-+{
-+  _fpurge_r (_REENT, fp);
-+}
-+
-+#endif
-+
- #endif /* _REENT_ONLY */
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fread.c newlib-1.19.0/newlib/libc/stdio/fread.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fread.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fread.c	2011-08-26 07:21:01.272516288 +0200
-@@ -146,7 +146,6 @@
- 
-   CHECK_INIT(ptr, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   ORIENT (fp, -1);
-   if (fp->_r < 0)
-@@ -197,12 +196,10 @@
-               if (fp->_flags & __SCLE)
- 	        {
- 	          _funlockfile (fp);
--		  __sfp_lock_release ();
- 	          return crlf_r (ptr, fp, buf, total-resid, 1) / size;
- 	        }
- #endif
- 	      _funlockfile (fp);
--	      __sfp_lock_release ();
- 	      return (total - resid) / size;
- 	    }
- 	}
-@@ -224,12 +221,10 @@
- 	      if (fp->_flags & __SCLE)
- 		{
- 		  _funlockfile (fp);
--		  __sfp_lock_release ();
- 		  return crlf_r (ptr, fp, buf, total-resid, 1) / size;
- 		}
- #endif
- 	      _funlockfile (fp);
--	      __sfp_lock_release ();
- 	      return (total - resid) / size;
- 	    }
- 	}
-@@ -243,12 +238,10 @@
-   if (fp->_flags & __SCLE)
-     {
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return crlf_r(ptr, fp, buf, total, 0) / size;
-     }
- #endif
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return count;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/freopen.c newlib-1.19.0/newlib/libc/stdio/freopen.c
---- newlib-1.19.0.orig/newlib/libc/stdio/freopen.c	2008-12-12 16:45:19.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/freopen.c	2011-08-26 07:21:01.272516288 +0200
-@@ -98,8 +98,6 @@
-   int flags, oflags;
-   int e = 0;
- 
--  __sfp_lock_acquire ();
--
-   CHECK_INIT (ptr, fp);
- 
-   _flockfile (fp);
-@@ -108,7 +106,6 @@
-     {
-       _funlockfile (fp);
-       _fclose_r (ptr, fp);
--      __sfp_lock_release ();
-       return NULL;
-     }
- 
-@@ -208,6 +205,7 @@
- 
-   if (f < 0)
-     {				/* did not get it after all */
-+      __sfp_lock_acquire ();
-       fp->_flags = 0;		/* set it free */
-       ptr->_errno = e;		/* restore in case _close clobbered */
-       _funlockfile (fp);
-@@ -232,7 +230,6 @@
- #endif
- 
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return fp;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fscanf.c newlib-1.19.0/newlib/libc/stdio/fscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fscanf.c	2004-04-23 22:01:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fscanf.c	2011-08-26 07:21:01.272516288 +0200
-@@ -45,7 +45,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (_REENT, fp, fmt, ap);
-+  ret = _vfscanf_r (_REENT, fp, fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -71,7 +71,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (ptr, fp, fmt, ap);
-+  ret = _vfscanf_r (ptr, fp, fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fseek.c newlib-1.19.0/newlib/libc/stdio/fseek.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fseek.c	2009-12-17 20:43:43.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fseek.c	2011-08-26 07:21:01.273516308 +0200
-@@ -138,7 +138,6 @@
- 
-   CHECK_INIT (ptr, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   /* If we've been doing some writing, and we're in append mode
-@@ -156,7 +155,6 @@
-     {
-       ptr->_errno = ESPIPE;	/* ??? */
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return EOF;
-     }
- 
-@@ -182,7 +180,6 @@
- 	  if (curoff == -1L)
- 	    {
- 	      _funlockfile (fp);
--	      __sfp_lock_release ();
- 	      return EOF;
- 	    }
- 	}
-@@ -208,7 +205,6 @@
-     default:
-       ptr->_errno = EINVAL;
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return (EOF);
-     }
- 
-@@ -268,7 +264,6 @@
-     {
-       ptr->_errno = EOVERFLOW;
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return EOF;
-     }
- 
-@@ -325,7 +320,6 @@
-       fp->_flags &= ~__SEOF;
-       memset (&fp->_mbstate, 0, sizeof (_mbstate_t));
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return 0;
-     }
- 
-@@ -356,7 +350,6 @@
-     }
-   memset (&fp->_mbstate, 0, sizeof (_mbstate_t));
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return 0;
- 
-   /*
-@@ -369,7 +362,6 @@
-       || seekfn (ptr, fp->_cookie, offset, whence) == POS_ERR)
-     {
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return EOF;
-     }
-   /* success: clear EOF indicator and discard ungetc() data */
-@@ -388,7 +380,6 @@
-   fp->_flags &= ~__SNPT;
-   memset (&fp->_mbstate, 0, sizeof (_mbstate_t));
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return 0;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fvwrite.c newlib-1.19.0/newlib/libc/stdio/fvwrite.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fvwrite.c	2007-07-13 22:37:53.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fvwrite.c	2011-08-26 07:21:01.273516308 +0200
-@@ -61,11 +61,7 @@
- 
-   /* make sure we can write */
-   if (cantwrite (ptr, fp))
--    {
--      fp->_flags |= __SERR;
--      ptr->_errno = EBADF;
--      return EOF;
--    }
-+    return EOF;
- 
-   iov = uio->uio_iov;
-   len = 0;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fwalk.c newlib-1.19.0/newlib/libc/stdio/fwalk.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fwalk.c	2009-01-12 23:19:11.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fwalk.c	2011-08-26 07:21:01.273516308 +0200
-@@ -27,8 +27,8 @@
- #include <errno.h>
- #include "local.h"
- 
--static int
--_DEFUN(__fwalk, (ptr, function),
-+int
-+_DEFUN(_fwalk, (ptr, function),
-        struct _reent *ptr _AND
-        register int (*function) (FILE *))
- {
-@@ -36,11 +36,19 @@
-   register int n, ret = 0;
-   register struct _glue *g;
- 
-+  /*
-+   * It should be safe to walk the list without locking it;
-+   * new nodes are only added to the end and none are ever
-+   * removed.
-+   *
-+   * Avoid locking this list while walking it or else you will
-+   * introduce a potential deadlock in [at least] refill.c.
-+   */
-   for (g = &ptr->__sglue; g != NULL; g = g->_next)
-     for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
-       if (fp->_flags != 0)
-         {
--          if (fp->_flags != 0 && fp->_file != -1)
-+          if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1)
-             ret |= (*function) (fp);
-         }
- 
-@@ -49,8 +57,8 @@
- 
- /* Special version of __fwalk where the function pointer is a reentrant
-    I/O function (e.g. _fclose_r).  */
--static int
--_DEFUN(__fwalk_reent, (ptr, reent_function),
-+int
-+_DEFUN(_fwalk_reent, (ptr, reent_function),
-        struct _reent *ptr _AND
-        register int (*reent_function) (struct _reent *, FILE *))
- {
-@@ -58,51 +66,21 @@
-   register int n, ret = 0;
-   register struct _glue *g;
- 
-+  /*
-+   * It should be safe to walk the list without locking it;
-+   * new nodes are only added to the end and none are ever
-+   * removed.
-+   *
-+   * Avoid locking this list while walking it or else you will
-+   * introduce a potential deadlock in [at least] refill.c.
-+   */
-   for (g = &ptr->__sglue; g != NULL; g = g->_next)
-     for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
-       if (fp->_flags != 0)
-         {
--          if (fp->_flags != 0 && fp->_file != -1)
-+          if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1)
-             ret |= (*reent_function) (ptr, fp);
-         }
- 
-   return ret;
- }
--
--int
--_DEFUN(_fwalk, (ptr, function),
--       struct _reent *ptr _AND
--       register int (*function)(FILE *))
--{
--  register int ret = 0;
--
--  __sfp_lock_acquire ();
--
--  /* Must traverse given list for streams.  Note that _GLOBAL_REENT
--     only walked once in exit().  */
--  ret |= __fwalk (ptr, function);
--
--  __sfp_lock_release ();
--
--  return ret;
--}
--
--/* Special version of _fwalk which handles a function pointer to a
--   reentrant I/O function (e.g. _fclose_r).  */
--int
--_DEFUN(_fwalk_reent, (ptr, reent_function),
--       struct _reent *ptr _AND
--       register int (*reent_function) (struct _reent *, FILE *))
--{
--  register int ret = 0;
--
--  __sfp_lock_acquire ();
--
--  /* Must traverse given list for streams.  Note that _GLOBAL_REENT
--     only walked once in exit().  */
--  ret |= __fwalk_reent (ptr, reent_function);
--
--  __sfp_lock_release ();
--
--  return ret;
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fwscanf.c newlib-1.19.0/newlib/libc/stdio/fwscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fwscanf.c	2009-03-11 12:53:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fwscanf.c	2011-08-26 07:21:01.273516308 +0200
-@@ -31,7 +31,7 @@
-   va_list ap;
- 
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (_REENT, fp, fmt, ap);
-+  ret = _vfwscanf_r (_REENT, fp, fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -45,7 +45,7 @@
-   va_list ap;
- 
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (ptr, fp, fmt, ap);
-+  ret = _vfwscanf_r (ptr, fp, fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/getc.c newlib-1.19.0/newlib/libc/stdio/getc.c
---- newlib-1.19.0.orig/newlib/libc/stdio/getc.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/getc.c	2011-08-26 07:21:01.273516308 +0200
-@@ -92,11 +92,9 @@
- {
-   int result;
-   CHECK_INIT (ptr, fp);
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   result = __sgetc_r (ptr, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return result;
- }
- 
-@@ -108,11 +106,9 @@
- {
-   int result;
-   CHECK_INIT (_REENT, fp);
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   result = __sgetc_r (_REENT, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return result;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/getdelim.c newlib-1.19.0/newlib/libc/stdio/getdelim.c
---- newlib-1.19.0.orig/newlib/libc/stdio/getdelim.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/getdelim.c	2011-08-26 07:21:01.274516324 +0200
-@@ -81,7 +81,6 @@
- 
-   CHECK_INIT (_REENT, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   numbytes = *n;
-@@ -131,7 +130,6 @@
-     }
- 
-   _funlockfile (fp);
--  __sfp_lock_release ();
- 
-   /* if no input data, return failure */
-   if (ptr == buf)
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/gets.c newlib-1.19.0/newlib/libc/stdio/gets.c
---- newlib-1.19.0.orig/newlib/libc/stdio/gets.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/gets.c	2011-08-26 07:21:01.274516324 +0200
-@@ -79,14 +79,12 @@
-   register int c;
-   register char *s = buf;
- 
--  __sfp_lock_acquire ();
-   _flockfile (stdin);
-   while ((c = __sgetc_r (ptr, stdin)) != '\n')
-     if (c == EOF)
-       if (s == buf)
- 	{
- 	  _funlockfile (stdin);
--	  __sfp_lock_release ();
- 	  return NULL;
- 	}
-       else
-@@ -95,7 +93,6 @@
-       *s++ = c;
-   *s = 0;
-   _funlockfile (stdin);
--  __sfp_lock_release ();
-   return buf;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/local.h newlib-1.19.0/newlib/libc/stdio/local.h
---- newlib-1.19.0.orig/newlib/libc/stdio/local.h	2009-04-22 10:30:03.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/local.h	2011-08-26 07:21:01.274516324 +0200
-@@ -54,6 +54,7 @@
- 				  va_list));
- extern FILE  *_EXFUN(__sfp,(struct _reent *));
- extern int    _EXFUN(__sflags,(struct _reent *,_CONST char*, int*));
-+extern int    _EXFUN(__sflush_r,(struct _reent *,FILE *));
- extern int    _EXFUN(__srefill_r,(struct _reent *,FILE *));
- extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(struct _reent *, void *, char *,
- 					       int));
-@@ -112,7 +113,8 @@
-     }						\
-   while (0)
- 
--/* Return true iff the given FILE cannot be written now.  */
-+/* Return true and set errno and stream error flag iff the given FILE
-+   cannot be written now.  */
- 
- #define	cantwrite(ptr, fp)                                     \
-   ((((fp)->_flags & __SWR) == 0 || (fp)->_bf._base == NULL) && \
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/open_memstream.c newlib-1.19.0/newlib/libc/stdio/open_memstream.c
---- newlib-1.19.0.orig/newlib/libc/stdio/open_memstream.c	2009-02-25 05:00:05.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/open_memstream.c	2011-08-26 07:21:01.274516324 +0200
-@@ -330,8 +330,10 @@
-     c->max *= sizeof(wchar_t);
-   if (c->max < 64)
-     c->max = 64;
--  else if (c->max > 64 * 1024)
--    c->max = 64 * 1024;
-+#if (SIZE_MAX >= 0x10000)
-+  else if (c->max > 0x10000)
-+    c->max = 0x10000;
-+#endif
-   *size = 0;
-   *buf = _malloc_r (ptr, c->max);
-   if (!*buf)
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/perror.c newlib-1.19.0/newlib/libc/stdio/perror.c
---- newlib-1.19.0.orig/newlib/libc/stdio/perror.c	2005-02-08 02:33:17.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/perror.c	2011-08-26 07:21:01.274516324 +0200
-@@ -73,6 +73,7 @@
-        _CONST char *s)
- {
-   char *error;
-+  int dummy;
- 
-   _REENT_SMALL_CHECK_INIT (ptr);
-   if (s != NULL && *s != '\0')
-@@ -81,7 +82,7 @@
-       fputs (": ", _stderr_r (ptr));
-     }
- 
--  if ((error = strerror (ptr->_errno)) != NULL)
-+  if ((error = _strerror_r (ptr, ptr->_errno, 1, &dummy)) != NULL)
-     fputs (error, _stderr_r (ptr));
- 
-   fputc ('\n', _stderr_r (ptr));
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/refill.c newlib-1.19.0/newlib/libc/stdio/refill.c
---- newlib-1.19.0.orig/newlib/libc/stdio/refill.c	2008-12-11 00:43:12.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/refill.c	2011-08-26 07:21:01.275516339 +0200
-@@ -102,9 +102,19 @@
-    * flush all line buffered output files, per the ANSI C
-    * standard.
-    */
--
-   if (fp->_flags & (__SLBF | __SNBF))
--    _CAST_VOID _fwalk (_GLOBAL_REENT, lflush);
-+    {
-+      /* Ignore this file in _fwalk to avoid potential deadlock. */
-+      short orig_flags = fp->_flags;
-+      fp->_flags = 1;
-+      _CAST_VOID _fwalk (_GLOBAL_REENT, lflush);
-+      fp->_flags = orig_flags;
-+
-+      /* Now flush this file without locking it. */
-+      if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR))
-+	__sflush_r (ptr, fp);
-+    }
-+
-   fp->_p = fp->_bf._base;
-   fp->_r = fp->_read (ptr, fp->_cookie, (char *) fp->_p, fp->_bf._size);
- #ifndef __CYGWIN__
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/scanf.c newlib-1.19.0/newlib/libc/stdio/scanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/scanf.c	2005-02-08 02:33:17.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/scanf.c	2011-08-26 07:21:01.275516339 +0200
-@@ -45,7 +45,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-+  ret = _vfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -71,7 +71,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-+  ret = _vfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/tmpnam.c newlib-1.19.0/newlib/libc/stdio/tmpnam.c
---- newlib-1.19.0.orig/newlib/libc/stdio/tmpnam.c	2004-04-23 22:01:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/tmpnam.c	2011-08-26 07:21:01.275516339 +0200
-@@ -94,11 +94,13 @@
- #include <_ansi.h>
- #include <reent.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
- #include <fcntl.h>
- #include <reent.h>
- #include <errno.h>
-+#include <inttypes.h>
- 
- /* Try to open the file specified, if it can't be opened then try
-    another one.  Return nonzero if successful, otherwise zero.  */
-@@ -109,7 +111,7 @@
-        char *result       _AND
-        _CONST char *part1 _AND
-        _CONST char *part2 _AND
--       int part3          _AND
-+       intptr_t part3     _AND
-        int *part4)
- {
-   /*  Generate the filename and make sure that there isn't one called
-@@ -118,7 +120,7 @@
-   while (1)
-     {
-       int t;
--      _sprintf_r (ptr, result, "%s/%s%x.%x", part1, part2, part3, *part4);
-+      _sprintf_r (ptr, result, "%s/%s%" PRIxPTR ".%x", part1, part2, part3, *part4);
-       (*part4)++;
-       t = _open_r (ptr, result, O_RDONLY, 0);
-       if (t == -1)
-@@ -183,7 +185,7 @@
-   if (filename)
-     {
-       if (! worker (p, filename, dir, prefix,
--		    _getpid_r (p) ^ (int) (_POINTER_INT) p, &p->_inc))
-+		    _getpid_r (p) ^ (intptr_t) p, &p->_inc))
- 	return NULL;
-     }
-   return filename;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vasiprintf.c newlib-1.19.0/newlib/libc/stdio/vasiprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vasiprintf.c	2008-04-14 23:14:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vasiprintf.c	2011-08-26 07:21:01.275516339 +0200
-@@ -26,6 +26,8 @@
- #include <limits.h>
- #include <stdarg.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vasprintf.c newlib-1.19.0/newlib/libc/stdio/vasprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vasprintf.c	2008-04-14 23:14:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vasprintf.c	2011-08-26 07:21:01.275516339 +0200
-@@ -26,6 +26,8 @@
- #include <limits.h>
- #include <stdarg.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfscanf.c newlib-1.19.0/newlib/libc/stdio/vfscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vfscanf.c	2010-01-20 00:16:45.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/vfscanf.c	2011-08-26 07:21:01.276516354 +0200
-@@ -453,7 +453,9 @@
-   wchar_t wc;                   /* wchar to use to read format string */
-   wchar_t *wcp;                 /* handy wide character pointer */
-   size_t mbslen;                /* length of converted multibyte sequence */
-+#ifdef _MB_CAPABLE
-   mbstate_t state;              /* value to keep track of multibyte state */
-+#endif
- 
-   #define CCFN_PARAMS	_PARAMS((struct _reent *, const char *, char **, int))
-   u_long (*ccfn)CCFN_PARAMS=0;	/* conversion function (strtol/strtoul) */
-@@ -494,7 +496,6 @@
- # define GET_ARG(n, ap, type) (va_arg (ap, type))
- #endif
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   ORIENT (fp, -1);
-@@ -795,7 +796,6 @@
- 	   */
- 	case '\0':		/* compat */
- 	  _funlockfile (fp);
--	  __sfp_lock_release ();
- 	  return EOF;
- 
- 	default:		/* compat */
-@@ -1596,13 +1596,11 @@
-      invalid format string), return EOF if no matches yet, else number
-      of matches made prior to failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF;
- match_failure:
- all_done:
-   /* Return number of matches, which can be 0 on match failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfwprintf.c newlib-1.19.0/newlib/libc/stdio/vfwprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vfwprintf.c	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vfwprintf.c	2011-08-26 07:21:01.276516354 +0200
-@@ -240,7 +240,7 @@
- # endif /* !_NO_LONGDBL */
- 
- static wchar_t *wcvt(struct _reent *, _PRINTF_FLOAT_TYPE, int, int, wchar_t *,
--		    int *, int, int *, wchar_t *);
-+		    int *, int, int *, wchar_t *, int);
- 
- static int wexponent(wchar_t *, int, int);
- 
-@@ -996,7 +996,23 @@
- 			flags |= FPT;
- 
- 			cp = wcvt (data, _fpvalue, prec, flags, &softsign,
--				   &expt, ch, &ndig, cp);
-+				   &expt, ch, &ndig, cp, BUF);
-+
-+			/* If buf is not large enough for the converted wchar_t
-+			   sequence, call wcvt again with a malloced new buffer.
-+			   This should happen fairly rarely.
-+			 */
-+			if (cp == buf && ndig > BUF && malloc_buf == NULL) {
-+				if ((malloc_buf =
-+				    (wchar_t *)_malloc_r (data, ndig * sizeof (wchar_t)))
-+				    == NULL)
-+				  {
-+				    fp->_flags |= __SERR;
-+				    goto error;
-+				  }
-+				cp = wcvt (data, _fpvalue, prec, flags, &softsign,
-+					   &expt, ch, &ndig, malloc_buf, ndig);
-+			}
- 
- 			if (ch == L'g' || ch == L'G') {
- 				if (expt <= -4 || expt > prec)
-@@ -1450,11 +1466,15 @@
-    to whether trailing zeros must be included.  Set *SIGN to nonzero
-    if VALUE was negative.  Set *DECPT to the exponent plus one.  Set
-    *LENGTH to the length of the returned string.  CH must be one of
--   [aAeEfFgG]; if it is [aA], then the return string lives in BUF,
--   otherwise the return value shares the mprec reentrant storage.  */
-+   [aAeEfFgG]; different from vfprintf.c:cvt(), the return string
-+   lives in BUF regardless of CH.  LEN is the length of BUF, except
-+   when CH is [aA], in which case LEN is not in use.  If BUF is not
-+   large enough for the converted string, only the first LEN number
-+   of characters will be returned in BUF, but *LENGTH will be set to
-+   the full length of the string before the truncation.  */
- static wchar_t *
- wcvt(struct _reent *data, _PRINTF_FLOAT_TYPE value, int ndigits, int flags,
--     wchar_t *sign, int *decpt, int ch, int *length, wchar_t *buf)
-+     wchar_t *sign, int *decpt, int ch, int *length, wchar_t *buf, int len)
- {
- 	int mode, dsgn;
- # ifdef _NO_LONGDBL
-@@ -1548,12 +1568,13 @@
- 		while (rve < bp)
- 			*rve++ = '0';
- 	  }
-+
-+	  *length = rve - digits; /* full length of the string */
- #ifdef _MB_CAPABLE
--	  *length = _mbsnrtowcs_r (data, buf, (const char **) &digits,
--				   rve - digits, BUF, NULL);
-+	  _mbsnrtowcs_r (data, buf, (const char **) &digits, *length,
-+			 len, NULL);
- #else
--	  *length = rve - digits;
--	  for (i = 0; i < *length && i < BUF; ++i)
-+	  for (i = 0; i < *length && i < len; ++i)
- 	    buf[i] = (wchar_t) digits[i];
- #endif
- 	  return buf;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfwscanf.c newlib-1.19.0/newlib/libc/stdio/vfwscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vfwscanf.c	2009-03-11 12:53:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/vfwscanf.c	2011-08-26 07:21:01.277516370 +0200
-@@ -434,7 +434,6 @@
- # define GET_ARG(n, ap, type) (va_arg (ap, type))
- #endif
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   ORIENT (fp, 1);
-@@ -714,7 +713,6 @@
- 	   */
- 	case L'\0':		/* compat */
- 	  _funlockfile (fp);
--	  __sfp_lock_release ();
- 	  return EOF;
- 
- 	default:		/* compat */
-@@ -1443,13 +1441,11 @@
-      invalid format string), return EOF if no matches yet, else number
-      of matches made prior to failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF;
- match_failure:
- all_done:
-   /* Return number of matches, which can be 0 on match failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vsiprintf.c newlib-1.19.0/newlib/libc/stdio/vsiprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vsiprintf.c	2008-04-14 23:14:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vsiprintf.c	2011-08-26 07:21:01.277516370 +0200
-@@ -26,6 +26,8 @@
- #include <limits.h>
- #include <stdarg.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vsniprintf.c newlib-1.19.0/newlib/libc/stdio/vsniprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vsniprintf.c	2008-04-14 23:14:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vsniprintf.c	2011-08-26 07:21:01.277516370 +0200
-@@ -27,6 +27,8 @@
- #include <stdarg.h>
- #include <errno.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vsnprintf.c newlib-1.19.0/newlib/libc/stdio/vsnprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vsnprintf.c	2008-04-30 04:47:14.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vsnprintf.c	2011-08-26 07:21:01.277516370 +0200
-@@ -27,6 +27,8 @@
- #include <stdarg.h>
- #include <errno.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vsprintf.c newlib-1.19.0/newlib/libc/stdio/vsprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vsprintf.c	2008-04-14 23:14:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vsprintf.c	2011-08-26 07:21:01.277516370 +0200
-@@ -26,6 +26,8 @@
- #include <limits.h>
- #include <stdarg.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/wbuf.c newlib-1.19.0/newlib/libc/stdio/wbuf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/wbuf.c	2008-12-11 00:43:12.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/wbuf.c	2011-08-26 07:21:01.277516370 +0200
-@@ -54,11 +54,7 @@
- 
-   fp->_w = fp->_lbfsize;
-   if (cantwrite (ptr, fp))
--    {
--      fp->_flags |= __SERR;
--      ptr->_errno = EBADF;
--      return EOF;
--    }
-+    return EOF;
-   c = (unsigned char) c;
- 
-   ORIENT (fp, -1);
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/wscanf.c newlib-1.19.0/newlib/libc/stdio/wscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/wscanf.c	2009-03-11 12:53:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/wscanf.c	2011-08-26 07:21:01.277516370 +0200
-@@ -32,7 +32,7 @@
- 
-   _REENT_SMALL_CHECK_INIT (_REENT);
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-+  ret = _vfwscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -47,7 +47,7 @@
- 
-   _REENT_SMALL_CHECK_INIT (ptr);
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-+  ret = _vfwscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/wsetup.c newlib-1.19.0/newlib/libc/stdio/wsetup.c
---- newlib-1.19.0.orig/newlib/libc/stdio/wsetup.c	2007-03-15 19:40:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/wsetup.c	2011-08-26 07:21:01.278516386 +0200
-@@ -20,12 +20,13 @@
- #include <_ansi.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <errno.h>
- #include "local.h"
- 
- /*
-  * Various output routines call wsetup to be sure it is safe to write,
-  * because either _flags does not include __SWR, or _buf is NULL.
-- * _wsetup returns 0 if OK to write, nonzero otherwise.
-+ * _wsetup returns 0 if OK to write, nonzero and set errno otherwise.
-  */
- 
- int
-@@ -44,7 +45,11 @@
-   if ((fp->_flags & __SWR) == 0)
-     {
-       if ((fp->_flags & __SRW) == 0)
--	return EOF;
-+        {
-+	  ptr->_errno = EBADF;
-+	  fp->_flags |= __SERR;
-+	  return EOF;
-+        }
-       if (fp->_flags & __SRD)
- 	{
- 	  /* clobber any ungetc data */
-@@ -62,7 +67,7 @@
-    * A string I/O file should not explicitly allocate a buffer
-    * unless asprintf is being used.
-    */
--  if (fp->_bf._base == NULL 
-+  if (fp->_bf._base == NULL
-         && (!(fp->_flags & __SSTR) || (fp->_flags & __SMBF)))
-     __smakebuf_r (ptr, fp);
- 
-@@ -79,5 +84,11 @@
-   else
-     fp->_w = fp->_flags & __SNBF ? 0 : fp->_bf._size;
- 
--  return (!fp->_bf._base && (fp->_flags & __SMBF)) ? EOF : 0;
-+  if (!fp->_bf._base && (fp->_flags & __SMBF))
-+    {
-+      /* __smakebuf_r set errno, but not flag */
-+      fp->_flags |= __SERR;
-+      return EOF;
-+    }
-+  return 0;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio64/freopen64.c newlib-1.19.0/newlib/libc/stdio64/freopen64.c
---- newlib-1.19.0.orig/newlib/libc/stdio64/freopen64.c	2007-07-13 22:37:53.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio64/freopen64.c	2011-08-26 07:21:01.278516386 +0200
-@@ -97,7 +97,6 @@
-   int flags, oflags;
-   int e = 0;
- 
--  __sfp_lock_acquire ();
- 
-   CHECK_INIT (ptr, fp);
- 
-@@ -107,7 +106,6 @@
-     {
-       _funlockfile(fp);
-       _fclose_r (ptr, fp);
--      __sfp_lock_release ();
-       return NULL;
-     }
- 
-@@ -204,6 +202,7 @@
- 
-   if (f < 0)
-     {				/* did not get it after all */
-+      __sfp_lock_acquire ();
-       fp->_flags = 0;		/* set it free */
-       ptr->_errno = e;		/* restore in case _close clobbered */
-       _funlockfile(fp);
-@@ -231,7 +230,6 @@
-   fp->_flags |= __SL64;
- 
-   _funlockfile(fp);
--  __sfp_lock_release ();
-   return fp;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/atof.c newlib-1.19.0/newlib/libc/stdlib/atof.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/atof.c	2003-10-20 20:46:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/atof.c	2011-08-26 07:21:01.279516402 +0200
-@@ -1,6 +1,6 @@
- /*
- FUNCTION
--   <<atof>>, <<atoff>>---string to double or float
-+   <<atof>> ---string to double
- 
- INDEX
- 	atof
-@@ -10,19 +10,14 @@
- ANSI_SYNOPSIS
- 	#include <stdlib.h>
-         double atof(const char *<[s]>);
--        float atoff(const char *<[s]>);
- 
- TRAD_SYNOPSIS
- 	#include <stdlib.h>
-         double atof(<[s]>)
-         char *<[s]>;
- 
--        float atoff(<[s]>)
--        char *<[s]>;
--
- DESCRIPTION
- <<atof>> converts the initial portion of a string to a <<double>>.
--<<atoff>> converts the initial portion of a string to a <<float>>.
- 
- The functions parse the character string <[s]>,
- locating a substring which can be converted to a floating-point
-@@ -36,7 +31,6 @@
- something other than <<+>>, <<->>, <<.>>, or a digit.
- 
- <<atof(<[s]>)>> is implemented as <<strtod(<[s]>, NULL)>>.
--<<atoff(<[s]>)>> is implemented as <<strtof(<[s]>, NULL)>>.
- 
- RETURNS
- <<atof>> returns the converted substring value, if any, as a
-@@ -47,12 +41,9 @@
- If the correct value would cause underflow, <<0.0>> is returned
- and <<ERANGE>> is stored in <<errno>>.
- 
--<<atoff>> obeys the same rules as <<atof>>, except that it
--returns a <<float>>.
--
- PORTABILITY
--<<atof>> is ANSI C. <<atof>>, <<atoi>>, and <<atol>> are subsumed by <<strod>>
--and <<strol>>, but are used extensively in existing code. These functions are
-+<<atof>> is ANSI C. <<atof>>, <<atoi>>, and <<atol>> are subsumed by <<strtod>>
-+and <<strtol>>, but are used extensively in existing code. These functions are
- less reliable, but may be faster if the argument is verified to be in a valid
- range.
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/atoff.c newlib-1.19.0/newlib/libc/stdlib/atoff.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/atoff.c	2002-12-06 19:58:51.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdlib/atoff.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,9 +0,0 @@
--#include <stdlib.h>
--#include <_ansi.h>
--
--float
--_DEFUN (atoff, (s),
--	_CONST char *s)
--{
--  return strtof (s, NULL);
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.am newlib-1.19.0/newlib/libc/stdlib/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.am	2009-04-16 20:24:35.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/Makefile.am	2011-08-26 07:21:01.278516386 +0200
-@@ -16,7 +16,6 @@
- 	assert.c  	\
- 	atexit.c	\
- 	atof.c 		\
--	atoff.c		\
- 	atoi.c  	\
- 	atol.c		\
- 	calloc.c	\
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.in newlib-1.19.0/newlib/libc/stdlib/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.in	2011-07-20 08:45:15.846331158 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/Makefile.in	2011-08-26 07:21:01.279516402 +0200
-@@ -69,8 +69,7 @@
- 	lib_a-__ten_mu.$(OBJEXT) lib_a-_Exit.$(OBJEXT) \
- 	lib_a-abort.$(OBJEXT) lib_a-abs.$(OBJEXT) \
- 	lib_a-assert.$(OBJEXT) lib_a-atexit.$(OBJEXT) \
--	lib_a-atof.$(OBJEXT) lib_a-atoff.$(OBJEXT) \
--	lib_a-atoi.$(OBJEXT) lib_a-atol.$(OBJEXT) \
-+	lib_a-atof.$(OBJEXT) lib_a-atoi.$(OBJEXT) lib_a-atol.$(OBJEXT) \
- 	lib_a-calloc.$(OBJEXT) lib_a-div.$(OBJEXT) \
- 	lib_a-dtoa.$(OBJEXT) lib_a-dtoastub.$(OBJEXT) \
- 	lib_a-environ.$(OBJEXT) lib_a-envlock.$(OBJEXT) \
-@@ -132,15 +131,15 @@
- @HAVE_LONG_DOUBLE_TRUE at am__objects_8 = strtold.lo wcstold.lo
- am__objects_9 = __adjust.lo __atexit.lo __call_atexit.lo __exp10.lo \
- 	__ten_mu.lo _Exit.lo abort.lo abs.lo assert.lo atexit.lo \
--	atof.lo atoff.lo atoi.lo atol.lo calloc.lo div.lo dtoa.lo \
--	dtoastub.lo environ.lo envlock.lo eprintf.lo exit.lo \
--	gdtoa-gethex.lo gdtoa-hexnan.lo getenv.lo getenv_r.lo labs.lo \
--	ldiv.lo ldtoa.lo malloc.lo mblen.lo mblen_r.lo mbstowcs.lo \
--	mbstowcs_r.lo mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo \
--	mstats.lo rand.lo rand_r.lo realloc.lo reallocf.lo \
--	sb_charsets.lo strtod.lo strtol.lo strtoul.lo wcstod.lo \
--	wcstol.lo wcstoul.lo wcstombs.lo wcstombs_r.lo wctomb.lo \
--	wctomb_r.lo $(am__objects_8)
-+	atof.lo atoi.lo atol.lo calloc.lo div.lo dtoa.lo dtoastub.lo \
-+	environ.lo envlock.lo eprintf.lo exit.lo gdtoa-gethex.lo \
-+	gdtoa-hexnan.lo getenv.lo getenv_r.lo labs.lo ldiv.lo ldtoa.lo \
-+	malloc.lo mblen.lo mblen_r.lo mbstowcs.lo mbstowcs_r.lo \
-+	mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo mstats.lo rand.lo \
-+	rand_r.lo realloc.lo reallocf.lo sb_charsets.lo strtod.lo \
-+	strtol.lo strtoul.lo wcstod.lo wcstol.lo wcstoul.lo \
-+	wcstombs.lo wcstombs_r.lo wctomb.lo wctomb_r.lo \
-+	$(am__objects_8)
- am__objects_10 = cxa_atexit.lo cxa_finalize.lo drand48.lo ecvtbuf.lo \
- 	efgcvt.lo erand48.lo jrand48.lo lcong48.lo lrand48.lo \
- 	mrand48.lo msize.lo mtrim.lo nrand48.lo rand48.lo seed48.lo \
-@@ -330,13 +329,13 @@
- INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
- GENERAL_SOURCES = __adjust.c __atexit.c __call_atexit.c __exp10.c \
- 	__ten_mu.c _Exit.c abort.c abs.c assert.c atexit.c atof.c \
--	atoff.c atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c \
--	environ.c envlock.c eprintf.c exit.c gdtoa-gethex.c \
--	gdtoa-hexnan.c getenv.c getenv_r.c labs.c ldiv.c ldtoa.c \
--	malloc.c mblen.c mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c \
--	mbtowc_r.c mlock.c mprec.c mstats.c rand.c rand_r.c realloc.c \
--	reallocf.c sb_charsets.c strtod.c strtol.c strtoul.c wcstod.c \
--	wcstol.c wcstoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c \
-+	atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c environ.c \
-+	envlock.c eprintf.c exit.c gdtoa-gethex.c gdtoa-hexnan.c \
-+	getenv.c getenv_r.c labs.c ldiv.c ldtoa.c malloc.c mblen.c \
-+	mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c mbtowc_r.c mlock.c \
-+	mprec.c mstats.c rand.c rand_r.c realloc.c reallocf.c \
-+	sb_charsets.c strtod.c strtol.c strtoul.c wcstod.c wcstol.c \
-+	wcstoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c \
- 	$(am__append_1)
- EXTENDED_SOURCES = \
- 	cxa_atexit.c	\
-@@ -616,12 +615,6 @@
- lib_a-atof.obj: atof.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atof.obj `if test -f 'atof.c'; then $(CYGPATH_W) 'atof.c'; else $(CYGPATH_W) '$(srcdir)/atof.c'; fi`
- 
--lib_a-atoff.o: atoff.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoff.o `test -f 'atoff.c' || echo '$(srcdir)/'`atoff.c
--
--lib_a-atoff.obj: atoff.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoff.obj `if test -f 'atoff.c'; then $(CYGPATH_W) 'atoff.c'; else $(CYGPATH_W) '$(srcdir)/atoff.c'; fi`
--
- lib_a-atoi.o: atoi.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoi.o `test -f 'atoi.c' || echo '$(srcdir)/'`atoi.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/putenv_r.c newlib-1.19.0/newlib/libc/stdlib/putenv_r.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/putenv_r.c	2004-11-24 23:34:14.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdlib/putenv_r.c	2011-08-26 07:21:01.279516402 +0200
-@@ -43,7 +43,7 @@
-   if (!p)
-     return 1;
- 
--  if (!(equal = index (p, '=')))
-+  if (!(equal = strchr (p, '=')))
-     {
-       (void) _free_r (reent_ptr, p);
-       return 1;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/setenv_r.c newlib-1.19.0/newlib/libc/stdlib/setenv_r.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/setenv_r.c	2008-09-25 05:00:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/setenv_r.c	2011-08-26 07:21:01.279516402 +0200
-@@ -110,7 +110,7 @@
-               ENV_UNLOCK;
- 	      return (-1);
-             }
--	  bcopy ((char *) *p_environ, (char *) P, cnt * sizeof (char *));
-+	  memcpy((char *) P,(char *) *p_environ, cnt * sizeof (char *));
- 	  *p_environ = P;
- 	}
-       (*p_environ)[cnt + 1] = NULL;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/strtod.c newlib-1.19.0/newlib/libc/stdlib/strtod.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/strtod.c	2010-12-07 22:26:45.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdlib/strtod.c	2011-08-26 07:21:01.280516418 +0200
-@@ -309,8 +309,7 @@
-         }
- 	nd0 = nd;
- 	if (strncmp (s, _localeconv_r (ptr)->decimal_point,
--		     strlen (_localeconv_r (ptr)->decimal_point)) == 0)
--		{
-+		     strlen (_localeconv_r (ptr)->decimal_point)) == 0) {
- 		decpt = 1;
- 		c = *(s += strlen (_localeconv_r (ptr)->decimal_point));
- 		if (!nd) {
-@@ -328,25 +327,28 @@
-  have_dig:
- 			nz++;
- 			if (c -= '0') {
--				nf += nz;
- 				for(i = 1; i < nz; i++) {
--					if (nd++ <= DBL_DIG + 1) {
--						if (nd < 10)
-+					if (nd <= DBL_DIG + 1) {
-+						if (nd + i < 10)
- 							y *= 10;
- 						else
- 							z *= 10;
- 					}
- 				}
--				if (nd++ <= DBL_DIG + 1) {
--					if (nd < 10)
-+				if (nd <= DBL_DIG + 1) {
-+					if (nd + i < 10)
- 						y = 10*y + c;
- 					else
- 						z = 10*z + c;
- 				}
--				nz = 0;
-+				if (nd <= DBL_DIG + 1) {
-+					nf += nz;
-+					nd += nz;
- 				}
-+				nz = 0;
- 			}
- 		}
-+	}
-  dig_done:
- 	e = 0;
- 	if (c == 'e' || c == 'E') {
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/bcmp.c newlib-1.19.0/newlib/libc/string/bcmp.c
---- newlib-1.19.0.orig/newlib/libc/string/bcmp.c	2005-10-28 23:21:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/bcmp.c	2011-08-26 07:21:01.281516434 +0200
-@@ -6,11 +6,11 @@
- 	bcmp
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int bcmp(const void *<[s1]>, const void *<[s2]>, size_t <[n]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int bcmp(<[s1]>, <[s2]>, <[n]>)
- 	const void *<[s1]>;
- 	const void *<[s2]>;
-@@ -36,6 +36,7 @@
- */
- 
- #include <string.h>
-+#include <strings.h>
- 
- int
- _DEFUN (bcmp, (m1, m2, n),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/bcopy.c newlib-1.19.0/newlib/libc/string/bcopy.c
---- newlib-1.19.0.orig/newlib/libc/string/bcopy.c	2002-05-23 20:46:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/bcopy.c	2011-08-26 07:21:01.281516434 +0200
-@@ -3,7 +3,7 @@
- 	<<bcopy>>---copy memory regions
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	void bcopy(const void *<[in]>, void *<[out]>, size_t <[n]>);
- 
- TRAD_SYNOPSIS
-@@ -27,6 +27,7 @@
- */
- 
- #include <string.h>
-+#include <strings.h>
- 
- void
- _DEFUN (bcopy, (b1, b2, length),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/bzero.c newlib-1.19.0/newlib/libc/string/bzero.c
---- newlib-1.19.0.orig/newlib/libc/string/bzero.c	2002-05-23 20:46:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/bzero.c	2011-08-26 07:21:01.281516434 +0200
-@@ -6,11 +6,11 @@
- 	bzero
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	void bzero(void *<[b]>, size_t <[length]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	void bzero(<[b]>, <[length]>)
- 	void *<[b]>;
- 	size_t <[length]>;
-@@ -30,7 +30,7 @@
- <<bzero>> requires no supporting OS subroutines.
- */
- 
--#include <string.h>
-+#include <strings.h>
- 
- _VOID
- _DEFUN (bzero, (b, length),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/index.c newlib-1.19.0/newlib/libc/string/index.c
---- newlib-1.19.0.orig/newlib/libc/string/index.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/index.c	2011-08-26 07:21:01.281516434 +0200
-@@ -6,11 +6,11 @@
- 	index
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	char * index(const char *<[string]>, int <[c]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	char * index(<[string]>, <[c]>);
- 	char *<[string]>;
- 	int *<[c]>;
-@@ -34,6 +34,7 @@
- */
- 
- #include <string.h>
-+#include <strings.h>
- 
- char *
- _DEFUN (index, (s, c),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/Makefile.am newlib-1.19.0/newlib/libc/string/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/string/Makefile.am	2010-05-11 22:27:20.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/Makefile.am	2011-08-26 07:21:01.280516418 +0200
-@@ -71,7 +71,8 @@
- 	wmemcmp.c \
- 	wmemcpy.c \
- 	wmemmove.c \
--	wmemset.c
-+	wmemset.c \
-+	xpg_strerror_r.c
- 
- if ELIX_LEVEL_1
- ELIX_2_SOURCES =
-@@ -84,6 +85,7 @@
- 	stpncpy.c \
- 	strndup.c \
- 	strcasestr.c \
-+	strchrnul.c \
- 	strndup_r.c \
- 	wcpcpy.c \
- 	wcpncpy.c \
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/Makefile.in newlib-1.19.0/newlib/libc/string/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/string/Makefile.in	2011-07-20 08:45:15.826330835 +0200
-+++ newlib-1.19.0/newlib/libc/string/Makefile.in	2011-08-26 07:21:01.280516418 +0200
-@@ -88,7 +88,7 @@
- 	lib_a-wcsxfrm.$(OBJEXT) lib_a-wcwidth.$(OBJEXT) \
- 	lib_a-wmemchr.$(OBJEXT) lib_a-wmemcmp.$(OBJEXT) \
- 	lib_a-wmemcpy.$(OBJEXT) lib_a-wmemmove.$(OBJEXT) \
--	lib_a-wmemset.$(OBJEXT)
-+	lib_a-wmemset.$(OBJEXT) lib_a-xpg_strerror_r.$(OBJEXT)
- @ELIX_LEVEL_1_FALSE at am__objects_2 = lib_a-bcmp.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-memccpy.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-mempcpy.$(OBJEXT) \
-@@ -96,6 +96,7 @@
- @ELIX_LEVEL_1_FALSE@	lib_a-stpncpy.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-strndup.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-strcasestr.$(OBJEXT) \
-+ at ELIX_LEVEL_1_FALSE@	lib_a-strchrnul.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-strndup_r.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-wcpcpy.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-wcpncpy.$(OBJEXT) \
-@@ -120,11 +121,11 @@
- 	wcslcpy.lo wcslen.lo wcsncat.lo wcsncmp.lo wcsncpy.lo \
- 	wcsnlen.lo wcspbrk.lo wcsrchr.lo wcsspn.lo wcsstr.lo wcstok.lo \
- 	wcswidth.lo wcsxfrm.lo wcwidth.lo wmemchr.lo wmemcmp.lo \
--	wmemcpy.lo wmemmove.lo wmemset.lo
-+	wmemcpy.lo wmemmove.lo wmemset.lo xpg_strerror_r.lo
- @ELIX_LEVEL_1_FALSE at am__objects_5 = bcmp.lo memccpy.lo mempcpy.lo \
- @ELIX_LEVEL_1_FALSE@	stpcpy.lo stpncpy.lo strndup.lo \
-- at ELIX_LEVEL_1_FALSE@	strcasestr.lo strndup_r.lo wcpcpy.lo \
-- at ELIX_LEVEL_1_FALSE@	wcpncpy.lo wcsdup.lo
-+ at ELIX_LEVEL_1_FALSE@	strcasestr.lo strchrnul.lo strndup_r.lo \
-+ at ELIX_LEVEL_1_FALSE@	wcpcpy.lo wcpncpy.lo wcsdup.lo
- @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE at am__objects_6 = memmem.lo \
- @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	wcscasecmp.lo \
- @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	wcsncasecmp.lo
-@@ -363,7 +364,8 @@
- 	wmemcmp.c \
- 	wmemcpy.c \
- 	wmemmove.c \
--	wmemset.c
-+	wmemset.c \
-+	xpg_strerror_r.c
- 
- @ELIX_LEVEL_1_FALSE at ELIX_2_SOURCES = \
- @ELIX_LEVEL_1_FALSE@	bcmp.c \
-@@ -373,6 +375,7 @@
- @ELIX_LEVEL_1_FALSE@	stpncpy.c \
- @ELIX_LEVEL_1_FALSE@	strndup.c \
- @ELIX_LEVEL_1_FALSE@	strcasestr.c \
-+ at ELIX_LEVEL_1_FALSE@	strchrnul.c \
- @ELIX_LEVEL_1_FALSE@	strndup_r.c \
- @ELIX_LEVEL_1_FALSE@	wcpcpy.c \
- @ELIX_LEVEL_1_FALSE@	wcpncpy.c \
-@@ -887,6 +890,12 @@
- lib_a-wmemset.obj: wmemset.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wmemset.obj `if test -f 'wmemset.c'; then $(CYGPATH_W) 'wmemset.c'; else $(CYGPATH_W) '$(srcdir)/wmemset.c'; fi`
- 
-+lib_a-xpg_strerror_r.o: xpg_strerror_r.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-xpg_strerror_r.o `test -f 'xpg_strerror_r.c' || echo '$(srcdir)/'`xpg_strerror_r.c
-+
-+lib_a-xpg_strerror_r.obj: xpg_strerror_r.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-xpg_strerror_r.obj `if test -f 'xpg_strerror_r.c'; then $(CYGPATH_W) 'xpg_strerror_r.c'; else $(CYGPATH_W) '$(srcdir)/xpg_strerror_r.c'; fi`
-+
- lib_a-bcmp.o: bcmp.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-bcmp.o `test -f 'bcmp.c' || echo '$(srcdir)/'`bcmp.c
- 
-@@ -929,6 +938,12 @@
- lib_a-strcasestr.obj: strcasestr.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strcasestr.obj `if test -f 'strcasestr.c'; then $(CYGPATH_W) 'strcasestr.c'; else $(CYGPATH_W) '$(srcdir)/strcasestr.c'; fi`
- 
-+lib_a-strchrnul.o: strchrnul.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strchrnul.o `test -f 'strchrnul.c' || echo '$(srcdir)/'`strchrnul.c
-+
-+lib_a-strchrnul.obj: strchrnul.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strchrnul.obj `if test -f 'strchrnul.c'; then $(CYGPATH_W) 'strchrnul.c'; else $(CYGPATH_W) '$(srcdir)/strchrnul.c'; fi`
-+
- lib_a-strndup_r.o: strndup_r.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strndup_r.o `test -f 'strndup_r.c' || echo '$(srcdir)/'`strndup_r.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memccpy.c newlib-1.19.0/newlib/libc/string/memccpy.c
---- newlib-1.19.0.orig/newlib/libc/string/memccpy.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memccpy.c	2011-08-26 07:21:01.281516434 +0200
-@@ -35,13 +35,14 @@
- 	*/
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include <stddef.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the word copy loop.  */
- #define LITTLEBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memchr.c newlib-1.19.0/newlib/libc/string/memchr.c
---- newlib-1.19.0.orig/newlib/libc/string/memchr.c	2008-05-27 01:31:08.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memchr.c	2011-08-26 07:21:01.281516434 +0200
-@@ -38,10 +38,11 @@
- 
- #include <_ansi.h>
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
--#define UNALIGNED(X) ((long)X & (sizeof (long) - 1))
-+#define UNALIGNED(X) ((intptr_t)X & (sizeof (long) - 1))
- 
- /* How many bytes are loaded each iteration of the word copy loop.  */
- #define LBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memcmp.c newlib-1.19.0/newlib/libc/string/memcmp.c
---- newlib-1.19.0.orig/newlib/libc/string/memcmp.c	2005-03-06 21:40:05.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/memcmp.c	2011-08-26 07:21:01.281516434 +0200
-@@ -37,11 +37,11 @@
- */
- 
- #include <string.h>
--
-+#include <stdint.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the word copy loop.  */
- #define LBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memcpy.c newlib-1.19.0/newlib/libc/string/memcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/memcpy.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memcpy.c	2011-08-26 07:21:01.282516451 +0200
-@@ -34,11 +34,12 @@
- 	*/
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include <string.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the 4X unrolled loop.  */
- #define BIGBLOCKSIZE    (sizeof (long) << 2)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memmove.c newlib-1.19.0/newlib/libc/string/memmove.c
---- newlib-1.19.0.orig/newlib/libc/string/memmove.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memmove.c	2011-08-26 07:21:01.282516451 +0200
-@@ -36,13 +36,14 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <_ansi.h>
- #include <stddef.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the 4X unrolled loop.  */
- #define BIGBLOCKSIZE    (sizeof (long) << 2)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/mempcpy.c newlib-1.19.0/newlib/libc/string/mempcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/mempcpy.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/mempcpy.c	2011-08-26 07:21:01.282516451 +0200
-@@ -34,10 +34,11 @@
- #include <stddef.h>
- #include <limits.h>
- #include <string.h>
-+#include <stdint.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the 4X unrolled loop.  */
- #define BIGBLOCKSIZE    (sizeof (long) << 2)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memset.c newlib-1.19.0/newlib/libc/string/memset.c
---- newlib-1.19.0.orig/newlib/libc/string/memset.c	2008-05-27 20:44:40.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memset.c	2011-08-26 07:21:01.282516451 +0200
-@@ -34,9 +34,10 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- 
- #define LBLOCKSIZE (sizeof(long))
--#define UNALIGNED(X)   ((long)X & (LBLOCKSIZE - 1))
-+#define UNALIGNED(X)   ((intptr_t)X & (LBLOCKSIZE - 1))
- #define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE)
- 
- _PTR
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/rindex.c newlib-1.19.0/newlib/libc/string/rindex.c
---- newlib-1.19.0.orig/newlib/libc/string/rindex.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/rindex.c	2011-08-26 07:21:01.282516451 +0200
-@@ -10,7 +10,7 @@
- 	char * rindex(const char *<[string]>, int <[c]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	char * rindex(<[string]>, <[c]>);
- 	char *<[string]>;
- 	int *<[c]>;
-@@ -34,6 +34,7 @@
- */
- 
- #include <string.h>
-+#include <strings.h>
- 
- char *
- _DEFUN (rindex, (s, c),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/stpcpy.c newlib-1.19.0/newlib/libc/string/stpcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/stpcpy.c	2007-06-28 19:07:23.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/stpcpy.c	2011-08-26 07:21:01.282516451 +0200
-@@ -34,6 +34,7 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /*SUPPRESS 560*/
-@@ -41,7 +42,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/stpncpy.c newlib-1.19.0/newlib/libc/string/stpncpy.c
---- newlib-1.19.0.orig/newlib/libc/string/stpncpy.c	2007-06-28 19:07:23.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/stpncpy.c	2011-08-26 07:21:01.283516468 +0200
-@@ -40,6 +40,7 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /*SUPPRESS 560*/
-@@ -47,7 +48,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcasecmp.c newlib-1.19.0/newlib/libc/string/strcasecmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strcasecmp.c	2009-04-23 20:11:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strcasecmp.c	2011-08-26 07:21:01.283516468 +0200
-@@ -6,11 +6,11 @@
- 	strcasecmp
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strcasecmp(const char *<[a]>, const char *<[b]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strcasecmp(<[a]>, <[b]>)
- 	char *<[a]>;
- 	char *<[b]>;
-@@ -38,7 +38,7 @@
- 	strcasecmp
- */
- 
--#include <string.h>
-+#include <strings.h>
- #include <ctype.h>
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcasestr.c newlib-1.19.0/newlib/libc/string/strcasestr.c
---- newlib-1.19.0.orig/newlib/libc/string/strcasestr.c	2008-01-12 05:25:55.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strcasestr.c	2011-08-26 07:21:01.283516468 +0200
-@@ -76,6 +76,7 @@
- 
- #include <ctype.h>
- #include <string.h>
-+#include <strings.h>
- 
- #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
- # define RETURN_TYPE char *
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcat.c newlib-1.19.0/newlib/libc/string/strcat.c
---- newlib-1.19.0.orig/newlib/libc/string/strcat.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strcat.c	2011-08-26 07:21:01.283516468 +0200
-@@ -33,12 +33,13 @@
- 	strcat ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if X is aligned on a "long" boundary.  */
- #define ALIGNED(X) \
--  (((long)X & (sizeof (long) - 1)) == 0)
-+  (((uintptr_t)X & (sizeof (long) - 1)) == 0)
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strchr.c newlib-1.19.0/newlib/libc/string/strchr.c
---- newlib-1.19.0.orig/newlib/libc/string/strchr.c	2008-05-22 04:31:46.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strchr.c	2011-08-26 07:21:01.283516468 +0200
-@@ -33,11 +33,12 @@
- 	strchr ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if X is not aligned on a "long" boundary.  */
--#define UNALIGNED(X) ((long)X & (sizeof (long) - 1))
-+#define UNALIGNED(X) ((uintptr_t)X & (sizeof (long) - 1))
- 
- /* How many bytes are loaded each iteration of the word copy loop.  */
- #define LBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strchrnul.c newlib-1.19.0/newlib/libc/string/strchrnul.c
---- newlib-1.19.0.orig/newlib/libc/string/strchrnul.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strchrnul.c	2011-08-26 07:21:01.283516468 +0200
-@@ -0,0 +1,47 @@
-+/*
-+FUNCTION
-+	<<strchrnul>>---search for character in string
-+
-+INDEX
-+	strchrnul
-+
-+ANSI_SYNOPSIS
-+	#include <string.h>
-+	char * strchrnul(const char *<[string]>, int <[c]>);
-+
-+TRAD_SYNOPSIS
-+	#include <string.h>
-+	char * strchrnul(<[string]>, <[c]>);
-+	const char *<[string]>;
-+	int <[c]>;
-+
-+DESCRIPTION
-+	This function finds the first occurence of <[c]> (converted to
-+	a char) in the string pointed to by <[string]> (including the
-+	terminating null character).
-+
-+RETURNS
-+	Returns a pointer to the located character, or a pointer
-+	to the concluding null byte if <[c]> does not occur in <[string]>.
-+
-+PORTABILITY
-+<<strchrnul>> is a GNU extension.
-+
-+<<strchrnul>> requires no supporting OS subroutines.  It uses
-+strchr() and strlen() from elsewhere in this library.
-+
-+QUICKREF
-+	strchrnul
-+*/
-+
-+#include <string.h>
-+
-+char *
-+_DEFUN (strchrnul, (s1, i),
-+	_CONST char *s1 _AND
-+	int i)
-+{
-+  char *s = strchr(s1, i);
-+
-+  return s ? s : (char *)s1 + strlen(s1);
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcmp.c newlib-1.19.0/newlib/libc/string/strcmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strcmp.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strcmp.c	2011-08-26 07:21:01.283516468 +0200
-@@ -35,12 +35,13 @@
- 	strcmp ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((uintptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1)))
- 
- /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */
- #if LONG_MAX == 2147483647L
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcpy.c newlib-1.19.0/newlib/libc/string/strcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/strcpy.c	2007-05-29 23:26:59.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strcpy.c	2011-08-26 07:21:01.284516485 +0200
-@@ -32,6 +32,7 @@
- 	strcpy ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
-@@ -40,7 +41,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strerror.c newlib-1.19.0/newlib/libc/string/strerror.c
---- newlib-1.19.0.orig/newlib/libc/string/strerror.c	2009-03-15 14:41:46.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strerror.c	2011-08-26 07:21:01.284516485 +0200
-@@ -15,6 +15,8 @@
- ANSI_SYNOPSIS
- 	#include <string.h>
- 	char *strerror(int <[errnum]>);
-+	char *_strerror_r(struct _reent <[ptr]>, int <[errnum]>,
-+			  int <[internal]>, int *<[error]>);
- 
- TRAD_SYNOPSIS
- 	#include <string.h>
-@@ -31,6 +33,9 @@
- for each of the values defined in `<<errno.h>>':
- 
- o+
-+o 0
-+Success
-+
- o E2BIG
- Arg list too long
- 
-@@ -288,6 +293,8 @@
- 
- o-
- 
-+<<_strerror_r>> is a reentrant version of the above.
-+
- RETURNS
- This function returns a pointer to a string.  Your application must
- not modify that string.
-@@ -296,22 +303,45 @@
- ANSI C requires <<strerror>>, but does not specify the strings used
- for each error number.
- 
--Although this implementation of <<strerror>> is reentrant, ANSI C
--declares that subsequent calls to <<strerror>> may overwrite the
--result string; therefore portable code cannot depend on the reentrancy
--of this subroutine.
-+Although this implementation of <<strerror>> is reentrant (depending
-+on <<_user_strerror>>), ANSI C declares that subsequent calls to
-+<<strerror>> may overwrite the result string; therefore portable
-+code cannot depend on the reentrancy of this subroutine.
-+
-+Although this implementation of <<strerror>> guarantees a non-null
-+result with a NUL-terminator, some implementations return <<NULL>>
-+on failure.  Although POSIX allows <<strerror>> to set <<errno>>
-+to EINVAL on failure, this implementation does not do so (unless
-+you provide <<_user_strerror>>).
-+
-+POSIX recommends that unknown <[errnum]> result in a message
-+including that value, however it is not a requirement and this
-+implementation does not provide that information (unless you
-+provide <<_user_strerror>>).
- 
- This implementation of <<strerror>> provides for user-defined
- extensibility.  <<errno.h>> defines <[__ELASTERROR]>, which can be
- used as a base for user-defined error values.  If the user supplies a
- routine named <<_user_strerror>>, and <[errnum]> passed to
- <<strerror>> does not match any of the supported values,
--<<_user_strerror>> is called with <[errnum]> as its argument.
--
--<<_user_strerror>> takes one argument of type <[int]>, and returns a
--character pointer.  If <[errnum]> is unknown to <<_user_strerror>>,
--<<_user_strerror>> returns <[NULL]>.  The default <<_user_strerror>>
--returns <[NULL]> for all input values.
-+<<_user_strerror>> is called with three arguments.  The first is of
-+type <[int]>, and is the <[errnum]> value unknown to <<strerror>>.
-+The second is of type <[int]>, and matches the <[internal]> argument
-+of <<_strerror_r>>; this should be zero if called from <<strerror>>
-+and non-zero if called from any other function; <<_user_strerror>> can
-+use this information to satisfy the POSIX rule that no other
-+standardized function can overwrite a static buffer reused by
-+<<strerror>>.  The third is of type <[int *]>, and matches the
-+<[error]> argument of <<_strerror_r>>; if a non-zero value is stored
-+into that location (usually <[EINVAL]>), then <<strerror>> will set
-+<<errno>> to that value, and the XPG variant of <<strerror_r>> will
-+return that value instead of zero or <[ERANGE]>.  <<_user_strerror>>
-+returns a <[char *]> value; returning <[NULL]> implies that the user
-+function did not choose to handle <[errnum]>.  The default
-+<<_user_strerror>> returns <[NULL]> for all input values.  Note that
-+<<_user_sterror>> must be thread-safe, and only denote errors via the
-+third argument rather than modifying <<errno>>, if <<strerror>> and
-+<<strerror_r>> are are to comply with POSIX.
- 
- <<strerror>> requires no supporting OS subroutines.
- 
-@@ -323,14 +353,20 @@
- #include <string.h>
- 
- char *
--_DEFUN (strerror, (errnum),
--	int errnum)
-+_DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
-+	struct _reent *ptr _AND
-+	int errnum _AND
-+	int internal _AND
-+	int *errptr)
- {
-   char *error;
--  extern char *_user_strerror _PARAMS ((int));
-+  extern char *_user_strerror _PARAMS ((int, int, int *));
- 
-   switch (errnum)
-     {
-+    case 0:
-+      error = "Success";
-+      break;
- /* go32 defines EPERM as EACCES */
- #if defined (EPERM) && (!defined (EACCES) || (EPERM != EACCES))
-     case EPERM:
-@@ -784,10 +820,19 @@
-         break;
- #endif
-     default:
--      if ((error = _user_strerror (errnum)) == 0)
--	error = "";
-+      if (!errptr)
-+        errptr = &ptr->_errno;
-+      if ((error = _user_strerror (errnum, internal, errptr)) == 0)
-+        error = "";
-       break;
-     }
- 
-   return error;
- }
-+
-+char *
-+_DEFUN(strerror, (int),
-+       int errnum)
-+{
-+  return _strerror_r (_REENT, errnum, 0, NULL);
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strerror_r.c newlib-1.19.0/newlib/libc/string/strerror_r.c
---- newlib-1.19.0.orig/newlib/libc/string/strerror_r.c	2005-10-28 23:21:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strerror_r.c	2011-08-26 07:21:01.284516485 +0200
-@@ -1,3 +1,4 @@
-+/* GNU variant of strerror_r. */
- /*
- FUNCTION
- 	<<strerror_r>>---convert error number to string and copy to buffer
-@@ -7,7 +8,11 @@
- 
- ANSI_SYNOPSIS
- 	#include <string.h>
-+	#ifdef _GNU_SOURCE
- 	char *strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>);
-+	#else
-+	int strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>);
-+	#endif
- 
- TRAD_SYNOPSIS
- 	#include <string.h>
-@@ -19,35 +24,62 @@
- DESCRIPTION
- <<strerror_r>> converts the error number <[errnum]> into a
- string and copies the result into the supplied <[buffer]> for
--a length up to <[n]>, including the NUL terminator. The value of 
--<[errnum]> is usually a copy of <<errno>>.  If <<errnum>> is not a known 
-+a length up to <[n]>, including the NUL terminator. The value of
-+<[errnum]> is usually a copy of <<errno>>.  If <<errnum>> is not a known
- error number, the result is the empty string.
- 
- See <<strerror>> for how strings are mapped to <<errnum>>.
- 
- RETURNS
--This function returns a pointer to a string.  Your application must
--not modify that string.
-+There are two variants: the GNU version always returns a NUL-terminated
-+string, which is <[buffer]> if all went well, but which is another
-+pointer if <[n]> was too small (leaving <[buffer]> untouched).  If the
-+return is not <[buffer]>, your application must not modify that string.
-+The POSIX version returns 0 on success, <[EINVAL]> if <<errnum>> was not
-+recognized, and <[ERANGE]> if <[n]> was too small.  The variant chosen
-+depends on macros that you define before inclusion of <<string.h>>.
- 
- PORTABILITY
--<<strerror_r>> is a GNU extension.
-+<<strerror_r>> with a <[char *]> result is a GNU extension.
-+<<strerror_r>> with an <[int]> result is required by POSIX 2001.
-+This function is compliant only if <<_user_strerror>> is not provided,
-+or if it is thread-safe and uses separate storage according to whether
-+the second argument of that function is non-zero.  For more details
-+on <<_user_strerror>>, see the <<strerror>> documentation.
-+
-+POSIX states that the contents of <[buf]> are unspecified on error,
-+although this implementation guarantees a NUL-terminated string for
-+all except <[n]> of 0.
-+
-+POSIX recommends that unknown <[errnum]> result in a message including
-+that value, however it is not a requirement and this implementation
-+provides only an empty string (unless you provide <<_user_strerror>>).
-+POSIX also recommends that unknown <[errnum]> fail with EINVAL even
-+when providing such a message, however it is not a requirement and
-+this implementation will return success if <<_user_strerror>> provided
-+a non-empty alternate string without assigning into its third argument.
- 
- <<strerror_r>> requires no supporting OS subroutines.
- 
- */
- 
- #undef __STRICT_ANSI__
-+#define _GNU_SOURCE
- #include <errno.h>
- #include <string.h>
-+#undef strerror_r
- 
-+/* For backwards-compatible linking, this must be the GNU signature;
-+   see xpg_strerror_r.c for the POSIX version.  */
- char *
- _DEFUN (strerror_r, (errnum, buffer, n),
- 	int errnum _AND
- 	char *buffer _AND
- 	size_t n)
- {
--  char *error;
--  error = strerror (errnum);
-+  char *error = _strerror_r (_REENT, errnum, 1, NULL);
- 
--  return strncpy (buffer, (const char *)error, n);
-+  if (strlen (error) >= n)
-+    return error;
-+  return strcpy (buffer, error);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strlen.c newlib-1.19.0/newlib/libc/string/strlen.c
---- newlib-1.19.0.orig/newlib/libc/string/strlen.c	2008-05-27 00:56:14.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strlen.c	2011-08-26 07:21:01.284516485 +0200
-@@ -32,11 +32,12 @@
- */
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- #define LBLOCKSIZE   (sizeof (long))
--#define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1))
-+#define UNALIGNED(X) ((intptr_t)X & (LBLOCKSIZE - 1))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncasecmp.c newlib-1.19.0/newlib/libc/string/strncasecmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strncasecmp.c	2009-04-23 20:11:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strncasecmp.c	2011-08-26 07:21:01.284516485 +0200
-@@ -6,11 +6,11 @@
- 	strncasecmp
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strncasecmp(const char *<[a]>, const char * <[b]>, size_t <[length]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strncasecmp(<[a]>, <[b]>, <[length]>)
- 	char *<[a]>;
- 	char *<[b]>;
-@@ -40,7 +40,7 @@
- 	strncasecmp
- */
- 
--#include <string.h>
-+#include <strings.h>
- #include <ctype.h>
- 
- int 
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncat.c newlib-1.19.0/newlib/libc/string/strncat.c
---- newlib-1.19.0.orig/newlib/libc/string/strncat.c	2005-10-28 23:21:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strncat.c	2011-08-26 07:21:01.285516502 +0200
-@@ -42,11 +42,12 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /* Nonzero if X is aligned on a "long" boundary.  */
- #define ALIGNED(X) \
--  (((long)X & (sizeof (long) - 1)) == 0)
-+  (((intptr_t)X & (sizeof (long) - 1)) == 0)
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncmp.c newlib-1.19.0/newlib/libc/string/strncmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strncmp.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strncmp.c	2011-08-26 07:21:01.285516502 +0200
-@@ -36,12 +36,13 @@
- 	strncmp ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((uintptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1)))
- 
- /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */
- #if LONG_MAX == 2147483647L
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncpy.c newlib-1.19.0/newlib/libc/string/strncpy.c
---- newlib-1.19.0.orig/newlib/libc/string/strncpy.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strncpy.c	2011-08-26 07:21:01.285516502 +0200
-@@ -38,6 +38,7 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /*SUPPRESS 560*/
-@@ -45,7 +46,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/u_strerr.c newlib-1.19.0/newlib/libc/string/u_strerr.c
---- newlib-1.19.0.orig/newlib/libc/string/u_strerr.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/u_strerr.c	2011-08-26 07:21:01.285516502 +0200
-@@ -1,8 +1,10 @@
- #include <_ansi.h>
- 
- char *
--_DEFUN(_user_strerror, (errnum),
--       int errnum)
-+_DEFUN(_user_strerror, (errnum, internal, errptr),
-+       int errnum _AND
-+       int internal _AND
-+       int *errptr)
- {
-   return 0;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/wcwidth.c newlib-1.19.0/newlib/libc/string/wcwidth.c
---- newlib-1.19.0.orig/newlib/libc/string/wcwidth.c	2009-06-03 21:28:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/wcwidth.c	2011-08-26 07:21:01.285516502 +0200
-@@ -94,6 +94,9 @@
- 
- #include <_ansi.h>
- #include <wchar.h>
-+#ifndef _MB_CAPABLE
-+#include <wctype.h> /* iswprint, iswcntrl */
-+#endif
- #include "local.h"
- 
- #ifdef _MB_CAPABLE
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/xpg_strerror_r.c newlib-1.19.0/newlib/libc/string/xpg_strerror_r.c
---- newlib-1.19.0.orig/newlib/libc/string/xpg_strerror_r.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/xpg_strerror_r.c	2011-08-26 07:21:01.285516502 +0200
-@@ -0,0 +1,26 @@
-+/* POSIX variant of strerror_r. */
-+#undef __STRICT_ANSI__
-+#include <errno.h>
-+#include <string.h>
-+
-+int
-+_DEFUN (__xpg_strerror_r, (errnum, buffer, n),
-+	int errnum _AND
-+	char *buffer _AND
-+	size_t n)
-+{
-+  char *error;
-+  int result = 0;
-+
-+  if (!n)
-+    return ERANGE;
-+  error = _strerror_r (_REENT, errnum, 1, &result);
-+  if (strlen (error) >= n)
-+    {
-+      memcpy (buffer, error, n - 1);
-+      buffer[n - 1] = '\0';
-+      return ERANGE;
-+    }
-+  strcpy (buffer, error);
-+  return (result || *error) ? result : EINVAL;
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.am newlib-1.19.0/newlib/libc/sys/linux/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.am	2009-08-19 22:04:43.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/Makefile.am	2011-08-26 07:21:01.286516519 +0200
-@@ -72,7 +72,6 @@
- 	process.c \
- 	prof-freq.c \
- 	profile.c \
--	psignal.c \
- 	pwrite.c \
- 	raise.c \
- 	realloc.c \
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.in newlib-1.19.0/newlib/libc/sys/linux/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.in	2011-07-20 08:45:15.805330498 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/Makefile.in	2011-08-26 07:21:01.286516519 +0200
-@@ -82,24 +82,23 @@
- 	lib_a-mtrim.$(OBJEXT) lib_a-mtrimr.$(OBJEXT) \
- 	lib_a-ntp_gettime.$(OBJEXT) lib_a-pread.$(OBJEXT) \
- 	lib_a-process.$(OBJEXT) lib_a-prof-freq.$(OBJEXT) \
--	lib_a-profile.$(OBJEXT) lib_a-psignal.$(OBJEXT) \
--	lib_a-pwrite.$(OBJEXT) lib_a-raise.$(OBJEXT) \
--	lib_a-realloc.$(OBJEXT) lib_a-reallocr.$(OBJEXT) \
--	lib_a-rename.$(OBJEXT) lib_a-resource.$(OBJEXT) \
--	lib_a-sched.$(OBJEXT) lib_a-select.$(OBJEXT) \
--	lib_a-seteuid.$(OBJEXT) lib_a-sethostid.$(OBJEXT) \
--	lib_a-sethostname.$(OBJEXT) lib_a-shm_open.$(OBJEXT) \
--	lib_a-shm_unlink.$(OBJEXT) lib_a-sig.$(OBJEXT) \
--	lib_a-sigaction.$(OBJEXT) lib_a-sigqueue.$(OBJEXT) \
--	lib_a-signal.$(OBJEXT) lib_a-siglongjmp.$(OBJEXT) \
--	lib_a-sigset.$(OBJEXT) lib_a-sigwait.$(OBJEXT) \
--	lib_a-socket.$(OBJEXT) lib_a-sleep.$(OBJEXT) \
--	lib_a-strsignal.$(OBJEXT) lib_a-strverscmp.$(OBJEXT) \
--	lib_a-sysconf.$(OBJEXT) lib_a-sysctl.$(OBJEXT) \
--	lib_a-systat.$(OBJEXT) lib_a-tcdrain.$(OBJEXT) \
--	lib_a-tcsendbrk.$(OBJEXT) lib_a-termios.$(OBJEXT) \
--	lib_a-time.$(OBJEXT) lib_a-usleep.$(OBJEXT) \
--	lib_a-versionsort.$(OBJEXT)
-+	lib_a-profile.$(OBJEXT) lib_a-pwrite.$(OBJEXT) \
-+	lib_a-raise.$(OBJEXT) lib_a-realloc.$(OBJEXT) \
-+	lib_a-reallocr.$(OBJEXT) lib_a-rename.$(OBJEXT) \
-+	lib_a-resource.$(OBJEXT) lib_a-sched.$(OBJEXT) \
-+	lib_a-select.$(OBJEXT) lib_a-seteuid.$(OBJEXT) \
-+	lib_a-sethostid.$(OBJEXT) lib_a-sethostname.$(OBJEXT) \
-+	lib_a-shm_open.$(OBJEXT) lib_a-shm_unlink.$(OBJEXT) \
-+	lib_a-sig.$(OBJEXT) lib_a-sigaction.$(OBJEXT) \
-+	lib_a-sigqueue.$(OBJEXT) lib_a-signal.$(OBJEXT) \
-+	lib_a-siglongjmp.$(OBJEXT) lib_a-sigset.$(OBJEXT) \
-+	lib_a-sigwait.$(OBJEXT) lib_a-socket.$(OBJEXT) \
-+	lib_a-sleep.$(OBJEXT) lib_a-strsignal.$(OBJEXT) \
-+	lib_a-strverscmp.$(OBJEXT) lib_a-sysconf.$(OBJEXT) \
-+	lib_a-sysctl.$(OBJEXT) lib_a-systat.$(OBJEXT) \
-+	lib_a-tcdrain.$(OBJEXT) lib_a-tcsendbrk.$(OBJEXT) \
-+	lib_a-termios.$(OBJEXT) lib_a-time.$(OBJEXT) \
-+	lib_a-usleep.$(OBJEXT) lib_a-versionsort.$(OBJEXT)
- am__objects_2 = lib_a-aio64.$(OBJEXT) lib_a-confstr.$(OBJEXT) \
- 	lib_a-ctermid.$(OBJEXT) lib_a-fclean.$(OBJEXT) \
- 	lib_a-fpathconf.$(OBJEXT) lib_a-fstab.$(OBJEXT) \
-@@ -141,8 +140,8 @@
- 	mq_close.lo mq_getattr.lo mq_notify.lo mq_open.lo \
- 	mq_receive.lo mq_send.lo mq_setattr.lo mq_unlink.lo msize.lo \
- 	msizer.lo mstats.lo mtrim.lo mtrimr.lo ntp_gettime.lo pread.lo \
--	process.lo prof-freq.lo profile.lo psignal.lo pwrite.lo \
--	raise.lo realloc.lo reallocr.lo rename.lo resource.lo sched.lo \
-+	process.lo prof-freq.lo profile.lo pwrite.lo raise.lo \
-+	realloc.lo reallocr.lo rename.lo resource.lo sched.lo \
- 	select.lo seteuid.lo sethostid.lo sethostname.lo shm_open.lo \
- 	shm_unlink.lo sig.lo sigaction.lo sigqueue.lo signal.lo \
- 	siglongjmp.lo sigset.lo sigwait.lo socket.lo sleep.lo \
-@@ -396,7 +395,6 @@
- 	process.c \
- 	prof-freq.c \
- 	profile.c \
--	psignal.c \
- 	pwrite.c \
- 	raise.c \
- 	realloc.c \
-@@ -865,12 +863,6 @@
- lib_a-profile.obj: profile.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-profile.obj `if test -f 'profile.c'; then $(CYGPATH_W) 'profile.c'; else $(CYGPATH_W) '$(srcdir)/profile.c'; fi`
- 
--lib_a-psignal.o: psignal.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.o `test -f 'psignal.c' || echo '$(srcdir)/'`psignal.c
--
--lib_a-psignal.obj: psignal.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.obj `if test -f 'psignal.c'; then $(CYGPATH_W) 'psignal.c'; else $(CYGPATH_W) '$(srcdir)/psignal.c'; fi`
--
- lib_a-pwrite.o: pwrite.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-pwrite.o `test -f 'pwrite.c' || echo '$(srcdir)/'`pwrite.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/psignal.c newlib-1.19.0/newlib/libc/sys/linux/psignal.c
---- newlib-1.19.0.orig/newlib/libc/sys/linux/psignal.c	2002-06-05 22:58:58.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/psignal.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,15 +0,0 @@
--/* libc/sys/linux/psignal.c - print signal message to stderr */
--
--/* Copyright 2002, Red Hat Inc. */
--
--#include <stdio.h>
--#include <string.h>
--
--void
--psignal (int sig, const char *s)
--{
--  if (s != NULL)
--    fprintf (stderr, "%s: %s\n", s, strsignal (sig));
--  else
--    fprintf (stderr, "%s\n", strsignal (sig));
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/sys/signal.h newlib-1.19.0/newlib/libc/sys/linux/sys/signal.h
---- newlib-1.19.0.orig/newlib/libc/sys/linux/sys/signal.h	2002-07-24 20:18:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/sys/signal.h	2011-08-26 07:21:01.287516536 +0200
-@@ -37,7 +37,6 @@
- #include <_ansi.h>
- 
- int 	_EXFUN(kill, (int, int));
--_VOID 	_EXFUN(psignal, (int, const char *));
- int 	_EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
- int 	_EXFUN(sigaddset, (sigset_t *, const int));
- int 	_EXFUN(sigdelset, (sigset_t *, const int));
-@@ -50,7 +49,6 @@
- 
- #ifndef _POSIX_SOURCE
- extern const char *const sys_siglist[];
--typedef __sighandler_t sig_t; /* BSDism */
- #endif
- 
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/crt0.c newlib-1.19.0/newlib/libc/sys/rtems/crt0.c
---- newlib-1.19.0.orig/newlib/libc/sys/rtems/crt0.c	2009-12-16 19:28:14.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/rtems/crt0.c	2011-08-26 07:21:01.287516536 +0200
-@@ -12,20 +12,21 @@
- 
- #include <reent.h>
- 
--#include <signal.h> // sigset_t
--#include <time.h> // struct timespec
-+#include <signal.h> /* sigset_t */
-+#include <time.h> /* struct timespec */
-+#include <unistd.h> /* isatty */
- 
- void rtems_provides_crt0( void ) {}  /* dummy symbol so file always has one */
- 
--#define RTEMS_STUB(ret, func) \
--ret rtems_stub_##func {}; \
--ret func
-+#define RTEMS_STUB(ret, func, body) \
-+ret rtems_stub_##func body; \
-+ret func body
- 
- /* RTEMS provides some of its own routines including a Malloc family */
--RTEMS_STUB(void *,malloc(size_t s)) { return 0; }
--RTEMS_STUB(void *,realloc(void* p, size_t s)) { return 0; }
--RTEMS_STUB(void, free(void)) { ; }
--RTEMS_STUB(_PTR, calloc(struct _reent *r, size_t s1, size_t s2)) {}
-+RTEMS_STUB(void *,malloc(size_t s), { return 0; })
-+RTEMS_STUB(void *,realloc(void* p, size_t s), { return 0; })
-+RTEMS_STUB(void, free(void* ptr), { })
-+RTEMS_STUB(_PTR, calloc(size_t s1, size_t s2), { return 0; })
- 
- #if defined(__GNUC__)
- /*
-@@ -49,90 +50,93 @@
- #endif
- 
- /* stubs for functions RTEMS provides */
--RTEMS_STUB(int, close (int fd)) { return -1; }
--RTEMS_STUB(int, dup2(int oldfd, int newfd)) { return -1; }
--RTEMS_STUB(int, fcntl( int fd, int cmd, ... /* arg */ )) { return -1; }
--RTEMS_STUB(pid_t, fork(void)) { return -1; }
--RTEMS_STUB(int, fstat(int fd, struct stat *buf)) { return -1; }
--RTEMS_STUB(int, getdents(int fd, void *dp, int count)) { return -1; }
--RTEMS_STUB(char *, getlogin(void)) { return 0; }
--RTEMS_STUB(struct passwd *, getpwnam(const char *name)) { return 0; }
--RTEMS_STUB(struct passwd *, getpwuid(uid_t uid)) { return 0; }
--RTEMS_STUB(uid_t, getuid(void)) { return 0; }
--RTEMS_STUB(int, nanosleep(const struct timespec *req, struct timespec *rem)) { return -1; }
--RTEMS_STUB(_off_t, lseek(int fd, _off_t offset, int whence)) { return -1; }
--RTEMS_STUB(int, lstat(const char *path, struct stat *buf)) { return -1; }
--RTEMS_STUB(int, open(const char *pathname, int flags, int mode)) { return -1; }
--RTEMS_STUB(int, pipe(int pipefd[2])) { return -1; }
--RTEMS_STUB(_ssize_t, read(int fd, void *buf, size_t count)) { return -1; }
--RTEMS_STUB(int, sigfillset(sigset_t *set)) { return -1; }
--RTEMS_STUB(int, sigprocmask(int how, const sigset_t *set, sigset_t *oldset)) { return -1; }
--RTEMS_STUB(int, stat(const char *path, struct stat *buf)) { return -1; }
--RTEMS_STUB(int, unlink(const char *pathname)) { return -1; }
--RTEMS_STUB(pid_t, vfork(void)) { return -1; }
-+RTEMS_STUB(int, clock_gettime(clockid_t clk_id, struct timespec *tp), { return -1; })
-+RTEMS_STUB(int, close (int fd), { return -1; })
-+RTEMS_STUB(int, dup2(int oldfd, int newfd), { return -1; })
-+RTEMS_STUB(int, fcntl( int fd, int cmd, ... /* arg */ ), { return -1; })
-+RTEMS_STUB(pid_t, fork(void), { return -1; })
-+RTEMS_STUB(int, fstat(int fd, struct stat *buf), { return -1; })
-+RTEMS_STUB(int, getdents(int fd, void *dp, int count), { return -1; })
-+RTEMS_STUB(char *, getlogin(void), { return 0; })
-+RTEMS_STUB(int, gettimeofday(struct timeval *tv, struct timezone *tz), { return -1; })
-+RTEMS_STUB(struct passwd *, getpwnam(const char *name), { return 0; })
-+RTEMS_STUB(struct passwd *, getpwuid(uid_t uid), { return 0; })
-+RTEMS_STUB(uid_t, getuid(void), { return 0; })
-+RTEMS_STUB(int, nanosleep(const struct timespec *req, struct timespec *rem), { return -1; })
-+RTEMS_STUB(_off_t, lseek(int fd, _off_t offset, int whence), { return -1; })
-+RTEMS_STUB(int, lstat(const char *path, struct stat *buf), { return -1; })
-+RTEMS_STUB(int, open(const char *pathname, int flags, int mode), { return -1; })
-+RTEMS_STUB(int, pipe(int pipefd[2]), { return -1; })
-+RTEMS_STUB(_ssize_t, read(int fd, void *buf, size_t count), { return -1; })
-+RTEMS_STUB(int, sched_yield(void), { return -1; })
-+RTEMS_STUB(int, sigfillset(sigset_t *set), { return -1; })
-+RTEMS_STUB(int, sigprocmask(int how, const sigset_t *set, sigset_t *oldset), { return -1; })
-+RTEMS_STUB(int, stat(const char *path, struct stat *buf), { return -1; })
-+RTEMS_STUB(int, unlink(const char *pathname), { return -1; })
-+RTEMS_STUB(pid_t, vfork(void), { return -1; })
- #if !defined(_NO_POPEN) && !defined(_NO_WORDEXP)
- /* pulled in by libc/sys/posix/popen.c and libc/sys/posix/word*.c */
--RTEMS_STUB(int, waitpid (pid_t pid, int *status, int options)) { return -1; }
-+RTEMS_STUB(int, waitpid (pid_t pid, int *status, int options), { return -1; })
- #endif
--RTEMS_STUB(_ssize_t, write (int fd, const void *buf, size_t nbytes)) { return -1; }
-+RTEMS_STUB(_ssize_t, write (int fd, const void *buf, size_t nbytes), { return -1; })
- 
- /* stubs for functions from reent.h */
--RTEMS_STUB(int, _close_r (struct _reent *r, int fd)) { return -1; }
-+RTEMS_STUB(int, _close_r (struct _reent *r, int fd), { return -1; })
- #if defined(_NO_EXECVE)
--RTEMS_STUB(int, _execve_r (struct _reent *r, char *, char **, char **)) { return -1; }
-+RTEMS_STUB(int, _execve_r (struct _reent *r, char *, char **, char **), { return -1; })
- #endif
--RTEMS_STUB(int, _fcntl_r (struct _reent *ptr, int fd, int cmd, int arg )) { return -1; }
-+RTEMS_STUB(int, _fcntl_r (struct _reent *ptr, int fd, int cmd, int arg ), { return -1; })
- #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC))
- #ifndef NO_FORK
- /* cf. newlib/libc/reent/execr.c */
--RTEMS_STUB(int, _fork_r (struct _reent *r)) { return -1; }
-+RTEMS_STUB(int, _fork_r (struct _reent *r), { return -1; })
- #endif
- #endif
--RTEMS_STUB(int, _fstat_r (struct _reent *r, int fd, struct stat *buf)) { return -1; }
--RTEMS_STUB(int, _getpid_r (struct _reent *r)) { return -1; }
--RTEMS_STUB(int, _gettimeofday_r(struct _reent *r, struct timeval *tp, void *tzp)) { return 0; }
--RTEMS_STUB(int, _isatty_r (struct _reent *r, int fd)) { return isatty( fd ); }
--RTEMS_STUB(int, _kill_r (struct _reent *r, int pid, int sig )) { return -1; }
-+RTEMS_STUB(int, _fstat_r (struct _reent *r, int fd, struct stat *buf), { return -1; })
-+RTEMS_STUB(int, _getpid_r (struct _reent *r), { return -1; })
-+RTEMS_STUB(int, _gettimeofday_r(struct _reent *r, struct timeval *tp, void *tzp), { return 0; })
-+RTEMS_STUB(int, _isatty_r (struct _reent *r, int fd), { return isatty( fd ); })
-+RTEMS_STUB(int, _kill_r (struct _reent *r, int pid, int sig ), { return -1; })
- #if !defined(REENTRANT_SYSCALLS_PROVIDED)
- /* cf. newlib/libc/reent/linkr.c */
--RTEMS_STUB(int, _link_r (struct _reent *, const char *, const char *)) { return -1; }
-+RTEMS_STUB(int, _link_r (struct _reent *r, const char *oldpath, const char *newpath), { return -1; })
- #endif
--RTEMS_STUB(_off_t, _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence )) { return -1; }
--RTEMS_STUB(int, _open_r (struct _reent *r, const char *buf, int flags, int mode)) { return -1; }
--RTEMS_STUB(_ssize_t, _read_r (struct _reent *r, int fd, void *buf, size_t nbytes)) { return -1; }
--RTEMS_STUB(int, _rename_r (struct _reent *r, const char *a, const char *b)){ return -1; }
-+RTEMS_STUB(_off_t, _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence ), { return -1; })
-+RTEMS_STUB(int, _open_r (struct _reent *r, const char *buf, int flags, int mode), { return -1; })
-+RTEMS_STUB(_ssize_t, _read_r (struct _reent *r, int fd, void *buf, size_t nbytes), { return -1; })
-+RTEMS_STUB(int, _rename_r (struct _reent *r, const char *a, const char *b), { return -1; })
- #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (MALLOC_PROVIDED))
- /* cf. newlib/libc/reent/sbrkr.c */
--RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t)) { return -1; }
-+RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t addr), { return 0; })
- #endif
--RTEMS_STUB(int, _stat_r (struct _reent *r, const char *path, struct stat *buf)) { return -1; }
--RTEMS_STUB(_CLOCK_T_, _times_r (struct _reent *r, struct tms *ptms)) { return -1; }
--RTEMS_STUB(int, _unlink_r (struct _reent *r, const char *path)) { return -1; }
-+RTEMS_STUB(int, _stat_r (struct _reent *r, const char *path, struct stat *buf), { return -1; })
-+RTEMS_STUB(_CLOCK_T_, _times_r (struct _reent *r, struct tms *ptms), { return -1; })
-+RTEMS_STUB(int, _unlink_r (struct _reent *r, const char *path), { return -1; })
- #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC))
- /* cf. newlib/libc/reent/execr.c */
--RTEMS_STUB(int, _wait_r (struct _reent *r, int *)) { return -1; }
-+RTEMS_STUB(int, _wait_r (struct _reent *r, int *status), { return -1; })
- #endif
--RTEMS_STUB(_ssize_t, _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes)) { return -1; }
-+RTEMS_STUB(_ssize_t, _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes), { return -1; })
- 
- 
--RTEMS_STUB(int, _execve(const char *path, char * const *argv, char * const *envp)) { return -1; }
--RTEMS_STUB(void, _exit(int status)) { while(1); }
-+RTEMS_STUB(int, _execve(const char *path, char * const *argv, char * const *envp), { return -1; })
-+RTEMS_STUB(void, _exit(int status), { while(1); })
- 
- /* Pulled in by newlib/libc/posix/glob.c */
- #ifndef _NO_GLOB
- #ifndef __NETBSD_SYSCALLS
--RTEMS_STUB(int, issetugid (void)) { return 0; }
-+RTEMS_STUB(int, issetugid (void), { return 0; })
- #endif
- #endif
- 
- /* stdlib.h */
--RTEMS_STUB(_PTR, _realloc_r(struct _reent *r, _PTR p, size_t s)) {}
--RTEMS_STUB(_PTR, _calloc_r(struct _reent *r, size_t s1, size_t s2)) {}
--RTEMS_STUB(_PTR, _malloc_r(struct _reent *r, size_t s)) {}
--RTEMS_STUB(_VOID, _free_r(struct _reent *r, _PTR p)) {}
-+RTEMS_STUB(_PTR, _realloc_r(struct _reent *r, _PTR p, size_t s), { return 0; })
-+RTEMS_STUB(_PTR, _calloc_r(struct _reent *r, size_t s1, size_t s2), { return 0; })
-+RTEMS_STUB(_PTR, _malloc_r(struct _reent * r, size_t s), { return 0; })
-+RTEMS_STUB(_VOID, _free_r(struct _reent *r, _PTR *p), { })
- 
- /* stubs for functions required by libc/stdlib */
--RTEMS_STUB(void, __assert_func(const char *file, int line, const char *failedexpr)) {}
-+RTEMS_STUB(void, __assert_func(const char *file, int line, const char *failedexpr), { })
- 
- /* The PowerPC expects certain symbols to be defined in the linker script. */
- 
-@@ -154,41 +158,6 @@
- int __EH_FRAME_BEGIN__;
- #endif
- 
--/*  The hppa expects this to be defined in the real crt0.s. 
-- *  Also for some reason, the hppa1.1 does not find atexit()
-- *  during the AC_PROG_CC tests.
-- */
--
--#if defined(__hppa__)
--/*
--  asm ( ".subspa \$GLOBAL\$,QUAD=1,ALIGN=8,ACCESS=0x1f,SORT=40");
--  asm ( ".export \$global\$" );
--  asm ( "\$global\$:");
--*/
--
--  asm (".text");
--  asm (".global");
--  asm (".EXPORT $$dyncall,ENTRY");
--  asm ("$$dyncall:");
--  int atexit(void (*function)(void)) { return 0; }
--#endif
--
--
--/*
-- *  The AMD a29k generates code expecting the following.
-- */
--
--#if defined(_AM29000) || defined(_AM29K)
--asm (".global V_SPILL, V_FILL" );
--asm (".global V_EPI_OS, V_BSD_OS" );
--
--asm (".equ    V_SPILL, 64" );
--asm (".equ    V_FILL, 65" );
--
--asm (".equ    V_BSD_OS, 66" );
--asm (".equ    V_EPI_OS, 69" );
--#endif
--
- #if defined(__AVR__)
- /*
-  * Initial stack pointer address "__stack"
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/include/limits.h newlib-1.19.0/newlib/libc/sys/rtems/include/limits.h
---- newlib-1.19.0.orig/newlib/libc/sys/rtems/include/limits.h	2008-11-17 23:05:12.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/rtems/include/limits.h	2011-08-26 07:21:01.287516536 +0200
-@@ -78,7 +78,13 @@
-  *  Invariant values
-  */
- 
-+#ifdef __SIZE_MAX__
-+#define SSIZE_MAX		(__SIZE_MAX__ >> 1)
-+#elif defined(__SIZEOF_SIZE_T__) && defined(__CHAR_BIT__)
-+#define SSIZE_MAX               ((1UL << (__SIZEOF_SIZE_T__ * __CHAR_BIT__ - 1)) - 1)
-+#else /* historic fallback, wrong in most cases */
- #define SSIZE_MAX               32767
-+#endif
- 
- /*
-  *  Maximum Values
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/sys/dirent.h newlib-1.19.0/newlib/libc/sys/rtems/sys/dirent.h
---- newlib-1.19.0.orig/newlib/libc/sys/rtems/sys/dirent.h	2010-07-06 17:23:27.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/rtems/sys/dirent.h	2011-08-26 07:21:01.287516536 +0200
-@@ -50,7 +50,7 @@
- 
- int scandir ( const char *dirname,
-    struct dirent *** namelist,
--   int (*select)(struct dirent *),
-+   int (*select)(const struct dirent *),
-    int (*dcomp)(const struct dirent **, const struct dirent **)
- );
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/fstat.c newlib-1.19.0/newlib/libc/sys/sysnecv850/fstat.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/fstat.c	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/fstat.c	2011-08-26 07:21:01.288516552 +0200
-@@ -13,6 +13,5 @@
- _fstat (int file,
- 	struct stat *st)
- {
--  st->st_mode = S_IFCHR;
--  return 0;
-+  return TRAP0 (SYS_fstat, file, st, 0);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.am newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.am	2010-09-09 16:54:24.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.am	2011-08-26 07:21:01.287516536 +0200
-@@ -16,7 +16,7 @@
- 	$(lpfx)open.o $(lpfx)pipe.o $(lpfx)read.o $(lpfx)link.o \
- 	$(lpfx)sbrk.o $(lpfx)stat.o $(lpfx)time.o $(lpfx)trap.o \
- 	$(lpfx)unlink.o $(lpfx)utime.o $(lpfx)wait.o $(lpfx)write.o \
--	$(lpfx)times.o $(lpfx)gettime.o
-+	$(lpfx)times.o $(lpfx)gettime.o $(lpfx)rename.o
- else
- extra_objs =
- endif
-@@ -27,7 +27,7 @@
- 	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
- 	kill.c lseek.c open.c pipe.c read.c link.c \
- 	sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c \
--	times.c gettime.c
-+	times.c gettime.c rename.c
- lib_a_SOURCES =
- lib_a_DEPENDENCIES = $(extra_objs)
- lib_a_CCASFLAGS = $(AM_CCASFLAGS)
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.in newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.in	2011-07-20 08:45:15.796330353 +0200
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.in	2011-08-26 07:21:01.288516552 +0200
-@@ -65,7 +65,8 @@
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)time.o $(lpfx)trap.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)unlink.o $(lpfx)utime.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)wait.o $(lpfx)write.o \
-- at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o
-+ at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o \
-+ at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)rename.o
- am_lib_a_OBJECTS =
- lib_a_OBJECTS = $(am_lib_a_OBJECTS)
- DEFAULT_INCLUDES = -I. at am__isrc@
-@@ -111,6 +112,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-+NO_INCLUDE_LIST = @NO_INCLUDE_LIST@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -194,7 +196,7 @@
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)open.o $(lpfx)pipe.o $(lpfx)read.o $(lpfx)link.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)sbrk.o $(lpfx)stat.o $(lpfx)time.o $(lpfx)trap.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)unlink.o $(lpfx)utime.o $(lpfx)wait.o $(lpfx)write.o \
-- at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o
-+ at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o $(lpfx)rename.o
- 
- lib_a_LIBADD = $(extra_objs)
- EXTRA_lib_a_SOURCES = \
-@@ -202,7 +204,7 @@
- 	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
- 	kill.c lseek.c open.c pipe.c read.c link.c \
- 	sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c \
--	times.c gettime.c
-+	times.c gettime.c rename.c
- 
- lib_a_SOURCES = 
- lib_a_DEPENDENCIES = $(extra_objs)
-@@ -448,6 +450,12 @@
- lib_a-gettime.obj: gettime.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-gettime.obj `if test -f 'gettime.c'; then $(CYGPATH_W) 'gettime.c'; else $(CYGPATH_W) '$(srcdir)/gettime.c'; fi`
- 
-+lib_a-rename.o: rename.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rename.o `test -f 'rename.c' || echo '$(srcdir)/'`rename.c
-+
-+lib_a-rename.obj: rename.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rename.obj `if test -f 'rename.c'; then $(CYGPATH_W) 'rename.c'; else $(CYGPATH_W) '$(srcdir)/rename.c'; fi`
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/rename.c newlib-1.19.0/newlib/libc/sys/sysnecv850/rename.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/rename.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/rename.c	2011-08-26 07:21:01.288516552 +0200
-@@ -0,0 +1,17 @@
-+#include <_ansi.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include "sys/syscall.h"
-+
-+int errno;
-+
-+int __trap0 (int function, int p1, int p2, int p3);
-+
-+#define TRAP0(f, p1, p2, p3) __trap0(f, (int)(p1), (int)(p2), (int)(p3))
-+
-+int
-+rename (const char *oldpath,
-+	 const char *newpath)
-+{
-+  return TRAP0 (SYS_rename, oldpath, newpath, 0);
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sbrk.c newlib-1.19.0/newlib/libc/sys/sysnecv850/sbrk.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sbrk.c	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/sbrk.c	2011-08-26 07:21:01.288516552 +0200
-@@ -3,34 +3,27 @@
- #include <sys/stat.h>
- #include "sys/syscall.h"
- 
--int errno;
--
--int __trap0 (int function, int p1, int p2, int p3);
--
--#define TRAP0(f, p1, p2, p3) __trap0(f, (int)(p1), (int)(p2), (int)(p3))
--
- caddr_t
- _sbrk (int incr)
- {
--  extern char end;		/* Defined by the linker */
--  static char *heap_end;
--  char *prev_heap_end;
--#if 0
--  char *sp = (char *)stack_ptr;
--#else
--  char *sp = (char *)&sp;
--#endif
-+  extern char   heap_start;	/* Defined by the linker script.  */
-+  static char * heap_end = NULL;
-+  char *        prev_heap_end;
-+  char *        sp = (char *) & sp;
-+
-+  if (heap_end == NULL)
-+    heap_end = & heap_start;
- 
--  if (heap_end == 0)
--    {
--      heap_end = &end;
--    }
-   prev_heap_end = heap_end;
-+
-   if (heap_end + incr > sp)
-     {
--      _write (1, "Heap and stack collision\n", 25);
-+#define MESSAGE "Heap and stack collision\n"
-+      _write (1, MESSAGE, sizeof MESSAGE);
-       abort ();
-     }
-+
-   heap_end += incr;
-+
-   return (caddr_t) prev_heap_end;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sys/syscall.h newlib-1.19.0/newlib/libc/sys/sysnecv850/sys/syscall.h
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sys/syscall.h	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/sys/syscall.h	2011-08-26 07:21:01.288516552 +0200
-@@ -29,6 +29,7 @@
- #define	SYS_execve	59
- #define   SYS_times       43
- #define SYS_gettimeofday 116
-+#define SYS_rename	134
- 
- #define SYS_utime       201 /* not really a system call */
- #define SYS_wait        202 /* nor is this */
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/trap.S newlib-1.19.0/newlib/libc/sys/sysnecv850/trap.S
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/trap.S	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/trap.S	2011-08-26 07:21:01.288516552 +0200
-@@ -2,9 +2,9 @@
- 	.global	___trap0
- ___trap0:
- 	trap 31
--	tst r10,r10
-+	tst r11,r11
- 	bz .L0
- 	movhi hi(_errno),r0,r6
--	st.w r10,lo(_errno)[r6]
-+	st.w r11,lo(_errno)[r6]
- .L0:
- 	jmp [r31]
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/unlink.c newlib-1.19.0/newlib/libc/sys/sysnecv850/unlink.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/unlink.c	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/unlink.c	2011-08-26 07:21:01.289516568 +0200
-@@ -10,7 +10,7 @@
- #define TRAP0(f, p1, p2, p3) __trap0(f, (int)(p1), (int)(p2), (int)(p3))
- 
- int
--_unlink ()
-+_unlink (const char *path)
- {
--  return -1;
-+  return TRAP0 (SYS_unlink, path, 0, 0);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/asctime_r.c newlib-1.19.0/newlib/libc/time/asctime_r.c
---- newlib-1.19.0.orig/newlib/libc/time/asctime_r.c	2000-05-10 19:58:29.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/time/asctime_r.c	2011-08-26 07:21:01.289516568 +0200
-@@ -18,10 +18,10 @@
- 	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-   };
- 
--  sprintf (result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
--	   day_name[tim_p->tm_wday], 
--	   mon_name[tim_p->tm_mon],
--	   tim_p->tm_mday, tim_p->tm_hour, tim_p->tm_min,
--	   tim_p->tm_sec, 1900 + tim_p->tm_year);
-+  siprintf (result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
-+	    day_name[tim_p->tm_wday], 
-+	    mon_name[tim_p->tm_mon],
-+	    tim_p->tm_mday, tim_p->tm_hour, tim_p->tm_min,
-+	    tim_p->tm_sec, 1900 + tim_p->tm_year);
-   return result;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/mktime.c newlib-1.19.0/newlib/libc/time/mktime.c
---- newlib-1.19.0.orig/newlib/libc/time/mktime.c	2008-12-11 18:27:56.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/time/mktime.c	2011-08-26 07:21:01.289516568 +0200
-@@ -107,7 +107,7 @@
-         }
-     }
- 
--  if (tim_p->tm_mon > 11)
-+  if (tim_p->tm_mon < 0 || tim_p->tm_mon > 11)
-     {
-       res = div (tim_p->tm_mon, 12);
-       tim_p->tm_year += res.quot;
-@@ -159,7 +159,7 @@
- {
-   time_t tim = 0;
-   long days = 0;
--  int year, isdst, tm_isdst;
-+  int year, isdst=0;
-   __tzinfo_type *tz = __gettzinfo ();
- 
-   /* validate structure */
-@@ -204,13 +204,16 @@
-   /* compute total seconds */
-   tim += (days * _SEC_IN_DAY);
- 
--  /* Convert user positive into 1 */
--  tm_isdst = tim_p->tm_isdst > 0  ?  1 : tim_p->tm_isdst;
--  isdst = tm_isdst;
-+  TZ_LOCK;
- 
-   if (_daylight)
-     {
-+      int tm_isdst;
-       int y = tim_p->tm_year + YEAR_BASE;
-+      /* Convert user positive into 1 */
-+      tm_isdst = tim_p->tm_isdst > 0  ?  1 : tim_p->tm_isdst;
-+      isdst = tm_isdst;
-+
-       if (y == tz->__tzyear || __tzcalc_limits (y))
- 	{
- 	  /* calculate start of dst in dst local time and 
-@@ -257,6 +260,8 @@
-   else /* otherwise assume std time */
-     tim += (time_t) tz->__tzrule[0].offset;
- 
-+  TZ_UNLOCK;
-+
-   /* reset isdst flag to what we have calculated */
-   tim_p->tm_isdst = isdst;
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/strftime.c newlib-1.19.0/newlib/libc/time/strftime.c
---- newlib-1.19.0.orig/newlib/libc/time/strftime.c	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/time/strftime.c	2011-08-26 07:21:01.289516568 +0200
-@@ -285,6 +285,7 @@
- #  define CQ(a)		a		/* character constant qualifier */
- #  define SFLG				/* %s flag (null for normal char) */
- #  define _ctloc(x) (ctloclen = strlen (ctloc = _CurrentTimeLocale->x), ctloc)
-+#  define snprintf	sniprintf	/* avoid to pull in FP functions. */
- #  define TOLOWER(c)	tolower((int)(unsigned char)(c))
- #  define STRTOUL(c,p,b) strtoul((c),(p),(b))
- #  define STRCPY(a,b)	strcpy((a),(b))
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/strptime.c newlib-1.19.0/newlib/libc/time/strptime.c
---- newlib-1.19.0.orig/newlib/libc/time/strptime.c	2010-01-22 14:03:42.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/time/strptime.c	2011-08-26 07:21:01.290516584 +0200
-@@ -34,12 +34,23 @@
- #include <stdio.h>
- #include <time.h>
- #include <string.h>
-+#include <strings.h>
- #include <ctype.h>
- #include <stdlib.h>
- #include "../locale/timelocal.h"
- 
- #define _ctloc(x) (_CurrentTimeLocale->x)
- 
-+static _CONST int _DAYS_BEFORE_MONTH[12] =
-+{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-+
-+#define SET_MDAY 1
-+#define SET_MON  2
-+#define SET_YEAR 4
-+#define SET_WDAY 8
-+#define SET_YDAY 16
-+#define SET_YMD  (SET_YEAR | SET_MON | SET_MDAY)
-+
- /*
-  * tm_year is relative this year 
-  */
-@@ -78,8 +89,8 @@
- {
-     int ret = 4;
- 
--    for (; year > 1970; --year)
--	ret = (ret + 365 + is_leap_year (year) ? 1 : 0) % 7;
-+    while (--year >= 1970)
-+	ret = (ret + 365 + is_leap_year (year)) % 7;
-     return ret;
- }
- 
-@@ -147,6 +158,7 @@
- 	struct tm *timeptr)
- {
-     char c;
-+    int ymd = 0;
- 
-     struct lc_time_T *_CurrentTimeLocale = __get_current_time_locale ();
-     for (; (c = *format) != '\0'; ++format) {
-@@ -166,18 +178,21 @@
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_wday = ret;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'a' :
- 		ret = match_string (&buf, _ctloc (wday));
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_wday = ret;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'B' :
- 		ret = match_string (&buf, _ctloc (month));
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_mon = ret;
-+		ymd |= SET_MON;
- 		break;
- 	    case 'b' :
- 	    case 'h' :
-@@ -185,6 +200,7 @@
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_mon = ret;
-+		ymd |= SET_MON;
- 		break;
- 	    case 'C' :
- 		ret = strtol (buf, &s, 10);
-@@ -192,18 +208,21 @@
- 		    return NULL;
- 		timeptr->tm_year = (ret * 100) - tm_year_base;
- 		buf = s;
-+		ymd |= SET_YEAR;
- 		break;
- 	    case 'c' :		/* %a %b %e %H:%M:%S %Y */
- 		s = strptime (buf, _ctloc (c_fmt), timeptr);
- 		if (s == NULL)
- 		    return NULL;
- 		buf = s;
-+		ymd |= SET_WDAY | SET_YMD;
- 		break;
- 	    case 'D' :		/* %m/%d/%y */
- 		s = strptime (buf, "%m/%d/%y", timeptr);
- 		if (s == NULL)
- 		    return NULL;
- 		buf = s;
-+		ymd |= SET_YMD;
- 		break;
- 	    case 'd' :
- 	    case 'e' :
-@@ -212,6 +231,7 @@
- 		    return NULL;
- 		timeptr->tm_mday = ret;
- 		buf = s;
-+		ymd |= SET_MDAY;
- 		break;
- 	    case 'H' :
- 	    case 'k' :
-@@ -238,6 +258,7 @@
- 		    return NULL;
- 		timeptr->tm_yday = ret - 1;
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'm' :
- 		ret = strtol (buf, &s, 10);
-@@ -245,6 +266,7 @@
- 		    return NULL;
- 		timeptr->tm_mon = ret - 1;
- 		buf = s;
-+		ymd |= SET_MON;
- 		break;
- 	    case 'M' :
- 		ret = strtol (buf, &s, 10);
-@@ -306,6 +328,7 @@
- 		    return NULL;
- 		timeptr->tm_wday = ret - 1;
- 		buf = s;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'w' :
- 		ret = strtol (buf, &s, 10);
-@@ -313,6 +336,7 @@
- 		    return NULL;
- 		timeptr->tm_wday = ret;
- 		buf = s;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'U' :
- 		ret = strtol (buf, &s, 10);
-@@ -320,6 +344,7 @@
- 		    return NULL;
- 		set_week_number_sun (timeptr, ret);
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'V' :
- 		ret = strtol (buf, &s, 10);
-@@ -327,6 +352,7 @@
- 		    return NULL;
- 		set_week_number_mon4 (timeptr, ret);
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'W' :
- 		ret = strtol (buf, &s, 10);
-@@ -334,12 +360,14 @@
- 		    return NULL;
- 		set_week_number_mon (timeptr, ret);
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'x' :
- 		s = strptime (buf, _ctloc (x_fmt), timeptr);
- 		if (s == NULL)
- 		    return NULL;
- 		buf = s;
-+		ymd |= SET_YMD;
- 		break;
- 	    case 'X' :
- 		s = strptime (buf, _ctloc (X_fmt), timeptr);
-@@ -356,6 +384,7 @@
- 		else
- 		    timeptr->tm_year = ret;
- 		buf = s;
-+		ymd |= SET_YEAR;
- 		break;
- 	    case 'Y' :
- 		ret = strtol (buf, &s, 10);
-@@ -363,6 +392,7 @@
- 		    return NULL;
- 		timeptr->tm_year = ret - tm_year_base;
- 		buf = s;
-+		ymd |= SET_YEAR;
- 		break;
- 	    case 'Z' :
- 		/* Unsupported. Just ignore.  */
-@@ -390,6 +420,58 @@
- 		return NULL;
- 	}
-     }
-+
-+    if ((ymd & SET_YMD) == SET_YMD) {
-+	/* all of tm_year, tm_mon and tm_mday, but... */
-+
-+	if (!(ymd & SET_YDAY)) {
-+	    /* ...not tm_yday, so fill it in */
-+	    timeptr->tm_yday = _DAYS_BEFORE_MONTH[timeptr->tm_mon]
-+		+ timeptr->tm_mday;
-+	    if (!is_leap_year (timeptr->tm_year + tm_year_base)
-+		|| timeptr->tm_mon < 2)
-+	    {
-+		timeptr->tm_yday--;
-+	    }
-+	    ymd |= SET_YDAY;
-+	}
-+    }
-+    else if ((ymd & (SET_YEAR | SET_YDAY)) == (SET_YEAR | SET_YDAY)) {
-+	/* both of tm_year and tm_yday, but... */
-+
-+	if (!(ymd & SET_MON)) {
-+	    /* ...not tm_mon, so fill it in, and/or... */
-+	    if (timeptr->tm_yday < _DAYS_BEFORE_MONTH[1])
-+		timeptr->tm_mon = 0;
-+	    else {
-+		int leap = is_leap_year (timeptr->tm_year + tm_year_base);
-+		int i;
-+		for (i = 2; i < 12; ++i) {
-+		    if (timeptr->tm_yday < _DAYS_BEFORE_MONTH[i] + leap)
-+			break;
-+		}
-+		timeptr->tm_mon = i - 1;
-+	    }
-+	}
-+
-+	if (!(ymd & SET_MDAY)) {
-+	    /* ...not tm_mday, so fill it in */
-+	    timeptr->tm_mday = timeptr->tm_yday
-+		- _DAYS_BEFORE_MONTH[timeptr->tm_mon];
-+	    if (!is_leap_year (timeptr->tm_year + tm_year_base)
-+		|| timeptr->tm_mon < 2)
-+	    {
-+		timeptr->tm_mday++;
-+	    }
-+	}
-+    }
-+
-+    if ((ymd & (SET_YEAR | SET_YDAY | SET_WDAY)) == (SET_YEAR | SET_YDAY)) {
-+	/* fill in tm_wday */
-+	int fday = first_day (timeptr->tm_year + tm_year_base);
-+	timeptr->tm_wday = (fday + timeptr->tm_yday) % 7;
-+    }
-+
-     return (char *)buf;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/tzset_r.c newlib-1.19.0/newlib/libc/time/tzset_r.c
---- newlib-1.19.0.orig/newlib/libc/time/tzset_r.c	2008-10-06 21:21:29.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/time/tzset_r.c	2011-08-26 07:21:01.290516584 +0200
-@@ -7,6 +7,8 @@
- #include <sys/time.h>
- #include "local.h"
- 
-+#define sscanf siscanf	/* avoid to pull in FP functions. */
-+
- static char __tzname_std[11];
- static char __tzname_dst[11];
- static char *prev_tzenv = NULL;
-@@ -28,6 +30,8 @@
- 	_daylight = 0;
- 	_tzname[0] = "GMT";
- 	_tzname[1] = "GMT";
-+	free(prev_tzenv);
-+	prev_tzenv = NULL;
- 	TZ_UNLOCK;
- 	return;
-       }
-@@ -80,8 +84,10 @@
-   tzenv += n;
-   
-   if (sscanf (tzenv, "%10[^0-9,+-]%n", __tzname_dst, &n) <= 0)
--    {
-+    { /* No dst */
-       _tzname[1] = _tzname[0];
-+      _timezone = tz->__tzrule[0].offset;
-+      _daylight = 0;
-       TZ_UNLOCK;
-       return;
-     }
-diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr.c newlib-1.19.0/newlib/libc/xdr/xdr.c
---- newlib-1.19.0.orig/newlib/libc/xdr/xdr.c	2010-03-02 13:05:18.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/xdr/xdr.c	2011-08-26 07:21:01.290516584 +0200
-@@ -113,7 +113,7 @@
- #elif INT_MAX == LONG_MAX
-   return xdr_long (xdrs, (long *) ip);
- #else
--# error Unexpeced integer sizes in xdr_int()
-+# error Unexpected integer sizes in xdr_int()
- #endif
- }
- 
-@@ -148,7 +148,7 @@
- #elif UINT_MAX == ULONG_MAX
-   return xdr_u_long (xdrs, (u_long *) up);
- #else
--# error Unexpeced integer sizes in xdr_int()
-+# error Unexpected integer sizes in xdr_int()
- #endif
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr_private.h newlib-1.19.0/newlib/libc/xdr/xdr_private.h
---- newlib-1.19.0.orig/newlib/libc/xdr/xdr_private.h	2010-03-02 13:05:18.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/xdr/xdr_private.h	2011-08-26 07:21:01.290516584 +0200
-@@ -25,6 +25,7 @@
- 
- #include <_ansi.h>
- #include <stdarg.h>
-+#include <stdint.h>
- #include <sys/param.h>
- 
- /* avoid including stdio header here */
-diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr_rec.c newlib-1.19.0/newlib/libc/xdr/xdr_rec.c
---- newlib-1.19.0.orig/newlib/libc/xdr/xdr_rec.c	2010-03-02 13:05:18.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/xdr/xdr_rec.c	2011-08-26 07:21:01.291516600 +0200
-@@ -51,6 +51,7 @@
- #include <assert.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <limits.h>
- 
- #include <rpc/types.h>
- #include <rpc/xdr.h>
-diff -Naur newlib-1.19.0.orig/newlib/libm/common/modfl.c newlib-1.19.0/newlib/libm/common/modfl.c
---- newlib-1.19.0.orig/newlib/libm/common/modfl.c	2009-04-18 00:15:43.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/common/modfl.c	2011-08-26 07:21:01.291516600 +0200
-@@ -36,7 +36,7 @@
- long double
- modfl (long double x, long double *iptr)
- {
--  return modf(x, iptr);
-+  return modf(x, (double*) iptr);
- }
- #endif
- 
-diff -Naur newlib-1.19.0.orig/newlib/libm/common/s_round.c newlib-1.19.0/newlib/libm/common/s_round.c
---- newlib-1.19.0.orig/newlib/libm/common/s_round.c	2009-03-25 20:13:01.000000000 +0100
-+++ newlib-1.19.0/newlib/libm/common/s_round.c	2011-08-26 07:21:01.291516600 +0200
-@@ -68,7 +68,7 @@
-           msw &= 0x80000000;
-           if (exponent_less_1023 == -1)
-             /* Result is +1.0 or -1.0. */
--            msw |= (1023 << 20);
-+            msw |= ((__int32_t)1023 << 20);
-           lsw = 0;
-         }
-       else
-diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cacos.c newlib-1.19.0/newlib/libm/complex/cacos.c
---- newlib-1.19.0.orig/newlib/libm/complex/cacos.c	2010-11-04 19:27:13.000000000 +0100
-+++ newlib-1.19.0/newlib/libm/complex/cacos.c	2011-08-26 07:21:01.291516600 +0200
-@@ -82,8 +82,18 @@
- {
- 	double complex w;
- 
-+	/* FIXME: The original NetBSD code results in an ICE when trying to
-+	   build this function on ARM/Thumb using gcc 4.5.1.  For now we use
-+	   a hopefully temporary workaround. */
-+#if 0
- 	w = casin(z);
--	w = M_PI_2 - creal(w);
--	w -= (cimag(w) * I);
-+	w = (M_PI_2 - creal(w)) - cimag(w) * I;
-+#else
-+	double complex tmp0, tmp1;
-+
-+	tmp0 = casin(z);
-+	tmp1 = M_PI_2 - creal(tmp0);
-+	w = tmp1 - (cimag(tmp0) * I);
-+#endif
- 	return w;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cproj.c newlib-1.19.0/newlib/libm/complex/cproj.c
---- newlib-1.19.0.orig/newlib/libm/complex/cproj.c	2010-10-19 00:40:24.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/complex/cproj.c	2011-08-26 07:21:01.291516600 +0200
-@@ -93,7 +93,7 @@
- {
- 	double_complex w = { .z = z };
- 
--	if (isinf(creal(z) || isinf(cimag(z)))) {
-+	if (isinf(creal(z)) || isinf(cimag(z))) {
- #ifdef __INFINITY
- 		REAL_PART(w) = __INFINITY;
- #else
-diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cprojf.c newlib-1.19.0/newlib/libm/complex/cprojf.c
---- newlib-1.19.0.orig/newlib/libm/complex/cprojf.c	2010-10-08 12:35:14.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/complex/cprojf.c	2011-08-26 07:21:01.292516616 +0200
-@@ -55,7 +55,7 @@
- {
- 	float_complex w = { .z = z };
- 
--	if (isinf(crealf(z) || isinf(cimagf(z)))) {
-+	if (isinf(crealf(z)) || isinf(cimagf(z))) {
- #ifdef __INFINITY
- 		REAL_PART(w) = __INFINITY;
- #else
-diff -Naur newlib-1.19.0.orig/newlib/libm/math/e_scalb.c newlib-1.19.0/newlib/libm/math/e_scalb.c
---- newlib-1.19.0.orig/newlib/libm/math/e_scalb.c	2000-02-17 20:39:51.000000000 +0100
-+++ newlib-1.19.0/newlib/libm/math/e_scalb.c	2011-08-26 07:21:01.292516616 +0200
-@@ -17,6 +17,7 @@
-  * should use scalbn() instead.
-  */
- 
-+#include <limits.h>
- #include "fdlibm.h"
- 
- #ifndef _DOUBLE_IS_32BITS
-@@ -46,8 +47,17 @@
- 	    else       return x/(-fn);
- 	}
- 	if (rint(fn)!=fn) return (fn-fn)/(fn-fn);
-+#if (INT_MAX < 65000)
-+	if ( fn > (double) INT_MAX) return scalbn(x, INT_MAX);
-+#else
- 	if ( fn > 65000.0) return scalbn(x, 65000);
--	if (-fn > 65000.0) return scalbn(x,-65000);
-+#endif
-+
-+#if (INT_MIN > -65000)
-+        if (fn < (double) INT_MIN) return scalbn(x,INT_MIN);
-+#else
-+	if (fn < -65000.0) return scalbn(x,-65000);
-+#endif
- 	return scalbn(x,(int)fn);
- #endif
- }
-diff -Naur newlib-1.19.0.orig/newlib/libm/math/wf_tgamma.c newlib-1.19.0/newlib/libm/math/wf_tgamma.c
---- newlib-1.19.0.orig/newlib/libm/math/wf_tgamma.c	2007-09-04 19:33:10.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/math/wf_tgamma.c	2011-08-26 07:21:01.292516616 +0200
-@@ -43,3 +43,17 @@
- 	return y;
- #endif
- }
-+
-+#ifdef _DOUBLE_IS_32BITS
-+
-+#ifdef __STDC__
-+	double tgamma(double x)
-+#else
-+	double tgamma(x)
-+	double x;
-+#endif
-+{
-+	return (double) tgammaf((float) x);
-+}
-+
-+#endif /* defined(_DOUBLE_IS_32BITS) */
-diff -Naur newlib-1.19.0.orig/newlib/libm/math/w_tgamma.c newlib-1.19.0/newlib/libm/math/w_tgamma.c
---- newlib-1.19.0.orig/newlib/libm/math/w_tgamma.c	2002-06-07 23:59:56.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/math/w_tgamma.c	2011-08-26 07:21:01.292516616 +0200
-@@ -17,6 +17,8 @@
- 
- #include "fdlibm.h"
- 
-+#ifndef _DOUBLE_IS_32BITS
-+
- #ifdef __STDC__
- 	double tgamma(double x)
- #else
-@@ -42,3 +44,5 @@
- 	return y;
- #endif
- }
-+
-+#endif /* defined(_DOUBLE_IS_32BITS) */
-diff -Naur newlib-1.19.0.orig/newlib/MAINTAINERS newlib-1.19.0/newlib/MAINTAINERS
---- newlib-1.19.0.orig/newlib/MAINTAINERS	2010-12-16 22:58:38.000000000 +0100
-+++ newlib-1.19.0/newlib/MAINTAINERS	2011-08-26 07:21:01.247516228 +0200
-@@ -6,7 +6,7 @@
- The official maintainers of newlib:
- 
- Jeff Johnston			jjohnstn at redhat.com
--Corinna	Vinschen		corinna at vinchen.de
-+Corinna Vinschen		corinna at vinschen.de
- 
- 
- 		     Various Domain Maintainers
-diff -Naur newlib-1.19.0.orig/newlib/Makefile.am newlib-1.19.0/newlib/Makefile.am
---- newlib-1.19.0.orig/newlib/Makefile.am	2010-12-16 22:58:38.000000000 +0100
-+++ newlib-1.19.0/newlib/Makefile.am	2011-08-26 07:21:01.248516222 +0200
-@@ -81,7 +81,7 @@
- 	libc.a
- endif
- 
--noinst_DATA = stmp-targ-include
-+BUILT_SOURCES = stmp-targ-include
- 
- toollib_DATA = $(CRT0) $(CRT1)
- 
-@@ -255,7 +255,7 @@
- 	  done
- 	touch $@
- 
--CLEANFILES = targ-include stmp-targ-include
-+CLEANFILES = stmp-targ-include
- 
- install-data-local:	install-toollibLIBRARIES
- if USE_LIBTOOL
-@@ -279,10 +279,6 @@
- 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
- 	    else true; fi ; \
- 	  done; \
--	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \
--	  for i in $(srcdir)/libc/include/rpc/*.h; do \
--	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \
--	  done; \
- 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \
- 	  for i in $(srcdir)/libc/include/sys/*.h; do \
- 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
-@@ -430,3 +426,6 @@
- 	else \
- 	   echo "WARNING: could not find \`runtest'" 1>&2 ; \
- 	fi
-+
-+clean-local:
-+	-rm -rf targ-include
-diff -Naur newlib-1.19.0.orig/newlib/Makefile.in newlib-1.19.0/newlib/Makefile.in
---- newlib-1.19.0.orig/newlib/Makefile.in	2011-07-20 08:45:15.622327553 +0200
-+++ newlib-1.19.0/newlib/Makefile.in	2011-08-26 07:21:01.248516222 +0200
-@@ -122,7 +122,7 @@
- 	install-pdf-recursive install-ps-recursive install-recursive \
- 	installcheck-recursive installdirs-recursive pdf-recursive \
- 	ps-recursive uninstall-recursive
--DATA = $(noinst_DATA) $(toollib_DATA)
-+DATA = $(toollib_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -351,7 +351,7 @@
- @USE_LIBTOOL_FALSE at toollib_LIBRARIES = libm.a \
- @USE_LIBTOOL_FALSE@	libc.a
- 
--noinst_DATA = stmp-targ-include
-+BUILT_SOURCES = stmp-targ-include
- toollib_DATA = $(CRT0) $(CRT1)
- 
- # The functions ldexp, frexp and modf are traditionally supplied in
-@@ -405,13 +405,13 @@
- @USE_LIBTOOL_TRUE at libm_la_DEPENDENCIES = libm-libtool-objectlist
- @USE_LIBTOOL_TRUE at libc_la_SOURCES = 
- @USE_LIBTOOL_TRUE at libc_la_DEPENDENCIES = libc-libtool-objectlist
--CLEANFILES = targ-include stmp-targ-include
-+CLEANFILES = stmp-targ-include
- CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
- MAKEOVERRIDES = 
- 
- # dejagnu support
- RUNTESTFLAGS = 
--all: newlib.h
-+all: $(BUILT_SOURCES) newlib.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
- .SUFFIXES:
-@@ -725,14 +725,16 @@
- 	done
- check-am:
- 	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
--check: check-recursive
-+check: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
- all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
--install: install-recursive
-+install: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
-@@ -758,10 +760,11 @@
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
-+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- clean: clean-recursive
- 
--clean-am: clean-generic clean-libtool clean-toollibLIBRARIES \
--	clean-toollibLTLIBRARIES mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-local \
-+	clean-toollibLIBRARIES clean-toollibLTLIBRARIES mostlyclean-am
- 
- distclean: distclean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-@@ -833,12 +836,13 @@
- uninstall-am: uninstall-toollibDATA uninstall-toollibLIBRARIES \
- 	uninstall-toollibLTLIBRARIES
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
--	ctags-recursive install-am install-strip tags-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-+	check-am ctags-recursive install install-am install-strip \
-+	tags-recursive
- 
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- 	all all-am am--refresh check check-DEJAGNU check-am clean \
--	clean-generic clean-libtool clean-toollibLIBRARIES \
-+	clean-generic clean-libtool clean-local clean-toollibLIBRARIES \
- 	clean-toollibLTLIBRARIES ctags ctags-recursive distclean \
- 	distclean-DEJAGNU distclean-compile distclean-generic \
- 	distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \
-@@ -985,10 +989,6 @@
- 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
- 	    else true; fi ; \
- 	  done; \
--	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \
--	  for i in $(srcdir)/libc/include/rpc/*.h; do \
--	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \
--	  done; \
- 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \
- 	  for i in $(srcdir)/libc/include/sys/*.h; do \
- 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
-@@ -1129,6 +1129,9 @@
- 	   echo "WARNING: could not find \`runtest'" 1>&2 ; \
- 	fi
- 
-+clean-local:
-+	-rm -rf targ-include
-+
- # 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.19.0.orig/newlib/testsuite/newlib.stdio/stdio.exp newlib-1.19.0/newlib/testsuite/newlib.stdio/stdio.exp
---- newlib-1.19.0.orig/newlib/testsuite/newlib.stdio/stdio.exp	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/testsuite/newlib.stdio/stdio.exp	2011-08-26 07:21:01.292516616 +0200
-@@ -0,0 +1,12 @@
-+# Copyright (C) 2011 by ARM Ltd. All rights reserved.
-+#
-+# Permission to use, copy, modify, and distribute this software
-+# is freely granted, provided that this notice is preserved.
-+#
-+
-+load_lib passfail.exp
-+
-+set exclude_list {
-+}
-+
-+newlib_pass_fail_all -x $exclude_list
-diff -Naur newlib-1.19.0.orig/newlib/testsuite/newlib.stdio/swprintf.c newlib-1.19.0/newlib/testsuite/newlib.stdio/swprintf.c
---- newlib-1.19.0.orig/newlib/testsuite/newlib.stdio/swprintf.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/testsuite/newlib.stdio/swprintf.c	2011-08-26 07:21:01.292516616 +0200
-@@ -0,0 +1,30 @@
-+/*
-+ * Copyright (C) 2011 by ARM Ltd. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and distribute this software
-+ * is freely granted, provided that this notice is preserved.
-+ */
-+
-+#include <stdio.h>
-+#include <newlib.h>
-+#include <stdlib.h>
-+#include <wchar.h>
-+#include "check.h"
-+
-+int main()
-+{
-+#if defined(INTEGER_ONLY) || defined(NO_FLOATING_POINT)
-+
-+#else
-+  char cbuf[512];
-+  wchar_t wcbuf[512], wcbuf2[512];
-+  double val = 1E+308;
-+  snprintf(cbuf, 512, "%.*f", 3, val);
-+  swprintf(wcbuf, 512, L"%.*f", 3, val);
-+  mbstowcs(wcbuf2, cbuf, 512);
-+
-+  CHECK (wcscmp(wcbuf, wcbuf2) == 0);
-+#endif
-+
-+  exit (0);
-+}
diff --git a/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20111006.diff b/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20111006.diff
deleted file mode 100644
index a392199..0000000
--- a/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20111006.diff
+++ /dev/null
@@ -1,6336 +0,0 @@
-diff -Naur newlib-1.19.0.orig/newlib/ChangeLog newlib-1.19.0/newlib/ChangeLog
---- newlib-1.19.0.orig/newlib/ChangeLog	2010-12-16 22:58:38.000000000 +0100
-+++ newlib-1.19.0/newlib/ChangeLog	2011-10-06 08:54:41.532113371 +0200
-@@ -1,3 +1,439 @@
-+2011-08-23  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdlib/putenv_r.c: Use "strchr" instead of obsolete "index".
-+	* libc/stdlib/setenv_r.c: Use "memcpy" instead of obsolete "bcopy".
-+
-+2011-08-23  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/misc/ffs.c, libc/string/bcmp.c, libc/string/bcopy.c,
-+	libc/string/bzero.c, libc/string/index.c, libc/string/rindex.c,
-+	libc/string/strcasecmp.c, libc/string/strncasecmp.c:
-+	Let synopsis reference "#include <strings.h>".
-+
-+2011-08-23  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/posix/regexec.c: Define "nope" only #ifndef NDEBUG.
-+	* libc/stdio/vfscanf.c: Define "state" only #ifdef _MB_CAPABLE.
-+	* libc/string/wcwidth.c: Include <wctypes.h> for "iswprint" and
-+	"iswcntrl".
-+
-+2011-08-23  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/include/limits.h: Compute SSIZE_MAX based on
-+	__SIZE_MAX__, __SIZEOF_SIZE_T__ and __CHAR_BIT__.
-+
-+2011-08-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/string/index.c: Include <strings.h> for "index".
-+	* libc/string/rindex.c: Include <strings.h> for "rindex".
-+	* libc/string/strcasecmp.c: Include <strings.h> for "strcasecmp".
-+	Don't include <string.h>.
-+	* libc/string/strncasecmp.c: Include <strings.h> for "strncasecmp".
-+	Don't include <string.h>.
-+	* libc/string/bzero.c: Include <strings.h> for "bzero".
-+	Don't include <string.h>
-+	* libc/misc/ffs.c: Include <strings.h> for "ffs".
-+	Don't include <_ansi.h>.
-+
-+2011-08-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/crt0.c: Rework RTEMS_STUB macro.
-+	Include <unistd.h>.
-+	Remove C++-style comments.
-+	Remove hppa, a29k.
-+	Add clock_gettime, gettimeofday, sched_yield.
-+
-+2011-08-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/vasiprintf.c: Include "local.h" for "_svfiprintf_r".
-+	* libc/stdio/vasprintf.c Include "local.h" for "_svfprintf_r".
-+	* libc/stdio/vsiprintf.c: Include "local.h" for "_svfiprintf_r".
-+	* libc/stdio/vsniprintf.c: Include "local.h" for "_svfiprintf_r".
-+	* libc/stdio/vsnprintf.c: Include "local.h" for "_svfprintf_r"
-+	* libc/stdio/vsprintf.c: Include "local.h" for "_svfprintf_r"
-+
-+2011-08-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/string/bcmp.c: Include <strings.h> for "bcmp".
-+	* libc/string/bcopy.c: Include <strings.h> for "bcopy".
-+	* libc/string/strcasestr.c: Include <strings.h> for "strncasecmp".
-+	* libc/time/strptime.c: Include <strings.h> for "strncasecmp".
-+
-+2011-08-19  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/process.h: Remove exec family function declarations.
-+	Add comment.
-+	* libc/include/sys/unistd.h (execlpe): Declare for Cygwin.
-+
-+2011-08-19  Craig Howland  <howland at LGSInnovations.com>
-+
-+	* libc/time/mktime.c (validate_structure): Account for tm_mon possibly
-+	being given as negative.
-+	(mktime): Set tm_isdst=0 when !daylight.
-+
-+2011-08-01  Sebastian Huber <sebastian.huber at embedded-brains.de>
-+
-+	* libc/include/sys/types.h: XML and RTEMS define
-+	_UNIX98_THREAD_MUTEX_ATTRIBUTES and can use the standard
-+	definitions. This avoids redefinition warnings.
-+
-+2011-07-26  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/sys/dirent.h (scandir):
-+	Add const to "select" parameter.
-+
-+2011-07-25  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/iconv/iconv.tex: Rename node "Introduction" into
-+	"Introduction to iconv".
-+
-+2011-07-20  Yaakov Selkowitz  <yselkowitz at ...>
-+
-+	* libc/include/time.h [_POSIX_CLOCK_SELECTION] (clock_nanosleep):
-+	Declare.
-+	* libc/include/sys/features.h [__CYGWIN__] (_POSIX_CLOCK_SELECTION):
-+	Define.
-+
-+2011-07-19  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/sys/unistd.h (_CS_XBS5_WIDTH_RESTRICTED_ENVS): Define.
-+	(_CS_V6_ENV): Fix definition.
-+
-+2011-07-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/locale/lmessages.c (_C_messages_locale):
-+	Move __HAVE_LOCALE_INFO_EXTENDED__ before codeset.
-+
-+2011-07-19  Matt Johnson  <johnso87 at crhc.illinois.edu>
-+
-+	* libc/reent/sbrkr.c: Define _sbrk_r independently of the definition
-+	of MALLOC_PROVIDED.
-+
-+2011-07-15  Yufeng Zhang  <yufeng.zhang at arm.com>
-+
-+	* libc/stdio/vfwprintf.c (wcvt): Add a new parameter len of type
-+	int.  *length is set to the value of (rev - digits) regardless
-+	of whether _MB_CAPABLE is defined or not.  Replace BUF with len
-+	in calling _mbsnrtowcs_r and also in the loop where _MB_CAPABLE
-+	is not defined.
-+	(_VFWPRINTF_R): Call wcvt with an extra argument.  Call wcvt
-+	again with allocated new buffer if buf is not large enough for
-+	the conversion.
-+	* testsuite/newlib.stdio/stdio.exp: New.
-+	* testsuite/newlib.stdio/swprintf.c: Likewise.
-+
-+2011-07-15  Matt Johnson  <johnso87 at crhc.illinois.edu>
-+
-+	* libc/stdio/fscanf.c (fscanf): Call _vfscanf_r instead of __svfscanf_r
-+	to make sure CHECK_INIT is called.
-+	(_fscanf_r): Ditto.
-+	* /libc/stdio/scanf.c (scanf): Ditto.
-+	(_scanf_r): Ditto.
-+	* libc/stdio/fwscanf.c (fwscanf): Call _vfwscanf_r instead of
-+	__svfwscanf_r to make sure CHECK_INIT is called.
-+	(_fwscanf_r): Ditto.
-+	* libc/stdio/wscanf.c (wscanf): Ditto.
-+	(_wscanf_r): Ditto.
-+
-+2011-07-13  Hans-Peter Nilsson <hp at axis.com>
-+
-+	* libm/complex/cacos.c: Use temporaries and correct sequencing
-+	error in previous reordering change.
-+
-+2011-06-25  Andreas Becker  <becker at se-elektronic.de>
-+
-+	* libc/time/mktime.c (mktime): Lock global timezone info while
-+	accessing it.
-+
-+2011-06-14  Philip Munts  <phil at munts.net>
-+
-+	* libc/time/asctime_r.c (asctime_r): Replace call to sprintf with call
-+	to siprintf.
-+	* libc/time/strftime.c: Define snprintf to sniprintf in multibyte case.
-+	* libc/time/tzset_r.c: Define sscanf to siscanf.
-+
-+2011-06-14  Joseph Myers  <joseph at codesourcery.com>
-+
-+	* configure.host: Don't handle ep9312, strongarm, xscale and thumb
-+	target names.
-+	* libc/machine/configure.in: Don't handle xscale target names.
-+	* libc/machine/configure: Regenerate.
-+
-+2011-06-14  Craig Howland <howland at LGSInnovations.com>
-+
-+	* libc/time/tzset_r.c (tzset_r):  Correct behavior for changing from
-+	non-GMT to GMT, when un-setting TZ.  Set _timezone and _daylight even
-+	if no DST is given in TZ.
-+
-+2011-06-13  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/stdio/wsetup.c (__swsetup_r): Set errno on failure.
-+	* libc/stdio/fvwrite.c (__sfvwrite_r): Simplify.
-+	* libc/stdio/wbuf.c (__swbuf_r): Likewise.
-+	* libc/stdio/local.h (cantwrite): Adjust comment.
-+
-+2011-06-09  Yaakov Selkowitz  <yselkowitz at ...>
-+
-+	* libc/include/string.h (strdupa): New macro function.
-+	(strndupa): New macro function.
-+
-+2011-05-27  Nick Clifton  <nickc at redhat.com>
-+
-+	* libc/sys/sysnecv850/sbrk.c (_sbrk): Tidy code.
-+	Base start of heap on the "heap_start" symbol.
-+
-+2011-05-25  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/string/strerror.c (_strerror_r): Report "Success" for 0.
-+
-+2011-05-25  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/string/strerror.c (strerror): Split body into...
-+	(_strerror_r): ...new reentrant function.
-+	* libc/string/u_strerr.c (_user_strerror): Update signature.
-+	* libc/include/string.h (_strerror_r): New prototype.
-+	* libc/posix/collate.c (__collate_err): Adjust callers.
-+	* libc/stdio/perror.c (_perror_r): Likewise.
-+	* libc/string/strerror_r.c (strerror_r): Likewise.
-+	* libc/string/xpg_strerror_r.c (__xpg_strerror_r): Likewise.
-+
-+2011-05-19  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/stdio_ext.h: New header.
-+	* libc/stdio/fpurge.c [!__rtems__] (__fpurge): New function.
-+
-+2011-05-19  Matthew Gretton-Dann  <matthew.gretton-dann at arm.com>
-+
-+	* Makefile.am (install-data-local): Fix condition and rm call.
-+	* Makefile.in: Regenerate.
-+
-+2011-05-16  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/time.h (CLOCK_PROCESS_CPUTIME_ID): Rename from
-+	CLOCK_PROCESS_CPUTIME.
-+	(CLOCK_THREAD_CPUTIME_ID): Rename from CLOCK_THREAD_CPUTIME.
-+	* libc/include/sys/features.h [__CYGWIN__] (_POSIX_CPUTIME): Define.
-+	(_POSIX_THREAD_CPUTIME): Define.
-+
-+2011-05-16  Christian Bruel  <christian.bruel at st.com>
-+
-+	* libc/stdlib/strtod.c (_strtod_r): Fix nf/nd counts to not exceed
-+	DBL_DIG.
-+
-+2011-05-15  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/features.h (_POSIX_THREAD_ATTR_STACKADDR): Define
-+	to 200112L for Cygwin.
-+
-+2011-05-12  Peter Rosin  <peda at lysator.liu.se>
-+
-+	* libc/time/strptime.c (strptime): Fill in tm_yday when all of tm_year,
-+	tm_mon and tm_mday are updated. Fill in tm_mon, tm_mday and tm_wday
-+	when both of tm_year and tm_yday are updated.
-+
-+2011-05-12  Peter Rosin  <peda at lysator.liu.se>
-+
-+	* libc/time/strptime.c (first_day): Actually return the wday
-+	of the first day of the year.
-+
-+2011-05-10  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/locale/lmessages.c (_C_messages_locale): Add missing comma.
-+
-+2011-05-04  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/signal.h (psignal): Declare.
-+	* libc/sys/linux/psignal.c: Move from here...
-+	* libc/signal/psignal.c: ... to here. Document.
-+	* libc/sys/linux/Makefile.am (GENERAL_SOURCES): Move psignal.c from here...
-+	* libc/signal/Makefile.am (LIB_SOURCES): ... to here.
-+	(CHEWOUT_FILES): Add psignal.def.
-+	* libc/sys/linux/Makefile.in: Regenerate.
-+	* libc/signal/Makefile.in: Ditto.
-+	* libc/signal/signal.tex: Add references to psignal.
-+
-+2011-05-04  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/locale/lmessages.h (__messages_load_locale): Declare.  Remove
-+	accidental declaration of __numeric_load_locale.
-+	* libc/locale/locale.c: Include timelocal.h to get declaration of
-+	__time_load_locale.
-+	(__set_locale_from_locale_alias): Fix return type.
-+	(__locale_msgcharset): Avoid compiler warnings.
-+	(_localeconv_r): Ditto.
-+
-+2011-05-04  Andy Koppe  <andy.koppe at gmail.com>
-+
-+	* libc/locale/locale.c (current_categories): On Cygwin, set LC_CTYPE 
-+	to C.UTF-8 to match initial __wctomb and __mbtowc settings.
-+	(lc_ctype_charset): On Cygwin, initialize to "UTF-8".
-+	(loadlocale): Remove unused Cygwin-specifc code.
-+
-+2011-05-02  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/sys/features.h [__CYGWIN__] (_POSIX_SPIN_LOCKS): Define.
-+	* libc/include/sys/types.h: Cygwin provides its own pthread_spinlock_t
-+	typedef.
-+
-+2011-04-19  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/signal.h (_sig_func_ptr): Define with int parameter
-+	per POSIX.  Explain in comment.
-+
-+2011-04-15  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/string/strchrnul.c (strchrnul): Fix strchrnul.
-+
-+2011-03-27  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/string.h (strchrnul): Declare.
-+	* libc/string/strchrnul.c: New file.
-+	* libc/string/Makefile.am (ELIX_2_SOURCES): Add strchrnul.c.
-+	* libc/string/Makefile.in: Regenerate.
-+
-+2011-03-23  Nick Clifton  <nickc at redhat.com>
-+
-+	* libc/machine/frv/setjmp.S: Fix typo in .size directive.
-+
-+2011-03-21  Kevin Buettner  <kevinb at redhat.com>
-+
-+	* libc/sys/sysnecv850/trap.S (___trap0): Fix errno handling.
-+	* libc/sys/sysnecv850/rename.c: New file.
-+	* libc/sys/sysnecv850/Makefile.am (lib_a_SOURCES): Add rename.c
-+	* libc/sys/sysnecv850/Makefile.in: Regenerate.
-+	* libc/sys/sysnecv850/fstat.c (_fstat): Invoke trap for SYS_fstat.
-+	* libc/sys/sysnecv850/unlink.c (_unlink): Invoke trap for SYS_unlink.
-+
-+2011-03-03  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/string.h: Include sys/cdefs.h.
-+
-+2011-03-03  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/cdefs.h (__CONCAT1): Define.
-+	(__CONCAT): Define.
-+	(__STRING): Define.
-+	(__XSTRING): Define.
-+	(__ASMNAME): Define.
-+	* libc/include/string.h (strerror_r): Use __ASMNAME to take target
-+	specific label prefixes into account.
-+
-+2011-03-01  Aaron Landwehr <snaphat at gmail.com>
-+
-+	* libm/complex/cproj.c: Fix typo.
-+	* libm/complex/cprojf.c: Ditto.
-+
-+2011-02-22  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/stdio/fmemopen.c (fmemopen): Fix EINVAL condition.  Avoid SEGV
-+	if incoming buffer is NULL.
-+
-+2011-02-09  Eric Blake  <eblake at redhat.com>
-+
-+	* libc/include/string.h (strerror_r): Update declaration.
-+	* libc/string/strerror.c (strerror): Update documentation.
-+	* libc/string/strerror_r.c (strerror_r): Always return
-+	NUL-terminated string; don't overwrite too-short buf.
-+	* libc/string/xpg_strerror_r.c (__xpg_strerror_r): Implement POSIX
-+	variant.
-+	* libc/string/Makefile.am (GENERAL_SOURCES): Build new file.
-+	* libc/string/Makefile.in: Regenerate.
-+
-+2011-01-28  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/stdio/fclose.c: Only use sfp lock to guard non-atomic
-+	changes of flags and fp lock.
-+	* libc/stdio/freopen.c: Ditto.
-+	* libc/stdio64/freopen64.c: Ditto.
-+	* libc/stdio/fgetc.c: Revert change from 2009-04-24, remove sfp locks
-+	which guard entire function to avoid potential deadlocks when using
-+	stdio functions in multiple thraeds.
-+	* libc/stdio/fgets.c: Ditto.
-+	* libc/stdio/fgetwc.c: Ditto.
-+	* libc/stdio/fgetws.c: Ditto.
-+	* libc/stdio/fread.c: Ditto.
-+	* libc/stdio/fseek.c: Ditto.
-+	* libc/stdio/getc.c: Ditto.
-+	* libc/stdio/getdelim.c: Ditto.
-+	* libc/stdio/gets.c: Ditto.
-+	* libc/stdio/vfscanf.c: Ditto.
-+	* libc/stdio/vfwscanf.c: Ditto.
-+
-+	* libc/stdio/fflush.c (_fflush_r): Split out core functionality into
-+	new function __sflush_r.  Just lock file and call __sflush_r from here.
-+	* libc/stdio/fwalk.c (_fwalk): Remove static helper function and move
-+	functionality back into main function. Don't walk a file with flags
-+	value of 1.  Add comment.
-+	(_fwalk_reent): Ditto.
-+	* libc/stdio/local.h (__sflush_r): Declare.
-+	* libc/stdio/refill.c (__srefill): Before calling fwalk, set flags
-+	value to 1 so this file pointer isn't walked.  Revert flags afterwards
-+	and call __sflush_r for this fp if necessary.  Add comments.
-+
-+2011-01-27  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/include/sys/features.h: Define __STDC_ISO_10646__ for Cygwin.
-+	* libc/include/wchar.h: Include features.h.
-+
-+2011-01-15  Yaakov Selkowitz  <yselkowitz at users.sourceforge.net>
-+
-+	* libc/include/sys/types.h (ulong): Add typedef.
-+
-+2011-01-12  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libm/math/w_tgamma.c: Only build ifndef _DOUBLE_IS_32BITS.
-+	* libm/math/wf_tgamma.c: Map tgamma to tgammaf, ifdef _DOUBLE_IS_32BITS.
-+
-+2011-01-11  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/string.h: Remove Cygwin DEFS_H kludge.
-+
-+2011-01-10  Corinna Vinschen  <vinschen at redhat.com>
-+
-+	* libc/machine/mips/strlen.c (strlen): Add delay slot for R3000.
-+
-+2011-01-10  Joel Sherrill <joel.sherrill at oarcorp.com>
-+
-+	* libc/include/string.h: Make strsignal() available unconditionally.
-+
-+2011-01-07  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/crt0.c: Adjust free() and calloc() to match their
-+	public decls.
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* Makefile.am: Move cleaning targ-include to clean-local.
-+	* Makefile.in: Regenerate.
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/open_memstream.c (internal_open_memstream_r):
-+	Don't limit c->max to 64*1024 on targets with SIZE_MAX < 64*1024.
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/xdr/xdr.c: Fix typos in #errors.
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/xdr/xdr_private.h: Include <stdint.h>
-+	* libc/xdr/xdr_rec.c: Include limits.h
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/Makefile.am (SUBDEFS): Remove redundant posix/stmp-def.
-+	* libc/Makefile.in: Regenerate.
-+
-+2011-01-05  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* libc/configure.in: Remove redundant posix_dir processing.
-+	* libc/configure: Regenerate.
-+
-+2010-12-31  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* MAINTAINERS: Change corinna at vinchen.de to corinna at vinschen.de.
-+
- 2010-12-16  Jeff Johnston  <jjohnstn at redhat.com>
- 
- 	* NEWS: Update with 1.19.0 info.
-@@ -28,12 +464,12 @@
- 
- 	* libm/mathfp/sf_logarithm.c: Change isfinitef reference to isfinite.
- 
--2010-12-08      Ralf Corsepius <ralf.corsepius at rtems.org>
-+2010-12-08  Ralf Corsepius <ralf.corsepius at rtems.org>
- 
- 	* include/sys/types.h: Add #if defined(__rtems__) around
- 	pthread_attr_t.guardsize.
- 
--2010-12-08      Joel Sherrill <joel at OARcorp.com>
-+2010-12-08  Joel Sherrill <joel at OARcorp.com>
- 
- 	* include/pthread.h: Add pthread_attr_setstack, pthread_attr_getstack,
- 	pthread_attr_getguardsize, pthread_attr_setguardsize.
-@@ -1048,13 +1484,13 @@
- 	* libc/stdlib/atexit.c: Ditto.
- 	* libc/stdlib/on_exit.c: Ditto.
- 
--2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/machine/ieeefp.h: Rework __IEEE_*_ENDIAN handling.
- 	* libc/machine/arm/machine/endian.h: Remove (Conflicts with
- 	libc/include/machine/endian.h)
- 
--2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-17  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/machine/setjmp.h: Set up _JBLEN #ifdef __m68k__.
- 
-@@ -1076,11 +1512,11 @@
- 	and ETOOMANYREFS into general list as they are referenced
- 	by OpenGroup and needed by RTEMS.
- 
--2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/search/hcreate.c: Don't include <sys/queue.h> (Unused).
- 
--2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-12-16  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/sys/rtems/machine/_types.h: New (Derived from
- 	machine/_default_types.h).
-@@ -1368,16 +1804,16 @@
- 	* libc/locale/locale.c: Drop Cygwin-specific windows.h include.
- 	(loadlocale): Call __set_charset_from_codepage with 0 codepage.
- 
--2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/stdlib.h: Add posix_memalign.
- 
--2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* configure.host (*-rtems*): Remove -DMISSING_SYSCALL_NAMES.
- 	Add -DHAVE_BLKSIZE, -D_NO_WORDEXP -D_NO_POPEN.
- 
--2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2009-09-22  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* configure.host (m32c): Move setting -DABORT_PROVIDED to second
- 	"case $host".
-@@ -6455,7 +6891,7 @@
- 	* libc/include/sys/unistd.h: Define all _SC_xxx values as
- 	required by SUSv3.  Unify formatting.
- 
--2007-02-02  Ralf Corsépius <ralf.corsepius at rtems.org>
-+2007-02-02  Ralf Corsépius <ralf.corsepius at rtems.org>
- 
- 	* libc/include/sys/errno.h: Add ECANCELED.
- 
-@@ -8432,16 +8868,16 @@
- 	* configure.host (newlib_cflags) <cris-*-*, crisv32-*-*>: Add
- 	-DCOMPACT_CTYPE.
- 
--2005-03-06  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-03-06  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libc/sys/rtems/include/inttypes.h: New file.
- 	* libc/sys/rtems/include/stdint.h: Ditto.
- 
--2005-03-06  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-03-06  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libc/string/memcmp.c: Fix to avoid pointer signedness warning.
- 
--2005-03-06  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-03-06  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libc/include/machine/_types.h: New file.
- 	* libc/include/sys/types.h: Do not check for __rtems__
-@@ -8450,7 +8886,7 @@
- 	* libc/sys/rtems/machine/_types.h: Removed.  Replaced with
- 	shared header file.
- 
--2005-02-25  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-02-25  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libm/common/fdlibm.h (FLT_UWORD_MAX, FLT_UWORD_HALF_MAX): Add
- 	L qualifier for these long constants.
-@@ -8466,13 +8902,13 @@
- 	* libc/time/strftime.c (strftime): Fix '%x' to deal with negative
- 	years.  Fix '%z' to use long, not int.
- 
--2005-02-24  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-02-24  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libm/common/s_fpclassify.c: Use __uint32_t instead of int to
- 	manipulate float values in integer form.
- 	* libm/common/sf_round.c: Ditto.
- 
--2005-02-24  Ralf Corsepious  <ralf.corsepius at rtems.org>
-+2005-02-24  Ralf Corsepius  <ralf.corsepius at rtems.org>
- 
- 	* libc/include/sys/types.h [__rtems__]: Include new
- 	header file machine/_types.h.
-diff -Naur newlib-1.19.0.orig/newlib/ChangeLog.rtems newlib-1.19.0/newlib/ChangeLog.rtems
---- newlib-1.19.0.orig/newlib/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/ChangeLog.rtems	2011-10-06 08:54:41.533113410 +0200
-@@ -0,0 +1,137 @@
-+2011-10-06	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/sys/rtems/machine/_types.h (_ssize_t): Special case __ARM_EABI__.
-+
-+2011-08-11	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/tmpnam.c: Use PRIxPTR instead of %x.
-+
-+2011-08-11	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/search/hcreate_r.c: #ifdef 0 unused vars ie, idx.
-+
-+2011-04-19  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/include/stdint.h: Rework SIZE_MAX.
-+
-+2011-02-07  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/stdlib.h: More ansi-compliance.
-+
-+2011-02-01  Ralf Corsépius  <ralf.corsepius at rtems.org>
-+	
-+	* libc/include/stdio.h: More ansi-compliance.
-+
-+	* libc/include/stdlib.h: Remove atoff.
-+	* libc/stdlib/atoff.c: Remove.
-+	* libc/stdlib/atof.c: Remove atoff.
-+	* libc/stdlib/Makefile.am: Remove atoff.
-+	* libc/stdlib/Makefile.in: Regenerate.
-+
-+	* libc/include/stdio.h: Make fdopen accessible to c99.
-+
-+2011-01-07	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/open_memstream.c: Replace 64 * 1024 with 0x10000 to 
-+	avoid integer overflow on h8300.
-+
-+2011-01-05	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/stdio/tmpnam.c: Include <stdint.h>.
-+	Use intptr_t instead of _POINTER_INT for improved portability.
-+	* libc/misc/__dprintf.c: Include <stdint.h>
-+	Use intptr_t instead of _POINTER_INT for improved portability.
-+
-+2011-01-05	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libm/common/s_round.c: Cast const int to __int32_t.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libm/math/e_scalb.c: Include <limits.h>.
-+	Don't rely on 65000 being a valid int.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/posix/readdir.c:	Include <stdint.h>.
-+	Cast to intptr_t instead of int.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/string/memccpy.c, libc/string/memchr.c,
-+	libc/string/memcmp.c, libc/string/memcpy.c,
-+	libc/string/memmove.c, libc/string/mempcpy.c,
-+	libc/string/memset.c, libc/string/stpcpy.c,
-+	libc/string/stpncpy.c, libc/string/strcpy.c,
-+	libc/string/strlen.c, libc/string/strncat.c,
-+	libc/string/strncpy.c (UNALIGNED):
-+	Include <stdint.h>.
-+	Cast to intptr_t instead of long.
-+
-+2011-01-04	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* Makefile.am: Don't install include/rpc/*.h.
-+	* Makefile.in: Regenerate.
-+	* libc/Makefile.am: Install include/rpc/xdr.h include/rpc/types.h. 
-+	* libc/Makefile.in: Regenerate.
-+
-+2010-12-31  Ralf Corsepius  <ralf.corsepius at rtems.org>
-+
-+	* doc/makedoc.c: Add cludge to make makedoc 64bit compliant.
-+
-+2010-12-30	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/signal.h: Don't provide sighandler_t.
-+
-+2010-12-29	Ralf Corsépius  <ralf.corsepius at rtems.org>
-+
-+	* libc/include/sys/dir.h: Remove.
-+
-+2010-08-10	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	PR 1475/newlib:
-+	* libc/include/stdint.h: Fall back to compute SIZE_MAX based on
-+	__SIZEOF_SIZE_T__ and __CHAR_BIT__ if available.
-+
-+2010-08-04	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/string/strcat.c: 
-+	Include <stdint.h>. Use uintptr_t instead of long in ALIGNED.
-+	* libc/string/strchr.c, libc/string/strcmp.c, libc/string/strncmp.c:
-+	Include <stdint.h>. Use uintptr_t instead of long in UNALIGNED.
-+
-+2010-03-25	Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/include/string.h: Remove bcmp, bcopy, bzero, ffs, index, rindex,
-+	strcasecmp, strncasecmp (Moved to strings.h).
-+	Remove strcmpi, stricmp, strncmpi, strnicmp.
-+
-+2009-12-18  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/search/db_local.h:
-+	Use __uint32_t instead of u_int (prototype mismatches).
-+	* libc/search/extern.h (__buf_init): 
-+	Use __uint32_t instead of int (16 bit target portability).
-+	* libc/search/hash_buf.c: Use ptrdiff_t instead of __uint32_t,
-+	use __uint32_t instead of int (16 bit target portability).
-+	* libc/search/hash.h: Use __uint32_it instead of int
-+	(16 bit target portability).
-+	* libm/common/modfl.c: Add cast to (double*) to avoid GCC warning.
-+
-+2009-10-29  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/include/inttypes.h: 
-+	Rework logic to determine PRI*PTR.
-+	Prefer long64 over longlong64.
-+	* libc/include/machine/_default_types.h: 
-+	Sync logic for __int32 with stdint.h (Prefer long over int).
-+	* libc/include/stdint.h:
-+	Remove __SPU__ hack.
-+	Prefer int for int16_t (sync with _default_types.h).
-+	Rework intptr_t determination.
-+
-+2009-03-09  Ralf Corsépius <ralf.corsepius at rtems.org>
-+
-+	* libc/machine/powerpc/times.c: Remove.
-+	* libc/machine/powerpc/Makefile.am: Remove times.c.
-+	* libc/machine/powerpc/Makefile.in: Regenerate.
-diff -Naur newlib-1.19.0.orig/newlib/configure.host newlib-1.19.0/newlib/configure.host
---- newlib-1.19.0.orig/newlib/configure.host	2010-12-02 20:30:46.000000000 +0100
-+++ newlib-1.19.0/newlib/configure.host	2011-10-06 08:54:41.534113448 +0200
-@@ -120,9 +120,6 @@
-   d30v*)
- 	machine_dir=d30v
- 	;;
--  ep9312)
--	machine_dir=arm
--	;;
-   fido)
- 	machine_dir=m68k
- 	newlib_cflags="${newlib_cflags} -DCOMPACT_CTYPE"
-@@ -240,15 +237,6 @@
- 	# FIXME: Might wish to make MALLOC_ALIGNMENT more generic.
- 	newlib_cflags="${newlib_cflags} -DMALLOC_ALIGNMENT=8"
- 	;;
--  strongarm)
--	machine_dir=arm
--	;;
--  xscale)
--	machine_dir=xscale
--	;;
--  thumb)
--	machine_dir=arm
--	;;
-   tic4x|c4x)
- 	machine_dir=tic4x
- 	;;
-@@ -391,12 +379,6 @@
-   d30v*)
- 	sys_dir=
- 	;;
--  ep9312-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
-   frv*)
-         sys_dir=
-         ;;
-@@ -493,18 +475,6 @@
- 	default_newlib_io_long_long="yes"
- 	default_newlib_atexit_dynamic_alloc="no"
- 	;;
--  strongarm-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
--  thumb-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
-   tic6x*)
- 	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
- 	have_crt0="no"
-@@ -527,12 +497,6 @@
-   w65-*-*)
- 	sys_dir=w65
- 	;;
--  xscale-*-*)
--	sys_dir=arm
--	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
--	  have_crt0="no"
--	fi
--	;;
-   z8k-*-coff)
- 	sys_dir=z8ksim
- 	;;
-@@ -594,7 +558,6 @@
- # to create the program's environment.
- # If --disable-newlib-supplied-syscalls is specified, then the end-user
- # may specify the protocol via gcc spec files supplied by libgloss.
--# See also thumb below.
- 	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
- #         newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
- 	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
-@@ -629,12 +592,6 @@
- 	newlib_cflags="${newlib_cflags} -DABORT_MESSAGE -DSMALL_MEMORY -DMISSING_SYSCALL_NAMES"
- 	syscall_dir=
- 	;;
--  ep9312-*-*)
--	syscall_dir=syscalls
--	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
--	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
--	fi
--	;;
-   fido-*-elf)
- 	newlib_cflags="${newlib_cflags} -DHAVE_RENAME -DHAVE_SYSTEM -DMISSING_SYSCALL_NAMES"
- 	syscall_dir=
-@@ -758,27 +715,6 @@
- 		newlib_cflags="${newlib_cflags} -DTARGET_PTR_SIZE=64" ;;
- 	esac
- 	;;
--  strongarm-*-*)
--	syscall_dir=syscalls
--	;;
--  thumb-*-pe)
--	syscall_dir=syscalls
--# Don't use the debugging protocols just yet.
--	;;
--  thumb-*-*)
--	syscall_dir=syscalls
--# If newlib is supplying syscalls, select which debug protocol is being used.
--# ARM_RDP_MONITOR selects the Demon monitor.
--# ARM_RDI_MONITOR selects the Angel monitor.
--# If neither are defined, then hard coded defaults will be used
--# to create the program's environment.
--# If --disable-newlib-supplied-syscalls is specified, then the end-user
--# may specify the protocol via gcc spec files supplied by libgloss.
--	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
--#         newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
--	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
--	fi
--	;;
-   tic6x*)
- 	syscall_dir=
- 	newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED"
-@@ -796,13 +732,6 @@
-   xc16x-*)
-           syscall_dir=syscalls
-         ;;
--  xscale-*-*)
--	syscall_dir=syscalls
--	newlib_cflags="${newlib_cflags} -DHAVE_SYSTEM -DHAVE_RENAME"
--	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
--	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
--	fi
--	;;
-   xstormy16-*-*)
- 	syscall_dir=syscalls
- 	;;
-diff -Naur newlib-1.19.0.orig/newlib/doc/makedoc.c newlib-1.19.0/newlib/doc/makedoc.c
---- newlib-1.19.0.orig/newlib/doc/makedoc.c	2009-03-25 22:16:04.000000000 +0100
-+++ newlib-1.19.0/newlib/doc/makedoc.c	2011-10-06 08:54:41.534113448 +0200
-@@ -57,7 +57,7 @@
- {
-     char *ptr;
-     unsigned int write_idx;
--    unsigned int size;
-+    size_t size;
- } string_type;
- 
- 
-@@ -68,7 +68,7 @@
- 
- static void DEFUN(init_string_with_size,(buffer, size),
- 	   string_type *buffer AND
--	   unsigned int size )
-+	   size_t size )
- {
-   buffer->write_idx = 0;
-   buffer->size = size;
-@@ -219,8 +219,8 @@
- stinst_type *pc;
- stinst_type sstack[STACK];
- stinst_type *ssp = &sstack[0];
--int istack[STACK];
--int *isp = &istack[0];
-+long istack[STACK];
-+long *isp = &istack[0];
- 
- typedef int *word_type;
- 
-@@ -270,7 +270,7 @@
- {
-     isp++;
-     pc++;
--    *isp = (int)(*pc);
-+    *isp = (long)(*pc);
-     pc++;
-     
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/configure newlib-1.19.0/newlib/libc/configure
---- newlib-1.19.0.orig/newlib/libc/configure	2010-12-16 22:58:39.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/configure	2011-10-06 08:54:41.538113615 +0200
-@@ -625,7 +625,10 @@
- HAVE_XDR_DIR_TRUE
- LIBC_XDR_DEF
- LIBC_XDR_LIB
-+HAVE_POSIX_DIR_FALSE
-+HAVE_POSIX_DIR_TRUE
- LIBC_POSIX_DEF
-+LIBC_POSIX_LIB
- HAVE_STDIO64_DIR_FALSE
- HAVE_STDIO64_DIR_TRUE
- LIBC_STDIO64_DEF
-@@ -638,9 +641,6 @@
- HAVE_SIGNAL_DIR_TRUE
- LIBC_SIGNAL_DEF
- LIBC_SIGNAL_LIB
--HAVE_POSIX_DIR_FALSE
--HAVE_POSIX_DIR_TRUE
--LIBC_POSIX_LIB
- CRT0
- subdirs
- CPP
-@@ -11805,24 +11805,6 @@
- 
- 
- 
--LIBC_POSIX_LIB=
--if test -n "${posix_dir}"; then
--  if test "${use_libtool}" = "yes"; then
--    LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext}
--  else
--    LIBC_POSIX_LIB=${posix_dir}/lib.${aext}
--  fi
--fi
--
-- if test x${posix_dir} != x; then
--  HAVE_POSIX_DIR_TRUE=
--  HAVE_POSIX_DIR_FALSE='#'
--else
--  HAVE_POSIX_DIR_TRUE='#'
--  HAVE_POSIX_DIR_FALSE=
--fi
--
--
- LIBC_SIGNAL_LIB=
- LIBC_SIGNAL_DEF=
- if test -n "${signal_dir}"; then
-@@ -12225,10 +12207,6 @@
-   as_fn_error "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
--if test -z "${HAVE_POSIX_DIR_TRUE}" && test -z "${HAVE_POSIX_DIR_FALSE}"; then
--  as_fn_error "conditional \"HAVE_POSIX_DIR\" was never defined.
--Usually this means the macro was only invoked conditionally." "$LINENO" 5
--fi
- if test -z "${HAVE_SIGNAL_DIR_TRUE}" && test -z "${HAVE_SIGNAL_DIR_FALSE}"; then
-   as_fn_error "conditional \"HAVE_SIGNAL_DIR\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-diff -Naur newlib-1.19.0.orig/newlib/libc/configure.in newlib-1.19.0/newlib/libc/configure.in
---- newlib-1.19.0.orig/newlib/libc/configure.in	2010-04-23 01:32:40.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/configure.in	2011-10-06 08:54:41.538113615 +0200
-@@ -41,17 +41,6 @@
- dnl for the library and an automake conditional for whether we should
- dnl build the library.
- 
--LIBC_POSIX_LIB=
--if test -n "${posix_dir}"; then
--  if test "${use_libtool}" = "yes"; then
--    LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext}
--  else
--    LIBC_POSIX_LIB=${posix_dir}/lib.${aext}
--  fi
--fi
--AC_SUBST(LIBC_POSIX_LIB)
--AM_CONDITIONAL(HAVE_POSIX_DIR, test x${posix_dir} != x)
--
- LIBC_SIGNAL_LIB=
- LIBC_SIGNAL_DEF=
- if test -n "${signal_dir}"; then
-diff -Naur newlib-1.19.0.orig/newlib/libc/iconv/iconv.tex newlib-1.19.0/newlib/libc/iconv/iconv.tex
---- newlib-1.19.0.orig/newlib/libc/iconv/iconv.tex	2004-09-13 19:10:20.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/iconv/iconv.tex	2011-10-06 08:54:41.539113661 +0200
-@@ -7,7 +7,7 @@
- 
- @menu
- * iconv::                           Encoding conversion routines
--* Introduction::                    Introduction to iconv and encodings
-+* Introduction to iconv::           Introduction to iconv and encodings
- * Supported encodings::             The list of currently supported encodings
- * iconv design decisions::          General iconv library design issues
- * iconv configuration::             iconv-related configure script options
-@@ -24,8 +24,8 @@
- @include iconv/iconv.def
- 
- @page
-- at node Introduction
-- at section Introduction
-+ at node Introduction to iconv
-+ at section Introduction to iconv
- @findex encoding
- @findex character set
- @findex charset
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/inttypes.h newlib-1.19.0/newlib/libc/include/inttypes.h
---- newlib-1.19.0.orig/newlib/libc/include/inttypes.h	2009-01-19 23:02:06.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/inttypes.h	2011-10-06 08:54:41.539113661 +0200
-@@ -242,15 +242,17 @@
- #define SCNxMAX		__SCNMAX(x)
- 
- /* ptr types */
--#if __have_long64
--#define __PRIPTR(x) __STRINGIFY(l##x)
--#define __SCNPTR(x) __STRINGIFY(l##x)
--#elif __have_longlong64
--#define __PRIPTR(x) __STRINGIFY(ll##x)
--#define __SCNPTR(x) __STRINGIFY(ll##x)
-+#if INTPTR_MAX == INT64_MAX
-+#define __PRIPTR(x) __PRI64(x)
-+#define __SCNPTR(x) __SCN64(x)
-+#elif INTPTR_MAX == INT32_MAX
-+#define __PRIPTR(x) __PRI32(x)
-+#define __SCNPTR(x) __SCN32(x)
-+#elif INTPTR_MAX == INT16_MAX
-+#define __PRIPTR(x) __PRI16(x)
-+#define __SCNPTR(x) __SCN16(x)
- #else
--#define __PRIPTR(x) __STRINGIFY(x)
--#define __SCNPTR(x) __STRINGIFY(x)
-+#error cannot determine PRI*PTR
- #endif
- 
- #define PRIdPTR		__PRIPTR(d)
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/machine/_default_types.h newlib-1.19.0/newlib/libc/include/machine/_default_types.h
---- newlib-1.19.0.orig/newlib/libc/include/machine/_default_types.h	2008-06-12 00:14:54.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/machine/_default_types.h	2011-10-06 08:54:41.539113661 +0200
-@@ -54,14 +54,14 @@
- #endif
- #endif
- 
--#if __EXP(INT_MAX) == 0x7fffffffL
--typedef signed int __int32_t;
--typedef unsigned int __uint32_t;
--#define ___int32_t_defined 1
--#elif __EXP(LONG_MAX) == 0x7fffffffL
-+#if __EXP(LONG_MAX) == 0x7fffffffL
- typedef signed long __int32_t;
- typedef unsigned long __uint32_t;
- #define ___int32_t_defined 1
-+#elif __EXP(INT_MAX) == 0x7fffffffL
-+typedef signed int __int32_t;
-+typedef unsigned int __uint32_t;
-+#define ___int32_t_defined 1
- #elif __EXP(SHRT_MAX) == 0x7fffffffL
- typedef signed short __int32_t;
- typedef unsigned short __uint32_t;
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/process.h newlib-1.19.0/newlib/libc/include/process.h
---- newlib-1.19.0.orig/newlib/libc/include/process.h	2002-06-11 04:26:43.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/process.h	2011-10-06 08:54:41.539113661 +0200
-@@ -1,4 +1,5 @@
--/* process.h.  This file comes with MSDOS and WIN32 systems.  */
-+/* process.h.  Define spawn family of functions as provided by Cygwin.
-+   The original file of this name is a MS/DOS invention. */
- 
- #ifndef __PROCESS_H_
- #define __PROCESS_H_
-@@ -7,15 +8,7 @@
- extern "C" {
- #endif
- 
--int execl(const char *path, const char *argv0, ...);
--int execle(const char *path, const char *argv0, ... /*, char * const *envp */);
--int execlp(const char *path, const char *argv0, ...);
--int execlpe(const char *path, const char *argv0, ... /*, char * const *envp */);
--
--int execv(const char *path, char * const *argv);
--int execve(const char *path, char * const *argv, char * const *envp);
--int execvp(const char *path, char * const *argv);
--int execvpe(const char *path, char * const *argv, char * const *envp);
-+/* For the exec functions, include unistd.h. */
- 
- int spawnl(int mode, const char *path, const char *argv0, ...);
- int spawnle(int mode, const char *path, const char *argv0, ... /*, char * const *envp */);
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/signal.h newlib-1.19.0/newlib/libc/include/signal.h
---- newlib-1.19.0.orig/newlib/libc/include/signal.h	2010-07-13 13:18:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/signal.h	2011-10-06 08:54:41.539113661 +0200
-@@ -7,9 +7,6 @@
- _BEGIN_STD_C
- 
- typedef int	sig_atomic_t;		/* Atomic entity type (ANSI) */
--#ifndef _POSIX_SOURCE
--typedef _sig_func_ptr sighandler_t;	/* glibc naming */
--#endif /* !_POSIX_SOURCE */
- 
- #define SIG_DFL ((_sig_func_ptr)0)	/* Default action */
- #define SIG_IGN ((_sig_func_ptr)1)	/* Ignore action */
-@@ -23,6 +20,7 @@
- #ifndef _REENT_ONLY
- _sig_func_ptr _EXFUN(signal, (int, _sig_func_ptr));
- int	_EXFUN(raise, (int));
-+void	_EXFUN(psignal, (int, const char *));
- #endif
- 
- _END_STD_C
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdint.h newlib-1.19.0/newlib/libc/include/stdint.h
---- newlib-1.19.0.orig/newlib/libc/include/stdint.h	2009-04-24 23:55:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/stdint.h	2011-10-06 08:54:41.540113700 +0200
-@@ -33,7 +33,7 @@
- /* Check if "long" is 64bit or 32bit wide */
- #if __STDINT_EXP(LONG_MAX) > 0x7fffffff
- #define __have_long64 1
--#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff && !defined(__SPU__)
-+#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff
- #define __have_long32 1
- #endif
- 
-@@ -49,14 +49,14 @@
- #define __int_least8_t_defined 1
- #endif
- 
--#if __STDINT_EXP(SHRT_MAX) == 0x7fff
--typedef signed short int16_t;
--typedef unsigned short uint16_t;
--#define __int16_t_defined 1
--#elif __STDINT_EXP(INT_MAX) == 0x7fff
-+#if __STDINT_EXP(INT_MAX) == 0x7fff
- typedef signed int int16_t;
- typedef unsigned int uint16_t;
- #define __int16_t_defined 1
-+#elif __STDINT_EXP(SHRT_MAX) == 0x7fff
-+typedef signed short int16_t;
-+typedef unsigned short uint16_t;
-+#define __int16_t_defined 1
- #elif __STDINT_EXP(SCHAR_MAX) == 0x7fff
- typedef signed char int16_t;
- typedef unsigned char uint16_t;
-@@ -239,6 +239,29 @@
-  * GCC doesn't provide an appropriate macro for [u]intptr_t
-  * For now, use __PTRDIFF_TYPE__
-  */
-+#if defined(__SIZEOF_POINTER__)
-+#if __SIZEOF_POINTER__ == 8
-+  typedef int64_t intptr_t;
-+  typedef uint64_t uintptr_t;
-+#define INTPTR_MAX INT64_MAX
-+#define INTPTR_MIN INT64_MIN
-+#define UINTPTR_MAX UINT64_MAX
-+#elif __SIZEOF_POINTER__ == 4
-+  typedef int32_t intptr_t;
-+  typedef uint32_t uintptr_t;
-+#define INTPTR_MAX INT32_MAX
-+#define INTPTR_MIN INT32_MIN
-+#define UINTPTR_MAX UINT32_MAX
-+#elif __SIZEOF_POINTER__ == 2
-+  typedef int16_t intptr_t;
-+  typedef uint16_t uintptr_t;
-+#define INTPTR_MAX INT16_MAX
-+#define INTPTR_MIN INT16_MIN
-+#define UINTPTR_MAX UINT16_MAX
-+#else
-+#error cannot determine intptr_t
-+#endif
-+#else
- #if defined(__PTRDIFF_TYPE__)
- typedef signed __PTRDIFF_TYPE__ intptr_t;
- typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
-@@ -260,6 +283,7 @@
- #define INTPTR_MIN (-__STDINT_EXP(LONG_MAX) - 1)
- #define UINTPTR_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1)
- #endif
-+#endif
- 
- /* Limits of Specified-Width Integer Types */
- 
-@@ -408,6 +432,8 @@
- /* This must match size_t in stddef.h, currently long unsigned int */
- #ifdef __SIZE_MAX__
- #define SIZE_MAX __SIZE_MAX__
-+#elif defined(__SIZEOF_SIZE_T__) && defined(__CHAR_BIT__)
-+#define SIZE_MAX (((1UL << (__SIZEOF_SIZE_T__ * __CHAR_BIT__ - 1)) - 1) * 2 + 1)
- #else
- #define SIZE_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1)
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdio_ext.h newlib-1.19.0/newlib/libc/include/stdio_ext.h
---- newlib-1.19.0.orig/newlib/libc/include/stdio_ext.h	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/stdio_ext.h	2011-10-06 08:54:41.540113700 +0200
-@@ -0,0 +1,22 @@
-+/*
-+ * stdio_ext.h
-+ *
-+ * Definitions for I/O internal operations, originally from Solaris.
-+ */
-+
-+#ifndef _STDIO_EXT_H_
-+#define _STDIO_EXT_H_
-+
-+#ifdef __rtems__
-+#error "<stdio_ext.h> not supported"
-+#endif
-+
-+#include <stdio.h>
-+
-+_BEGIN_STD_C
-+
-+void	 _EXFUN(__fpurge,(FILE *));
-+
-+_END_STD_C
-+
-+#endif /* _STDIO_EXT_H_ */
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdio.h newlib-1.19.0/newlib/libc/include/stdio.h
---- newlib-1.19.0.orig/newlib/libc/include/stdio.h	2010-02-26 10:41:43.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/stdio.h	2011-10-06 08:54:41.540113700 +0200
-@@ -308,7 +308,7 @@
-  * Routines in POSIX 1003.1:2001.
-  */
- 
--#ifndef __STRICT_ANSI__
-+#if (!defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L))
- #ifndef _REENT_ONLY
- FILE *	_EXFUN(fdopen, (int, const char *));
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdlib.h newlib-1.19.0/newlib/libc/include/stdlib.h
---- newlib-1.19.0.orig/newlib/libc/include/stdlib.h	2010-07-19 20:21:11.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/stdlib.h	2011-10-06 08:54:41.540113700 +0200
-@@ -38,7 +38,7 @@
-   long rem; /* remainder */
- } ldiv_t;
- 
--#ifndef __STRICT_ANSI__
-+#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L)
- typedef struct
- {
-   long long int quot; /* quotient */
-@@ -63,13 +63,12 @@
- int	_EXFUN(abs,(int));
- int	_EXFUN(atexit,(_VOID (*__func)(_VOID)));
- double	_EXFUN(atof,(const char *__nptr));
--#ifndef __STRICT_ANSI__
--float	_EXFUN(atoff,(const char *__nptr));
--#endif
- int	_EXFUN(atoi,(const char *__nptr));
--int	_EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
- long	_EXFUN(atol,(const char *__nptr));
-+#ifndef __STRICT_ANSI__
-+int	_EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
- long	_EXFUN(_atol_r,(struct _reent *, const char *__nptr));
-+#endif /* ! __STRICT_ANSI__ */
- _PTR	_EXFUN(bsearch,(const _PTR __key,
- 		       const _PTR __base,
- 		       size_t __nmemb,
-@@ -80,10 +79,10 @@
- _VOID	_EXFUN(exit,(int __status) _ATTRIBUTE ((noreturn)));
- _VOID	_EXFUN_NOTHROW(free,(_PTR));
- char *  _EXFUN(getenv,(const char *__string));
-+#ifndef __STRICT_ANSI__
- char *	_EXFUN(_getenv_r,(struct _reent *, const char *__string));
- char *	_EXFUN(_findenv,(_CONST char *, int *));
- char *	_EXFUN(_findenv_r,(struct _reent *, _CONST char *, int *));
--#ifndef __STRICT_ANSI__
- extern char *suboptarg;			/* getsubopt(3) external variable */
- int	_EXFUN(getsubopt,(char **, char * const *, char **));
- #endif
-@@ -91,16 +90,16 @@
- ldiv_t	_EXFUN(ldiv,(long __numer, long __denom));
- _PTR	_EXFUN_NOTHROW(malloc,(size_t __size));
- int	_EXFUN(mblen,(const char *, size_t));
--int	_EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
- int	_EXFUN(mbtowc,(wchar_t *, const char *, size_t));
--int	_EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
- int	_EXFUN(wctomb,(char *, wchar_t));
--int	_EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *));
- size_t	_EXFUN(mbstowcs,(wchar_t *, const char *, size_t));
--size_t	_EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
- size_t	_EXFUN(wcstombs,(char *, const wchar_t *, size_t));
--size_t	_EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *));
- #ifndef __STRICT_ANSI__
-+int	_EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
-+int	_EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
-+int	_EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *));
-+size_t	_EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
-+size_t	_EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *));
- #ifndef _REENT_ONLY
- char *	_EXFUN(mkdtemp,(char *));
- int	_EXFUN(mkostemp,(char *, int));
-@@ -133,10 +132,11 @@
- # endif
- #endif
- long	_EXFUN(strtol,(const char *__n, char **__end_PTR, int __base));
--long	_EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base));
- unsigned long _EXFUN(strtoul,(const char *__n, char **__end_PTR, int __base));
-+#ifndef __STRICT_ANSI__
- unsigned long _EXFUN(_strtoul_r,(struct _reent *,const char *__n, char **__end_PTR, int __base));
--
-+long	_EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base));
-+#endif /* !__STRICT_ANSI__ */
- int	_EXFUN(system,(const char *__string));
- 
- #ifndef __STRICT_ANSI__
-@@ -163,33 +163,39 @@
- int	_EXFUN(rand_r,(unsigned *__seed));
- 
- double _EXFUN(drand48,(_VOID));
--double _EXFUN(_drand48_r,(struct _reent *));
- double _EXFUN(erand48,(unsigned short [3]));
--double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3]));
- long   _EXFUN(jrand48,(unsigned short [3]));
--long   _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3]));
- _VOID  _EXFUN(lcong48,(unsigned short [7]));
--_VOID  _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
- long   _EXFUN(lrand48,(_VOID));
--long   _EXFUN(_lrand48_r,(struct _reent *));
- long   _EXFUN(mrand48,(_VOID));
--long   _EXFUN(_mrand48_r,(struct _reent *));
- long   _EXFUN(nrand48,(unsigned short [3]));
--long   _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3]));
- unsigned short *
-        _EXFUN(seed48,(unsigned short [3]));
-+_VOID  _EXFUN(srand48,(long));
-+long long _EXFUN(atoll,(const char *__nptr));
-+#ifndef __STRICT_ANSI__
-+double _EXFUN(_drand48_r,(struct _reent *));
-+double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3]));
-+long   _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3]));
-+_VOID  _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
-+long   _EXFUN(_lrand48_r,(struct _reent *));
-+long   _EXFUN(_mrand48_r,(struct _reent *));
-+long   _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3]));
- unsigned short *
-        _EXFUN(_seed48_r,(struct _reent *, unsigned short [3]));
--_VOID  _EXFUN(srand48,(long));
- _VOID  _EXFUN(_srand48_r,(struct _reent *, long));
--long long _EXFUN(atoll,(const char *__nptr));
- long long _EXFUN(_atoll_r,(struct _reent *, const char *__nptr));
-+#endif /* ! __STRICT_ANSI__ */
-+#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L)
- long long _EXFUN(llabs,(long long));
- lldiv_t	_EXFUN(lldiv,(long long __numer, long long __denom));
- long long _EXFUN(strtoll,(const char *__n, char **__end_PTR, int __base));
--long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base));
- unsigned long long _EXFUN(strtoull,(const char *__n, char **__end_PTR, int __base));
-+#endif
-+#ifndef __STRICT_ANSI__
-+long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base));
- unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__n, char **__end_PTR, int __base));
-+#endif /* ! __STRICT_ANSI__ */
- 
- #ifndef __CYGWIN__
- _VOID	_EXFUN(cfree,(_PTR));
-@@ -203,6 +209,7 @@
- 
- #endif /* ! __STRICT_ANSI__ */
- 
-+#ifndef __STRICT_ANSI__
- char *	_EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**));
- #ifndef __CYGWIN__
- _PTR	_EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t));
-@@ -214,6 +221,7 @@
- int	_EXFUN(_system_r,(struct _reent *, const char *));
- 
- _VOID	_EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
-+#endif /* ! __STRICT_ANSI__ */
- 
- /* On platforms where long double equals double.  */
- #ifdef _LDBL_EQ_DBL
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/string.h newlib-1.19.0/newlib/libc/include/string.h
---- newlib-1.19.0.orig/newlib/libc/include/string.h	2008-06-18 17:27:27.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/string.h	2011-10-06 08:54:41.540113700 +0200
-@@ -9,6 +9,7 @@
- 
- #include "_ansi.h"
- #include <sys/reent.h>
-+#include <sys/cdefs.h>
- 
- #define __need_size_t
- #include <stddef.h>
-@@ -49,51 +50,58 @@
- #ifndef __STRICT_ANSI__
- char 	*_EXFUN(strtok_r,(char *, const char *, char **));
- 
--int	 _EXFUN(bcmp,(const void *, const void *, size_t));
--void	 _EXFUN(bcopy,(const void *, void *, size_t));
--void	 _EXFUN(bzero,(void *, size_t));
--int	 _EXFUN(ffs,(int));
--char 	*_EXFUN(index,(const char *, int));
- _PTR	 _EXFUN(memccpy,(_PTR, const _PTR, int, size_t));
- _PTR	 _EXFUN(mempcpy,(_PTR, const _PTR, size_t));
- _PTR	 _EXFUN(memmem, (const _PTR, size_t, const _PTR, size_t));
--char 	*_EXFUN(rindex,(const char *, int));
- char 	*_EXFUN(stpcpy,(char *, const char *));
- char 	*_EXFUN(stpncpy,(char *, const char *, size_t));
--int	 _EXFUN(strcasecmp,(const char *, const char *));
- char	*_EXFUN(strcasestr,(const char *, const char *));
-+char 	*_EXFUN(strchrnul,(const char *, int));
- char 	*_EXFUN(strdup,(const char *));
- char 	*_EXFUN(_strdup_r,(struct _reent *, const char *));
- char 	*_EXFUN(strndup,(const char *, size_t));
- char 	*_EXFUN(_strndup_r,(struct _reent *, const char *, size_t));
--char 	*_EXFUN(strerror_r,(int, char *, size_t));
-+/* There are two common strerror_r variants.  If you request
-+   _GNU_SOURCE, you get the GNU version; otherwise you get the POSIX
-+   version.  POSIX requires that #undef strerror_r will still let you
-+   invoke the underlying function, but that requires gcc support.  */
-+#ifdef _GNU_SOURCE
-+char    *_EXFUN(strerror_r,(int, char *, size_t));
-+#else
-+# ifdef __GNUC__
-+int      _EXFUN(strerror_r,(int, char *, size_t)) __asm__ (__ASMNAME ("__xpg_strerror_r"));
-+# else
-+int      _EXFUN(__xpg_strerror_r,(int, char *, size_t));
-+#  define strerror_r __xpg_strerror_r
-+# endif
-+#endif
- size_t	 _EXFUN(strlcat,(char *, const char *, size_t));
- size_t	 _EXFUN(strlcpy,(char *, const char *, size_t));
--int	 _EXFUN(strncasecmp,(const char *, const char *, size_t));
- size_t	 _EXFUN(strnlen,(const char *, size_t));
- char 	*_EXFUN(strsep,(char **, const char *));
- char	*_EXFUN(strlwr,(char *));
- char	*_EXFUN(strupr,(char *));
-+char	*_EXFUN(strsignal, (int __signo));
- #ifdef __CYGWIN__
--#ifndef DEFS_H	/* Kludge to work around problem compiling in gdb */
--char  *_EXFUN(strsignal, (int __signo));
--#endif
- int     _EXFUN(strtosigno, (const char *__name));
- #endif
- 
--/* These function names are used on Windows and perhaps other systems.  */
--#ifndef strcmpi
--#define strcmpi strcasecmp
--#endif
--#ifndef stricmp
--#define stricmp strcasecmp
--#endif
--#ifndef strncmpi
--#define strncmpi strncasecmp
--#endif
--#ifndef strnicmp
--#define strnicmp strncasecmp
--#endif
-+/* Recursive version of strerror.  */
-+char *	_EXFUN(_strerror_r, (struct _reent *, int, int, int *));
-+
-+#if defined _GNU_SOURCE && defined __GNUC__
-+#define strdupa(__s) \
-+	(__extension__ ({const char *__in = (__s); \
-+			 size_t __len = strlen (__in) + 1; \
-+			 char * __out = (char *) __builtin_alloca (__len); \
-+			 (char *) memcpy (__out, __in, __len);}))
-+#define strndupa(__s, __n) \
-+	(__extension__ ({const char *__in = (__s); \
-+			 size_t __len = strnlen (__in, (__n)) + 1; \
-+			 char *__out = (char *) __builtin_alloca (__len); \
-+			 __out[__len-1] = '\0'; \
-+			 (char *) memcpy (__out, __in, __len-1);}))
-+#endif /* _GNU_SOURCE && __GNUC__ */
- 
- #endif /* ! __STRICT_ANSI__ */
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/cdefs.h newlib-1.19.0/newlib/libc/include/sys/cdefs.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/cdefs.h	2002-06-20 21:51:24.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/cdefs.h	2011-10-06 08:54:41.541113736 +0200
-@@ -58,6 +58,27 @@
- #define __DOTS    	, ...
- #define __THROW
- 
-+/*
-+ * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
-+ * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
-+ * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI
-+ * mode -- there must be no spaces between its arguments, and for nested
-+ * __CONCAT's, all the __CONCAT's must be at the left.  __CONCAT can also
-+ * concatenate double-quoted strings produced by the __STRING macro, but
-+ * this only works with ANSI C.
-+ *
-+ * __XSTRING is like __STRING, but it expands any macros in its argument
-+ * first.  It is only available with ANSI C.
-+ */
-+#define __CONCAT1(x,y)  x ## y
-+#define __CONCAT(x,y)   __CONCAT1(x,y)
-+#define __STRING(x)     #x              /* stringify without expanding x */
-+#define __XSTRING(x)    __STRING(x)     /* expand x, then stringify */
-+
-+#ifdef __GNUC__
-+# define __ASMNAME(cname)  __XSTRING (__USER_LABEL_PREFIX__) cname
-+#endif
-+
- #define __ptr_t void *
- #define __long_double_t  long double
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/_default_fcntl.h newlib-1.19.0/newlib/libc/include/sys/_default_fcntl.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/_default_fcntl.h	2010-01-14 19:49:13.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/sys/_default_fcntl.h	2011-10-06 08:54:41.541113736 +0200
-@@ -51,8 +51,6 @@
- #define O_BINARY	_FBINARY
- #define O_TEXT		_FTEXT
- #define O_NOINHERIT	_FNOINHERIT
--/* O_CLOEXEC is the Linux equivalent to O_NOINHERIT */
--#define O_CLOEXEC	_FNOINHERIT
- 
- /* The windows header files define versions with a leading underscore.  */
- #define _O_RDONLY	O_RDONLY
-@@ -124,9 +122,6 @@
- #define	F_CNVT 		12	/* Convert a fhandle to an open fd */
- #define	F_RSETLKW 	13	/* Set or Clear remote record-lock(Blocking) */
- #endif	/* !_POSIX_SOURCE */
--#ifdef __CYGWIN__
--#define	F_DUPFD_CLOEXEC	14	/* As F_DUPFD, but set close-on-exec flag */
--#endif
- 
- /* fcntl(2) flags (l_type field of flock structure) */
- #define	F_RDLCK		1	/* read lock */
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/dir.h newlib-1.19.0/newlib/libc/include/sys/dir.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/dir.h	2010-08-11 20:14:54.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/dir.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,10 +0,0 @@
--/* BSD predecessor of POSIX.1 <dirent.h> and struct dirent */
--
--#ifndef _SYS_DIR_H_
--#define _SYS_DIR_H_
--
--#include <dirent.h>
--
--#define direct dirent
--
--#endif /*_SYS_DIR_H_*/
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/features.h newlib-1.19.0/newlib/libc/include/sys/features.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/features.h	2010-08-09 10:29:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/features.h	2011-10-06 08:54:41.545113859 +0200
-@@ -15,7 +15,7 @@
-  *  OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS
-  *  SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
-  *
-- *  $Id$
-+ *  $Id$
-  */
- 
- #ifndef _SYS_FEATURES_H
-@@ -102,8 +102,8 @@
- /* #define _POSIX_ASYNCHRONOUS_IO		    -1 */
- /* #define _POSIX_BARRIERS			    -1 */
- #define _POSIX_CHOWN_RESTRICTED			     1
--/* #define _POSIX_CLOCK_SELECTION		    -1 */
--/* #define _POSIX_CPUTIME			    -1 */
-+#define _POSIX_CLOCK_SELECTION			200112L
-+#define _POSIX_CPUTIME			    	200112L
- #define _POSIX_FSYNC				200112L
- #define _POSIX_IPV6				200112L
- #define _POSIX_JOB_CONTROL			     1
-@@ -125,12 +125,12 @@
- #define _POSIX_SHARED_MEMORY_OBJECTS		200112L 
- #define _POSIX_SHELL				     1
- /* #define _POSIX_SPAWN				    -1 */
--/* #define _POSIX_SPIN_LOCKS			    -1 */
-+#define _POSIX_SPIN_LOCKS			    200112L
- /* #define _POSIX_SPORADIC_SERVER		    -1 */
- #define _POSIX_SYNCHRONIZED_IO			200112L
--/* #define _POSIX_THREAD_ATTR_STACKADDR		    -1 */
-+#define _POSIX_THREAD_ATTR_STACKADDR		200112L
- #define _POSIX_THREAD_ATTR_STACKSIZE		200112L
--/* #define _POSIX_THREAD_CPUTIME		    -1 */
-+#define _POSIX_THREAD_CPUTIME			200112L
- /* #define _POSIX_THREAD_PRIO_INHERIT		    -1 */
- /* #define _POSIX_THREAD_PRIO_PROTECT		    -1 */
- #define _POSIX_THREAD_PRIORITY_SCHEDULING	200112L
-@@ -178,6 +178,12 @@
- /* #define _XOPEN_UNIX				    -1 */
- 
- #endif /* !__STRICT_ANSI__ || __cplusplus || __STDC_VERSION__ >= 199901L */
-+
-+/* The value corresponds to UNICODE version 4.0, which is the version
-+   supported by XP.  Newlib supports 5.2 (2011) but so far Cygwin needs
-+   the MS conversions for double-byte charsets. */
-+#define __STDC_ISO_10646__ 200305L
-+
- #endif /* __CYGWIN__ */
- 
- /* Per the permission given in POSIX.1-2008 section 2.2.1, define
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/signal.h newlib-1.19.0/newlib/libc/include/sys/signal.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/signal.h	2009-10-13 19:31:49.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/signal.h	2011-10-06 08:54:41.545113859 +0200
-@@ -76,11 +76,12 @@
-  *
-  *  (1) Routines stored in sa_handler should take a single int as
-  *      their argument although the POSIX standard does not require this.
-+ *      This is not longer true since at least POSIX.1-2008
-  *  (2) The fields sa_handler and sa_sigaction may overlap, and a conforming
-  *      application should not use both simultaneously.
-  */
- 
--typedef void (*_sig_func_ptr)();
-+typedef void (*_sig_func_ptr)(int);
- 
- struct sigaction {
-   int         sa_flags;       /* Special flags to affect behavior of signal */
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/types.h newlib-1.19.0/newlib/libc/include/sys/types.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/types.h	2010-12-08 15:44:06.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/include/sys/types.h	2011-10-06 08:54:41.545113859 +0200
-@@ -98,6 +98,7 @@
- 
- typedef	unsigned short	ushort;		/* System V compatibility */
- typedef	unsigned int	uint;		/* System V compatibility */
-+typedef	unsigned long	ulong;		/* System V compatibility */
- # endif	/*!_POSIX_SOURCE */
- 
- #ifndef __clock_t_defined
-@@ -300,39 +301,6 @@
- #define PTHREAD_CREATE_DETACHED 0
- #define PTHREAD_CREATE_JOINABLE  1
- 
--#if defined(__XMK__) || defined(__rtems__)
--/* The following defines are part of the X/Open System Interface (XSI). */
--
--/* This type of mutex does not detect deadlock. A thread attempting to relock this mutex without first unlocking 
-- * it shall deadlock. Attempting to unlock a mutex locked by a different thread results in undefined behavior. 
-- * Attempting to unlock an unlocked mutex results in undefined behavior. 
-- */
--#define PTHREAD_MUTEX_NORMAL  1
--
--/* 
-- * This type of mutex provides error checking. A thread attempting to relock this mutex without first unlocking 
-- * it shall return with an error. A thread attempting to unlock a mutex which another thread has locked shall return 
-- * with an error. A thread attempting to unlock an unlocked mutex shall return with an error. 
-- */
--#define PTHREAD_MUTEX_ERRORCHECK  2 
--
--/* A thread attempting to relock this mutex without first unlocking it shall succeed in locking the mutex. 
-- * The relocking deadlock which can occur with mutexes of type PTHREAD_MUTEX_NORMAL cannot occur with this type of mutex. 
-- * Multiple locks of this mutex shall require the same number of unlocks to release the mutex before another thread can 
-- * acquire the mutex. A thread attempting to unlock a mutex which another thread has locked shall return with an error. 
-- * A thread attempting to unlock an unlocked mutex shall return with an error. 
-- */
--#define PTHREAD_MUTEX_RECURSIVE  3
--
--/* Attempting to recursively lock a mutex of this type results in undefined behavior. Attempting to unlock a 
-- * mutex of this type which was not locked by the calling thread results in undefined behavior. Attempting to 
-- * unlock a mutex of this type which is not locked results in undefined behavior. An implementation may map this 
-- * mutex to one of the other mutex types.
-- */
--#define PTHREAD_MUTEX_DEFAULT  4 
--
--#endif /* defined(__XMK__) || defined(__rtems__) */
--
- #if defined(__XMK__)
- typedef struct pthread_attr_s {
-   int contentionscope;
-@@ -390,12 +358,49 @@
- 
- /* Values for mutex type */
- 
-+/* The following defines are part of the X/Open System Interface (XSI). */
-+
-+/*
-+ * This type of mutex does not detect deadlock. A thread attempting to
-+ * relock this mutex without first unlocking it shall deadlock. Attempting
-+ * to unlock a mutex locked by a different thread results in undefined
-+ * behavior.  Attempting to unlock an unlocked mutex results in undefined
-+ * behavior.
-+ */
- #define PTHREAD_MUTEX_NORMAL     0
-+
-+/*
-+ * A thread attempting to relock this mutex without first unlocking
-+ * it shall succeed in locking the mutex.  The relocking deadlock which
-+ * can occur with mutexes of type PTHREAD_MUTEX_NORMAL cannot occur with
-+ * this type of mutex.  Multiple locks of this mutex shall require the
-+ * same number of unlocks to release the mutex before another thread can
-+ * acquire the mutex. A thread attempting to unlock a mutex which another
-+ * thread has locked shall return with an error.  A thread attempting to
-+ * unlock an unlocked mutex shall return with an error.
-+ */
- #define PTHREAD_MUTEX_RECURSIVE  1
-+
-+/* 
-+ * This type of mutex provides error checking. A thread attempting
-+ * to relock this mutex without first unlocking it shall return with an
-+ * error. A thread attempting to unlock a mutex which another thread has
-+ * locked shall return with an error. A thread attempting to unlock an
-+ * unlocked mutex shall return with an error.
-+ */
- #define PTHREAD_MUTEX_ERRORCHECK 2
-+
-+/*
-+ * Attempting to recursively lock a mutex of this type results
-+ * in undefined behavior. Attempting to unlock a mutex of this type
-+ * which was not locked by the calling thread results in undefined
-+ * behavior. Attempting to unlock a mutex of this type which is not locked
-+ * results in undefined behavior. An implementation may map this mutex to
-+ * one of the other mutex types.
-+ */
- #define PTHREAD_MUTEX_DEFAULT    3
- 
--#endif
-+#endif /* !defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES) */
- 
- #if defined(__XMK__)
- typedef unsigned int pthread_mutex_t;    /* identify a mutex */
-@@ -462,13 +467,13 @@
- 
- /* POSIX Spin Lock Types */
- 
-+#if !defined (__CYGWIN__)
- #if defined(_POSIX_SPIN_LOCKS)
- typedef __uint32_t pthread_spinlock_t;        /* POSIX Spin Lock Object */
- #endif /* defined(_POSIX_SPIN_LOCKS) */
- 
- /* POSIX Reader/Writer Lock Types */
- 
--#if !defined (__CYGWIN__)
- #if defined(_POSIX_READER_WRITER_LOCKS)
- typedef __uint32_t pthread_rwlock_t;         /* POSIX RWLock Object */
- typedef struct {
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/unistd.h newlib-1.19.0/newlib/libc/include/sys/unistd.h
---- newlib-1.19.0.orig/newlib/libc/include/sys/unistd.h	2010-10-08 17:28:49.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/sys/unistd.h	2011-10-06 08:54:41.546113891 +0200
-@@ -46,6 +46,9 @@
- int     _EXFUN(execl, (const char *__path, const char *, ... ));
- int     _EXFUN(execle, (const char *__path, const char *, ... ));
- int     _EXFUN(execlp, (const char *__file, const char *, ... ));
-+#if defined(__CYGWIN__)
-+int     _EXFUN(execlpe, (const char *__file, const char *, ... ));
-+#endif
- int     _EXFUN(execv, (const char *__path, char * const __argv[] ));
- int     _EXFUN(execve, (const char *__path, char * const __argv[], char * const __envp[] ));
- int     _EXFUN(execvp, (const char *__file, char * const __argv[] ));
-@@ -487,10 +490,11 @@
- #define _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS       16
- #define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS    17
- #define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS    _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS
-+#define _CS_XBS5_WIDTH_RESTRICTED_ENVS        _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS
- #define _CS_POSIX_V7_THREADS_CFLAGS           18
- #define _CS_POSIX_V7_THREADS_LDFLAGS          19
- #define _CS_V7_ENV                            20
--#define _CS_V6_ENV                           _CS_V6_ENV
-+#define _CS_V6_ENV                            _CS_V7_ENV
- #endif
- 
- #ifndef __CYGWIN__
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/time.h newlib-1.19.0/newlib/libc/include/time.h
---- newlib-1.19.0.orig/newlib/libc/include/time.h	2008-10-16 23:53:58.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/time.h	2011-10-06 08:54:41.546113891 +0200
-@@ -175,6 +175,22 @@
- #endif
- #endif /* _POSIX_TIMERS */
- 
-+#if defined(_POSIX_CLOCK_SELECTION)
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+int _EXFUN(clock_nanosleep,
-+  (clockid_t clock_id, int flags, const struct timespec *rqtp,
-+   struct timespec *rmtp));
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _POSIX_CLOCK_SELECTION */
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -212,7 +228,7 @@
-    the identifier of the CPU_time clock associated with the PROCESS
-    making the function call.  */
- 
--#define CLOCK_PROCESS_CPUTIME (clockid_t)2
-+#define CLOCK_PROCESS_CPUTIME_ID (clockid_t)2
- 
- #endif
- 
-@@ -222,7 +238,7 @@
-     the identifier of the CPU_time clock associated with the THREAD
-     making the function call.  */
- 
--#define CLOCK_THREAD_CPUTIME (clockid_t)3
-+#define CLOCK_THREAD_CPUTIME_ID (clockid_t)3
- 
- #endif
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/include/wchar.h newlib-1.19.0/newlib/libc/include/wchar.h
---- newlib-1.19.0.orig/newlib/libc/include/wchar.h	2009-10-15 10:23:27.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/include/wchar.h	2011-10-06 08:54:41.546113891 +0200
-@@ -16,6 +16,9 @@
- /* For _mbstate_t definition. */
- #include <sys/_types.h>
- 
-+/* For __STDC_ISO_10646__ */
-+#include <sys/features.h>
-+
- #ifndef NULL
- #define NULL	0
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/locale/lmessages.c newlib-1.19.0/newlib/libc/locale/lmessages.c
---- newlib-1.19.0.orig/newlib/libc/locale/lmessages.c	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/locale/lmessages.c	2011-10-06 08:54:41.546113891 +0200
-@@ -42,9 +42,9 @@
- 	"^[nN]" ,	/* noexpr */
- 	"yes" , 	/* yesstr */
- 	"no"		/* nostr */
--	"ASCII"		/* codeset */
- #ifdef __HAVE_LOCALE_INFO_EXTENDED__
--	, L"^[yY]" ,	/* wyesexpr */
-+	, "ASCII" ,	/* codeset */
-+	L"^[yY]" ,	/* wyesexpr */
- 	L"^[nN]" ,	/* wnoexpr */
- 	L"yes" , 	/* wyesstr */
- 	L"no"		/* wnostr */
-diff -Naur newlib-1.19.0.orig/newlib/libc/locale/lmessages.h newlib-1.19.0/newlib/libc/locale/lmessages.h
---- newlib-1.19.0.orig/newlib/libc/locale/lmessages.h	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/locale/lmessages.h	2011-10-06 08:54:41.546113891 +0200
-@@ -50,7 +50,7 @@
- };
- 
- struct lc_messages_T *__get_current_messages_locale(void);
--int __numeric_load_locale(const char *, void *, const char *);
-+int __messages_load_locale(const char *, void *, const char *);
- 
- __END_DECLS
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/locale/locale.c newlib-1.19.0/newlib/libc/locale/locale.c
---- newlib-1.19.0.orig/newlib/libc/locale/locale.c	2010-11-19 11:02:36.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/locale/locale.c	2011-10-06 08:54:41.547113918 +0200
-@@ -182,6 +182,7 @@
- #include "lmonetary.h"
- #include "lnumeric.h"
- #include "lctype.h"
-+#include "timelocal.h"
- #include "../stdlib/local.h"
- 
- #define _LC_LAST      7
-@@ -235,7 +236,11 @@
- static char current_categories[_LC_LAST][ENCODING_LEN + 1] = {
-     "C",
-     "C",
-+#ifdef __CYGWIN__ /* Cygwin starts with LC_CTYPE set to "C.UTF-8". */
-+    "C.UTF-8",
-+#else
-     "C",
-+#endif
-     "C",
-     "C",
-     "C",
-@@ -255,13 +260,12 @@
- 
- #endif /* _MB_CAPABLE */
- 
--#if 0 /*def __CYGWIN__  TODO: temporarily(?) disable C == UTF-8 */
-+#ifdef __CYGWIN__
- static char lc_ctype_charset[ENCODING_LEN + 1] = "UTF-8";
--static char lc_message_charset[ENCODING_LEN + 1] = "UTF-8";
- #else
- static char lc_ctype_charset[ENCODING_LEN + 1] = "ASCII";
--static char lc_message_charset[ENCODING_LEN + 1] = "ASCII";
- #endif
-+static char lc_message_charset[ENCODING_LEN + 1] = "ASCII";
- static int lc_ctype_cjk_lang = 0;
- 
- char *
-@@ -432,7 +436,7 @@
- #ifdef _MB_CAPABLE
- #ifdef __CYGWIN__
- extern void __set_charset_from_locale (const char *locale, char *charset);
--extern int __set_locale_from_locale_alias (const char *, char *);
-+extern char *__set_locale_from_locale_alias (const char *, char *);
- extern int __collate_load_locale (const char *, void *, const char *);
- #endif /* __CYGWIN__ */
- 
-@@ -495,11 +499,7 @@
-   if (!strcmp (locale, "POSIX"))
-     strcpy (locale, "C");
-   if (!strcmp (locale, "C"))				/* Default "C" locale */
--#if 0 /*def __CYGWIN__  TODO: temporarily(?) disable C == UTF-8 */
--    strcpy (charset, "UTF-8");
--#else
-     strcpy (charset, "ASCII");
--#endif
-   else if (locale[0] == 'C'
- 	   && (locale[1] == '-'		/* Old newlib style */
- 	       || locale[1] == '.'))	/* Extension for the C locale to allow
-@@ -952,7 +952,7 @@
- _DEFUN_VOID(__locale_msgcharset)
- {
- #ifdef __HAVE_LOCALE_INFO__
--  return __get_current_messages_locale ()->codeset;
-+  return (char *) __get_current_messages_locale ()->codeset;
- #else
-   return lc_message_charset;
- #endif
-@@ -972,21 +972,21 @@
-   if (__nlocale_changed)
-     {
-       struct lc_numeric_T *n = __get_current_numeric_locale ();
--      lconv.decimal_point = n->decimal_point;
--      lconv.thousands_sep = n->thousands_sep;
--      lconv.grouping = n->grouping;
-+      lconv.decimal_point = (char *) n->decimal_point;
-+      lconv.thousands_sep = (char *) n->thousands_sep;
-+      lconv.grouping = (char *) n->grouping;
-       __nlocale_changed = 0;
-     }
-   if (__mlocale_changed)
-     {
-       struct lc_monetary_T *m = __get_current_monetary_locale ();
--      lconv.int_curr_symbol = m->int_curr_symbol;
--      lconv.currency_symbol = m->currency_symbol;
--      lconv.mon_decimal_point = m->mon_decimal_point;
--      lconv.mon_thousands_sep = m->mon_thousands_sep;
--      lconv.mon_grouping = m->mon_grouping;
--      lconv.positive_sign = m->positive_sign;
--      lconv.negative_sign = m->negative_sign;
-+      lconv.int_curr_symbol = (char *) m->int_curr_symbol;
-+      lconv.currency_symbol = (char *) m->currency_symbol;
-+      lconv.mon_decimal_point = (char *) m->mon_decimal_point;
-+      lconv.mon_thousands_sep = (char *) m->mon_thousands_sep;
-+      lconv.mon_grouping = (char *) m->mon_grouping;
-+      lconv.positive_sign = (char *) m->positive_sign;
-+      lconv.negative_sign = (char *) m->negative_sign;
-       lconv.int_frac_digits = m->int_frac_digits[0];
-       lconv.frac_digits = m->frac_digits[0];
-       lconv.p_cs_precedes = m->p_cs_precedes[0];
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/configure newlib-1.19.0/newlib/libc/machine/configure
---- newlib-1.19.0.orig/newlib/libc/machine/configure	2010-12-16 22:58:42.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/configure	2011-10-06 08:54:41.550114007 +0200
-@@ -651,6 +651,7 @@
- ELIX_LEVEL_0_FALSE
- ELIX_LEVEL_0_TRUE
- LDFLAGS
-+NO_INCLUDE_LIST
- NEWLIB_CFLAGS
- CCASFLAGS
- CCAS
-@@ -816,7 +817,6 @@
- w65
- x86_64
- xc16x
--xscale
- xstormy16
- z8k'
- 
-@@ -3694,6 +3694,9 @@
- NEWLIB_CFLAGS=${newlib_cflags}
- 
- 
-+NO_INCLUDE_LIST=${noinclude}
-+
-+
- LDFLAGS=${ldflags}
- 
- 
-@@ -9660,10 +9663,6 @@
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
--      ld_shlibs=no
--      ;;
--
-     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-     # support.  Future versions do this automatically, but an explicit c++rt0.o
-     # does not break anything, and helps significantly (at the cost of a little
-@@ -10582,10 +10581,6 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -11445,7 +11440,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11448 "configure"
-+#line 11443 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11551,7 +11546,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11554 "configure"
-+#line 11549 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11878,8 +11873,6 @@
-  ;;
- 	xc16x) subdirs="$subdirs xc16x"
-  ;;
--	xscale) subdirs="$subdirs xscale"
-- ;;
- 	xstormy16) subdirs="$subdirs xstormy16"
-  ;;
- 	z8k) subdirs="$subdirs z8k"
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/configure.in newlib-1.19.0/newlib/libc/machine/configure.in
---- newlib-1.19.0.orig/newlib/libc/machine/configure.in	2010-12-02 20:30:47.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/configure.in	2011-10-06 08:54:41.550114007 +0200
-@@ -65,7 +65,6 @@
- 	w65) AC_CONFIG_SUBDIRS(w65) ;;
- 	x86_64) AC_CONFIG_SUBDIRS(x86_64) ;;
- 	xc16x) AC_CONFIG_SUBDIRS(xc16x) ;;
--	xscale) AC_CONFIG_SUBDIRS(xscale) ;;
- 	xstormy16) AC_CONFIG_SUBDIRS(xstormy16) ;;
- 	z8k) AC_CONFIG_SUBDIRS(z8k) ;;
-   esac;
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/frv/setjmp.S newlib-1.19.0/newlib/libc/machine/frv/setjmp.S
---- newlib-1.19.0.orig/newlib/libc/machine/frv/setjmp.S	2002-06-18 23:20:28.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/machine/frv/setjmp.S	2011-10-06 08:54:41.550114007 +0200
-@@ -123,4 +123,4 @@
- 	cmov	gr9, gr8, cc4, 1
- 	ret
- .Lend2:
--	.size	EXT(longjmp),.Lend2-EXT(longjmp2)
-+	.size	EXT(longjmp),.Lend2-EXT(longjmp)
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S
---- newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S	2010-02-08 18:24:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S	2011-10-06 08:54:41.550114007 +0200
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mcpu32__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/mips/strlen.c newlib-1.19.0/newlib/libc/machine/mips/strlen.c
---- newlib-1.19.0.orig/newlib/libc/machine/mips/strlen.c	2002-03-14 03:41:43.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/machine/mips/strlen.c	2011-10-06 08:54:41.551114023 +0200
-@@ -60,6 +60,9 @@
- 	"	addiu	$2,$4,1\n"
- 	"\n"
- 	"1:	lbu	$3,0($4)\n"
-+#if defined(_R3000)
-+	"	nop	\n"
-+#endif
- 	"	bnez	$3,1b\n"
- 	"	addiu	$4,$4,1\n"
- 	"\n"
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.am newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.am	2007-05-24 19:33:35.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.am	2011-10-06 08:54:41.552114035 +0200
-@@ -10,7 +10,7 @@
- 
- AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
- 
--lib_a_SOURCES = setjmp.S times.c
-+lib_a_SOURCES = setjmp.S
- lib_a_CCASFLAGS=$(AM_CCASFLAGS)
- lib_a_CFLAGS=$(AM_CFLAGS)
- lib_a_LIBADD = @extra_objs@
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.in newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.in	2011-07-20 08:45:15.913332235 +0200
-+++ newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.in	2011-10-06 08:54:41.552114035 +0200
-@@ -51,7 +51,7 @@
- LIBRARIES = $(noinst_LIBRARIES)
- ARFLAGS = cru
- lib_a_AR = $(AR) $(ARFLAGS)
--am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-times.$(OBJEXT)
-+am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT)
- lib_a_OBJECTS = $(am_lib_a_OBJECTS)
- DEFAULT_INCLUDES = -I. at am__isrc@
- depcomp =
-@@ -174,7 +174,7 @@
- AM_CCASFLAGS = $(INCLUDES)
- noinst_LIBRARIES = lib.a
- AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
--lib_a_SOURCES = setjmp.S times.c
-+lib_a_SOURCES = setjmp.S
- lib_a_CCASFLAGS = $(AM_CCASFLAGS)
- lib_a_CFLAGS = $(AM_CFLAGS)
- lib_a_LIBADD = @extra_objs@
-@@ -185,7 +185,7 @@
- all: all-am
- 
- .SUFFIXES:
--.SUFFIXES: .S .c .o .obj
-+.SUFFIXES: .S .o .obj
- am--refresh:
- 	@:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-@@ -246,18 +246,6 @@
- lib_a-setjmp.obj: setjmp.S
- 	$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi`
- 
--.c.o:
--	$(COMPILE) -c $<
--
--.c.obj:
--	$(COMPILE) -c `$(CYGPATH_W) '$<'`
--
--lib_a-times.o: times.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.o `test -f 'times.c' || echo '$(srcdir)/'`times.c
--
--lib_a-times.obj: times.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.obj `if test -f 'times.c'; then $(CYGPATH_W) 'times.c'; else $(CYGPATH_W) '$(srcdir)/times.c'; fi`
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/times.c newlib-1.19.0/newlib/libc/machine/powerpc/times.c
---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/times.c	2002-07-22 22:26:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/machine/powerpc/times.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,36 +0,0 @@
--/* Time support routines for PowerPC.
-- *
-- * Written by Aldy Hernandez.
-- */
--
--#include <_ansi.h>
--#include <reent.h>
--#include <sys/time.h>
--#include <sys/times.h>
--#include <sys/resource.h>
--
--clock_t
--times (struct tms *tp)
--{
--  struct rusage usage;
--  union {
--    struct rusage r;
--    /* Newlib's rusage has only 2 fields.  We need to make room for
--       when we call the system's rusage.  This should be enough.  */
--    int filler[32];
--  } host_ru;
--
--  getrusage (RUSAGE_SELF, (void *)&host_ru);
--
--  if (tp)
--    {
--      tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000
--	+ host_ru.r.ru_utime.tv_usec;
--      tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000
--	+ host_ru.r.ru_stime.tv_usec;
--      tp->tms_cutime = 0;	/* user time, children */
--      tp->tms_cstime = 0;	/* system time, children */
--    }
--
--  return tp->tms_utime;
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/Makefile.am newlib-1.19.0/newlib/libc/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/Makefile.am	2010-05-07 01:25:16.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/Makefile.am	2011-10-06 08:54:41.534113448 +0200
-@@ -36,6 +36,8 @@
- 
- if HAVE_XDR_DIR
- XDR_SUBDIR = xdr
-+rpcincludedir = $(tooldir)
-+nobase_rpcinclude_HEADERS = include/rpc/xdr.h include/rpc/types.h
- endif
- 
- # The order of SUBDIRS is important for the integrated documentation.
-@@ -140,8 +142,7 @@
- 	locale/stmp-def \
- 	reent/stmp-def \
- 	$(LIBC_EXTRA_DEF) \
--	misc/stmp-def \
--	posix/stmp-def
-+	misc/stmp-def
- 
- libc.info: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \
- 	targetdep.tex $(SUBDEFS)
-diff -Naur newlib-1.19.0.orig/newlib/libc/Makefile.in newlib-1.19.0/newlib/libc/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/Makefile.in	2011-07-20 08:45:15.822330771 +0200
-+++ newlib-1.19.0/newlib/libc/Makefile.in	2011-10-06 08:54:41.535113475 +0200
-@@ -17,6 +17,7 @@
- 
- 
- 
-+
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -39,7 +40,8 @@
- subdir = .
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(top_srcdir)/configure $(am__configure_deps) \
--	$(srcdir)/../../mkinstalldirs $(libc_TEXINFOS)
-+	$(srcdir)/../../mkinstalldirs $(libc_TEXINFOS) \
-+	$(am__nobase_rpcinclude_HEADERS_DIST)
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \
- 	$(top_srcdir)/../../ltoptions.m4 \
-@@ -155,6 +157,10 @@
-   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- DATA = $(noinst_DATA)
-+am__nobase_rpcinclude_HEADERS_DIST = include/rpc/xdr.h \
-+	include/rpc/types.h
-+am__installdirs = "$(DESTDIR)$(rpcincludedir)"
-+HEADERS = $(nobase_rpcinclude_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -319,6 +325,8 @@
- @ENABLE_NEWLIB_ICONV_FALSE at NEWLIB_ICONV_LIBS = 
- @ENABLE_NEWLIB_ICONV_TRUE at NEWLIB_ICONV_LIBS = iconv/ces/lib.$(aext) iconv/ccs/lib.$(aext) iconv/lib/lib.$(aext)
- @HAVE_XDR_DIR_TRUE at XDR_SUBDIR = xdr
-+ at HAVE_XDR_DIR_TRUE@rpcincludedir = $(tooldir)
-+ at HAVE_XDR_DIR_TRUE@nobase_rpcinclude_HEADERS = include/rpc/xdr.h include/rpc/types.h
- 
- # The order of SUBDIRS is important for the integrated documentation.
- # Do not change the order without considering the doc impact.
-@@ -396,8 +404,7 @@
- 	locale/stmp-def \
- 	reent/stmp-def \
- 	$(LIBC_EXTRA_DEF) \
--	misc/stmp-def \
--	posix/stmp-def
-+	misc/stmp-def
- 
- info_TEXINFOS = libc.texinfo
- libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \
-@@ -638,6 +645,29 @@
- 	done
- 
- clean-info: mostlyclean-aminfo clean-aminfo
-+install-nobase_rpcincludeHEADERS: $(nobase_rpcinclude_HEADERS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(rpcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(rpcincludedir)"
-+	@list='$(nobase_rpcinclude_HEADERS)'; test -n "$(rpcincludedir)" || list=; \
-+	$(am__nobase_list) | while read dir files; do \
-+	  xfiles=; for file in $$files; do \
-+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-+	  test -z "$$xfiles" || { \
-+	    test "x$$dir" = x. || { \
-+	      echo "$(MKDIR_P) '$(DESTDIR)$(rpcincludedir)/$$dir'"; \
-+	      $(MKDIR_P) "$(DESTDIR)$(rpcincludedir)/$$dir"; }; \
-+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(rpcincludedir)/$$dir'"; \
-+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(rpcincludedir)/$$dir" || exit $$?; }; \
-+	done
-+
-+uninstall-nobase_rpcincludeHEADERS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(nobase_rpcinclude_HEADERS)'; test -n "$(rpcincludedir)" || list=; \
-+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(rpcincludedir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(rpcincludedir)" && rm -f $$files
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -775,9 +805,12 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- check-am:
- check: check-recursive
--all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) $(HEADERS)
- installdirs: installdirs-recursive
- installdirs-am:
-+	for dir in "$(DESTDIR)$(rpcincludedir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -827,7 +860,7 @@
- 
- info-am: $(INFO_DEPS)
- 
--install-data-am:
-+install-data-am: install-nobase_rpcincludeHEADERS
- 
- install-dvi: install-dvi-recursive
- 
-@@ -952,7 +985,8 @@
- ps-am: $(PSS)
- 
- uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
--	uninstall-pdf-am uninstall-ps-am
-+	uninstall-nobase_rpcincludeHEADERS uninstall-pdf-am \
-+	uninstall-ps-am
- 
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- 	install-am install-strip tags-recursive
-@@ -966,14 +1000,16 @@
- 	info-am install install-am install-data install-data-am \
- 	install-dvi install-dvi-am install-exec install-exec-am \
- 	install-html install-html-am install-info install-info-am \
--	install-man install-pdf install-pdf-am install-ps \
--	install-ps-am install-strip installcheck installcheck-am \
--	installdirs installdirs-am maintainer-clean \
--	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
--	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-dvi-am uninstall-html-am \
--	uninstall-info-am uninstall-pdf-am uninstall-ps-am
-+	install-man install-nobase_rpcincludeHEADERS install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs installdirs-am \
-+	maintainer-clean maintainer-clean-aminfo \
-+	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	uninstall-dvi-am uninstall-html-am uninstall-info-am \
-+	uninstall-nobase_rpcincludeHEADERS uninstall-pdf-am \
-+	uninstall-ps-am
- 
- @USE_LIBTOOL_FALSE at libc.a: $(SUBLIBS)
- @USE_LIBTOOL_FALSE@	rm -f $@
-diff -Naur newlib-1.19.0.orig/newlib/libc/misc/__dprintf.c newlib-1.19.0/newlib/libc/misc/__dprintf.c
---- newlib-1.19.0.orig/newlib/libc/misc/__dprintf.c	2008-12-11 18:27:55.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/misc/__dprintf.c	2011-10-06 08:54:41.552114035 +0200
-@@ -5,6 +5,7 @@
- */
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include "ctype.h"
- #include "reent.h"
- #include "string.h"
-@@ -131,7 +132,7 @@
- 	      write_string (unctrl (c));
- 	      break;
- 	    case 'p' :
--	      l = (_POINTER_INT) va_arg (args, char *);
-+	      l = (intptr_t) va_arg (args, char *);
- 	      print_number (16, 1, l);
- 	      break;
- 	    case 'd' :
-diff -Naur newlib-1.19.0.orig/newlib/libc/misc/ffs.c newlib-1.19.0/newlib/libc/misc/ffs.c
---- newlib-1.19.0.orig/newlib/libc/misc/ffs.c	2003-06-06 21:57:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/misc/ffs.c	2011-10-06 08:54:41.552114035 +0200
-@@ -6,9 +6,11 @@
- 	ffs
- 
- ANSI_SYNOPSIS
-+	#include <strings.h>
- 	int ffs(int <[word]>);
- 
- TRAD_SYNOPSIS
-+	#include <strings.h>
- 	int ffs(<[word]>);
- 
- DESCRIPTION
-@@ -24,7 +26,7 @@
- 
- No supporting OS subroutines are required.  */
- 
--#include <_ansi.h>
-+#include <strings.h>
- 
- int
- _DEFUN(ffs, (word),
-diff -Naur newlib-1.19.0.orig/newlib/libc/posix/collate.c newlib-1.19.0/newlib/libc/posix/collate.c
---- newlib-1.19.0.orig/newlib/libc/posix/collate.c	2008-11-19 21:04:09.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/posix/collate.c	2011-10-06 08:54:41.552114035 +0200
-@@ -177,12 +177,13 @@
- {
- 	const char *s;
- 	int serrno = errno;
-+	int dummy;
- 
- 	/* Be careful to change write counts if you change the strings */
- 	write(STDERR_FILENO, "collate_error: ", 15);
- 	write(STDERR_FILENO, f, strlen(f));
- 	write(STDERR_FILENO, ": ", 2);
--	s = strerror(serrno);
-+	s = _strerror_r(_REENT, serrno, 1, &dummy);
- 	write(STDERR_FILENO, s, strlen(s));
- 	write(STDERR_FILENO, "\n", 1);
- 	exit(ex);
-diff -Naur newlib-1.19.0.orig/newlib/libc/posix/readdir.c newlib-1.19.0/newlib/libc/posix/readdir.c
---- newlib-1.19.0.orig/newlib/libc/posix/readdir.c	2003-06-06 21:57:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/posix/readdir.c	2011-10-06 08:54:41.553114046 +0200
-@@ -37,6 +37,7 @@
- static char sccsid[] = "@(#)readdir.c	5.7 (Berkeley) 6/1/90";
- #endif /* LIBC_SCCS and not lint */
- 
-+#include <stdint.h>
- #include <dirent.h>
- 
- extern int getdents (int fd, void *dp, int count);
-@@ -75,7 +76,7 @@
-       continue;
-     }
-     dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
--    if ((int)dp & 03) {	/* bogus pointer check */
-+    if ((intptr_t)dp & 03) {	/* bogus pointer check */
- #ifdef HAVE_DD_LOCK
-       __lock_release_recursive(dirp->dd_lock);
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/posix/regexec.c newlib-1.19.0/newlib/libc/posix/regexec.c
---- newlib-1.19.0.orig/newlib/libc/posix/regexec.c	2008-10-31 22:03:41.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/posix/regexec.c	2011-10-06 08:54:41.554114058 +0200
-@@ -58,7 +58,9 @@
- #include "utils.h"
- #include "regex2.h"
- 
-+#ifndef NDEBUG
- static int nope = 0;		/* for use in asserts; shuts lint up */
-+#endif
- 
- /* macros for manipulating states, small version */
- #define	states	long
-diff -Naur newlib-1.19.0.orig/newlib/libc/reent/sbrkr.c newlib-1.19.0/newlib/libc/reent/sbrkr.c
---- newlib-1.19.0.orig/newlib/libc/reent/sbrkr.c	2003-06-03 21:48:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/reent/sbrkr.c	2011-10-06 08:54:41.554114058 +0200
-@@ -13,9 +13,7 @@
- #endif
- #endif
- 
--/* If MALLOC_PROVIDED is defined, we don't need this function.  */
--
--#if defined (REENTRANT_SYSCALLS_PROVIDED) || defined (MALLOC_PROVIDED)
-+#if defined (REENTRANT_SYSCALLS_PROVIDED)
- 
- int _dummy_sbrk_syscalls = 1;
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/db_local.h newlib-1.19.0/newlib/libc/search/db_local.h
---- newlib-1.19.0.orig/newlib/libc/search/db_local.h	2010-03-05 09:55:15.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/search/db_local.h	2011-10-06 08:54:41.554114058 +0200
-@@ -102,11 +102,11 @@
- typedef struct __db {
- 	DBTYPE type;			/* Underlying db type. */
- 	int (*close)(struct __db *);
--	int (*del)(const struct __db *, const DBT *, u_int);
--	int (*get)(const struct __db *, const DBT *, DBT *, u_int);
--	int (*put)(const struct __db *, DBT *, const DBT *, u_int);
--	int (*seq)(const struct __db *, DBT *, DBT *, u_int);
--	int (*sync)(const struct __db *, u_int);
-+	int (*del)(const struct __db *, const DBT *, __uint32_t);
-+	int (*get)(const struct __db *, const DBT *, DBT *, __uint32_t);
-+	int (*put)(const struct __db *, DBT *, const DBT *, __uint32_t);
-+	int (*seq)(const struct __db *, DBT *, DBT *, __uint32_t);
-+	int (*sync)(const struct __db *, __uint32_t);
- 	void *internal;			/* Access method private. */
- 	int (*fd)(const struct __db *);
- } DB;
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/extern.h newlib-1.19.0/newlib/libc/search/extern.h
---- newlib-1.19.0.orig/newlib/libc/search/extern.h	2002-06-20 21:51:31.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/extern.h	2011-10-06 08:54:41.554114058 +0200
-@@ -43,7 +43,7 @@
- int	 __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
- 		int, __uint32_t, SPLIT_RETURN *);
- int	 __buf_free(HTAB *, int, int);
--void	 __buf_init(HTAB *, int);
-+void	 __buf_init(HTAB *, __uint32_t);
- __uint32_t	 __call_hash(HTAB *, char *, int);
- int	 __delpair(HTAB *, BUFHEAD *, int);
- int	 __expand_table(HTAB *);
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/hash_buf.c newlib-1.19.0/newlib/libc/search/hash_buf.c
---- newlib-1.19.0.orig/newlib/libc/search/hash_buf.c	2004-05-26 19:57:10.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/hash_buf.c	2011-10-06 08:54:41.555114070 +0200
-@@ -118,7 +118,7 @@
- 	int newpage;	/* If prev_bp set, indicates a new overflow page. */
- {
- 	BUFHEAD *bp;
--	__uint32_t is_disk_mask;
-+	ptrdiff_t is_disk_mask;
- 	int is_disk, segment_ndx;
- 	SEGMENT segp;
- 
-@@ -298,7 +298,7 @@
- extern void
- __buf_init(hashp, nbytes)
- 	HTAB *hashp;
--	int nbytes;
-+	__uint32_t nbytes;
- {
- 	BUFHEAD *bfp;
- 	int npages;
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/hash.h newlib-1.19.0/newlib/libc/search/hash.h
---- newlib-1.19.0.orig/newlib/libc/search/hash.h	2008-07-02 20:38:45.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/hash.h	2011-10-06 08:54:41.554114058 +0200
-@@ -82,7 +82,7 @@
- 
- /* Hash Table Information */
- typedef struct hashhdr {		/* Disk resident portion */
--	int		magic;		/* Magic NO for hash tables */
-+	__uint32_t	magic;		/* Magic NO for hash tables */
- 	int		version;	/* Version ID */
- 	__uint32_t	lorder;		/* Byte Order */
- 	int		bsize;		/* Bucket/Page Size */
-@@ -97,7 +97,7 @@
- 	int		high_mask;	/* Mask to modulo into entire table */
- 	int		low_mask;	/* Mask to modulo into lower half of 
- 					 * table */
--	int		ffactor;	/* Fill factor */
-+	__uint32_t	ffactor;	/* Fill factor */
- 	int		nkeys;		/* Number of keys in hash table */
- 	int		hdrpages;	/* Size of table header */
- 	int		h_charkey;	/* value of hash(CHARKEY) */
-diff -Naur newlib-1.19.0.orig/newlib/libc/search/hcreate_r.c newlib-1.19.0/newlib/libc/search/hcreate_r.c
---- newlib-1.19.0.orig/newlib/libc/search/hcreate_r.c	2002-07-03 02:33:57.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/search/hcreate_r.c	2011-10-06 08:54:41.555114070 +0200
-@@ -123,9 +123,10 @@
- void
- hdestroy_r(struct hsearch_data *htab)
- {
-+#if 0
- 	struct internal_entry *ie;
- 	size_t idx;
--
-+#endif
- 	if (htab->htable == NULL)
- 		return;
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/Makefile.am newlib-1.19.0/newlib/libc/signal/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/signal/Makefile.am	2006-04-11 21:02:09.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/signal/Makefile.am	2011-10-06 08:54:41.555114070 +0200
-@@ -4,7 +4,7 @@
- 
- INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
- 
--LIB_SOURCES = raise.c signal.c
-+LIB_SOURCES = psignal.c raise.c signal.c
- 
- libsignal_la_LDFLAGS = -Xcompiler -nostdlib
- 
-@@ -21,7 +21,7 @@
- 
- include $(srcdir)/../../Makefile.shared
- 
--CHEWOUT_FILES = raise.def signal.def
-+CHEWOUT_FILES = psignal.def raise.def signal.def
- 
- SUFFIXES = .def
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/Makefile.in newlib-1.19.0/newlib/libc/signal/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/signal/Makefile.in	2011-07-20 08:45:15.831330915 +0200
-+++ newlib-1.19.0/newlib/libc/signal/Makefile.in	2011-10-06 08:54:41.555114070 +0200
-@@ -55,12 +55,13 @@
- ARFLAGS = cru
- lib_a_AR = $(AR) $(ARFLAGS)
- lib_a_LIBADD =
--am__objects_1 = lib_a-raise.$(OBJEXT) lib_a-signal.$(OBJEXT)
-+am__objects_1 = lib_a-psignal.$(OBJEXT) lib_a-raise.$(OBJEXT) \
-+	lib_a-signal.$(OBJEXT)
- @USE_LIBTOOL_FALSE at am_lib_a_OBJECTS = $(am__objects_1)
- lib_a_OBJECTS = $(am_lib_a_OBJECTS)
- LTLIBRARIES = $(noinst_LTLIBRARIES)
- libsignal_la_LIBADD =
--am__objects_2 = raise.lo signal.lo
-+am__objects_2 = psignal.lo raise.lo signal.lo
- @USE_LIBTOOL_TRUE at am_libsignal_la_OBJECTS = $(am__objects_2)
- libsignal_la_OBJECTS = $(am_libsignal_la_OBJECTS)
- libsignal_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -228,7 +229,7 @@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = cygnus
- INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
--LIB_SOURCES = raise.c signal.c
-+LIB_SOURCES = psignal.c raise.c signal.c
- libsignal_la_LDFLAGS = -Xcompiler -nostdlib
- @USE_LIBTOOL_TRUE at noinst_LTLIBRARIES = libsignal.la
- @USE_LIBTOOL_TRUE at libsignal_la_SOURCES = $(LIB_SOURCES)
-@@ -237,7 +238,7 @@
- @USE_LIBTOOL_FALSE at noinst_LIBRARIES = lib.a
- @USE_LIBTOOL_FALSE at lib_a_SOURCES = $(LIB_SOURCES)
- @USE_LIBTOOL_FALSE at lib_a_CFLAGS = $(AM_CFLAGS)
--CHEWOUT_FILES = raise.def signal.def
-+CHEWOUT_FILES = psignal.def raise.def signal.def
- SUFFIXES = .def
- CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
- TARGETDOC = ../tmp.texi
-@@ -310,6 +311,12 @@
- .c.lo:
- 	$(LTCOMPILE) -c -o $@ $<
- 
-+lib_a-psignal.o: psignal.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.o `test -f 'psignal.c' || echo '$(srcdir)/'`psignal.c
-+
-+lib_a-psignal.obj: psignal.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.obj `if test -f 'psignal.c'; then $(CYGPATH_W) 'psignal.c'; else $(CYGPATH_W) '$(srcdir)/psignal.c'; fi`
-+
- lib_a-raise.o: raise.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-raise.o `test -f 'raise.c' || echo '$(srcdir)/'`raise.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/psignal.c newlib-1.19.0/newlib/libc/signal/psignal.c
---- newlib-1.19.0.orig/newlib/libc/signal/psignal.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/signal/psignal.c	2011-10-06 08:54:41.555114070 +0200
-@@ -0,0 +1,51 @@
-+/* Copyright 2002, 2011 Red Hat Inc. */
-+/*
-+FUNCTION
-+<<psignal>>---print a signal message on standard error
-+
-+INDEX
-+	psignal
-+
-+ANSI_SYNOPSIS
-+	#include <stdio.h>
-+	void psignal(int <[signal]>, const char *<[prefix]>);
-+
-+TRAD_SYNOPSIS
-+	#include <stdio.h>
-+	void psignal(<[signal]>, <[prefix]>)
-+	int <[signal]>;
-+	const char *<[prefix]>;
-+
-+DESCRIPTION
-+Use <<psignal>> to print (on standard error) a signal message
-+corresponding to the value of the signal number <[signal]>.
-+Unless you use <<NULL>> as the value of the argument <[prefix]>, the
-+signal message will begin with the string at <[prefix]>, followed by a
-+colon and a space (<<: >>). The remainder of the signal message is one
-+of the strings described for <<strsignal>>.
-+
-+RETURNS
-+<<psignal>> returns no result.
-+
-+PORTABILITY
-+POSIX.1-2008 requires <<psignal>>, but the strings issued vary from one
-+implementation to another.
-+
-+Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-+<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-+*/
-+
-+#include <_ansi.h>
-+#include <stdio.h>
-+#include <string.h>
-+
-+_VOID
-+_DEFUN(psignal, (sig, s),
-+       int sig _AND
-+       _CONST char *s)
-+{
-+  if (s != NULL && *s != '\0')
-+    fprintf (stderr, "%s: %s\n", s, strsignal (sig));
-+  else
-+    fprintf (stderr, "%s\n", strsignal (sig));
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/signal/signal.tex newlib-1.19.0/newlib/libc/signal/signal.tex
---- newlib-1.19.0.orig/newlib/libc/signal/signal.tex	2000-02-17 20:39:47.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/signal/signal.tex	2011-10-06 08:54:41.555114070 +0200
-@@ -59,11 +59,15 @@
- reliable from signal handlers.)
- 
- @menu
-+* psignal:: Print a signal message to standard error
- * raise::   Send a signal
- * signal::  Specify handler subroutine for a signal
- @end menu
- 
- @page
-+ at include signal/psignal.def
-+
-+ at page
- @include signal/raise.def
- 
- @page
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fclose.c newlib-1.19.0/newlib/libc/stdio/fclose.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fclose.c	2007-07-13 22:37:53.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fclose.c	2011-10-06 08:54:41.556114085 +0200
-@@ -74,8 +74,6 @@
-   if (fp == NULL)
-     return (0);			/* on NULL */
- 
--  __sfp_lock_acquire ();
--
-   CHECK_INIT (rptr, fp);
- 
-   _flockfile (fp);
-@@ -83,7 +81,6 @@
-   if (fp->_flags == 0)		/* not open! */
-     {
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return (0);
-     }
-   /* Unconditionally flush to allow special handling for seekable read
-@@ -98,6 +95,7 @@
-     FREEUB (rptr, fp);
-   if (HASLB (fp))
-     FREELB (rptr, fp);
-+  __sfp_lock_acquire ();
-   fp->_flags = 0;		/* release this FILE for reuse */
-   _funlockfile (fp);
- #ifndef __SINGLE_THREAD__
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fflush.c newlib-1.19.0/newlib/libc/stdio/fflush.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fflush.c	2009-10-30 09:26:41.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fflush.c	2011-10-06 08:54:41.556114085 +0200
-@@ -67,37 +67,16 @@
- 
- /* Flush a single file, or (if fp is NULL) all files.  */
- 
-+/* Core function which does not lock file pointer.  This gets called
-+   directly from __srefill. */
- int
--_DEFUN(_fflush_r, (ptr, fp),
-+_DEFUN(__sflush_r, (ptr, fp),
-        struct _reent *ptr _AND
-        register FILE * fp)
- {
-   register unsigned char *p;
-   register int n, t;
- 
--#ifdef _REENT_SMALL
--  /* For REENT_SMALL platforms, it is possible we are being
--     called for the first time on a std stream.  This std
--     stream can belong to a reentrant struct that is not
--     _REENT.  If CHECK_INIT gets called below based on _REENT,
--     we will end up changing said file pointers to the equivalent
--     std stream off of _REENT.  This causes unexpected behavior if
--     there is any data to flush on the _REENT std stream.  There
--     are two alternatives to fix this:  1) make a reentrant fflush
--     or 2) simply recognize that this file has nothing to flush
--     and return immediately before performing a CHECK_INIT.  Choice
--     2 is implemented here due to its simplicity.  */
--  if (fp->_bf._base == NULL)
--    return 0;
--#endif /* _REENT_SMALL  */
--
--  CHECK_INIT (ptr, fp);
--
--  if (!fp->_flags)
--    return 0;
--
--  _flockfile (fp);
--
-   t = fp->_flags;
-   if ((t & __SWR) == 0)
-     {
-@@ -150,7 +129,6 @@
- 		    }
- 		  else
- 		    fp->_flags |= __SERR;
--		  _funlockfile (fp);
- 		  return result;
- 		}
-             }
-@@ -186,17 +164,14 @@
- 	  else
- 	    {
- 	      fp->_flags |= __SERR;
--	      _funlockfile (fp);
- 	      return EOF;
- 	    }
- 	}
--      _funlockfile (fp);
-       return 0;
-     }
-   if ((p = fp->_bf._base) == NULL)
-     {
-       /* Nothing to flush.  */
--      _funlockfile (fp);
-       return 0;
-     }
-   n = fp->_p - p;		/* write this much */
-@@ -215,16 +190,48 @@
-       if (t <= 0)
- 	{
-           fp->_flags |= __SERR;
--          _funlockfile (fp);
-           return EOF;
- 	}
-       p += t;
-       n -= t;
-     }
--  _funlockfile (fp);
-   return 0;
- }
- 
-+int
-+_DEFUN(_fflush_r, (ptr, fp),
-+       struct _reent *ptr _AND
-+       register FILE * fp)
-+{
-+  int ret;
-+
-+#ifdef _REENT_SMALL
-+  /* For REENT_SMALL platforms, it is possible we are being
-+     called for the first time on a std stream.  This std
-+     stream can belong to a reentrant struct that is not
-+     _REENT.  If CHECK_INIT gets called below based on _REENT,
-+     we will end up changing said file pointers to the equivalent
-+     std stream off of _REENT.  This causes unexpected behavior if
-+     there is any data to flush on the _REENT std stream.  There
-+     are two alternatives to fix this:  1) make a reentrant fflush
-+     or 2) simply recognize that this file has nothing to flush
-+     and return immediately before performing a CHECK_INIT.  Choice
-+     2 is implemented here due to its simplicity.  */
-+  if (fp->_bf._base == NULL)
-+    return 0;
-+#endif /* _REENT_SMALL  */
-+
-+  CHECK_INIT (ptr, fp);
-+
-+  if (!fp->_flags)
-+    return 0;
-+
-+  _flockfile (fp);
-+  ret = __sflush_r (ptr, fp);
-+  _funlockfile (fp);
-+  return ret;
-+}
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetc.c newlib-1.19.0/newlib/libc/stdio/fgetc.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgetc.c	2009-04-25 00:52:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgetc.c	2011-10-06 08:54:41.556114085 +0200
-@@ -93,11 +93,9 @@
- #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
-   int result;
-   CHECK_INIT(_REENT, fp);
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   result = __sgetc_r (_REENT, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return result;
- #else
-   return _fgetc_r (_REENT, fp);
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgets.c newlib-1.19.0/newlib/libc/stdio/fgets.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgets.c	2009-04-25 00:52:51.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgets.c	2011-10-06 08:54:41.556114085 +0200
-@@ -98,7 +98,6 @@
- 
-   CHECK_INIT(ptr, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- #ifdef __SCLE
-   if (fp->_flags & __SCLE)
-@@ -114,12 +113,10 @@
-       if (c == EOF && s == buf)
-         {
-           _funlockfile (fp);
--	  __sfp_lock_release ();
-           return NULL;
-         }
-       *s = 0;
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return buf;
-     }
- #endif
-@@ -138,7 +135,6 @@
- 	      if (s == buf)
-                 {
-                   _funlockfile (fp);
--		  __sfp_lock_release ();
-                   return 0;
-                 }
- 	      break;
-@@ -164,7 +160,6 @@
- 	  _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len);
- 	  s[len] = 0;
-           _funlockfile (fp);
--	  __sfp_lock_release ();
- 	  return (buf);
- 	}
-       fp->_r -= len;
-@@ -175,7 +170,6 @@
-   while ((n -= len) != 0);
-   *s = 0;
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return buf;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetwc.c newlib-1.19.0/newlib/libc/stdio/fgetwc.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgetwc.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgetwc.c	2011-10-06 08:54:41.556114085 +0200
-@@ -164,12 +164,10 @@
- {
-   wint_t r;
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   ORIENT(fp, 1);
-   r = __fgetwc (ptr, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return r;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetws.c newlib-1.19.0/newlib/libc/stdio/fgetws.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fgetws.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fgetws.c	2011-10-06 08:54:41.557114104 +0200
-@@ -93,7 +93,6 @@
-   const char *src;
-   unsigned char *nl;
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   ORIENT (fp, 1);
- 
-@@ -144,12 +143,10 @@
-     goto error;
-   *wsp++ = L'\0';
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return ws;
- 
- error:
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return NULL;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fmemopen.c newlib-1.19.0/newlib/libc/stdio/fmemopen.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fmemopen.c	2007-08-02 22:23:06.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fmemopen.c	2011-10-06 08:54:41.557114104 +0200
-@@ -281,7 +281,7 @@
- 
-   if ((flags = __sflags (ptr, mode, &dummy)) == 0)
-     return NULL;
--  if (!size || !(buf || flags & __SAPP))
-+  if (!size || !(buf || flags & __SRW))
-     {
-       ptr->_errno = EINVAL;
-       return NULL;
-@@ -310,7 +310,7 @@
-     {
-       /* r+/w+/a+, and no buf: file starts empty.  */
-       c->buf = (char *) (c + 1);
--      *(char *) buf = '\0';
-+      c->buf[0] = '\0';
-       c->pos = c->eof = 0;
-       c->append = (flags & __SAPP) != 0;
-     }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fpurge.c newlib-1.19.0/newlib/libc/stdio/fpurge.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fpurge.c	2009-07-03 13:58:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fpurge.c	2011-10-06 08:54:41.557114104 +0200
-@@ -11,6 +11,8 @@
- 	fpurge
- INDEX
- 	_fpurge_r
-+INDEX
-+	__fpurge
- 
- ANSI_SYNOPSIS
- 	#include <stdio.h>
-@@ -18,6 +20,11 @@
- 
- 	int _fpurge_r(struct _reent *<[reent]>, FILE *<[fp]>);
- 
-+	#include <stdio.h>
-+	#include <stdio_ext.h>
-+	void  __fpurge(FILE *<[fp]>);
-+
-+
- DESCRIPTION
- Use <<fpurge>> to clear all buffers of the given stream.  For output
- streams, this discards data not yet written to disk.  For input streams,
-@@ -26,6 +33,8 @@
- and generally is only needed when manually altering the underlying file
- descriptor of a stream.
- 
-+<<__fpurge>> behaves exactly like <<fpurge>> but does not return a value.
-+
- The alternate function <<_fpurge_r>> is a reentrant version, where the
- extra argument <[reent]> is a pointer to a reentrancy structure, and
- <[fp]> must not be NULL.
-@@ -42,6 +51,9 @@
- 
- #include <_ansi.h>
- #include <stdio.h>
-+#ifndef __rtems__
-+#include <stdio_ext.h>
-+#endif
- #include <errno.h>
- #include "local.h"
- 
-@@ -87,4 +99,15 @@
-   return _fpurge_r (_REENT, fp);
- }
- 
-+#ifndef __rtems__
-+
-+void
-+_DEFUN(__fpurge, (fp),
-+       register FILE * fp)
-+{
-+  _fpurge_r (_REENT, fp);
-+}
-+
-+#endif
-+
- #endif /* _REENT_ONLY */
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fread.c newlib-1.19.0/newlib/libc/stdio/fread.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fread.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fread.c	2011-10-06 08:54:41.557114104 +0200
-@@ -146,7 +146,6 @@
- 
-   CHECK_INIT(ptr, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   ORIENT (fp, -1);
-   if (fp->_r < 0)
-@@ -197,12 +196,10 @@
-               if (fp->_flags & __SCLE)
- 	        {
- 	          _funlockfile (fp);
--		  __sfp_lock_release ();
- 	          return crlf_r (ptr, fp, buf, total-resid, 1) / size;
- 	        }
- #endif
- 	      _funlockfile (fp);
--	      __sfp_lock_release ();
- 	      return (total - resid) / size;
- 	    }
- 	}
-@@ -224,12 +221,10 @@
- 	      if (fp->_flags & __SCLE)
- 		{
- 		  _funlockfile (fp);
--		  __sfp_lock_release ();
- 		  return crlf_r (ptr, fp, buf, total-resid, 1) / size;
- 		}
- #endif
- 	      _funlockfile (fp);
--	      __sfp_lock_release ();
- 	      return (total - resid) / size;
- 	    }
- 	}
-@@ -243,12 +238,10 @@
-   if (fp->_flags & __SCLE)
-     {
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return crlf_r(ptr, fp, buf, total, 0) / size;
-     }
- #endif
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return count;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/freopen.c newlib-1.19.0/newlib/libc/stdio/freopen.c
---- newlib-1.19.0.orig/newlib/libc/stdio/freopen.c	2008-12-12 16:45:19.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/freopen.c	2011-10-06 08:54:41.557114104 +0200
-@@ -98,8 +98,6 @@
-   int flags, oflags;
-   int e = 0;
- 
--  __sfp_lock_acquire ();
--
-   CHECK_INIT (ptr, fp);
- 
-   _flockfile (fp);
-@@ -108,7 +106,6 @@
-     {
-       _funlockfile (fp);
-       _fclose_r (ptr, fp);
--      __sfp_lock_release ();
-       return NULL;
-     }
- 
-@@ -208,6 +205,7 @@
- 
-   if (f < 0)
-     {				/* did not get it after all */
-+      __sfp_lock_acquire ();
-       fp->_flags = 0;		/* set it free */
-       ptr->_errno = e;		/* restore in case _close clobbered */
-       _funlockfile (fp);
-@@ -232,7 +230,6 @@
- #endif
- 
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return fp;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fscanf.c newlib-1.19.0/newlib/libc/stdio/fscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fscanf.c	2004-04-23 22:01:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fscanf.c	2011-10-06 08:54:41.558114124 +0200
-@@ -45,7 +45,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (_REENT, fp, fmt, ap);
-+  ret = _vfscanf_r (_REENT, fp, fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -71,7 +71,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (ptr, fp, fmt, ap);
-+  ret = _vfscanf_r (ptr, fp, fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fseek.c newlib-1.19.0/newlib/libc/stdio/fseek.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fseek.c	2009-12-17 20:43:43.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fseek.c	2011-10-06 08:54:41.558114124 +0200
-@@ -138,7 +138,6 @@
- 
-   CHECK_INIT (ptr, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   /* If we've been doing some writing, and we're in append mode
-@@ -156,7 +155,6 @@
-     {
-       ptr->_errno = ESPIPE;	/* ??? */
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return EOF;
-     }
- 
-@@ -182,7 +180,6 @@
- 	  if (curoff == -1L)
- 	    {
- 	      _funlockfile (fp);
--	      __sfp_lock_release ();
- 	      return EOF;
- 	    }
- 	}
-@@ -208,7 +205,6 @@
-     default:
-       ptr->_errno = EINVAL;
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return (EOF);
-     }
- 
-@@ -268,7 +264,6 @@
-     {
-       ptr->_errno = EOVERFLOW;
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return EOF;
-     }
- 
-@@ -325,7 +320,6 @@
-       fp->_flags &= ~__SEOF;
-       memset (&fp->_mbstate, 0, sizeof (_mbstate_t));
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return 0;
-     }
- 
-@@ -356,7 +350,6 @@
-     }
-   memset (&fp->_mbstate, 0, sizeof (_mbstate_t));
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return 0;
- 
-   /*
-@@ -369,7 +362,6 @@
-       || seekfn (ptr, fp->_cookie, offset, whence) == POS_ERR)
-     {
-       _funlockfile (fp);
--      __sfp_lock_release ();
-       return EOF;
-     }
-   /* success: clear EOF indicator and discard ungetc() data */
-@@ -388,7 +380,6 @@
-   fp->_flags &= ~__SNPT;
-   memset (&fp->_mbstate, 0, sizeof (_mbstate_t));
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return 0;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fvwrite.c newlib-1.19.0/newlib/libc/stdio/fvwrite.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fvwrite.c	2007-07-13 22:37:53.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/fvwrite.c	2011-10-06 08:54:41.558114124 +0200
-@@ -61,11 +61,7 @@
- 
-   /* make sure we can write */
-   if (cantwrite (ptr, fp))
--    {
--      fp->_flags |= __SERR;
--      ptr->_errno = EBADF;
--      return EOF;
--    }
-+    return EOF;
- 
-   iov = uio->uio_iov;
-   len = 0;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fwalk.c newlib-1.19.0/newlib/libc/stdio/fwalk.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fwalk.c	2009-01-12 23:19:11.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fwalk.c	2011-10-06 08:54:41.558114124 +0200
-@@ -27,8 +27,8 @@
- #include <errno.h>
- #include "local.h"
- 
--static int
--_DEFUN(__fwalk, (ptr, function),
-+int
-+_DEFUN(_fwalk, (ptr, function),
-        struct _reent *ptr _AND
-        register int (*function) (FILE *))
- {
-@@ -36,11 +36,19 @@
-   register int n, ret = 0;
-   register struct _glue *g;
- 
-+  /*
-+   * It should be safe to walk the list without locking it;
-+   * new nodes are only added to the end and none are ever
-+   * removed.
-+   *
-+   * Avoid locking this list while walking it or else you will
-+   * introduce a potential deadlock in [at least] refill.c.
-+   */
-   for (g = &ptr->__sglue; g != NULL; g = g->_next)
-     for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
-       if (fp->_flags != 0)
-         {
--          if (fp->_flags != 0 && fp->_file != -1)
-+          if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1)
-             ret |= (*function) (fp);
-         }
- 
-@@ -49,8 +57,8 @@
- 
- /* Special version of __fwalk where the function pointer is a reentrant
-    I/O function (e.g. _fclose_r).  */
--static int
--_DEFUN(__fwalk_reent, (ptr, reent_function),
-+int
-+_DEFUN(_fwalk_reent, (ptr, reent_function),
-        struct _reent *ptr _AND
-        register int (*reent_function) (struct _reent *, FILE *))
- {
-@@ -58,51 +66,21 @@
-   register int n, ret = 0;
-   register struct _glue *g;
- 
-+  /*
-+   * It should be safe to walk the list without locking it;
-+   * new nodes are only added to the end and none are ever
-+   * removed.
-+   *
-+   * Avoid locking this list while walking it or else you will
-+   * introduce a potential deadlock in [at least] refill.c.
-+   */
-   for (g = &ptr->__sglue; g != NULL; g = g->_next)
-     for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
-       if (fp->_flags != 0)
-         {
--          if (fp->_flags != 0 && fp->_file != -1)
-+          if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1)
-             ret |= (*reent_function) (ptr, fp);
-         }
- 
-   return ret;
- }
--
--int
--_DEFUN(_fwalk, (ptr, function),
--       struct _reent *ptr _AND
--       register int (*function)(FILE *))
--{
--  register int ret = 0;
--
--  __sfp_lock_acquire ();
--
--  /* Must traverse given list for streams.  Note that _GLOBAL_REENT
--     only walked once in exit().  */
--  ret |= __fwalk (ptr, function);
--
--  __sfp_lock_release ();
--
--  return ret;
--}
--
--/* Special version of _fwalk which handles a function pointer to a
--   reentrant I/O function (e.g. _fclose_r).  */
--int
--_DEFUN(_fwalk_reent, (ptr, reent_function),
--       struct _reent *ptr _AND
--       register int (*reent_function) (struct _reent *, FILE *))
--{
--  register int ret = 0;
--
--  __sfp_lock_acquire ();
--
--  /* Must traverse given list for streams.  Note that _GLOBAL_REENT
--     only walked once in exit().  */
--  ret |= __fwalk_reent (ptr, reent_function);
--
--  __sfp_lock_release ();
--
--  return ret;
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fwscanf.c newlib-1.19.0/newlib/libc/stdio/fwscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/fwscanf.c	2009-03-11 12:53:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/fwscanf.c	2011-10-06 08:54:41.558114124 +0200
-@@ -31,7 +31,7 @@
-   va_list ap;
- 
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (_REENT, fp, fmt, ap);
-+  ret = _vfwscanf_r (_REENT, fp, fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -45,7 +45,7 @@
-   va_list ap;
- 
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (ptr, fp, fmt, ap);
-+  ret = _vfwscanf_r (ptr, fp, fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/getc.c newlib-1.19.0/newlib/libc/stdio/getc.c
---- newlib-1.19.0.orig/newlib/libc/stdio/getc.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/getc.c	2011-10-06 08:54:41.558114124 +0200
-@@ -92,11 +92,9 @@
- {
-   int result;
-   CHECK_INIT (ptr, fp);
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   result = __sgetc_r (ptr, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return result;
- }
- 
-@@ -108,11 +106,9 @@
- {
-   int result;
-   CHECK_INIT (_REENT, fp);
--  __sfp_lock_acquire ();
-   _flockfile (fp);
-   result = __sgetc_r (_REENT, fp);
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return result;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/getdelim.c newlib-1.19.0/newlib/libc/stdio/getdelim.c
---- newlib-1.19.0.orig/newlib/libc/stdio/getdelim.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/getdelim.c	2011-10-06 08:54:41.559114143 +0200
-@@ -81,7 +81,6 @@
- 
-   CHECK_INIT (_REENT, fp);
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   numbytes = *n;
-@@ -131,7 +130,6 @@
-     }
- 
-   _funlockfile (fp);
--  __sfp_lock_release ();
- 
-   /* if no input data, return failure */
-   if (ptr == buf)
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/gets.c newlib-1.19.0/newlib/libc/stdio/gets.c
---- newlib-1.19.0.orig/newlib/libc/stdio/gets.c	2009-04-25 00:52:52.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/gets.c	2011-10-06 08:54:41.559114143 +0200
-@@ -79,14 +79,12 @@
-   register int c;
-   register char *s = buf;
- 
--  __sfp_lock_acquire ();
-   _flockfile (stdin);
-   while ((c = __sgetc_r (ptr, stdin)) != '\n')
-     if (c == EOF)
-       if (s == buf)
- 	{
- 	  _funlockfile (stdin);
--	  __sfp_lock_release ();
- 	  return NULL;
- 	}
-       else
-@@ -95,7 +93,6 @@
-       *s++ = c;
-   *s = 0;
-   _funlockfile (stdin);
--  __sfp_lock_release ();
-   return buf;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/local.h newlib-1.19.0/newlib/libc/stdio/local.h
---- newlib-1.19.0.orig/newlib/libc/stdio/local.h	2009-04-22 10:30:03.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/local.h	2011-10-06 08:54:41.559114143 +0200
-@@ -54,6 +54,7 @@
- 				  va_list));
- extern FILE  *_EXFUN(__sfp,(struct _reent *));
- extern int    _EXFUN(__sflags,(struct _reent *,_CONST char*, int*));
-+extern int    _EXFUN(__sflush_r,(struct _reent *,FILE *));
- extern int    _EXFUN(__srefill_r,(struct _reent *,FILE *));
- extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(struct _reent *, void *, char *,
- 					       int));
-@@ -112,7 +113,8 @@
-     }						\
-   while (0)
- 
--/* Return true iff the given FILE cannot be written now.  */
-+/* Return true and set errno and stream error flag iff the given FILE
-+   cannot be written now.  */
- 
- #define	cantwrite(ptr, fp)                                     \
-   ((((fp)->_flags & __SWR) == 0 || (fp)->_bf._base == NULL) && \
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/open_memstream.c newlib-1.19.0/newlib/libc/stdio/open_memstream.c
---- newlib-1.19.0.orig/newlib/libc/stdio/open_memstream.c	2009-02-25 05:00:05.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/open_memstream.c	2011-10-06 08:54:41.559114143 +0200
-@@ -330,8 +330,10 @@
-     c->max *= sizeof(wchar_t);
-   if (c->max < 64)
-     c->max = 64;
--  else if (c->max > 64 * 1024)
--    c->max = 64 * 1024;
-+#if (SIZE_MAX >= 0x10000)
-+  else if (c->max > 0x10000)
-+    c->max = 0x10000;
-+#endif
-   *size = 0;
-   *buf = _malloc_r (ptr, c->max);
-   if (!*buf)
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/perror.c newlib-1.19.0/newlib/libc/stdio/perror.c
---- newlib-1.19.0.orig/newlib/libc/stdio/perror.c	2005-02-08 02:33:17.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/perror.c	2011-10-06 08:54:41.559114143 +0200
-@@ -73,6 +73,7 @@
-        _CONST char *s)
- {
-   char *error;
-+  int dummy;
- 
-   _REENT_SMALL_CHECK_INIT (ptr);
-   if (s != NULL && *s != '\0')
-@@ -81,7 +82,7 @@
-       fputs (": ", _stderr_r (ptr));
-     }
- 
--  if ((error = strerror (ptr->_errno)) != NULL)
-+  if ((error = _strerror_r (ptr, ptr->_errno, 1, &dummy)) != NULL)
-     fputs (error, _stderr_r (ptr));
- 
-   fputc ('\n', _stderr_r (ptr));
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/refill.c newlib-1.19.0/newlib/libc/stdio/refill.c
---- newlib-1.19.0.orig/newlib/libc/stdio/refill.c	2008-12-11 00:43:12.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/refill.c	2011-10-06 08:54:41.560114161 +0200
-@@ -102,9 +102,19 @@
-    * flush all line buffered output files, per the ANSI C
-    * standard.
-    */
--
-   if (fp->_flags & (__SLBF | __SNBF))
--    _CAST_VOID _fwalk (_GLOBAL_REENT, lflush);
-+    {
-+      /* Ignore this file in _fwalk to avoid potential deadlock. */
-+      short orig_flags = fp->_flags;
-+      fp->_flags = 1;
-+      _CAST_VOID _fwalk (_GLOBAL_REENT, lflush);
-+      fp->_flags = orig_flags;
-+
-+      /* Now flush this file without locking it. */
-+      if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR))
-+	__sflush_r (ptr, fp);
-+    }
-+
-   fp->_p = fp->_bf._base;
-   fp->_r = fp->_read (ptr, fp->_cookie, (char *) fp->_p, fp->_bf._size);
- #ifndef __CYGWIN__
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/scanf.c newlib-1.19.0/newlib/libc/stdio/scanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/scanf.c	2005-02-08 02:33:17.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/scanf.c	2011-10-06 08:54:41.560114161 +0200
-@@ -45,7 +45,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-+  ret = _vfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -71,7 +71,7 @@
- #else
-   va_start (ap);
- #endif
--  ret = __svfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-+  ret = _vfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/tmpnam.c newlib-1.19.0/newlib/libc/stdio/tmpnam.c
---- newlib-1.19.0.orig/newlib/libc/stdio/tmpnam.c	2004-04-23 22:01:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/tmpnam.c	2011-10-06 08:54:41.560114161 +0200
-@@ -94,11 +94,13 @@
- #include <_ansi.h>
- #include <reent.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
- #include <fcntl.h>
- #include <reent.h>
- #include <errno.h>
-+#include <inttypes.h>
- 
- /* Try to open the file specified, if it can't be opened then try
-    another one.  Return nonzero if successful, otherwise zero.  */
-@@ -109,7 +111,7 @@
-        char *result       _AND
-        _CONST char *part1 _AND
-        _CONST char *part2 _AND
--       int part3          _AND
-+       intptr_t part3     _AND
-        int *part4)
- {
-   /*  Generate the filename and make sure that there isn't one called
-@@ -118,7 +120,7 @@
-   while (1)
-     {
-       int t;
--      _sprintf_r (ptr, result, "%s/%s%x.%x", part1, part2, part3, *part4);
-+      _sprintf_r (ptr, result, "%s/%s%" PRIxPTR ".%x", part1, part2, part3, *part4);
-       (*part4)++;
-       t = _open_r (ptr, result, O_RDONLY, 0);
-       if (t == -1)
-@@ -183,7 +185,7 @@
-   if (filename)
-     {
-       if (! worker (p, filename, dir, prefix,
--		    _getpid_r (p) ^ (int) (_POINTER_INT) p, &p->_inc))
-+		    _getpid_r (p) ^ (intptr_t) p, &p->_inc))
- 	return NULL;
-     }
-   return filename;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vasiprintf.c newlib-1.19.0/newlib/libc/stdio/vasiprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vasiprintf.c	2008-04-14 23:14:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vasiprintf.c	2011-10-06 08:54:41.560114161 +0200
-@@ -26,6 +26,8 @@
- #include <limits.h>
- #include <stdarg.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vasprintf.c newlib-1.19.0/newlib/libc/stdio/vasprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vasprintf.c	2008-04-14 23:14:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vasprintf.c	2011-10-06 08:54:41.560114161 +0200
-@@ -26,6 +26,8 @@
- #include <limits.h>
- #include <stdarg.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfscanf.c newlib-1.19.0/newlib/libc/stdio/vfscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vfscanf.c	2010-01-20 00:16:45.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/vfscanf.c	2011-10-06 08:54:41.561114177 +0200
-@@ -453,7 +453,9 @@
-   wchar_t wc;                   /* wchar to use to read format string */
-   wchar_t *wcp;                 /* handy wide character pointer */
-   size_t mbslen;                /* length of converted multibyte sequence */
-+#ifdef _MB_CAPABLE
-   mbstate_t state;              /* value to keep track of multibyte state */
-+#endif
- 
-   #define CCFN_PARAMS	_PARAMS((struct _reent *, const char *, char **, int))
-   u_long (*ccfn)CCFN_PARAMS=0;	/* conversion function (strtol/strtoul) */
-@@ -494,7 +496,6 @@
- # define GET_ARG(n, ap, type) (va_arg (ap, type))
- #endif
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   ORIENT (fp, -1);
-@@ -795,7 +796,6 @@
- 	   */
- 	case '\0':		/* compat */
- 	  _funlockfile (fp);
--	  __sfp_lock_release ();
- 	  return EOF;
- 
- 	default:		/* compat */
-@@ -1596,13 +1596,11 @@
-      invalid format string), return EOF if no matches yet, else number
-      of matches made prior to failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF;
- match_failure:
- all_done:
-   /* Return number of matches, which can be 0 on match failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfwprintf.c newlib-1.19.0/newlib/libc/stdio/vfwprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vfwprintf.c	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vfwprintf.c	2011-10-06 08:54:41.561114177 +0200
-@@ -240,7 +240,7 @@
- # endif /* !_NO_LONGDBL */
- 
- static wchar_t *wcvt(struct _reent *, _PRINTF_FLOAT_TYPE, int, int, wchar_t *,
--		    int *, int, int *, wchar_t *);
-+		    int *, int, int *, wchar_t *, int);
- 
- static int wexponent(wchar_t *, int, int);
- 
-@@ -996,7 +996,23 @@
- 			flags |= FPT;
- 
- 			cp = wcvt (data, _fpvalue, prec, flags, &softsign,
--				   &expt, ch, &ndig, cp);
-+				   &expt, ch, &ndig, cp, BUF);
-+
-+			/* If buf is not large enough for the converted wchar_t
-+			   sequence, call wcvt again with a malloced new buffer.
-+			   This should happen fairly rarely.
-+			 */
-+			if (cp == buf && ndig > BUF && malloc_buf == NULL) {
-+				if ((malloc_buf =
-+				    (wchar_t *)_malloc_r (data, ndig * sizeof (wchar_t)))
-+				    == NULL)
-+				  {
-+				    fp->_flags |= __SERR;
-+				    goto error;
-+				  }
-+				cp = wcvt (data, _fpvalue, prec, flags, &softsign,
-+					   &expt, ch, &ndig, malloc_buf, ndig);
-+			}
- 
- 			if (ch == L'g' || ch == L'G') {
- 				if (expt <= -4 || expt > prec)
-@@ -1450,11 +1466,15 @@
-    to whether trailing zeros must be included.  Set *SIGN to nonzero
-    if VALUE was negative.  Set *DECPT to the exponent plus one.  Set
-    *LENGTH to the length of the returned string.  CH must be one of
--   [aAeEfFgG]; if it is [aA], then the return string lives in BUF,
--   otherwise the return value shares the mprec reentrant storage.  */
-+   [aAeEfFgG]; different from vfprintf.c:cvt(), the return string
-+   lives in BUF regardless of CH.  LEN is the length of BUF, except
-+   when CH is [aA], in which case LEN is not in use.  If BUF is not
-+   large enough for the converted string, only the first LEN number
-+   of characters will be returned in BUF, but *LENGTH will be set to
-+   the full length of the string before the truncation.  */
- static wchar_t *
- wcvt(struct _reent *data, _PRINTF_FLOAT_TYPE value, int ndigits, int flags,
--     wchar_t *sign, int *decpt, int ch, int *length, wchar_t *buf)
-+     wchar_t *sign, int *decpt, int ch, int *length, wchar_t *buf, int len)
- {
- 	int mode, dsgn;
- # ifdef _NO_LONGDBL
-@@ -1548,12 +1568,13 @@
- 		while (rve < bp)
- 			*rve++ = '0';
- 	  }
-+
-+	  *length = rve - digits; /* full length of the string */
- #ifdef _MB_CAPABLE
--	  *length = _mbsnrtowcs_r (data, buf, (const char **) &digits,
--				   rve - digits, BUF, NULL);
-+	  _mbsnrtowcs_r (data, buf, (const char **) &digits, *length,
-+			 len, NULL);
- #else
--	  *length = rve - digits;
--	  for (i = 0; i < *length && i < BUF; ++i)
-+	  for (i = 0; i < *length && i < len; ++i)
- 	    buf[i] = (wchar_t) digits[i];
- #endif
- 	  return buf;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfwscanf.c newlib-1.19.0/newlib/libc/stdio/vfwscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vfwscanf.c	2009-03-11 12:53:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/vfwscanf.c	2011-10-06 08:54:41.561114177 +0200
-@@ -434,7 +434,6 @@
- # define GET_ARG(n, ap, type) (va_arg (ap, type))
- #endif
- 
--  __sfp_lock_acquire ();
-   _flockfile (fp);
- 
-   ORIENT (fp, 1);
-@@ -714,7 +713,6 @@
- 	   */
- 	case L'\0':		/* compat */
- 	  _funlockfile (fp);
--	  __sfp_lock_release ();
- 	  return EOF;
- 
- 	default:		/* compat */
-@@ -1443,13 +1441,11 @@
-      invalid format string), return EOF if no matches yet, else number
-      of matches made prior to failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF;
- match_failure:
- all_done:
-   /* Return number of matches, which can be 0 on match failure.  */
-   _funlockfile (fp);
--  __sfp_lock_release ();
-   return nassigned;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vsiprintf.c newlib-1.19.0/newlib/libc/stdio/vsiprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vsiprintf.c	2008-04-14 23:14:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vsiprintf.c	2011-10-06 08:54:41.562114191 +0200
-@@ -26,6 +26,8 @@
- #include <limits.h>
- #include <stdarg.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vsniprintf.c newlib-1.19.0/newlib/libc/stdio/vsniprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vsniprintf.c	2008-04-14 23:14:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vsniprintf.c	2011-10-06 08:54:41.562114191 +0200
-@@ -27,6 +27,8 @@
- #include <stdarg.h>
- #include <errno.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vsnprintf.c newlib-1.19.0/newlib/libc/stdio/vsnprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vsnprintf.c	2008-04-30 04:47:14.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vsnprintf.c	2011-10-06 08:54:41.562114191 +0200
-@@ -27,6 +27,8 @@
- #include <stdarg.h>
- #include <errno.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vsprintf.c newlib-1.19.0/newlib/libc/stdio/vsprintf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/vsprintf.c	2008-04-14 23:14:55.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio/vsprintf.c	2011-10-06 08:54:41.562114191 +0200
-@@ -26,6 +26,8 @@
- #include <limits.h>
- #include <stdarg.h>
- 
-+#include "local.h"
-+
- #ifndef _REENT_ONLY
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/wbuf.c newlib-1.19.0/newlib/libc/stdio/wbuf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/wbuf.c	2008-12-11 00:43:12.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/wbuf.c	2011-10-06 08:54:41.562114191 +0200
-@@ -54,11 +54,7 @@
- 
-   fp->_w = fp->_lbfsize;
-   if (cantwrite (ptr, fp))
--    {
--      fp->_flags |= __SERR;
--      ptr->_errno = EBADF;
--      return EOF;
--    }
-+    return EOF;
-   c = (unsigned char) c;
- 
-   ORIENT (fp, -1);
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/wscanf.c newlib-1.19.0/newlib/libc/stdio/wscanf.c
---- newlib-1.19.0.orig/newlib/libc/stdio/wscanf.c	2009-03-11 12:53:22.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/wscanf.c	2011-10-06 08:54:41.562114191 +0200
-@@ -32,7 +32,7 @@
- 
-   _REENT_SMALL_CHECK_INIT (_REENT);
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-+  ret = _vfwscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-   va_end (ap);
-   return ret;
- }
-@@ -47,7 +47,7 @@
- 
-   _REENT_SMALL_CHECK_INIT (ptr);
-   va_start (ap, fmt);
--  ret = __svfwscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-+  ret = _vfwscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-   va_end (ap);
-   return (ret);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/wsetup.c newlib-1.19.0/newlib/libc/stdio/wsetup.c
---- newlib-1.19.0.orig/newlib/libc/stdio/wsetup.c	2007-03-15 19:40:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdio/wsetup.c	2011-10-06 08:54:41.563114206 +0200
-@@ -20,12 +20,13 @@
- #include <_ansi.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <errno.h>
- #include "local.h"
- 
- /*
-  * Various output routines call wsetup to be sure it is safe to write,
-  * because either _flags does not include __SWR, or _buf is NULL.
-- * _wsetup returns 0 if OK to write, nonzero otherwise.
-+ * _wsetup returns 0 if OK to write, nonzero and set errno otherwise.
-  */
- 
- int
-@@ -44,7 +45,11 @@
-   if ((fp->_flags & __SWR) == 0)
-     {
-       if ((fp->_flags & __SRW) == 0)
--	return EOF;
-+        {
-+	  ptr->_errno = EBADF;
-+	  fp->_flags |= __SERR;
-+	  return EOF;
-+        }
-       if (fp->_flags & __SRD)
- 	{
- 	  /* clobber any ungetc data */
-@@ -62,7 +67,7 @@
-    * A string I/O file should not explicitly allocate a buffer
-    * unless asprintf is being used.
-    */
--  if (fp->_bf._base == NULL 
-+  if (fp->_bf._base == NULL
-         && (!(fp->_flags & __SSTR) || (fp->_flags & __SMBF)))
-     __smakebuf_r (ptr, fp);
- 
-@@ -79,5 +84,11 @@
-   else
-     fp->_w = fp->_flags & __SNBF ? 0 : fp->_bf._size;
- 
--  return (!fp->_bf._base && (fp->_flags & __SMBF)) ? EOF : 0;
-+  if (!fp->_bf._base && (fp->_flags & __SMBF))
-+    {
-+      /* __smakebuf_r set errno, but not flag */
-+      fp->_flags |= __SERR;
-+      return EOF;
-+    }
-+  return 0;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdio64/freopen64.c newlib-1.19.0/newlib/libc/stdio64/freopen64.c
---- newlib-1.19.0.orig/newlib/libc/stdio64/freopen64.c	2007-07-13 22:37:53.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdio64/freopen64.c	2011-10-06 08:54:41.563114206 +0200
-@@ -97,7 +97,6 @@
-   int flags, oflags;
-   int e = 0;
- 
--  __sfp_lock_acquire ();
- 
-   CHECK_INIT (ptr, fp);
- 
-@@ -107,7 +106,6 @@
-     {
-       _funlockfile(fp);
-       _fclose_r (ptr, fp);
--      __sfp_lock_release ();
-       return NULL;
-     }
- 
-@@ -204,6 +202,7 @@
- 
-   if (f < 0)
-     {				/* did not get it after all */
-+      __sfp_lock_acquire ();
-       fp->_flags = 0;		/* set it free */
-       ptr->_errno = e;		/* restore in case _close clobbered */
-       _funlockfile(fp);
-@@ -231,7 +230,6 @@
-   fp->_flags |= __SL64;
- 
-   _funlockfile(fp);
--  __sfp_lock_release ();
-   return fp;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/atof.c newlib-1.19.0/newlib/libc/stdlib/atof.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/atof.c	2003-10-20 20:46:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/atof.c	2011-10-06 08:54:41.564114221 +0200
-@@ -1,6 +1,6 @@
- /*
- FUNCTION
--   <<atof>>, <<atoff>>---string to double or float
-+   <<atof>> ---string to double
- 
- INDEX
- 	atof
-@@ -10,19 +10,14 @@
- ANSI_SYNOPSIS
- 	#include <stdlib.h>
-         double atof(const char *<[s]>);
--        float atoff(const char *<[s]>);
- 
- TRAD_SYNOPSIS
- 	#include <stdlib.h>
-         double atof(<[s]>)
-         char *<[s]>;
- 
--        float atoff(<[s]>)
--        char *<[s]>;
--
- DESCRIPTION
- <<atof>> converts the initial portion of a string to a <<double>>.
--<<atoff>> converts the initial portion of a string to a <<float>>.
- 
- The functions parse the character string <[s]>,
- locating a substring which can be converted to a floating-point
-@@ -36,7 +31,6 @@
- something other than <<+>>, <<->>, <<.>>, or a digit.
- 
- <<atof(<[s]>)>> is implemented as <<strtod(<[s]>, NULL)>>.
--<<atoff(<[s]>)>> is implemented as <<strtof(<[s]>, NULL)>>.
- 
- RETURNS
- <<atof>> returns the converted substring value, if any, as a
-@@ -47,12 +41,9 @@
- If the correct value would cause underflow, <<0.0>> is returned
- and <<ERANGE>> is stored in <<errno>>.
- 
--<<atoff>> obeys the same rules as <<atof>>, except that it
--returns a <<float>>.
--
- PORTABILITY
--<<atof>> is ANSI C. <<atof>>, <<atoi>>, and <<atol>> are subsumed by <<strod>>
--and <<strol>>, but are used extensively in existing code. These functions are
-+<<atof>> is ANSI C. <<atof>>, <<atoi>>, and <<atol>> are subsumed by <<strtod>>
-+and <<strtol>>, but are used extensively in existing code. These functions are
- less reliable, but may be faster if the argument is verified to be in a valid
- range.
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/atoff.c newlib-1.19.0/newlib/libc/stdlib/atoff.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/atoff.c	2002-12-06 19:58:51.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdlib/atoff.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,9 +0,0 @@
--#include <stdlib.h>
--#include <_ansi.h>
--
--float
--_DEFUN (atoff, (s),
--	_CONST char *s)
--{
--  return strtof (s, NULL);
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.am newlib-1.19.0/newlib/libc/stdlib/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.am	2009-04-16 20:24:35.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/Makefile.am	2011-10-06 08:54:41.563114206 +0200
-@@ -16,7 +16,6 @@
- 	assert.c  	\
- 	atexit.c	\
- 	atof.c 		\
--	atoff.c		\
- 	atoi.c  	\
- 	atol.c		\
- 	calloc.c	\
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.in newlib-1.19.0/newlib/libc/stdlib/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.in	2011-07-20 08:45:15.846331158 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/Makefile.in	2011-10-06 08:54:41.564114221 +0200
-@@ -69,8 +69,7 @@
- 	lib_a-__ten_mu.$(OBJEXT) lib_a-_Exit.$(OBJEXT) \
- 	lib_a-abort.$(OBJEXT) lib_a-abs.$(OBJEXT) \
- 	lib_a-assert.$(OBJEXT) lib_a-atexit.$(OBJEXT) \
--	lib_a-atof.$(OBJEXT) lib_a-atoff.$(OBJEXT) \
--	lib_a-atoi.$(OBJEXT) lib_a-atol.$(OBJEXT) \
-+	lib_a-atof.$(OBJEXT) lib_a-atoi.$(OBJEXT) lib_a-atol.$(OBJEXT) \
- 	lib_a-calloc.$(OBJEXT) lib_a-div.$(OBJEXT) \
- 	lib_a-dtoa.$(OBJEXT) lib_a-dtoastub.$(OBJEXT) \
- 	lib_a-environ.$(OBJEXT) lib_a-envlock.$(OBJEXT) \
-@@ -132,15 +131,15 @@
- @HAVE_LONG_DOUBLE_TRUE at am__objects_8 = strtold.lo wcstold.lo
- am__objects_9 = __adjust.lo __atexit.lo __call_atexit.lo __exp10.lo \
- 	__ten_mu.lo _Exit.lo abort.lo abs.lo assert.lo atexit.lo \
--	atof.lo atoff.lo atoi.lo atol.lo calloc.lo div.lo dtoa.lo \
--	dtoastub.lo environ.lo envlock.lo eprintf.lo exit.lo \
--	gdtoa-gethex.lo gdtoa-hexnan.lo getenv.lo getenv_r.lo labs.lo \
--	ldiv.lo ldtoa.lo malloc.lo mblen.lo mblen_r.lo mbstowcs.lo \
--	mbstowcs_r.lo mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo \
--	mstats.lo rand.lo rand_r.lo realloc.lo reallocf.lo \
--	sb_charsets.lo strtod.lo strtol.lo strtoul.lo wcstod.lo \
--	wcstol.lo wcstoul.lo wcstombs.lo wcstombs_r.lo wctomb.lo \
--	wctomb_r.lo $(am__objects_8)
-+	atof.lo atoi.lo atol.lo calloc.lo div.lo dtoa.lo dtoastub.lo \
-+	environ.lo envlock.lo eprintf.lo exit.lo gdtoa-gethex.lo \
-+	gdtoa-hexnan.lo getenv.lo getenv_r.lo labs.lo ldiv.lo ldtoa.lo \
-+	malloc.lo mblen.lo mblen_r.lo mbstowcs.lo mbstowcs_r.lo \
-+	mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo mstats.lo rand.lo \
-+	rand_r.lo realloc.lo reallocf.lo sb_charsets.lo strtod.lo \
-+	strtol.lo strtoul.lo wcstod.lo wcstol.lo wcstoul.lo \
-+	wcstombs.lo wcstombs_r.lo wctomb.lo wctomb_r.lo \
-+	$(am__objects_8)
- am__objects_10 = cxa_atexit.lo cxa_finalize.lo drand48.lo ecvtbuf.lo \
- 	efgcvt.lo erand48.lo jrand48.lo lcong48.lo lrand48.lo \
- 	mrand48.lo msize.lo mtrim.lo nrand48.lo rand48.lo seed48.lo \
-@@ -330,13 +329,13 @@
- INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
- GENERAL_SOURCES = __adjust.c __atexit.c __call_atexit.c __exp10.c \
- 	__ten_mu.c _Exit.c abort.c abs.c assert.c atexit.c atof.c \
--	atoff.c atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c \
--	environ.c envlock.c eprintf.c exit.c gdtoa-gethex.c \
--	gdtoa-hexnan.c getenv.c getenv_r.c labs.c ldiv.c ldtoa.c \
--	malloc.c mblen.c mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c \
--	mbtowc_r.c mlock.c mprec.c mstats.c rand.c rand_r.c realloc.c \
--	reallocf.c sb_charsets.c strtod.c strtol.c strtoul.c wcstod.c \
--	wcstol.c wcstoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c \
-+	atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c environ.c \
-+	envlock.c eprintf.c exit.c gdtoa-gethex.c gdtoa-hexnan.c \
-+	getenv.c getenv_r.c labs.c ldiv.c ldtoa.c malloc.c mblen.c \
-+	mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c mbtowc_r.c mlock.c \
-+	mprec.c mstats.c rand.c rand_r.c realloc.c reallocf.c \
-+	sb_charsets.c strtod.c strtol.c strtoul.c wcstod.c wcstol.c \
-+	wcstoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c \
- 	$(am__append_1)
- EXTENDED_SOURCES = \
- 	cxa_atexit.c	\
-@@ -616,12 +615,6 @@
- lib_a-atof.obj: atof.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atof.obj `if test -f 'atof.c'; then $(CYGPATH_W) 'atof.c'; else $(CYGPATH_W) '$(srcdir)/atof.c'; fi`
- 
--lib_a-atoff.o: atoff.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoff.o `test -f 'atoff.c' || echo '$(srcdir)/'`atoff.c
--
--lib_a-atoff.obj: atoff.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoff.obj `if test -f 'atoff.c'; then $(CYGPATH_W) 'atoff.c'; else $(CYGPATH_W) '$(srcdir)/atoff.c'; fi`
--
- lib_a-atoi.o: atoi.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoi.o `test -f 'atoi.c' || echo '$(srcdir)/'`atoi.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/putenv_r.c newlib-1.19.0/newlib/libc/stdlib/putenv_r.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/putenv_r.c	2004-11-24 23:34:14.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdlib/putenv_r.c	2011-10-06 08:54:41.564114221 +0200
-@@ -43,7 +43,7 @@
-   if (!p)
-     return 1;
- 
--  if (!(equal = index (p, '=')))
-+  if (!(equal = strchr (p, '=')))
-     {
-       (void) _free_r (reent_ptr, p);
-       return 1;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/setenv_r.c newlib-1.19.0/newlib/libc/stdlib/setenv_r.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/setenv_r.c	2008-09-25 05:00:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/stdlib/setenv_r.c	2011-10-06 08:54:41.564114221 +0200
-@@ -110,7 +110,7 @@
-               ENV_UNLOCK;
- 	      return (-1);
-             }
--	  bcopy ((char *) *p_environ, (char *) P, cnt * sizeof (char *));
-+	  memcpy((char *) P,(char *) *p_environ, cnt * sizeof (char *));
- 	  *p_environ = P;
- 	}
-       (*p_environ)[cnt + 1] = NULL;
-diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/strtod.c newlib-1.19.0/newlib/libc/stdlib/strtod.c
---- newlib-1.19.0.orig/newlib/libc/stdlib/strtod.c	2010-12-07 22:26:45.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/stdlib/strtod.c	2011-10-06 08:54:41.564114221 +0200
-@@ -309,8 +309,7 @@
-         }
- 	nd0 = nd;
- 	if (strncmp (s, _localeconv_r (ptr)->decimal_point,
--		     strlen (_localeconv_r (ptr)->decimal_point)) == 0)
--		{
-+		     strlen (_localeconv_r (ptr)->decimal_point)) == 0) {
- 		decpt = 1;
- 		c = *(s += strlen (_localeconv_r (ptr)->decimal_point));
- 		if (!nd) {
-@@ -328,25 +327,28 @@
-  have_dig:
- 			nz++;
- 			if (c -= '0') {
--				nf += nz;
- 				for(i = 1; i < nz; i++) {
--					if (nd++ <= DBL_DIG + 1) {
--						if (nd < 10)
-+					if (nd <= DBL_DIG + 1) {
-+						if (nd + i < 10)
- 							y *= 10;
- 						else
- 							z *= 10;
- 					}
- 				}
--				if (nd++ <= DBL_DIG + 1) {
--					if (nd < 10)
-+				if (nd <= DBL_DIG + 1) {
-+					if (nd + i < 10)
- 						y = 10*y + c;
- 					else
- 						z = 10*z + c;
- 				}
--				nz = 0;
-+				if (nd <= DBL_DIG + 1) {
-+					nf += nz;
-+					nd += nz;
- 				}
-+				nz = 0;
- 			}
- 		}
-+	}
-  dig_done:
- 	e = 0;
- 	if (c == 'e' || c == 'E') {
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/bcmp.c newlib-1.19.0/newlib/libc/string/bcmp.c
---- newlib-1.19.0.orig/newlib/libc/string/bcmp.c	2005-10-28 23:21:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/bcmp.c	2011-10-06 08:54:41.565114236 +0200
-@@ -6,11 +6,11 @@
- 	bcmp
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int bcmp(const void *<[s1]>, const void *<[s2]>, size_t <[n]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int bcmp(<[s1]>, <[s2]>, <[n]>)
- 	const void *<[s1]>;
- 	const void *<[s2]>;
-@@ -36,6 +36,7 @@
- */
- 
- #include <string.h>
-+#include <strings.h>
- 
- int
- _DEFUN (bcmp, (m1, m2, n),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/bcopy.c newlib-1.19.0/newlib/libc/string/bcopy.c
---- newlib-1.19.0.orig/newlib/libc/string/bcopy.c	2002-05-23 20:46:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/bcopy.c	2011-10-06 08:54:41.565114236 +0200
-@@ -3,7 +3,7 @@
- 	<<bcopy>>---copy memory regions
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	void bcopy(const void *<[in]>, void *<[out]>, size_t <[n]>);
- 
- TRAD_SYNOPSIS
-@@ -27,6 +27,7 @@
- */
- 
- #include <string.h>
-+#include <strings.h>
- 
- void
- _DEFUN (bcopy, (b1, b2, length),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/bzero.c newlib-1.19.0/newlib/libc/string/bzero.c
---- newlib-1.19.0.orig/newlib/libc/string/bzero.c	2002-05-23 20:46:04.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/bzero.c	2011-10-06 08:54:41.566114253 +0200
-@@ -6,11 +6,11 @@
- 	bzero
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	void bzero(void *<[b]>, size_t <[length]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	void bzero(<[b]>, <[length]>)
- 	void *<[b]>;
- 	size_t <[length]>;
-@@ -30,7 +30,7 @@
- <<bzero>> requires no supporting OS subroutines.
- */
- 
--#include <string.h>
-+#include <strings.h>
- 
- _VOID
- _DEFUN (bzero, (b, length),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/index.c newlib-1.19.0/newlib/libc/string/index.c
---- newlib-1.19.0.orig/newlib/libc/string/index.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/index.c	2011-10-06 08:54:41.566114253 +0200
-@@ -6,11 +6,11 @@
- 	index
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	char * index(const char *<[string]>, int <[c]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	char * index(<[string]>, <[c]>);
- 	char *<[string]>;
- 	int *<[c]>;
-@@ -34,6 +34,7 @@
- */
- 
- #include <string.h>
-+#include <strings.h>
- 
- char *
- _DEFUN (index, (s, c),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/Makefile.am newlib-1.19.0/newlib/libc/string/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/string/Makefile.am	2010-05-11 22:27:20.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/Makefile.am	2011-10-06 08:54:41.565114236 +0200
-@@ -71,7 +71,8 @@
- 	wmemcmp.c \
- 	wmemcpy.c \
- 	wmemmove.c \
--	wmemset.c
-+	wmemset.c \
-+	xpg_strerror_r.c
- 
- if ELIX_LEVEL_1
- ELIX_2_SOURCES =
-@@ -84,6 +85,7 @@
- 	stpncpy.c \
- 	strndup.c \
- 	strcasestr.c \
-+	strchrnul.c \
- 	strndup_r.c \
- 	wcpcpy.c \
- 	wcpncpy.c \
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/Makefile.in newlib-1.19.0/newlib/libc/string/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/string/Makefile.in	2011-07-20 08:45:15.826330835 +0200
-+++ newlib-1.19.0/newlib/libc/string/Makefile.in	2011-10-06 08:54:41.565114236 +0200
-@@ -88,7 +88,7 @@
- 	lib_a-wcsxfrm.$(OBJEXT) lib_a-wcwidth.$(OBJEXT) \
- 	lib_a-wmemchr.$(OBJEXT) lib_a-wmemcmp.$(OBJEXT) \
- 	lib_a-wmemcpy.$(OBJEXT) lib_a-wmemmove.$(OBJEXT) \
--	lib_a-wmemset.$(OBJEXT)
-+	lib_a-wmemset.$(OBJEXT) lib_a-xpg_strerror_r.$(OBJEXT)
- @ELIX_LEVEL_1_FALSE at am__objects_2 = lib_a-bcmp.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-memccpy.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-mempcpy.$(OBJEXT) \
-@@ -96,6 +96,7 @@
- @ELIX_LEVEL_1_FALSE@	lib_a-stpncpy.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-strndup.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-strcasestr.$(OBJEXT) \
-+ at ELIX_LEVEL_1_FALSE@	lib_a-strchrnul.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-strndup_r.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-wcpcpy.$(OBJEXT) \
- @ELIX_LEVEL_1_FALSE@	lib_a-wcpncpy.$(OBJEXT) \
-@@ -120,11 +121,11 @@
- 	wcslcpy.lo wcslen.lo wcsncat.lo wcsncmp.lo wcsncpy.lo \
- 	wcsnlen.lo wcspbrk.lo wcsrchr.lo wcsspn.lo wcsstr.lo wcstok.lo \
- 	wcswidth.lo wcsxfrm.lo wcwidth.lo wmemchr.lo wmemcmp.lo \
--	wmemcpy.lo wmemmove.lo wmemset.lo
-+	wmemcpy.lo wmemmove.lo wmemset.lo xpg_strerror_r.lo
- @ELIX_LEVEL_1_FALSE at am__objects_5 = bcmp.lo memccpy.lo mempcpy.lo \
- @ELIX_LEVEL_1_FALSE@	stpcpy.lo stpncpy.lo strndup.lo \
-- at ELIX_LEVEL_1_FALSE@	strcasestr.lo strndup_r.lo wcpcpy.lo \
-- at ELIX_LEVEL_1_FALSE@	wcpncpy.lo wcsdup.lo
-+ at ELIX_LEVEL_1_FALSE@	strcasestr.lo strchrnul.lo strndup_r.lo \
-+ at ELIX_LEVEL_1_FALSE@	wcpcpy.lo wcpncpy.lo wcsdup.lo
- @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE at am__objects_6 = memmem.lo \
- @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	wcscasecmp.lo \
- @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	wcsncasecmp.lo
-@@ -363,7 +364,8 @@
- 	wmemcmp.c \
- 	wmemcpy.c \
- 	wmemmove.c \
--	wmemset.c
-+	wmemset.c \
-+	xpg_strerror_r.c
- 
- @ELIX_LEVEL_1_FALSE at ELIX_2_SOURCES = \
- @ELIX_LEVEL_1_FALSE@	bcmp.c \
-@@ -373,6 +375,7 @@
- @ELIX_LEVEL_1_FALSE@	stpncpy.c \
- @ELIX_LEVEL_1_FALSE@	strndup.c \
- @ELIX_LEVEL_1_FALSE@	strcasestr.c \
-+ at ELIX_LEVEL_1_FALSE@	strchrnul.c \
- @ELIX_LEVEL_1_FALSE@	strndup_r.c \
- @ELIX_LEVEL_1_FALSE@	wcpcpy.c \
- @ELIX_LEVEL_1_FALSE@	wcpncpy.c \
-@@ -887,6 +890,12 @@
- lib_a-wmemset.obj: wmemset.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wmemset.obj `if test -f 'wmemset.c'; then $(CYGPATH_W) 'wmemset.c'; else $(CYGPATH_W) '$(srcdir)/wmemset.c'; fi`
- 
-+lib_a-xpg_strerror_r.o: xpg_strerror_r.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-xpg_strerror_r.o `test -f 'xpg_strerror_r.c' || echo '$(srcdir)/'`xpg_strerror_r.c
-+
-+lib_a-xpg_strerror_r.obj: xpg_strerror_r.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-xpg_strerror_r.obj `if test -f 'xpg_strerror_r.c'; then $(CYGPATH_W) 'xpg_strerror_r.c'; else $(CYGPATH_W) '$(srcdir)/xpg_strerror_r.c'; fi`
-+
- lib_a-bcmp.o: bcmp.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-bcmp.o `test -f 'bcmp.c' || echo '$(srcdir)/'`bcmp.c
- 
-@@ -929,6 +938,12 @@
- lib_a-strcasestr.obj: strcasestr.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strcasestr.obj `if test -f 'strcasestr.c'; then $(CYGPATH_W) 'strcasestr.c'; else $(CYGPATH_W) '$(srcdir)/strcasestr.c'; fi`
- 
-+lib_a-strchrnul.o: strchrnul.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strchrnul.o `test -f 'strchrnul.c' || echo '$(srcdir)/'`strchrnul.c
-+
-+lib_a-strchrnul.obj: strchrnul.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strchrnul.obj `if test -f 'strchrnul.c'; then $(CYGPATH_W) 'strchrnul.c'; else $(CYGPATH_W) '$(srcdir)/strchrnul.c'; fi`
-+
- lib_a-strndup_r.o: strndup_r.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strndup_r.o `test -f 'strndup_r.c' || echo '$(srcdir)/'`strndup_r.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memccpy.c newlib-1.19.0/newlib/libc/string/memccpy.c
---- newlib-1.19.0.orig/newlib/libc/string/memccpy.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memccpy.c	2011-10-06 08:54:41.566114253 +0200
-@@ -35,13 +35,14 @@
- 	*/
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include <stddef.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the word copy loop.  */
- #define LITTLEBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memchr.c newlib-1.19.0/newlib/libc/string/memchr.c
---- newlib-1.19.0.orig/newlib/libc/string/memchr.c	2008-05-27 01:31:08.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memchr.c	2011-10-06 08:54:41.566114253 +0200
-@@ -38,10 +38,11 @@
- 
- #include <_ansi.h>
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
--#define UNALIGNED(X) ((long)X & (sizeof (long) - 1))
-+#define UNALIGNED(X) ((intptr_t)X & (sizeof (long) - 1))
- 
- /* How many bytes are loaded each iteration of the word copy loop.  */
- #define LBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memcmp.c newlib-1.19.0/newlib/libc/string/memcmp.c
---- newlib-1.19.0.orig/newlib/libc/string/memcmp.c	2005-03-06 21:40:05.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/memcmp.c	2011-10-06 08:54:41.566114253 +0200
-@@ -37,11 +37,11 @@
- */
- 
- #include <string.h>
--
-+#include <stdint.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the word copy loop.  */
- #define LBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memcpy.c newlib-1.19.0/newlib/libc/string/memcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/memcpy.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memcpy.c	2011-10-06 08:54:41.566114253 +0200
-@@ -34,11 +34,12 @@
- 	*/
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include <string.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the 4X unrolled loop.  */
- #define BIGBLOCKSIZE    (sizeof (long) << 2)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memmove.c newlib-1.19.0/newlib/libc/string/memmove.c
---- newlib-1.19.0.orig/newlib/libc/string/memmove.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memmove.c	2011-10-06 08:54:41.567114271 +0200
-@@ -36,13 +36,14 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <_ansi.h>
- #include <stddef.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the 4X unrolled loop.  */
- #define BIGBLOCKSIZE    (sizeof (long) << 2)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/mempcpy.c newlib-1.19.0/newlib/libc/string/mempcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/mempcpy.c	2010-09-22 05:15:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/mempcpy.c	2011-10-06 08:54:41.567114271 +0200
-@@ -34,10 +34,11 @@
- #include <stddef.h>
- #include <limits.h>
- #include <string.h>
-+#include <stdint.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1)))
- 
- /* How many bytes are copied each iteration of the 4X unrolled loop.  */
- #define BIGBLOCKSIZE    (sizeof (long) << 2)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/memset.c newlib-1.19.0/newlib/libc/string/memset.c
---- newlib-1.19.0.orig/newlib/libc/string/memset.c	2008-05-27 20:44:40.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/memset.c	2011-10-06 08:54:41.567114271 +0200
-@@ -34,9 +34,10 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- 
- #define LBLOCKSIZE (sizeof(long))
--#define UNALIGNED(X)   ((long)X & (LBLOCKSIZE - 1))
-+#define UNALIGNED(X)   ((intptr_t)X & (LBLOCKSIZE - 1))
- #define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE)
- 
- _PTR
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/rindex.c newlib-1.19.0/newlib/libc/string/rindex.c
---- newlib-1.19.0.orig/newlib/libc/string/rindex.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/rindex.c	2011-10-06 08:54:41.567114271 +0200
-@@ -10,7 +10,7 @@
- 	char * rindex(const char *<[string]>, int <[c]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	char * rindex(<[string]>, <[c]>);
- 	char *<[string]>;
- 	int *<[c]>;
-@@ -34,6 +34,7 @@
- */
- 
- #include <string.h>
-+#include <strings.h>
- 
- char *
- _DEFUN (rindex, (s, c),
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/stpcpy.c newlib-1.19.0/newlib/libc/string/stpcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/stpcpy.c	2007-06-28 19:07:23.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/stpcpy.c	2011-10-06 08:54:41.567114271 +0200
-@@ -34,6 +34,7 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /*SUPPRESS 560*/
-@@ -41,7 +42,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/stpncpy.c newlib-1.19.0/newlib/libc/string/stpncpy.c
---- newlib-1.19.0.orig/newlib/libc/string/stpncpy.c	2007-06-28 19:07:23.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/stpncpy.c	2011-10-06 08:54:41.567114271 +0200
-@@ -40,6 +40,7 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /*SUPPRESS 560*/
-@@ -47,7 +48,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcasecmp.c newlib-1.19.0/newlib/libc/string/strcasecmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strcasecmp.c	2009-04-23 20:11:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strcasecmp.c	2011-10-06 08:54:41.567114271 +0200
-@@ -6,11 +6,11 @@
- 	strcasecmp
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strcasecmp(const char *<[a]>, const char *<[b]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strcasecmp(<[a]>, <[b]>)
- 	char *<[a]>;
- 	char *<[b]>;
-@@ -38,7 +38,7 @@
- 	strcasecmp
- */
- 
--#include <string.h>
-+#include <strings.h>
- #include <ctype.h>
- 
- int
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcasestr.c newlib-1.19.0/newlib/libc/string/strcasestr.c
---- newlib-1.19.0.orig/newlib/libc/string/strcasestr.c	2008-01-12 05:25:55.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strcasestr.c	2011-10-06 08:54:41.568114288 +0200
-@@ -76,6 +76,7 @@
- 
- #include <ctype.h>
- #include <string.h>
-+#include <strings.h>
- 
- #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
- # define RETURN_TYPE char *
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcat.c newlib-1.19.0/newlib/libc/string/strcat.c
---- newlib-1.19.0.orig/newlib/libc/string/strcat.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strcat.c	2011-10-06 08:54:41.568114288 +0200
-@@ -33,12 +33,13 @@
- 	strcat ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if X is aligned on a "long" boundary.  */
- #define ALIGNED(X) \
--  (((long)X & (sizeof (long) - 1)) == 0)
-+  (((uintptr_t)X & (sizeof (long) - 1)) == 0)
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strchr.c newlib-1.19.0/newlib/libc/string/strchr.c
---- newlib-1.19.0.orig/newlib/libc/string/strchr.c	2008-05-22 04:31:46.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strchr.c	2011-10-06 08:54:41.568114288 +0200
-@@ -33,11 +33,12 @@
- 	strchr ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if X is not aligned on a "long" boundary.  */
--#define UNALIGNED(X) ((long)X & (sizeof (long) - 1))
-+#define UNALIGNED(X) ((uintptr_t)X & (sizeof (long) - 1))
- 
- /* How many bytes are loaded each iteration of the word copy loop.  */
- #define LBLOCKSIZE (sizeof (long))
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strchrnul.c newlib-1.19.0/newlib/libc/string/strchrnul.c
---- newlib-1.19.0.orig/newlib/libc/string/strchrnul.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strchrnul.c	2011-10-06 08:54:41.568114288 +0200
-@@ -0,0 +1,47 @@
-+/*
-+FUNCTION
-+	<<strchrnul>>---search for character in string
-+
-+INDEX
-+	strchrnul
-+
-+ANSI_SYNOPSIS
-+	#include <string.h>
-+	char * strchrnul(const char *<[string]>, int <[c]>);
-+
-+TRAD_SYNOPSIS
-+	#include <string.h>
-+	char * strchrnul(<[string]>, <[c]>);
-+	const char *<[string]>;
-+	int <[c]>;
-+
-+DESCRIPTION
-+	This function finds the first occurence of <[c]> (converted to
-+	a char) in the string pointed to by <[string]> (including the
-+	terminating null character).
-+
-+RETURNS
-+	Returns a pointer to the located character, or a pointer
-+	to the concluding null byte if <[c]> does not occur in <[string]>.
-+
-+PORTABILITY
-+<<strchrnul>> is a GNU extension.
-+
-+<<strchrnul>> requires no supporting OS subroutines.  It uses
-+strchr() and strlen() from elsewhere in this library.
-+
-+QUICKREF
-+	strchrnul
-+*/
-+
-+#include <string.h>
-+
-+char *
-+_DEFUN (strchrnul, (s1, i),
-+	_CONST char *s1 _AND
-+	int i)
-+{
-+  char *s = strchr(s1, i);
-+
-+  return s ? s : (char *)s1 + strlen(s1);
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcmp.c newlib-1.19.0/newlib/libc/string/strcmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strcmp.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strcmp.c	2011-10-06 08:54:41.568114288 +0200
-@@ -35,12 +35,13 @@
- 	strcmp ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((uintptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1)))
- 
- /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */
- #if LONG_MAX == 2147483647L
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcpy.c newlib-1.19.0/newlib/libc/string/strcpy.c
---- newlib-1.19.0.orig/newlib/libc/string/strcpy.c	2007-05-29 23:26:59.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strcpy.c	2011-10-06 08:54:41.568114288 +0200
-@@ -32,6 +32,7 @@
- 	strcpy ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
-@@ -40,7 +41,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strerror.c newlib-1.19.0/newlib/libc/string/strerror.c
---- newlib-1.19.0.orig/newlib/libc/string/strerror.c	2009-03-15 14:41:46.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strerror.c	2011-10-06 08:54:41.569114304 +0200
-@@ -15,6 +15,8 @@
- ANSI_SYNOPSIS
- 	#include <string.h>
- 	char *strerror(int <[errnum]>);
-+	char *_strerror_r(struct _reent <[ptr]>, int <[errnum]>,
-+			  int <[internal]>, int *<[error]>);
- 
- TRAD_SYNOPSIS
- 	#include <string.h>
-@@ -31,6 +33,9 @@
- for each of the values defined in `<<errno.h>>':
- 
- o+
-+o 0
-+Success
-+
- o E2BIG
- Arg list too long
- 
-@@ -288,6 +293,8 @@
- 
- o-
- 
-+<<_strerror_r>> is a reentrant version of the above.
-+
- RETURNS
- This function returns a pointer to a string.  Your application must
- not modify that string.
-@@ -296,22 +303,45 @@
- ANSI C requires <<strerror>>, but does not specify the strings used
- for each error number.
- 
--Although this implementation of <<strerror>> is reentrant, ANSI C
--declares that subsequent calls to <<strerror>> may overwrite the
--result string; therefore portable code cannot depend on the reentrancy
--of this subroutine.
-+Although this implementation of <<strerror>> is reentrant (depending
-+on <<_user_strerror>>), ANSI C declares that subsequent calls to
-+<<strerror>> may overwrite the result string; therefore portable
-+code cannot depend on the reentrancy of this subroutine.
-+
-+Although this implementation of <<strerror>> guarantees a non-null
-+result with a NUL-terminator, some implementations return <<NULL>>
-+on failure.  Although POSIX allows <<strerror>> to set <<errno>>
-+to EINVAL on failure, this implementation does not do so (unless
-+you provide <<_user_strerror>>).
-+
-+POSIX recommends that unknown <[errnum]> result in a message
-+including that value, however it is not a requirement and this
-+implementation does not provide that information (unless you
-+provide <<_user_strerror>>).
- 
- This implementation of <<strerror>> provides for user-defined
- extensibility.  <<errno.h>> defines <[__ELASTERROR]>, which can be
- used as a base for user-defined error values.  If the user supplies a
- routine named <<_user_strerror>>, and <[errnum]> passed to
- <<strerror>> does not match any of the supported values,
--<<_user_strerror>> is called with <[errnum]> as its argument.
--
--<<_user_strerror>> takes one argument of type <[int]>, and returns a
--character pointer.  If <[errnum]> is unknown to <<_user_strerror>>,
--<<_user_strerror>> returns <[NULL]>.  The default <<_user_strerror>>
--returns <[NULL]> for all input values.
-+<<_user_strerror>> is called with three arguments.  The first is of
-+type <[int]>, and is the <[errnum]> value unknown to <<strerror>>.
-+The second is of type <[int]>, and matches the <[internal]> argument
-+of <<_strerror_r>>; this should be zero if called from <<strerror>>
-+and non-zero if called from any other function; <<_user_strerror>> can
-+use this information to satisfy the POSIX rule that no other
-+standardized function can overwrite a static buffer reused by
-+<<strerror>>.  The third is of type <[int *]>, and matches the
-+<[error]> argument of <<_strerror_r>>; if a non-zero value is stored
-+into that location (usually <[EINVAL]>), then <<strerror>> will set
-+<<errno>> to that value, and the XPG variant of <<strerror_r>> will
-+return that value instead of zero or <[ERANGE]>.  <<_user_strerror>>
-+returns a <[char *]> value; returning <[NULL]> implies that the user
-+function did not choose to handle <[errnum]>.  The default
-+<<_user_strerror>> returns <[NULL]> for all input values.  Note that
-+<<_user_sterror>> must be thread-safe, and only denote errors via the
-+third argument rather than modifying <<errno>>, if <<strerror>> and
-+<<strerror_r>> are are to comply with POSIX.
- 
- <<strerror>> requires no supporting OS subroutines.
- 
-@@ -323,14 +353,20 @@
- #include <string.h>
- 
- char *
--_DEFUN (strerror, (errnum),
--	int errnum)
-+_DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
-+	struct _reent *ptr _AND
-+	int errnum _AND
-+	int internal _AND
-+	int *errptr)
- {
-   char *error;
--  extern char *_user_strerror _PARAMS ((int));
-+  extern char *_user_strerror _PARAMS ((int, int, int *));
- 
-   switch (errnum)
-     {
-+    case 0:
-+      error = "Success";
-+      break;
- /* go32 defines EPERM as EACCES */
- #if defined (EPERM) && (!defined (EACCES) || (EPERM != EACCES))
-     case EPERM:
-@@ -784,10 +820,19 @@
-         break;
- #endif
-     default:
--      if ((error = _user_strerror (errnum)) == 0)
--	error = "";
-+      if (!errptr)
-+        errptr = &ptr->_errno;
-+      if ((error = _user_strerror (errnum, internal, errptr)) == 0)
-+        error = "";
-       break;
-     }
- 
-   return error;
- }
-+
-+char *
-+_DEFUN(strerror, (int),
-+       int errnum)
-+{
-+  return _strerror_r (_REENT, errnum, 0, NULL);
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strerror_r.c newlib-1.19.0/newlib/libc/string/strerror_r.c
---- newlib-1.19.0.orig/newlib/libc/string/strerror_r.c	2005-10-28 23:21:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strerror_r.c	2011-10-06 08:54:41.569114304 +0200
-@@ -1,3 +1,4 @@
-+/* GNU variant of strerror_r. */
- /*
- FUNCTION
- 	<<strerror_r>>---convert error number to string and copy to buffer
-@@ -7,7 +8,11 @@
- 
- ANSI_SYNOPSIS
- 	#include <string.h>
-+	#ifdef _GNU_SOURCE
- 	char *strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>);
-+	#else
-+	int strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>);
-+	#endif
- 
- TRAD_SYNOPSIS
- 	#include <string.h>
-@@ -19,35 +24,62 @@
- DESCRIPTION
- <<strerror_r>> converts the error number <[errnum]> into a
- string and copies the result into the supplied <[buffer]> for
--a length up to <[n]>, including the NUL terminator. The value of 
--<[errnum]> is usually a copy of <<errno>>.  If <<errnum>> is not a known 
-+a length up to <[n]>, including the NUL terminator. The value of
-+<[errnum]> is usually a copy of <<errno>>.  If <<errnum>> is not a known
- error number, the result is the empty string.
- 
- See <<strerror>> for how strings are mapped to <<errnum>>.
- 
- RETURNS
--This function returns a pointer to a string.  Your application must
--not modify that string.
-+There are two variants: the GNU version always returns a NUL-terminated
-+string, which is <[buffer]> if all went well, but which is another
-+pointer if <[n]> was too small (leaving <[buffer]> untouched).  If the
-+return is not <[buffer]>, your application must not modify that string.
-+The POSIX version returns 0 on success, <[EINVAL]> if <<errnum>> was not
-+recognized, and <[ERANGE]> if <[n]> was too small.  The variant chosen
-+depends on macros that you define before inclusion of <<string.h>>.
- 
- PORTABILITY
--<<strerror_r>> is a GNU extension.
-+<<strerror_r>> with a <[char *]> result is a GNU extension.
-+<<strerror_r>> with an <[int]> result is required by POSIX 2001.
-+This function is compliant only if <<_user_strerror>> is not provided,
-+or if it is thread-safe and uses separate storage according to whether
-+the second argument of that function is non-zero.  For more details
-+on <<_user_strerror>>, see the <<strerror>> documentation.
-+
-+POSIX states that the contents of <[buf]> are unspecified on error,
-+although this implementation guarantees a NUL-terminated string for
-+all except <[n]> of 0.
-+
-+POSIX recommends that unknown <[errnum]> result in a message including
-+that value, however it is not a requirement and this implementation
-+provides only an empty string (unless you provide <<_user_strerror>>).
-+POSIX also recommends that unknown <[errnum]> fail with EINVAL even
-+when providing such a message, however it is not a requirement and
-+this implementation will return success if <<_user_strerror>> provided
-+a non-empty alternate string without assigning into its third argument.
- 
- <<strerror_r>> requires no supporting OS subroutines.
- 
- */
- 
- #undef __STRICT_ANSI__
-+#define _GNU_SOURCE
- #include <errno.h>
- #include <string.h>
-+#undef strerror_r
- 
-+/* For backwards-compatible linking, this must be the GNU signature;
-+   see xpg_strerror_r.c for the POSIX version.  */
- char *
- _DEFUN (strerror_r, (errnum, buffer, n),
- 	int errnum _AND
- 	char *buffer _AND
- 	size_t n)
- {
--  char *error;
--  error = strerror (errnum);
-+  char *error = _strerror_r (_REENT, errnum, 1, NULL);
- 
--  return strncpy (buffer, (const char *)error, n);
-+  if (strlen (error) >= n)
-+    return error;
-+  return strcpy (buffer, error);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strlen.c newlib-1.19.0/newlib/libc/string/strlen.c
---- newlib-1.19.0.orig/newlib/libc/string/strlen.c	2008-05-27 00:56:14.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strlen.c	2011-10-06 08:54:41.569114304 +0200
-@@ -32,11 +32,12 @@
- */
- 
- #include <_ansi.h>
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- #define LBLOCKSIZE   (sizeof (long))
--#define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1))
-+#define UNALIGNED(X) ((intptr_t)X & (LBLOCKSIZE - 1))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncasecmp.c newlib-1.19.0/newlib/libc/string/strncasecmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strncasecmp.c	2009-04-23 20:11:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strncasecmp.c	2011-10-06 08:54:41.569114304 +0200
-@@ -6,11 +6,11 @@
- 	strncasecmp
- 
- ANSI_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strncasecmp(const char *<[a]>, const char * <[b]>, size_t <[length]>);
- 
- TRAD_SYNOPSIS
--	#include <string.h>
-+	#include <strings.h>
- 	int strncasecmp(<[a]>, <[b]>, <[length]>)
- 	char *<[a]>;
- 	char *<[b]>;
-@@ -40,7 +40,7 @@
- 	strncasecmp
- */
- 
--#include <string.h>
-+#include <strings.h>
- #include <ctype.h>
- 
- int 
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncat.c newlib-1.19.0/newlib/libc/string/strncat.c
---- newlib-1.19.0.orig/newlib/libc/string/strncat.c	2005-10-28 23:21:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/strncat.c	2011-10-06 08:54:41.569114304 +0200
-@@ -42,11 +42,12 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /* Nonzero if X is aligned on a "long" boundary.  */
- #define ALIGNED(X) \
--  (((long)X & (sizeof (long) - 1)) == 0)
-+  (((intptr_t)X & (sizeof (long) - 1)) == 0)
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncmp.c newlib-1.19.0/newlib/libc/string/strncmp.c
---- newlib-1.19.0.orig/newlib/libc/string/strncmp.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strncmp.c	2011-10-06 08:54:41.570114320 +0200
-@@ -36,12 +36,13 @@
- 	strncmp ansi pure
- */
- 
-+#include <stdint.h>
- #include <string.h>
- #include <limits.h>
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((uintptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1)))
- 
- /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */
- #if LONG_MAX == 2147483647L
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncpy.c newlib-1.19.0/newlib/libc/string/strncpy.c
---- newlib-1.19.0.orig/newlib/libc/string/strncpy.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/strncpy.c	2011-10-06 08:54:41.570114320 +0200
-@@ -38,6 +38,7 @@
- */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <limits.h>
- 
- /*SUPPRESS 560*/
-@@ -45,7 +46,7 @@
- 
- /* Nonzero if either X or Y is not aligned on a "long" boundary.  */
- #define UNALIGNED(X, Y) \
--  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-+  (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1)))
- 
- #if LONG_MAX == 2147483647L
- #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/u_strerr.c newlib-1.19.0/newlib/libc/string/u_strerr.c
---- newlib-1.19.0.orig/newlib/libc/string/u_strerr.c	2000-02-17 20:39:48.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/u_strerr.c	2011-10-06 08:54:41.570114320 +0200
-@@ -1,8 +1,10 @@
- #include <_ansi.h>
- 
- char *
--_DEFUN(_user_strerror, (errnum),
--       int errnum)
-+_DEFUN(_user_strerror, (errnum, internal, errptr),
-+       int errnum _AND
-+       int internal _AND
-+       int *errptr)
- {
-   return 0;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/wcwidth.c newlib-1.19.0/newlib/libc/string/wcwidth.c
---- newlib-1.19.0.orig/newlib/libc/string/wcwidth.c	2009-06-03 21:28:22.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/string/wcwidth.c	2011-10-06 08:54:41.570114320 +0200
-@@ -94,6 +94,9 @@
- 
- #include <_ansi.h>
- #include <wchar.h>
-+#ifndef _MB_CAPABLE
-+#include <wctype.h> /* iswprint, iswcntrl */
-+#endif
- #include "local.h"
- 
- #ifdef _MB_CAPABLE
-diff -Naur newlib-1.19.0.orig/newlib/libc/string/xpg_strerror_r.c newlib-1.19.0/newlib/libc/string/xpg_strerror_r.c
---- newlib-1.19.0.orig/newlib/libc/string/xpg_strerror_r.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/string/xpg_strerror_r.c	2011-10-06 08:54:41.570114320 +0200
-@@ -0,0 +1,26 @@
-+/* POSIX variant of strerror_r. */
-+#undef __STRICT_ANSI__
-+#include <errno.h>
-+#include <string.h>
-+
-+int
-+_DEFUN (__xpg_strerror_r, (errnum, buffer, n),
-+	int errnum _AND
-+	char *buffer _AND
-+	size_t n)
-+{
-+  char *error;
-+  int result = 0;
-+
-+  if (!n)
-+    return ERANGE;
-+  error = _strerror_r (_REENT, errnum, 1, &result);
-+  if (strlen (error) >= n)
-+    {
-+      memcpy (buffer, error, n - 1);
-+      buffer[n - 1] = '\0';
-+      return ERANGE;
-+    }
-+  strcpy (buffer, error);
-+  return (result || *error) ? result : EINVAL;
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.am newlib-1.19.0/newlib/libc/sys/linux/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.am	2009-08-19 22:04:43.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/Makefile.am	2011-10-06 08:54:41.570114320 +0200
-@@ -72,7 +72,6 @@
- 	process.c \
- 	prof-freq.c \
- 	profile.c \
--	psignal.c \
- 	pwrite.c \
- 	raise.c \
- 	realloc.c \
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.in newlib-1.19.0/newlib/libc/sys/linux/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/sys/linux/Makefile.in	2011-07-20 08:45:15.805330498 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/Makefile.in	2011-10-06 08:54:41.571114336 +0200
-@@ -82,24 +82,23 @@
- 	lib_a-mtrim.$(OBJEXT) lib_a-mtrimr.$(OBJEXT) \
- 	lib_a-ntp_gettime.$(OBJEXT) lib_a-pread.$(OBJEXT) \
- 	lib_a-process.$(OBJEXT) lib_a-prof-freq.$(OBJEXT) \
--	lib_a-profile.$(OBJEXT) lib_a-psignal.$(OBJEXT) \
--	lib_a-pwrite.$(OBJEXT) lib_a-raise.$(OBJEXT) \
--	lib_a-realloc.$(OBJEXT) lib_a-reallocr.$(OBJEXT) \
--	lib_a-rename.$(OBJEXT) lib_a-resource.$(OBJEXT) \
--	lib_a-sched.$(OBJEXT) lib_a-select.$(OBJEXT) \
--	lib_a-seteuid.$(OBJEXT) lib_a-sethostid.$(OBJEXT) \
--	lib_a-sethostname.$(OBJEXT) lib_a-shm_open.$(OBJEXT) \
--	lib_a-shm_unlink.$(OBJEXT) lib_a-sig.$(OBJEXT) \
--	lib_a-sigaction.$(OBJEXT) lib_a-sigqueue.$(OBJEXT) \
--	lib_a-signal.$(OBJEXT) lib_a-siglongjmp.$(OBJEXT) \
--	lib_a-sigset.$(OBJEXT) lib_a-sigwait.$(OBJEXT) \
--	lib_a-socket.$(OBJEXT) lib_a-sleep.$(OBJEXT) \
--	lib_a-strsignal.$(OBJEXT) lib_a-strverscmp.$(OBJEXT) \
--	lib_a-sysconf.$(OBJEXT) lib_a-sysctl.$(OBJEXT) \
--	lib_a-systat.$(OBJEXT) lib_a-tcdrain.$(OBJEXT) \
--	lib_a-tcsendbrk.$(OBJEXT) lib_a-termios.$(OBJEXT) \
--	lib_a-time.$(OBJEXT) lib_a-usleep.$(OBJEXT) \
--	lib_a-versionsort.$(OBJEXT)
-+	lib_a-profile.$(OBJEXT) lib_a-pwrite.$(OBJEXT) \
-+	lib_a-raise.$(OBJEXT) lib_a-realloc.$(OBJEXT) \
-+	lib_a-reallocr.$(OBJEXT) lib_a-rename.$(OBJEXT) \
-+	lib_a-resource.$(OBJEXT) lib_a-sched.$(OBJEXT) \
-+	lib_a-select.$(OBJEXT) lib_a-seteuid.$(OBJEXT) \
-+	lib_a-sethostid.$(OBJEXT) lib_a-sethostname.$(OBJEXT) \
-+	lib_a-shm_open.$(OBJEXT) lib_a-shm_unlink.$(OBJEXT) \
-+	lib_a-sig.$(OBJEXT) lib_a-sigaction.$(OBJEXT) \
-+	lib_a-sigqueue.$(OBJEXT) lib_a-signal.$(OBJEXT) \
-+	lib_a-siglongjmp.$(OBJEXT) lib_a-sigset.$(OBJEXT) \
-+	lib_a-sigwait.$(OBJEXT) lib_a-socket.$(OBJEXT) \
-+	lib_a-sleep.$(OBJEXT) lib_a-strsignal.$(OBJEXT) \
-+	lib_a-strverscmp.$(OBJEXT) lib_a-sysconf.$(OBJEXT) \
-+	lib_a-sysctl.$(OBJEXT) lib_a-systat.$(OBJEXT) \
-+	lib_a-tcdrain.$(OBJEXT) lib_a-tcsendbrk.$(OBJEXT) \
-+	lib_a-termios.$(OBJEXT) lib_a-time.$(OBJEXT) \
-+	lib_a-usleep.$(OBJEXT) lib_a-versionsort.$(OBJEXT)
- am__objects_2 = lib_a-aio64.$(OBJEXT) lib_a-confstr.$(OBJEXT) \
- 	lib_a-ctermid.$(OBJEXT) lib_a-fclean.$(OBJEXT) \
- 	lib_a-fpathconf.$(OBJEXT) lib_a-fstab.$(OBJEXT) \
-@@ -141,8 +140,8 @@
- 	mq_close.lo mq_getattr.lo mq_notify.lo mq_open.lo \
- 	mq_receive.lo mq_send.lo mq_setattr.lo mq_unlink.lo msize.lo \
- 	msizer.lo mstats.lo mtrim.lo mtrimr.lo ntp_gettime.lo pread.lo \
--	process.lo prof-freq.lo profile.lo psignal.lo pwrite.lo \
--	raise.lo realloc.lo reallocr.lo rename.lo resource.lo sched.lo \
-+	process.lo prof-freq.lo profile.lo pwrite.lo raise.lo \
-+	realloc.lo reallocr.lo rename.lo resource.lo sched.lo \
- 	select.lo seteuid.lo sethostid.lo sethostname.lo shm_open.lo \
- 	shm_unlink.lo sig.lo sigaction.lo sigqueue.lo signal.lo \
- 	siglongjmp.lo sigset.lo sigwait.lo socket.lo sleep.lo \
-@@ -396,7 +395,6 @@
- 	process.c \
- 	prof-freq.c \
- 	profile.c \
--	psignal.c \
- 	pwrite.c \
- 	raise.c \
- 	realloc.c \
-@@ -865,12 +863,6 @@
- lib_a-profile.obj: profile.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-profile.obj `if test -f 'profile.c'; then $(CYGPATH_W) 'profile.c'; else $(CYGPATH_W) '$(srcdir)/profile.c'; fi`
- 
--lib_a-psignal.o: psignal.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.o `test -f 'psignal.c' || echo '$(srcdir)/'`psignal.c
--
--lib_a-psignal.obj: psignal.c
--	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-psignal.obj `if test -f 'psignal.c'; then $(CYGPATH_W) 'psignal.c'; else $(CYGPATH_W) '$(srcdir)/psignal.c'; fi`
--
- lib_a-pwrite.o: pwrite.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-pwrite.o `test -f 'pwrite.c' || echo '$(srcdir)/'`pwrite.c
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/psignal.c newlib-1.19.0/newlib/libc/sys/linux/psignal.c
---- newlib-1.19.0.orig/newlib/libc/sys/linux/psignal.c	2002-06-05 22:58:58.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/psignal.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,15 +0,0 @@
--/* libc/sys/linux/psignal.c - print signal message to stderr */
--
--/* Copyright 2002, Red Hat Inc. */
--
--#include <stdio.h>
--#include <string.h>
--
--void
--psignal (int sig, const char *s)
--{
--  if (s != NULL)
--    fprintf (stderr, "%s: %s\n", s, strsignal (sig));
--  else
--    fprintf (stderr, "%s\n", strsignal (sig));
--}
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/sys/signal.h newlib-1.19.0/newlib/libc/sys/linux/sys/signal.h
---- newlib-1.19.0.orig/newlib/libc/sys/linux/sys/signal.h	2002-07-24 20:18:07.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/linux/sys/signal.h	2011-10-06 08:54:41.571114336 +0200
-@@ -37,7 +37,6 @@
- #include <_ansi.h>
- 
- int 	_EXFUN(kill, (int, int));
--_VOID 	_EXFUN(psignal, (int, const char *));
- int 	_EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
- int 	_EXFUN(sigaddset, (sigset_t *, const int));
- int 	_EXFUN(sigdelset, (sigset_t *, const int));
-@@ -50,7 +49,6 @@
- 
- #ifndef _POSIX_SOURCE
- extern const char *const sys_siglist[];
--typedef __sighandler_t sig_t; /* BSDism */
- #endif
- 
- #endif
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/crt0.c newlib-1.19.0/newlib/libc/sys/rtems/crt0.c
---- newlib-1.19.0.orig/newlib/libc/sys/rtems/crt0.c	2009-12-16 19:28:14.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/rtems/crt0.c	2011-10-06 08:54:41.572114352 +0200
-@@ -12,20 +12,21 @@
- 
- #include <reent.h>
- 
--#include <signal.h> // sigset_t
--#include <time.h> // struct timespec
-+#include <signal.h> /* sigset_t */
-+#include <time.h> /* struct timespec */
-+#include <unistd.h> /* isatty */
- 
- void rtems_provides_crt0( void ) {}  /* dummy symbol so file always has one */
- 
--#define RTEMS_STUB(ret, func) \
--ret rtems_stub_##func {}; \
--ret func
-+#define RTEMS_STUB(ret, func, body) \
-+ret rtems_stub_##func body; \
-+ret func body
- 
- /* RTEMS provides some of its own routines including a Malloc family */
--RTEMS_STUB(void *,malloc(size_t s)) { return 0; }
--RTEMS_STUB(void *,realloc(void* p, size_t s)) { return 0; }
--RTEMS_STUB(void, free(void)) { ; }
--RTEMS_STUB(_PTR, calloc(struct _reent *r, size_t s1, size_t s2)) {}
-+RTEMS_STUB(void *,malloc(size_t s), { return 0; })
-+RTEMS_STUB(void *,realloc(void* p, size_t s), { return 0; })
-+RTEMS_STUB(void, free(void* ptr), { })
-+RTEMS_STUB(_PTR, calloc(size_t s1, size_t s2), { return 0; })
- 
- #if defined(__GNUC__)
- /*
-@@ -49,90 +50,93 @@
- #endif
- 
- /* stubs for functions RTEMS provides */
--RTEMS_STUB(int, close (int fd)) { return -1; }
--RTEMS_STUB(int, dup2(int oldfd, int newfd)) { return -1; }
--RTEMS_STUB(int, fcntl( int fd, int cmd, ... /* arg */ )) { return -1; }
--RTEMS_STUB(pid_t, fork(void)) { return -1; }
--RTEMS_STUB(int, fstat(int fd, struct stat *buf)) { return -1; }
--RTEMS_STUB(int, getdents(int fd, void *dp, int count)) { return -1; }
--RTEMS_STUB(char *, getlogin(void)) { return 0; }
--RTEMS_STUB(struct passwd *, getpwnam(const char *name)) { return 0; }
--RTEMS_STUB(struct passwd *, getpwuid(uid_t uid)) { return 0; }
--RTEMS_STUB(uid_t, getuid(void)) { return 0; }
--RTEMS_STUB(int, nanosleep(const struct timespec *req, struct timespec *rem)) { return -1; }
--RTEMS_STUB(_off_t, lseek(int fd, _off_t offset, int whence)) { return -1; }
--RTEMS_STUB(int, lstat(const char *path, struct stat *buf)) { return -1; }
--RTEMS_STUB(int, open(const char *pathname, int flags, int mode)) { return -1; }
--RTEMS_STUB(int, pipe(int pipefd[2])) { return -1; }
--RTEMS_STUB(_ssize_t, read(int fd, void *buf, size_t count)) { return -1; }
--RTEMS_STUB(int, sigfillset(sigset_t *set)) { return -1; }
--RTEMS_STUB(int, sigprocmask(int how, const sigset_t *set, sigset_t *oldset)) { return -1; }
--RTEMS_STUB(int, stat(const char *path, struct stat *buf)) { return -1; }
--RTEMS_STUB(int, unlink(const char *pathname)) { return -1; }
--RTEMS_STUB(pid_t, vfork(void)) { return -1; }
-+RTEMS_STUB(int, clock_gettime(clockid_t clk_id, struct timespec *tp), { return -1; })
-+RTEMS_STUB(int, close (int fd), { return -1; })
-+RTEMS_STUB(int, dup2(int oldfd, int newfd), { return -1; })
-+RTEMS_STUB(int, fcntl( int fd, int cmd, ... /* arg */ ), { return -1; })
-+RTEMS_STUB(pid_t, fork(void), { return -1; })
-+RTEMS_STUB(int, fstat(int fd, struct stat *buf), { return -1; })
-+RTEMS_STUB(int, getdents(int fd, void *dp, int count), { return -1; })
-+RTEMS_STUB(char *, getlogin(void), { return 0; })
-+RTEMS_STUB(int, gettimeofday(struct timeval *tv, struct timezone *tz), { return -1; })
-+RTEMS_STUB(struct passwd *, getpwnam(const char *name), { return 0; })
-+RTEMS_STUB(struct passwd *, getpwuid(uid_t uid), { return 0; })
-+RTEMS_STUB(uid_t, getuid(void), { return 0; })
-+RTEMS_STUB(int, nanosleep(const struct timespec *req, struct timespec *rem), { return -1; })
-+RTEMS_STUB(_off_t, lseek(int fd, _off_t offset, int whence), { return -1; })
-+RTEMS_STUB(int, lstat(const char *path, struct stat *buf), { return -1; })
-+RTEMS_STUB(int, open(const char *pathname, int flags, int mode), { return -1; })
-+RTEMS_STUB(int, pipe(int pipefd[2]), { return -1; })
-+RTEMS_STUB(_ssize_t, read(int fd, void *buf, size_t count), { return -1; })
-+RTEMS_STUB(int, sched_yield(void), { return -1; })
-+RTEMS_STUB(int, sigfillset(sigset_t *set), { return -1; })
-+RTEMS_STUB(int, sigprocmask(int how, const sigset_t *set, sigset_t *oldset), { return -1; })
-+RTEMS_STUB(int, stat(const char *path, struct stat *buf), { return -1; })
-+RTEMS_STUB(int, unlink(const char *pathname), { return -1; })
-+RTEMS_STUB(pid_t, vfork(void), { return -1; })
- #if !defined(_NO_POPEN) && !defined(_NO_WORDEXP)
- /* pulled in by libc/sys/posix/popen.c and libc/sys/posix/word*.c */
--RTEMS_STUB(int, waitpid (pid_t pid, int *status, int options)) { return -1; }
-+RTEMS_STUB(int, waitpid (pid_t pid, int *status, int options), { return -1; })
- #endif
--RTEMS_STUB(_ssize_t, write (int fd, const void *buf, size_t nbytes)) { return -1; }
-+RTEMS_STUB(_ssize_t, write (int fd, const void *buf, size_t nbytes), { return -1; })
- 
- /* stubs for functions from reent.h */
--RTEMS_STUB(int, _close_r (struct _reent *r, int fd)) { return -1; }
-+RTEMS_STUB(int, _close_r (struct _reent *r, int fd), { return -1; })
- #if defined(_NO_EXECVE)
--RTEMS_STUB(int, _execve_r (struct _reent *r, char *, char **, char **)) { return -1; }
-+RTEMS_STUB(int, _execve_r (struct _reent *r, char *, char **, char **), { return -1; })
- #endif
--RTEMS_STUB(int, _fcntl_r (struct _reent *ptr, int fd, int cmd, int arg )) { return -1; }
-+RTEMS_STUB(int, _fcntl_r (struct _reent *ptr, int fd, int cmd, int arg ), { return -1; })
- #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC))
- #ifndef NO_FORK
- /* cf. newlib/libc/reent/execr.c */
--RTEMS_STUB(int, _fork_r (struct _reent *r)) { return -1; }
-+RTEMS_STUB(int, _fork_r (struct _reent *r), { return -1; })
- #endif
- #endif
--RTEMS_STUB(int, _fstat_r (struct _reent *r, int fd, struct stat *buf)) { return -1; }
--RTEMS_STUB(int, _getpid_r (struct _reent *r)) { return -1; }
--RTEMS_STUB(int, _gettimeofday_r(struct _reent *r, struct timeval *tp, void *tzp)) { return 0; }
--RTEMS_STUB(int, _isatty_r (struct _reent *r, int fd)) { return isatty( fd ); }
--RTEMS_STUB(int, _kill_r (struct _reent *r, int pid, int sig )) { return -1; }
-+RTEMS_STUB(int, _fstat_r (struct _reent *r, int fd, struct stat *buf), { return -1; })
-+RTEMS_STUB(int, _getpid_r (struct _reent *r), { return -1; })
-+RTEMS_STUB(int, _gettimeofday_r(struct _reent *r, struct timeval *tp, void *tzp), { return 0; })
-+RTEMS_STUB(int, _isatty_r (struct _reent *r, int fd), { return isatty( fd ); })
-+RTEMS_STUB(int, _kill_r (struct _reent *r, int pid, int sig ), { return -1; })
- #if !defined(REENTRANT_SYSCALLS_PROVIDED)
- /* cf. newlib/libc/reent/linkr.c */
--RTEMS_STUB(int, _link_r (struct _reent *, const char *, const char *)) { return -1; }
-+RTEMS_STUB(int, _link_r (struct _reent *r, const char *oldpath, const char *newpath), { return -1; })
- #endif
--RTEMS_STUB(_off_t, _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence )) { return -1; }
--RTEMS_STUB(int, _open_r (struct _reent *r, const char *buf, int flags, int mode)) { return -1; }
--RTEMS_STUB(_ssize_t, _read_r (struct _reent *r, int fd, void *buf, size_t nbytes)) { return -1; }
--RTEMS_STUB(int, _rename_r (struct _reent *r, const char *a, const char *b)){ return -1; }
-+RTEMS_STUB(_off_t, _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence ), { return -1; })
-+RTEMS_STUB(int, _open_r (struct _reent *r, const char *buf, int flags, int mode), { return -1; })
-+RTEMS_STUB(_ssize_t, _read_r (struct _reent *r, int fd, void *buf, size_t nbytes), { return -1; })
-+RTEMS_STUB(int, _rename_r (struct _reent *r, const char *a, const char *b), { return -1; })
- #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (MALLOC_PROVIDED))
- /* cf. newlib/libc/reent/sbrkr.c */
--RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t)) { return -1; }
-+RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t addr), { return 0; })
- #endif
--RTEMS_STUB(int, _stat_r (struct _reent *r, const char *path, struct stat *buf)) { return -1; }
--RTEMS_STUB(_CLOCK_T_, _times_r (struct _reent *r, struct tms *ptms)) { return -1; }
--RTEMS_STUB(int, _unlink_r (struct _reent *r, const char *path)) { return -1; }
-+RTEMS_STUB(int, _stat_r (struct _reent *r, const char *path, struct stat *buf), { return -1; })
-+RTEMS_STUB(_CLOCK_T_, _times_r (struct _reent *r, struct tms *ptms), { return -1; })
-+RTEMS_STUB(int, _unlink_r (struct _reent *r, const char *path), { return -1; })
- #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC))
- /* cf. newlib/libc/reent/execr.c */
--RTEMS_STUB(int, _wait_r (struct _reent *r, int *)) { return -1; }
-+RTEMS_STUB(int, _wait_r (struct _reent *r, int *status), { return -1; })
- #endif
--RTEMS_STUB(_ssize_t, _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes)) { return -1; }
-+RTEMS_STUB(_ssize_t, _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes), { return -1; })
- 
- 
--RTEMS_STUB(int, _execve(const char *path, char * const *argv, char * const *envp)) { return -1; }
--RTEMS_STUB(void, _exit(int status)) { while(1); }
-+RTEMS_STUB(int, _execve(const char *path, char * const *argv, char * const *envp), { return -1; })
-+RTEMS_STUB(void, _exit(int status), { while(1); })
- 
- /* Pulled in by newlib/libc/posix/glob.c */
- #ifndef _NO_GLOB
- #ifndef __NETBSD_SYSCALLS
--RTEMS_STUB(int, issetugid (void)) { return 0; }
-+RTEMS_STUB(int, issetugid (void), { return 0; })
- #endif
- #endif
- 
- /* stdlib.h */
--RTEMS_STUB(_PTR, _realloc_r(struct _reent *r, _PTR p, size_t s)) {}
--RTEMS_STUB(_PTR, _calloc_r(struct _reent *r, size_t s1, size_t s2)) {}
--RTEMS_STUB(_PTR, _malloc_r(struct _reent *r, size_t s)) {}
--RTEMS_STUB(_VOID, _free_r(struct _reent *r, _PTR p)) {}
-+RTEMS_STUB(_PTR, _realloc_r(struct _reent *r, _PTR p, size_t s), { return 0; })
-+RTEMS_STUB(_PTR, _calloc_r(struct _reent *r, size_t s1, size_t s2), { return 0; })
-+RTEMS_STUB(_PTR, _malloc_r(struct _reent * r, size_t s), { return 0; })
-+RTEMS_STUB(_VOID, _free_r(struct _reent *r, _PTR *p), { })
- 
- /* stubs for functions required by libc/stdlib */
--RTEMS_STUB(void, __assert_func(const char *file, int line, const char *failedexpr)) {}
-+RTEMS_STUB(void, __assert_func(const char *file, int line, const char *failedexpr), { })
- 
- /* The PowerPC expects certain symbols to be defined in the linker script. */
- 
-@@ -154,41 +158,6 @@
- int __EH_FRAME_BEGIN__;
- #endif
- 
--/*  The hppa expects this to be defined in the real crt0.s. 
-- *  Also for some reason, the hppa1.1 does not find atexit()
-- *  during the AC_PROG_CC tests.
-- */
--
--#if defined(__hppa__)
--/*
--  asm ( ".subspa \$GLOBAL\$,QUAD=1,ALIGN=8,ACCESS=0x1f,SORT=40");
--  asm ( ".export \$global\$" );
--  asm ( "\$global\$:");
--*/
--
--  asm (".text");
--  asm (".global");
--  asm (".EXPORT $$dyncall,ENTRY");
--  asm ("$$dyncall:");
--  int atexit(void (*function)(void)) { return 0; }
--#endif
--
--
--/*
-- *  The AMD a29k generates code expecting the following.
-- */
--
--#if defined(_AM29000) || defined(_AM29K)
--asm (".global V_SPILL, V_FILL" );
--asm (".global V_EPI_OS, V_BSD_OS" );
--
--asm (".equ    V_SPILL, 64" );
--asm (".equ    V_FILL, 65" );
--
--asm (".equ    V_BSD_OS, 66" );
--asm (".equ    V_EPI_OS, 69" );
--#endif
--
- #if defined(__AVR__)
- /*
-  * Initial stack pointer address "__stack"
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/include/limits.h newlib-1.19.0/newlib/libc/sys/rtems/include/limits.h
---- newlib-1.19.0.orig/newlib/libc/sys/rtems/include/limits.h	2008-11-17 23:05:12.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/rtems/include/limits.h	2011-10-06 08:54:41.572114352 +0200
-@@ -78,7 +78,13 @@
-  *  Invariant values
-  */
- 
-+#ifdef __SIZE_MAX__
-+#define SSIZE_MAX		(__SIZE_MAX__ >> 1)
-+#elif defined(__SIZEOF_SIZE_T__) && defined(__CHAR_BIT__)
-+#define SSIZE_MAX               ((1UL << (__SIZEOF_SIZE_T__ * __CHAR_BIT__ - 1)) - 1)
-+#else /* historic fallback, wrong in most cases */
- #define SSIZE_MAX               32767
-+#endif
- 
- /*
-  *  Maximum Values
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/machine/_types.h newlib-1.19.0/newlib/libc/sys/rtems/machine/_types.h
---- newlib-1.19.0.orig/newlib/libc/sys/rtems/machine/_types.h	2010-11-16 18:29:39.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/rtems/machine/_types.h	2011-10-06 08:54:41.572114352 +0200
-@@ -13,7 +13,7 @@
-  * could be applied here.
-  */
- 
--#if defined(__i386__) || defined(__m32r__) || defined(__h8300__) || defined(__arm__) || defined(__bfin__) || defined(__m68k__)
-+#if defined(__i386__) || defined(__m32r__) || defined(__h8300__) || (defined(__arm__) && !defined(__ARM_EABI__)) || defined(__bfin__) || defined(__m68k__)
- #if defined(__H8300__)
- typedef signed int _ssize_t;
- #else
-@@ -23,7 +23,7 @@
- #elif defined(__sparc__) && defined(__LP64__)
- typedef long signed int _ssize_t;
- #define __ssize_t_defined 1
--#elif defined(__AVR__) || defined(__lm32__) || defined(__m32c__) || defined(__mips__) || defined(__moxie__) || defined(__PPC__) || defined(__sparc__) || defined(__sh__)
-+#elif defined(__AVR__) || defined(__lm32__) || defined(__m32c__) || defined(__mips__) || defined(__moxie__) || defined(__PPC__) || defined(__sparc__) || defined(__sh__) || defined(__ARM_EABI__)
- typedef signed int _ssize_t;
- #define __ssize_t_defined 1
- #else
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/sys/dirent.h newlib-1.19.0/newlib/libc/sys/rtems/sys/dirent.h
---- newlib-1.19.0.orig/newlib/libc/sys/rtems/sys/dirent.h	2010-07-06 17:23:27.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/rtems/sys/dirent.h	2011-10-06 08:54:41.572114352 +0200
-@@ -50,7 +50,7 @@
- 
- int scandir ( const char *dirname,
-    struct dirent *** namelist,
--   int (*select)(struct dirent *),
-+   int (*select)(const struct dirent *),
-    int (*dcomp)(const struct dirent **, const struct dirent **)
- );
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/fstat.c newlib-1.19.0/newlib/libc/sys/sysnecv850/fstat.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/fstat.c	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/fstat.c	2011-10-06 08:54:41.573114368 +0200
-@@ -13,6 +13,5 @@
- _fstat (int file,
- 	struct stat *st)
- {
--  st->st_mode = S_IFCHR;
--  return 0;
-+  return TRAP0 (SYS_fstat, file, st, 0);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.am newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.am
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.am	2010-09-09 16:54:24.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.am	2011-10-06 08:54:41.572114352 +0200
-@@ -16,7 +16,7 @@
- 	$(lpfx)open.o $(lpfx)pipe.o $(lpfx)read.o $(lpfx)link.o \
- 	$(lpfx)sbrk.o $(lpfx)stat.o $(lpfx)time.o $(lpfx)trap.o \
- 	$(lpfx)unlink.o $(lpfx)utime.o $(lpfx)wait.o $(lpfx)write.o \
--	$(lpfx)times.o $(lpfx)gettime.o
-+	$(lpfx)times.o $(lpfx)gettime.o $(lpfx)rename.o
- else
- extra_objs =
- endif
-@@ -27,7 +27,7 @@
- 	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
- 	kill.c lseek.c open.c pipe.c read.c link.c \
- 	sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c \
--	times.c gettime.c
-+	times.c gettime.c rename.c
- lib_a_SOURCES =
- lib_a_DEPENDENCIES = $(extra_objs)
- lib_a_CCASFLAGS = $(AM_CCASFLAGS)
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.in newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.in
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/Makefile.in	2011-07-20 08:45:15.796330353 +0200
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/Makefile.in	2011-10-06 08:54:41.573114368 +0200
-@@ -65,7 +65,8 @@
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)time.o $(lpfx)trap.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)unlink.o $(lpfx)utime.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)wait.o $(lpfx)write.o \
-- at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o
-+ at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o \
-+ at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)rename.o
- am_lib_a_OBJECTS =
- lib_a_OBJECTS = $(am_lib_a_OBJECTS)
- DEFAULT_INCLUDES = -I. at am__isrc@
-@@ -111,6 +112,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-+NO_INCLUDE_LIST = @NO_INCLUDE_LIST@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -194,7 +196,7 @@
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)open.o $(lpfx)pipe.o $(lpfx)read.o $(lpfx)link.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)sbrk.o $(lpfx)stat.o $(lpfx)time.o $(lpfx)trap.o \
- @MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)unlink.o $(lpfx)utime.o $(lpfx)wait.o $(lpfx)write.o \
-- at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o
-+ at MAY_SUPPLY_SYSCALLS_TRUE@	$(lpfx)times.o $(lpfx)gettime.o $(lpfx)rename.o
- 
- lib_a_LIBADD = $(extra_objs)
- EXTRA_lib_a_SOURCES = \
-@@ -202,7 +204,7 @@
- 	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
- 	kill.c lseek.c open.c pipe.c read.c link.c \
- 	sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c \
--	times.c gettime.c
-+	times.c gettime.c rename.c
- 
- lib_a_SOURCES = 
- lib_a_DEPENDENCIES = $(extra_objs)
-@@ -448,6 +450,12 @@
- lib_a-gettime.obj: gettime.c
- 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-gettime.obj `if test -f 'gettime.c'; then $(CYGPATH_W) 'gettime.c'; else $(CYGPATH_W) '$(srcdir)/gettime.c'; fi`
- 
-+lib_a-rename.o: rename.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rename.o `test -f 'rename.c' || echo '$(srcdir)/'`rename.c
-+
-+lib_a-rename.obj: rename.c
-+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-rename.obj `if test -f 'rename.c'; then $(CYGPATH_W) 'rename.c'; else $(CYGPATH_W) '$(srcdir)/rename.c'; fi`
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/rename.c newlib-1.19.0/newlib/libc/sys/sysnecv850/rename.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/rename.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/rename.c	2011-10-06 08:54:41.573114368 +0200
-@@ -0,0 +1,17 @@
-+#include <_ansi.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include "sys/syscall.h"
-+
-+int errno;
-+
-+int __trap0 (int function, int p1, int p2, int p3);
-+
-+#define TRAP0(f, p1, p2, p3) __trap0(f, (int)(p1), (int)(p2), (int)(p3))
-+
-+int
-+rename (const char *oldpath,
-+	 const char *newpath)
-+{
-+  return TRAP0 (SYS_rename, oldpath, newpath, 0);
-+}
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sbrk.c newlib-1.19.0/newlib/libc/sys/sysnecv850/sbrk.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sbrk.c	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/sbrk.c	2011-10-06 08:54:41.573114368 +0200
-@@ -3,34 +3,27 @@
- #include <sys/stat.h>
- #include "sys/syscall.h"
- 
--int errno;
--
--int __trap0 (int function, int p1, int p2, int p3);
--
--#define TRAP0(f, p1, p2, p3) __trap0(f, (int)(p1), (int)(p2), (int)(p3))
--
- caddr_t
- _sbrk (int incr)
- {
--  extern char end;		/* Defined by the linker */
--  static char *heap_end;
--  char *prev_heap_end;
--#if 0
--  char *sp = (char *)stack_ptr;
--#else
--  char *sp = (char *)&sp;
--#endif
-+  extern char   heap_start;	/* Defined by the linker script.  */
-+  static char * heap_end = NULL;
-+  char *        prev_heap_end;
-+  char *        sp = (char *) & sp;
-+
-+  if (heap_end == NULL)
-+    heap_end = & heap_start;
- 
--  if (heap_end == 0)
--    {
--      heap_end = &end;
--    }
-   prev_heap_end = heap_end;
-+
-   if (heap_end + incr > sp)
-     {
--      _write (1, "Heap and stack collision\n", 25);
-+#define MESSAGE "Heap and stack collision\n"
-+      _write (1, MESSAGE, sizeof MESSAGE);
-       abort ();
-     }
-+
-   heap_end += incr;
-+
-   return (caddr_t) prev_heap_end;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sys/syscall.h newlib-1.19.0/newlib/libc/sys/sysnecv850/sys/syscall.h
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/sys/syscall.h	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/sys/syscall.h	2011-10-06 08:54:41.573114368 +0200
-@@ -29,6 +29,7 @@
- #define	SYS_execve	59
- #define   SYS_times       43
- #define SYS_gettimeofday 116
-+#define SYS_rename	134
- 
- #define SYS_utime       201 /* not really a system call */
- #define SYS_wait        202 /* nor is this */
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/trap.S newlib-1.19.0/newlib/libc/sys/sysnecv850/trap.S
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/trap.S	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/trap.S	2011-10-06 08:54:41.573114368 +0200
-@@ -2,9 +2,9 @@
- 	.global	___trap0
- ___trap0:
- 	trap 31
--	tst r10,r10
-+	tst r11,r11
- 	bz .L0
- 	movhi hi(_errno),r0,r6
--	st.w r10,lo(_errno)[r6]
-+	st.w r11,lo(_errno)[r6]
- .L0:
- 	jmp [r31]
-diff -Naur newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/unlink.c newlib-1.19.0/newlib/libc/sys/sysnecv850/unlink.c
---- newlib-1.19.0.orig/newlib/libc/sys/sysnecv850/unlink.c	2000-02-17 20:39:50.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/sys/sysnecv850/unlink.c	2011-10-06 08:54:41.574114385 +0200
-@@ -10,7 +10,7 @@
- #define TRAP0(f, p1, p2, p3) __trap0(f, (int)(p1), (int)(p2), (int)(p3))
- 
- int
--_unlink ()
-+_unlink (const char *path)
- {
--  return -1;
-+  return TRAP0 (SYS_unlink, path, 0, 0);
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/asctime_r.c newlib-1.19.0/newlib/libc/time/asctime_r.c
---- newlib-1.19.0.orig/newlib/libc/time/asctime_r.c	2000-05-10 19:58:29.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/time/asctime_r.c	2011-10-06 08:54:41.574114385 +0200
-@@ -18,10 +18,10 @@
- 	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-   };
- 
--  sprintf (result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
--	   day_name[tim_p->tm_wday], 
--	   mon_name[tim_p->tm_mon],
--	   tim_p->tm_mday, tim_p->tm_hour, tim_p->tm_min,
--	   tim_p->tm_sec, 1900 + tim_p->tm_year);
-+  siprintf (result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
-+	    day_name[tim_p->tm_wday], 
-+	    mon_name[tim_p->tm_mon],
-+	    tim_p->tm_mday, tim_p->tm_hour, tim_p->tm_min,
-+	    tim_p->tm_sec, 1900 + tim_p->tm_year);
-   return result;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/mktime.c newlib-1.19.0/newlib/libc/time/mktime.c
---- newlib-1.19.0.orig/newlib/libc/time/mktime.c	2008-12-11 18:27:56.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/time/mktime.c	2011-10-06 08:54:41.574114385 +0200
-@@ -107,7 +107,7 @@
-         }
-     }
- 
--  if (tim_p->tm_mon > 11)
-+  if (tim_p->tm_mon < 0 || tim_p->tm_mon > 11)
-     {
-       res = div (tim_p->tm_mon, 12);
-       tim_p->tm_year += res.quot;
-@@ -159,7 +159,7 @@
- {
-   time_t tim = 0;
-   long days = 0;
--  int year, isdst, tm_isdst;
-+  int year, isdst=0;
-   __tzinfo_type *tz = __gettzinfo ();
- 
-   /* validate structure */
-@@ -204,13 +204,16 @@
-   /* compute total seconds */
-   tim += (days * _SEC_IN_DAY);
- 
--  /* Convert user positive into 1 */
--  tm_isdst = tim_p->tm_isdst > 0  ?  1 : tim_p->tm_isdst;
--  isdst = tm_isdst;
-+  TZ_LOCK;
- 
-   if (_daylight)
-     {
-+      int tm_isdst;
-       int y = tim_p->tm_year + YEAR_BASE;
-+      /* Convert user positive into 1 */
-+      tm_isdst = tim_p->tm_isdst > 0  ?  1 : tim_p->tm_isdst;
-+      isdst = tm_isdst;
-+
-       if (y == tz->__tzyear || __tzcalc_limits (y))
- 	{
- 	  /* calculate start of dst in dst local time and 
-@@ -257,6 +260,8 @@
-   else /* otherwise assume std time */
-     tim += (time_t) tz->__tzrule[0].offset;
- 
-+  TZ_UNLOCK;
-+
-   /* reset isdst flag to what we have calculated */
-   tim_p->tm_isdst = isdst;
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/strftime.c newlib-1.19.0/newlib/libc/time/strftime.c
---- newlib-1.19.0.orig/newlib/libc/time/strftime.c	2010-04-28 11:59:37.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/time/strftime.c	2011-10-06 08:54:41.574114385 +0200
-@@ -285,6 +285,7 @@
- #  define CQ(a)		a		/* character constant qualifier */
- #  define SFLG				/* %s flag (null for normal char) */
- #  define _ctloc(x) (ctloclen = strlen (ctloc = _CurrentTimeLocale->x), ctloc)
-+#  define snprintf	sniprintf	/* avoid to pull in FP functions. */
- #  define TOLOWER(c)	tolower((int)(unsigned char)(c))
- #  define STRTOUL(c,p,b) strtoul((c),(p),(b))
- #  define STRCPY(a,b)	strcpy((a),(b))
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/strptime.c newlib-1.19.0/newlib/libc/time/strptime.c
---- newlib-1.19.0.orig/newlib/libc/time/strptime.c	2010-01-22 14:03:42.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/time/strptime.c	2011-10-06 08:54:41.575114402 +0200
-@@ -34,12 +34,23 @@
- #include <stdio.h>
- #include <time.h>
- #include <string.h>
-+#include <strings.h>
- #include <ctype.h>
- #include <stdlib.h>
- #include "../locale/timelocal.h"
- 
- #define _ctloc(x) (_CurrentTimeLocale->x)
- 
-+static _CONST int _DAYS_BEFORE_MONTH[12] =
-+{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-+
-+#define SET_MDAY 1
-+#define SET_MON  2
-+#define SET_YEAR 4
-+#define SET_WDAY 8
-+#define SET_YDAY 16
-+#define SET_YMD  (SET_YEAR | SET_MON | SET_MDAY)
-+
- /*
-  * tm_year is relative this year 
-  */
-@@ -78,8 +89,8 @@
- {
-     int ret = 4;
- 
--    for (; year > 1970; --year)
--	ret = (ret + 365 + is_leap_year (year) ? 1 : 0) % 7;
-+    while (--year >= 1970)
-+	ret = (ret + 365 + is_leap_year (year)) % 7;
-     return ret;
- }
- 
-@@ -147,6 +158,7 @@
- 	struct tm *timeptr)
- {
-     char c;
-+    int ymd = 0;
- 
-     struct lc_time_T *_CurrentTimeLocale = __get_current_time_locale ();
-     for (; (c = *format) != '\0'; ++format) {
-@@ -166,18 +178,21 @@
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_wday = ret;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'a' :
- 		ret = match_string (&buf, _ctloc (wday));
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_wday = ret;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'B' :
- 		ret = match_string (&buf, _ctloc (month));
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_mon = ret;
-+		ymd |= SET_MON;
- 		break;
- 	    case 'b' :
- 	    case 'h' :
-@@ -185,6 +200,7 @@
- 		if (ret < 0)
- 		    return NULL;
- 		timeptr->tm_mon = ret;
-+		ymd |= SET_MON;
- 		break;
- 	    case 'C' :
- 		ret = strtol (buf, &s, 10);
-@@ -192,18 +208,21 @@
- 		    return NULL;
- 		timeptr->tm_year = (ret * 100) - tm_year_base;
- 		buf = s;
-+		ymd |= SET_YEAR;
- 		break;
- 	    case 'c' :		/* %a %b %e %H:%M:%S %Y */
- 		s = strptime (buf, _ctloc (c_fmt), timeptr);
- 		if (s == NULL)
- 		    return NULL;
- 		buf = s;
-+		ymd |= SET_WDAY | SET_YMD;
- 		break;
- 	    case 'D' :		/* %m/%d/%y */
- 		s = strptime (buf, "%m/%d/%y", timeptr);
- 		if (s == NULL)
- 		    return NULL;
- 		buf = s;
-+		ymd |= SET_YMD;
- 		break;
- 	    case 'd' :
- 	    case 'e' :
-@@ -212,6 +231,7 @@
- 		    return NULL;
- 		timeptr->tm_mday = ret;
- 		buf = s;
-+		ymd |= SET_MDAY;
- 		break;
- 	    case 'H' :
- 	    case 'k' :
-@@ -238,6 +258,7 @@
- 		    return NULL;
- 		timeptr->tm_yday = ret - 1;
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'm' :
- 		ret = strtol (buf, &s, 10);
-@@ -245,6 +266,7 @@
- 		    return NULL;
- 		timeptr->tm_mon = ret - 1;
- 		buf = s;
-+		ymd |= SET_MON;
- 		break;
- 	    case 'M' :
- 		ret = strtol (buf, &s, 10);
-@@ -306,6 +328,7 @@
- 		    return NULL;
- 		timeptr->tm_wday = ret - 1;
- 		buf = s;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'w' :
- 		ret = strtol (buf, &s, 10);
-@@ -313,6 +336,7 @@
- 		    return NULL;
- 		timeptr->tm_wday = ret;
- 		buf = s;
-+		ymd |= SET_WDAY;
- 		break;
- 	    case 'U' :
- 		ret = strtol (buf, &s, 10);
-@@ -320,6 +344,7 @@
- 		    return NULL;
- 		set_week_number_sun (timeptr, ret);
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'V' :
- 		ret = strtol (buf, &s, 10);
-@@ -327,6 +352,7 @@
- 		    return NULL;
- 		set_week_number_mon4 (timeptr, ret);
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'W' :
- 		ret = strtol (buf, &s, 10);
-@@ -334,12 +360,14 @@
- 		    return NULL;
- 		set_week_number_mon (timeptr, ret);
- 		buf = s;
-+		ymd |= SET_YDAY;
- 		break;
- 	    case 'x' :
- 		s = strptime (buf, _ctloc (x_fmt), timeptr);
- 		if (s == NULL)
- 		    return NULL;
- 		buf = s;
-+		ymd |= SET_YMD;
- 		break;
- 	    case 'X' :
- 		s = strptime (buf, _ctloc (X_fmt), timeptr);
-@@ -356,6 +384,7 @@
- 		else
- 		    timeptr->tm_year = ret;
- 		buf = s;
-+		ymd |= SET_YEAR;
- 		break;
- 	    case 'Y' :
- 		ret = strtol (buf, &s, 10);
-@@ -363,6 +392,7 @@
- 		    return NULL;
- 		timeptr->tm_year = ret - tm_year_base;
- 		buf = s;
-+		ymd |= SET_YEAR;
- 		break;
- 	    case 'Z' :
- 		/* Unsupported. Just ignore.  */
-@@ -390,6 +420,58 @@
- 		return NULL;
- 	}
-     }
-+
-+    if ((ymd & SET_YMD) == SET_YMD) {
-+	/* all of tm_year, tm_mon and tm_mday, but... */
-+
-+	if (!(ymd & SET_YDAY)) {
-+	    /* ...not tm_yday, so fill it in */
-+	    timeptr->tm_yday = _DAYS_BEFORE_MONTH[timeptr->tm_mon]
-+		+ timeptr->tm_mday;
-+	    if (!is_leap_year (timeptr->tm_year + tm_year_base)
-+		|| timeptr->tm_mon < 2)
-+	    {
-+		timeptr->tm_yday--;
-+	    }
-+	    ymd |= SET_YDAY;
-+	}
-+    }
-+    else if ((ymd & (SET_YEAR | SET_YDAY)) == (SET_YEAR | SET_YDAY)) {
-+	/* both of tm_year and tm_yday, but... */
-+
-+	if (!(ymd & SET_MON)) {
-+	    /* ...not tm_mon, so fill it in, and/or... */
-+	    if (timeptr->tm_yday < _DAYS_BEFORE_MONTH[1])
-+		timeptr->tm_mon = 0;
-+	    else {
-+		int leap = is_leap_year (timeptr->tm_year + tm_year_base);
-+		int i;
-+		for (i = 2; i < 12; ++i) {
-+		    if (timeptr->tm_yday < _DAYS_BEFORE_MONTH[i] + leap)
-+			break;
-+		}
-+		timeptr->tm_mon = i - 1;
-+	    }
-+	}
-+
-+	if (!(ymd & SET_MDAY)) {
-+	    /* ...not tm_mday, so fill it in */
-+	    timeptr->tm_mday = timeptr->tm_yday
-+		- _DAYS_BEFORE_MONTH[timeptr->tm_mon];
-+	    if (!is_leap_year (timeptr->tm_year + tm_year_base)
-+		|| timeptr->tm_mon < 2)
-+	    {
-+		timeptr->tm_mday++;
-+	    }
-+	}
-+    }
-+
-+    if ((ymd & (SET_YEAR | SET_YDAY | SET_WDAY)) == (SET_YEAR | SET_YDAY)) {
-+	/* fill in tm_wday */
-+	int fday = first_day (timeptr->tm_year + tm_year_base);
-+	timeptr->tm_wday = (fday + timeptr->tm_yday) % 7;
-+    }
-+
-     return (char *)buf;
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/time/tzset_r.c newlib-1.19.0/newlib/libc/time/tzset_r.c
---- newlib-1.19.0.orig/newlib/libc/time/tzset_r.c	2008-10-06 21:21:29.000000000 +0200
-+++ newlib-1.19.0/newlib/libc/time/tzset_r.c	2011-10-06 08:54:41.575114402 +0200
-@@ -7,6 +7,8 @@
- #include <sys/time.h>
- #include "local.h"
- 
-+#define sscanf siscanf	/* avoid to pull in FP functions. */
-+
- static char __tzname_std[11];
- static char __tzname_dst[11];
- static char *prev_tzenv = NULL;
-@@ -28,6 +30,8 @@
- 	_daylight = 0;
- 	_tzname[0] = "GMT";
- 	_tzname[1] = "GMT";
-+	free(prev_tzenv);
-+	prev_tzenv = NULL;
- 	TZ_UNLOCK;
- 	return;
-       }
-@@ -80,8 +84,10 @@
-   tzenv += n;
-   
-   if (sscanf (tzenv, "%10[^0-9,+-]%n", __tzname_dst, &n) <= 0)
--    {
-+    { /* No dst */
-       _tzname[1] = _tzname[0];
-+      _timezone = tz->__tzrule[0].offset;
-+      _daylight = 0;
-       TZ_UNLOCK;
-       return;
-     }
-diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr.c newlib-1.19.0/newlib/libc/xdr/xdr.c
---- newlib-1.19.0.orig/newlib/libc/xdr/xdr.c	2010-03-02 13:05:18.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/xdr/xdr.c	2011-10-06 08:54:41.575114402 +0200
-@@ -113,7 +113,7 @@
- #elif INT_MAX == LONG_MAX
-   return xdr_long (xdrs, (long *) ip);
- #else
--# error Unexpeced integer sizes in xdr_int()
-+# error Unexpected integer sizes in xdr_int()
- #endif
- }
- 
-@@ -148,7 +148,7 @@
- #elif UINT_MAX == ULONG_MAX
-   return xdr_u_long (xdrs, (u_long *) up);
- #else
--# error Unexpeced integer sizes in xdr_int()
-+# error Unexpected integer sizes in xdr_int()
- #endif
- }
- 
-diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr_private.h newlib-1.19.0/newlib/libc/xdr/xdr_private.h
---- newlib-1.19.0.orig/newlib/libc/xdr/xdr_private.h	2010-03-02 13:05:18.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/xdr/xdr_private.h	2011-10-06 08:54:41.575114402 +0200
-@@ -25,6 +25,7 @@
- 
- #include <_ansi.h>
- #include <stdarg.h>
-+#include <stdint.h>
- #include <sys/param.h>
- 
- /* avoid including stdio header here */
-diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr_rec.c newlib-1.19.0/newlib/libc/xdr/xdr_rec.c
---- newlib-1.19.0.orig/newlib/libc/xdr/xdr_rec.c	2010-03-02 13:05:18.000000000 +0100
-+++ newlib-1.19.0/newlib/libc/xdr/xdr_rec.c	2011-10-06 08:54:41.576114419 +0200
-@@ -51,6 +51,7 @@
- #include <assert.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <limits.h>
- 
- #include <rpc/types.h>
- #include <rpc/xdr.h>
-diff -Naur newlib-1.19.0.orig/newlib/libm/common/modfl.c newlib-1.19.0/newlib/libm/common/modfl.c
---- newlib-1.19.0.orig/newlib/libm/common/modfl.c	2009-04-18 00:15:43.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/common/modfl.c	2011-10-06 08:54:41.576114419 +0200
-@@ -36,7 +36,7 @@
- long double
- modfl (long double x, long double *iptr)
- {
--  return modf(x, iptr);
-+  return modf(x, (double*) iptr);
- }
- #endif
- 
-diff -Naur newlib-1.19.0.orig/newlib/libm/common/s_round.c newlib-1.19.0/newlib/libm/common/s_round.c
---- newlib-1.19.0.orig/newlib/libm/common/s_round.c	2009-03-25 20:13:01.000000000 +0100
-+++ newlib-1.19.0/newlib/libm/common/s_round.c	2011-10-06 08:54:41.576114419 +0200
-@@ -68,7 +68,7 @@
-           msw &= 0x80000000;
-           if (exponent_less_1023 == -1)
-             /* Result is +1.0 or -1.0. */
--            msw |= (1023 << 20);
-+            msw |= ((__int32_t)1023 << 20);
-           lsw = 0;
-         }
-       else
-diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cacos.c newlib-1.19.0/newlib/libm/complex/cacos.c
---- newlib-1.19.0.orig/newlib/libm/complex/cacos.c	2010-11-04 19:27:13.000000000 +0100
-+++ newlib-1.19.0/newlib/libm/complex/cacos.c	2011-10-06 08:54:41.576114419 +0200
-@@ -82,8 +82,18 @@
- {
- 	double complex w;
- 
-+	/* FIXME: The original NetBSD code results in an ICE when trying to
-+	   build this function on ARM/Thumb using gcc 4.5.1.  For now we use
-+	   a hopefully temporary workaround. */
-+#if 0
- 	w = casin(z);
--	w = M_PI_2 - creal(w);
--	w -= (cimag(w) * I);
-+	w = (M_PI_2 - creal(w)) - cimag(w) * I;
-+#else
-+	double complex tmp0, tmp1;
-+
-+	tmp0 = casin(z);
-+	tmp1 = M_PI_2 - creal(tmp0);
-+	w = tmp1 - (cimag(tmp0) * I);
-+#endif
- 	return w;
- }
-diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cproj.c newlib-1.19.0/newlib/libm/complex/cproj.c
---- newlib-1.19.0.orig/newlib/libm/complex/cproj.c	2010-10-19 00:40:24.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/complex/cproj.c	2011-10-06 08:54:41.576114419 +0200
-@@ -93,7 +93,7 @@
- {
- 	double_complex w = { .z = z };
- 
--	if (isinf(creal(z) || isinf(cimag(z)))) {
-+	if (isinf(creal(z)) || isinf(cimag(z))) {
- #ifdef __INFINITY
- 		REAL_PART(w) = __INFINITY;
- #else
-diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cprojf.c newlib-1.19.0/newlib/libm/complex/cprojf.c
---- newlib-1.19.0.orig/newlib/libm/complex/cprojf.c	2010-10-08 12:35:14.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/complex/cprojf.c	2011-10-06 08:54:41.576114419 +0200
-@@ -55,7 +55,7 @@
- {
- 	float_complex w = { .z = z };
- 
--	if (isinf(crealf(z) || isinf(cimagf(z)))) {
-+	if (isinf(crealf(z)) || isinf(cimagf(z))) {
- #ifdef __INFINITY
- 		REAL_PART(w) = __INFINITY;
- #else
-diff -Naur newlib-1.19.0.orig/newlib/libm/math/e_scalb.c newlib-1.19.0/newlib/libm/math/e_scalb.c
---- newlib-1.19.0.orig/newlib/libm/math/e_scalb.c	2000-02-17 20:39:51.000000000 +0100
-+++ newlib-1.19.0/newlib/libm/math/e_scalb.c	2011-10-06 08:54:41.576114419 +0200
-@@ -17,6 +17,7 @@
-  * should use scalbn() instead.
-  */
- 
-+#include <limits.h>
- #include "fdlibm.h"
- 
- #ifndef _DOUBLE_IS_32BITS
-@@ -46,8 +47,17 @@
- 	    else       return x/(-fn);
- 	}
- 	if (rint(fn)!=fn) return (fn-fn)/(fn-fn);
-+#if (INT_MAX < 65000)
-+	if ( fn > (double) INT_MAX) return scalbn(x, INT_MAX);
-+#else
- 	if ( fn > 65000.0) return scalbn(x, 65000);
--	if (-fn > 65000.0) return scalbn(x,-65000);
-+#endif
-+
-+#if (INT_MIN > -65000)
-+        if (fn < (double) INT_MIN) return scalbn(x,INT_MIN);
-+#else
-+	if (fn < -65000.0) return scalbn(x,-65000);
-+#endif
- 	return scalbn(x,(int)fn);
- #endif
- }
-diff -Naur newlib-1.19.0.orig/newlib/libm/math/wf_tgamma.c newlib-1.19.0/newlib/libm/math/wf_tgamma.c
---- newlib-1.19.0.orig/newlib/libm/math/wf_tgamma.c	2007-09-04 19:33:10.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/math/wf_tgamma.c	2011-10-06 08:54:41.577114436 +0200
-@@ -43,3 +43,17 @@
- 	return y;
- #endif
- }
-+
-+#ifdef _DOUBLE_IS_32BITS
-+
-+#ifdef __STDC__
-+	double tgamma(double x)
-+#else
-+	double tgamma(x)
-+	double x;
-+#endif
-+{
-+	return (double) tgammaf((float) x);
-+}
-+
-+#endif /* defined(_DOUBLE_IS_32BITS) */
-diff -Naur newlib-1.19.0.orig/newlib/libm/math/w_tgamma.c newlib-1.19.0/newlib/libm/math/w_tgamma.c
---- newlib-1.19.0.orig/newlib/libm/math/w_tgamma.c	2002-06-07 23:59:56.000000000 +0200
-+++ newlib-1.19.0/newlib/libm/math/w_tgamma.c	2011-10-06 08:54:41.577114436 +0200
-@@ -17,6 +17,8 @@
- 
- #include "fdlibm.h"
- 
-+#ifndef _DOUBLE_IS_32BITS
-+
- #ifdef __STDC__
- 	double tgamma(double x)
- #else
-@@ -42,3 +44,5 @@
- 	return y;
- #endif
- }
-+
-+#endif /* defined(_DOUBLE_IS_32BITS) */
-diff -Naur newlib-1.19.0.orig/newlib/MAINTAINERS newlib-1.19.0/newlib/MAINTAINERS
---- newlib-1.19.0.orig/newlib/MAINTAINERS	2010-12-16 22:58:38.000000000 +0100
-+++ newlib-1.19.0/newlib/MAINTAINERS	2011-10-06 08:54:41.533113410 +0200
-@@ -6,7 +6,7 @@
- The official maintainers of newlib:
- 
- Jeff Johnston			jjohnstn at redhat.com
--Corinna	Vinschen		corinna at vinchen.de
-+Corinna Vinschen		corinna at vinschen.de
- 
- 
- 		     Various Domain Maintainers
-diff -Naur newlib-1.19.0.orig/newlib/Makefile.am newlib-1.19.0/newlib/Makefile.am
---- newlib-1.19.0.orig/newlib/Makefile.am	2010-12-16 22:58:38.000000000 +0100
-+++ newlib-1.19.0/newlib/Makefile.am	2011-10-06 08:54:41.533113410 +0200
-@@ -81,7 +81,7 @@
- 	libc.a
- endif
- 
--noinst_DATA = stmp-targ-include
-+BUILT_SOURCES = stmp-targ-include
- 
- toollib_DATA = $(CRT0) $(CRT1)
- 
-@@ -255,7 +255,7 @@
- 	  done
- 	touch $@
- 
--CLEANFILES = targ-include stmp-targ-include
-+CLEANFILES = stmp-targ-include
- 
- install-data-local:	install-toollibLIBRARIES
- if USE_LIBTOOL
-@@ -279,10 +279,6 @@
- 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
- 	    else true; fi ; \
- 	  done; \
--	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \
--	  for i in $(srcdir)/libc/include/rpc/*.h; do \
--	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \
--	  done; \
- 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \
- 	  for i in $(srcdir)/libc/include/sys/*.h; do \
- 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
-@@ -430,3 +426,6 @@
- 	else \
- 	   echo "WARNING: could not find \`runtest'" 1>&2 ; \
- 	fi
-+
-+clean-local:
-+	-rm -rf targ-include
-diff -Naur newlib-1.19.0.orig/newlib/Makefile.in newlib-1.19.0/newlib/Makefile.in
---- newlib-1.19.0.orig/newlib/Makefile.in	2011-07-20 08:45:15.622327553 +0200
-+++ newlib-1.19.0/newlib/Makefile.in	2011-10-06 08:54:41.533113410 +0200
-@@ -122,7 +122,7 @@
- 	install-pdf-recursive install-ps-recursive install-recursive \
- 	installcheck-recursive installdirs-recursive pdf-recursive \
- 	ps-recursive uninstall-recursive
--DATA = $(noinst_DATA) $(toollib_DATA)
-+DATA = $(toollib_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -351,7 +351,7 @@
- @USE_LIBTOOL_FALSE at toollib_LIBRARIES = libm.a \
- @USE_LIBTOOL_FALSE@	libc.a
- 
--noinst_DATA = stmp-targ-include
-+BUILT_SOURCES = stmp-targ-include
- toollib_DATA = $(CRT0) $(CRT1)
- 
- # The functions ldexp, frexp and modf are traditionally supplied in
-@@ -405,13 +405,13 @@
- @USE_LIBTOOL_TRUE at libm_la_DEPENDENCIES = libm-libtool-objectlist
- @USE_LIBTOOL_TRUE at libc_la_SOURCES = 
- @USE_LIBTOOL_TRUE at libc_la_DEPENDENCIES = libc-libtool-objectlist
--CLEANFILES = targ-include stmp-targ-include
-+CLEANFILES = stmp-targ-include
- CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
- MAKEOVERRIDES = 
- 
- # dejagnu support
- RUNTESTFLAGS = 
--all: newlib.h
-+all: $(BUILT_SOURCES) newlib.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
- .SUFFIXES:
-@@ -725,14 +725,16 @@
- 	done
- check-am:
- 	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
--check: check-recursive
-+check: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
- all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
--install: install-recursive
-+install: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
-@@ -758,10 +760,11 @@
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
-+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- clean: clean-recursive
- 
--clean-am: clean-generic clean-libtool clean-toollibLIBRARIES \
--	clean-toollibLTLIBRARIES mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-local \
-+	clean-toollibLIBRARIES clean-toollibLTLIBRARIES mostlyclean-am
- 
- distclean: distclean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-@@ -833,12 +836,13 @@
- uninstall-am: uninstall-toollibDATA uninstall-toollibLIBRARIES \
- 	uninstall-toollibLTLIBRARIES
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
--	ctags-recursive install-am install-strip tags-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-+	check-am ctags-recursive install install-am install-strip \
-+	tags-recursive
- 
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- 	all all-am am--refresh check check-DEJAGNU check-am clean \
--	clean-generic clean-libtool clean-toollibLIBRARIES \
-+	clean-generic clean-libtool clean-local clean-toollibLIBRARIES \
- 	clean-toollibLTLIBRARIES ctags ctags-recursive distclean \
- 	distclean-DEJAGNU distclean-compile distclean-generic \
- 	distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \
-@@ -985,10 +989,6 @@
- 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
- 	    else true; fi ; \
- 	  done; \
--	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \
--	  for i in $(srcdir)/libc/include/rpc/*.h; do \
--	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \
--	  done; \
- 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \
- 	  for i in $(srcdir)/libc/include/sys/*.h; do \
- 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
-@@ -1129,6 +1129,9 @@
- 	   echo "WARNING: could not find \`runtest'" 1>&2 ; \
- 	fi
- 
-+clean-local:
-+	-rm -rf targ-include
-+
- # 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.19.0.orig/newlib/testsuite/newlib.stdio/stdio.exp newlib-1.19.0/newlib/testsuite/newlib.stdio/stdio.exp
---- newlib-1.19.0.orig/newlib/testsuite/newlib.stdio/stdio.exp	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/testsuite/newlib.stdio/stdio.exp	2011-10-06 08:54:41.594114713 +0200
-@@ -0,0 +1,12 @@
-+# Copyright (C) 2011 by ARM Ltd. All rights reserved.
-+#
-+# Permission to use, copy, modify, and distribute this software
-+# is freely granted, provided that this notice is preserved.
-+#
-+
-+load_lib passfail.exp
-+
-+set exclude_list {
-+}
-+
-+newlib_pass_fail_all -x $exclude_list
-diff -Naur newlib-1.19.0.orig/newlib/testsuite/newlib.stdio/swprintf.c newlib-1.19.0/newlib/testsuite/newlib.stdio/swprintf.c
---- newlib-1.19.0.orig/newlib/testsuite/newlib.stdio/swprintf.c	1970-01-01 01:00:00.000000000 +0100
-+++ newlib-1.19.0/newlib/testsuite/newlib.stdio/swprintf.c	2011-10-06 08:54:41.594114713 +0200
-@@ -0,0 +1,30 @@
-+/*
-+ * Copyright (C) 2011 by ARM Ltd. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and distribute this software
-+ * is freely granted, provided that this notice is preserved.
-+ */
-+
-+#include <stdio.h>
-+#include <newlib.h>
-+#include <stdlib.h>
-+#include <wchar.h>
-+#include "check.h"
-+
-+int main()
-+{
-+#if defined(INTEGER_ONLY) || defined(NO_FLOATING_POINT)
-+
-+#else
-+  char cbuf[512];
-+  wchar_t wcbuf[512], wcbuf2[512];
-+  double val = 1E+308;
-+  snprintf(cbuf, 512, "%.*f", 3, val);
-+  swprintf(wcbuf, 512, L"%.*f", 3, val);
-+  mbstowcs(wcbuf2, cbuf, 512);
-+
-+  CHECK (wcscmp(wcbuf, wcbuf2) == 0);
-+#endif
-+
-+  exit (0);
-+}
diff --git a/contrib/crossrpms/rtems4.11/Makefile.am b/contrib/crossrpms/rtems4.11/Makefile.am
deleted file mode 100644
index 0c28b90..0000000
--- a/contrib/crossrpms/rtems4.11/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id$
-
-SUBDIRS =
-SUBDIRS += arm
-SUBDIRS += arm-eabi
-SUBDIRS += avr
-SUBDIRS += bfin
-SUBDIRS += h8300
-SUBDIRS += i386
-SUBDIRS += lm32
-SUBDIRS += m32c
-SUBDIRS += m32r
-SUBDIRS += m68k
-SUBDIRS += mips
-SUBDIRS += mipstx39
-SUBDIRS += powerpc
-SUBDIRS += sh
-SUBDIRS += sparc
-
-SUBDIRS += sparc64
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am b/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
deleted file mode 100644
index e40aa43..0000000
--- a/contrib/crossrpms/rtems4.11/arm-eabi/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = arm-rtemseabi4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/binutils-sources.add b/contrib/crossrpms/rtems4.11/arm-eabi/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/arm-eabi/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/cpukit-sources.add b/contrib/crossrpms/rtems4.11/arm-eabi/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/arm-eabi/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/gcc-sources.add b/contrib/crossrpms/rtems4.11/arm-eabi/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/arm-eabi/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/gdb-sources.add b/contrib/crossrpms/rtems4.11/arm-eabi/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/arm-eabi/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-binutils.spec b/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-binutils.spec
deleted file mode 100644
index cc72dad..0000000
--- a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-arm-rtemseabi4.11-binutils
-Summary:	Binutils for target arm-rtemseabi4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target arm-rtemseabi4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=arm-rtemseabi4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtemseabi4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtemseabi4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtemseabi4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtemseabi4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtemseabi4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtemseabi4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtemseabi4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtemseabi4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# arm-rtemseabi4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-arm-rtemseabi4.11-binutils
-# Summary:      rtems binutils for arm-rtemseabi4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-arm-rtemseabi4.11-binutils
-GNU binutils targetting arm-rtemseabi4.11.
-
-%files -n rtems-4.11-arm-rtemseabi4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtemseabi4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/arm-rtemseabi4.11-*
-
-%dir %{_exec_prefix}/arm-rtemseabi4.11
-%dir %{_exec_prefix}/arm-rtemseabi4.11/bin
-%{_exec_prefix}/arm-rtemseabi4.11/bin/*
-
-%dir %{_exec_prefix}/arm-rtemseabi4.11/lib
-%{_exec_prefix}/arm-rtemseabi4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-cpukit.spec
deleted file mode 100644
index 3f53175..0000000
--- a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-arm-rtemseabi4.11-cpukit
-Summary:      	arm-rtemseabi4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-arm-rtemseabi4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for arm-rtemseabi4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=arm-rtemseabi4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtemseabi4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/arm-rtemseabi4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtemseabi4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/arm-rtemseabi4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-arm-rtemseabi4.11-cpukit
-RTEMS cpukit for target arm-rtemseabi4.11.
-
-%files -n rtems-4.11-arm-rtemseabi4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/arm-rtemseabi4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gcc.spec b/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gcc.spec
deleted file mode 100644
index 3057d03..0000000
--- a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-arm-rtemseabi4.11-gcc
-Summary:      	arm-rtemseabi4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-arm-rtemseabi4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-arm-rtemseabi4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-arm-rtemseabi4.11-binutils
-Requires:	rtems-4.11-arm-rtemseabi4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for arm-rtemseabi4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=arm-rtemseabi4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/arm-rtemseabi4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtemseabi4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtemseabi4.11-arm-rtemseabi4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/arm-rtemseabi4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/arm-rtemseabi4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/arm-rtemseabi4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/arm-rtemseabi4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtemseabi4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtemseabi4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtemseabi4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtemseabi4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-arm-rtemseabi4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-arm-rtemseabi4.11-gcc
-# Summary:        GNU cc compiler for arm-rtemseabi4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-arm-rtemseabi4.11-binutils
-# Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-arm-rtemseabi4.11-gcc
-GNU cc compiler for arm-rtemseabi4.11.
-
-# ==============================================================
-# rtems-4.11-arm-rtemseabi4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-arm-rtemseabi4.11-gcc-libgcc
-Summary:        libgcc for arm-rtemseabi4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-arm-rtemseabi4.11-gcc-libgcc
-libgcc arm-rtemseabi4.11-gcc.
-
-
-%files -n rtems-4.11-arm-rtemseabi4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtemseabi4.11-gcc.1*
-%{_mandir}/man1/arm-rtemseabi4.11-cpp.1*
-%{_mandir}/man1/arm-rtemseabi4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/arm-rtemseabi4.11-cpp%{_exeext}
-%{_bindir}/arm-rtemseabi4.11-gcc%{_exeext}
-%{_bindir}/arm-rtemseabi4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/arm-rtemseabi4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/arm-rtemseabi4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/arm-rtemseabi4.11
-%dir %{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}
-%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-arm-rtemseabi4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-arm-rtemseabi4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-arm-rtemseabi4.11-gcc-c++
-Summary:	GCC c++ compiler for arm-rtemseabi4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-arm-rtemseabi4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-arm-rtemseabi4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-arm-rtemseabi4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-arm-rtemseabi4.11-gcc-c++
-GCC c++ compiler for arm-rtemseabi4.11.
-
-
-%package -n rtems-4.11-arm-rtemseabi4.11-gcc-libstdc++
-Summary:	libstdc++ for arm-rtemseabi4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-arm-rtemseabi4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-arm-rtemseabi4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtemseabi4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/arm-rtemseabi4.11-c++%{_exeext}
-%{_bindir}/arm-rtemseabi4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/arm-rtemseabi4.11
-%dir %{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}
-%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-arm-rtemseabi4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-arm-rtemseabi4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-arm-rtemseabi4.11-newlib
-Summary:      	C Library (newlib) for arm-rtemseabi4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-arm-rtemseabi4.11-newlib
-Newlib C Library for arm-rtemseabi4.11.
-
-%files -n rtems-4.11-arm-rtemseabi4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/arm-rtemseabi4.11
-%{_exec_prefix}/arm-rtemseabi4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gdb.spec b/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gdb.spec
deleted file mode 100644
index e1d55fe..0000000
--- a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gdb.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-arm-rtemseabi4.11-gdb
-Summary:	Gdb for target arm-rtemseabi4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target arm-rtemseabi4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=arm-rtemseabi4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/arm-rtemseabi4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libarm-rtemseabi4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/arm-rtemseabi4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/arm-rtemseabi4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/arm-rtemseabi4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# arm-rtemseabi4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-arm-rtemseabi4.11-gdb
-# Summary:      rtems gdb for arm-rtemseabi4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-arm-rtemseabi4.11-gdb
-GNU gdb targetting arm-rtemseabi4.11.
-
-%files -n rtems-4.11-arm-rtemseabi4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/arm-rtemseabi4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtemseabi4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/arm-rtemseabi4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/arm/Makefile.am b/contrib/crossrpms/rtems4.11/arm/Makefile.am
deleted file mode 100644
index 2b1a363..0000000
--- a/contrib/crossrpms/rtems4.11/arm/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = arm-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/arm/binutils-sources.add b/contrib/crossrpms/rtems4.11/arm/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/arm/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/arm/cpukit-sources.add b/contrib/crossrpms/rtems4.11/arm/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/arm/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/arm/gcc-sources.add b/contrib/crossrpms/rtems4.11/arm/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/arm/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/arm/gdb-sources.add b/contrib/crossrpms/rtems4.11/arm/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/arm/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-binutils.spec
deleted file mode 100644
index 8bb5869..0000000
--- a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-arm-rtems4.11-binutils
-Summary:	Binutils for target arm-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target arm-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=arm-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# arm-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-arm-rtems4.11-binutils
-# Summary:      rtems binutils for arm-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-arm-rtems4.11-binutils
-GNU binutils targetting arm-rtems4.11.
-
-%files -n rtems-4.11-arm-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/arm-rtems4.11-*
-
-%dir %{_exec_prefix}/arm-rtems4.11
-%dir %{_exec_prefix}/arm-rtems4.11/bin
-%{_exec_prefix}/arm-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/arm-rtems4.11/lib
-%{_exec_prefix}/arm-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-cpukit.spec
deleted file mode 100644
index ee82db7..0000000
--- a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-arm-rtems4.11-cpukit
-Summary:      	arm-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-arm-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for arm-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=arm-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/arm-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/arm-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-arm-rtems4.11-cpukit
-RTEMS cpukit for target arm-rtems4.11.
-
-%files -n rtems-4.11-arm-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/arm-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec
deleted file mode 100644
index 311f094..0000000
--- a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-arm-rtems4.11-gcc
-Summary:      	arm-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-arm-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-arm-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-arm-rtems4.11-binutils
-Requires:	rtems-4.11-arm-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for arm-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=arm-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/arm-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.11-arm-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/arm-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/arm-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/arm-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/arm-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-arm-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-arm-rtems4.11-gcc
-# Summary:        GNU cc compiler for arm-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-arm-rtems4.11-binutils
-# Requires:       rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-arm-rtems4.11-gcc
-GNU cc compiler for arm-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-arm-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-arm-rtems4.11-gcc-libgcc
-Summary:        libgcc for arm-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-arm-rtems4.11-gcc-libgcc
-libgcc arm-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-arm-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtems4.11-gcc.1*
-%{_mandir}/man1/arm-rtems4.11-cpp.1*
-%{_mandir}/man1/arm-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/arm-rtems4.11-cpp%{_exeext}
-%{_bindir}/arm-rtems4.11-gcc%{_exeext}
-%{_bindir}/arm-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/arm-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/arm-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/arm-rtems4.11
-%dir %{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-arm-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/arm-rtems4.11
-%dir %{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-arm-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-arm-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for arm-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-arm-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-arm-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-arm-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-arm-rtems4.11-gcc-c++
-GCC c++ compiler for arm-rtems4.11.
-
-
-%package -n rtems-4.11-arm-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for arm-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-arm-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-arm-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/arm-rtems4.11-c++%{_exeext}
-%{_bindir}/arm-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/arm-rtems4.11
-%dir %{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-arm-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/arm-rtems4.11
-%dir %{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-arm-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-arm-rtems4.11-newlib
-Summary:      	C Library (newlib) for arm-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-arm-rtems4.11-newlib
-Newlib C Library for arm-rtems4.11.
-
-%files -n rtems-4.11-arm-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/arm-rtems4.11
-%{_exec_prefix}/arm-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gdb.spec
deleted file mode 100644
index cb7be05..0000000
--- a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-arm-rtems4.11-gdb
-Summary:	Gdb for target arm-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target arm-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=arm-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/arm-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libarm-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# arm-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-arm-rtems4.11-gdb
-# Summary:      rtems gdb for arm-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-arm-rtems4.11-gdb
-GNU gdb targetting arm-rtems4.11.
-
-%files -n rtems-4.11-arm-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/arm-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/arm-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/avr/Makefile.am b/contrib/crossrpms/rtems4.11/avr/Makefile.am
deleted file mode 100644
index 6400367..0000000
--- a/contrib/crossrpms/rtems4.11/avr/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = avr-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS +=
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/avr/binutils-sources.add b/contrib/crossrpms/rtems4.11/avr/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/avr/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/avr/cpukit-sources.add b/contrib/crossrpms/rtems4.11/avr/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/avr/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/avr/gcc-sources.add b/contrib/crossrpms/rtems4.11/avr/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/avr/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/avr/gdb-sources.add b/contrib/crossrpms/rtems4.11/avr/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/avr/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
deleted file mode 100644
index 2b9b30a..0000000
--- a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-avr-rtems4.11-binutils
-Summary:	Binutils for target avr-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target avr-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=avr-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/avr-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/avr-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/avr-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/avr-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/avr-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/avr-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/avr-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/avr-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# avr-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-avr-rtems4.11-binutils
-# Summary:      rtems binutils for avr-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-avr-rtems4.11-binutils
-GNU binutils targetting avr-rtems4.11.
-
-%files -n rtems-4.11-avr-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/avr-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/avr-rtems4.11-*
-
-%dir %{_exec_prefix}/avr-rtems4.11
-%dir %{_exec_prefix}/avr-rtems4.11/bin
-%{_exec_prefix}/avr-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/avr-rtems4.11/lib
-%{_exec_prefix}/avr-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-cpukit.spec
deleted file mode 100644
index abf9c99..0000000
--- a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-avr-rtems4.11-cpukit
-Summary:      	avr-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-avr-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for avr-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=avr-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/avr-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/avr-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-avr-rtems4.11-cpukit
-RTEMS cpukit for target avr-rtems4.11.
-
-%files -n rtems-4.11-avr-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/avr-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec
deleted file mode 100644
index 59a0977..0000000
--- a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,823 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-avr-rtems4.11-gcc
-Summary:      	avr-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-avr-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-avr-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-avr-rtems4.11-binutils
-Requires:	rtems-4.11-avr-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for avr-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=avr-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/avr-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/avr-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/avr-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/avr-rtems4.11-avr-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/avr-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/avr-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/avr-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/avr-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/avr-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-avr-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-avr-rtems4.11-gcc
-# Summary:        GNU cc compiler for avr-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-avr-rtems4.11-binutils
-# Requires:       rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-avr-rtems4.11-gcc
-GNU cc compiler for avr-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-avr-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-avr-rtems4.11-gcc-libgcc
-Summary:        libgcc for avr-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-avr-rtems4.11-gcc-libgcc
-libgcc avr-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-avr-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/avr-rtems4.11-gcc.1*
-%{_mandir}/man1/avr-rtems4.11-cpp.1*
-%{_mandir}/man1/avr-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/avr-rtems4.11-cpp%{_exeext}
-%{_bindir}/avr-rtems4.11-gcc%{_exeext}
-%{_bindir}/avr-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/avr-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/avr-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/avr-rtems4.11
-%dir %{_libexecdir}/gcc/avr-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/avr-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/avr-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/avr-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/avr-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-avr-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/avr-rtems4.11
-%dir %{_gcclibdir}/gcc/avr-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/avr-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/avr-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-
-
-
-# ==============================================================
-# rtems-4.11-avr-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-avr-rtems4.11-newlib
-Summary:      	C Library (newlib) for avr-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-avr-rtems4.11-newlib
-Newlib C Library for avr-rtems4.11.
-
-%files -n rtems-4.11-avr-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/avr-rtems4.11
-%{_exec_prefix}/avr-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec
deleted file mode 100644
index 2fdb295..0000000
--- a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-avr-rtems4.11-gdb
-Summary:	Gdb for target avr-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target avr-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=avr-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/avr-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libavr-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/avr-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/avr-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/avr-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# avr-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-avr-rtems4.11-gdb
-# Summary:      rtems gdb for avr-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-avr-rtems4.11-gdb
-GNU gdb targetting avr-rtems4.11.
-
-%files -n rtems-4.11-avr-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/avr-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/avr-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/avr-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/bfin/Makefile.am b/contrib/crossrpms/rtems4.11/bfin/Makefile.am
deleted file mode 100644
index 4775fab..0000000
--- a/contrib/crossrpms/rtems4.11/bfin/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = bfin-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/bfin/binutils-sources.add b/contrib/crossrpms/rtems4.11/bfin/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/bfin/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/bfin/cpukit-sources.add b/contrib/crossrpms/rtems4.11/bfin/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/bfin/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/bfin/gcc-sources.add b/contrib/crossrpms/rtems4.11/bfin/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/bfin/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/bfin/gdb-sources.add b/contrib/crossrpms/rtems4.11/bfin/gdb-sources.add
deleted file mode 100644
index 0cdd0bb..0000000
--- a/contrib/crossrpms/rtems4.11/bfin/gdb-sources.add
+++ /dev/null
@@ -1,23 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%if "%{gdb_version}" == "7.3.1"
-BuildRequires:  @rpmprefix at bfin-rtems4.11-binutils
-BuildRequires:  texinfo
-
-# The bfin simulator silently tries to conditionally build an SDL based GUI, 
-# but fails to link correctly
-# Force not building the GUI.
-%{!?suse:BuildConflicts: SDL-devel}
-%{?suse:BuildConflicts: libSDL-devel}
-%endif
diff --git a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
deleted file mode 100644
index 6bcd0e0..0000000
--- a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-bfin-rtems4.11-binutils
-Summary:	Binutils for target bfin-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target bfin-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=bfin-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/bfin-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/bfin-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/bfin-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/bfin-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/bfin-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/bfin-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/bfin-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/bfin-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# bfin-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-bfin-rtems4.11-binutils
-# Summary:      rtems binutils for bfin-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-bfin-rtems4.11-binutils
-GNU binutils targetting bfin-rtems4.11.
-
-%files -n rtems-4.11-bfin-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/bfin-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/bfin-rtems4.11-*
-
-%dir %{_exec_prefix}/bfin-rtems4.11
-%dir %{_exec_prefix}/bfin-rtems4.11/bin
-%{_exec_prefix}/bfin-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/bfin-rtems4.11/lib
-%{_exec_prefix}/bfin-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-cpukit.spec
deleted file mode 100644
index 05492a6..0000000
--- a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-bfin-rtems4.11-cpukit
-Summary:      	bfin-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-bfin-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for bfin-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=bfin-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/bfin-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/bfin-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-bfin-rtems4.11-cpukit
-RTEMS cpukit for target bfin-rtems4.11.
-
-%files -n rtems-4.11-bfin-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/bfin-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec
deleted file mode 100644
index 7e6050b..0000000
--- a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,896 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-bfin-rtems4.11-gcc
-Summary:      	bfin-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-bfin-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-bfin-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-bfin-rtems4.11-binutils
-Requires:	rtems-4.11-bfin-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for bfin-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=bfin-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/bfin-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/bfin-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/bfin-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/bfin-rtems4.11-bfin-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/bfin-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/bfin-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/bfin-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/bfin-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/bfin-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-bfin-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-bfin-rtems4.11-gcc
-# Summary:        GNU cc compiler for bfin-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-bfin-rtems4.11-binutils
-# Requires:       rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-bfin-rtems4.11-gcc
-GNU cc compiler for bfin-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-bfin-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-bfin-rtems4.11-gcc-libgcc
-Summary:        libgcc for bfin-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-bfin-rtems4.11-gcc-libgcc
-libgcc bfin-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-bfin-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/bfin-rtems4.11-gcc.1*
-%{_mandir}/man1/bfin-rtems4.11-cpp.1*
-%{_mandir}/man1/bfin-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/bfin-rtems4.11-cpp%{_exeext}
-%{_bindir}/bfin-rtems4.11-gcc%{_exeext}
-%{_bindir}/bfin-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/bfin-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/bfin-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/bfin-rtems4.11
-%dir %{_libexecdir}/gcc/bfin-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/bfin-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/bfin-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/bfin-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/bfin-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-bfin-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/bfin-rtems4.11
-%dir %{_gcclibdir}/gcc/bfin-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/bfin-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/bfin-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-bfin-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-bfin-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for bfin-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-bfin-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-bfin-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-bfin-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-bfin-rtems4.11-gcc-c++
-GCC c++ compiler for bfin-rtems4.11.
-
-
-%package -n rtems-4.11-bfin-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for bfin-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-bfin-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-bfin-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/bfin-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/bfin-rtems4.11-c++%{_exeext}
-%{_bindir}/bfin-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/bfin-rtems4.11
-%dir %{_libexecdir}/gcc/bfin-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/bfin-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-bfin-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/bfin-rtems4.11
-%dir %{_gcclibdir}/gcc/bfin-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/bfin-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/bfin-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-bfin-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-bfin-rtems4.11-newlib
-Summary:      	C Library (newlib) for bfin-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-bfin-rtems4.11-newlib
-Newlib C Library for bfin-rtems4.11.
-
-%files -n rtems-4.11-bfin-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/bfin-rtems4.11
-%{_exec_prefix}/bfin-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gdb.spec
deleted file mode 100644
index 9bce956..0000000
--- a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,309 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-bfin-rtems4.11-gdb
-Summary:	Gdb for target bfin-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%if "%{gdb_version}" == "7.3.1"
-BuildRequires:  rtems-4.11-bfin-rtems4.11-binutils
-BuildRequires:  texinfo
-
-# The bfin simulator silently tries to conditionally build an SDL based GUI, 
-# but fails to link correctly
-# Force not building the GUI.
-%{!?suse:BuildConflicts: SDL-devel}
-%{?suse:BuildConflicts: libSDL-devel}
-%endif
-
-%description
-GDB for target bfin-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=bfin-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/bfin-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libbfin-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# bfin-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-bfin-rtems4.11-gdb
-# Summary:      rtems gdb for bfin-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-bfin-rtems4.11-gdb
-GNU gdb targetting bfin-rtems4.11.
-
-%files -n rtems-4.11-bfin-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/bfin-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/bfin-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/bfin-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/binutils.am b/contrib/crossrpms/rtems4.11/binutils.am
deleted file mode 100644
index 6145fd6..0000000
--- a/contrib/crossrpms/rtems4.11/binutils.am
+++ /dev/null
@@ -1,31 +0,0 @@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_OPTS =
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add $(srcdir)/../binutils.am
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \
-	  -e "/--with-sysroot/d" \
-	  | $(MKSPEC0) > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
- at rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
-
-EXTRA_DIST += $(BINUTILS_SUBPACKAGES)
diff --git a/contrib/crossrpms/rtems4.11/cpukit-prep.add b/contrib/crossrpms/rtems4.11/cpukit-prep.add
deleted file mode 100644
index 8b13789..0000000
--- a/contrib/crossrpms/rtems4.11/cpukit-prep.add
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/contrib/crossrpms/rtems4.11/cpukit.am b/contrib/crossrpms/rtems4.11/cpukit.am
deleted file mode 100644
index 2dbf6d1..0000000
--- a/contrib/crossrpms/rtems4.11/cpukit.am
+++ /dev/null
@@ -1,35 +0,0 @@
-EXTRA_DIST += $(srcdir)/../rtems-prep.add
-EXTRA_DIST += $(srcdir)/rtems-sources.add
-
-CPUKIT_OPTS =
-
-CPUKIT_SUBPACKAGES = $(top_srcdir)/common/common.add
-CPUKIT_SUBPACKAGES += $(top_srcdir)/cpukit/cpukit.add
-CPUKIT_SUBPACKAGES += $(top_srcdir)/cpukit/prep.add
-CPUKIT_SUBPACKAGES += $(top_srcdir)/cpukit/build.add
-CPUKIT_SUBPACKAGES += $(top_srcdir)/cpukit/install.add
-CPUKIT_SUBPACKAGES += $(top_srcdir)/cpukit/rpm-install.add
-CPUKIT_SUBPACKAGES += $(top_srcdir)/common/clean.add
-CPUKIT_SUBPACKAGES += $(top_srcdir)/cpukit/target-cpukit.add
-
-$(TARGET)-cpukit.spec.in: $(CPUKIT_SUBPACKAGES) Makefile.am $(srcdir)/cpukit-sources.add $(srcdir)/../cpukit-prep.add
-	cat $(CPUKIT_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/cpukit-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../cpukit-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  -e "s/[@]CPUKIT_VERS[@]/$(CPUKIT_VERS)/g" \
-	  -e "s/[@]CPUKIT_PKGVERS[@]/$(CPUKIT_PKGVERS)/g" \
-	  -e "s/[@]CPUKIT_RPMREL[@]/$(CPUKIT_RPMREL)%{?dist}/g" \
-	  -e "/--with-sysroot/d" \
-	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
-	  | $(MKSPEC0) > $(TARGET)-cpukit.spec.in
-CLEANFILES += $(TARGET)-cpukit.spec.in
-
- at rpmprefix@$(TARGET)-cpukit.spec: $(TARGET)-cpukit.spec.in
-	$(MKSPEC) $(TARGET)-cpukit.spec.in | $(SPECSTRIP) $(CPUKIT_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-cpukit.spec
-noinst_DATA += @rpmprefix@$(TARGET)-cpukit.spec
-
-EXTRA_DIST += $(CPUKIT_SUBPACKAGES)
diff --git a/contrib/crossrpms/rtems4.11/gcc-prep.add b/contrib/crossrpms/rtems4.11/gcc-prep.add
deleted file mode 100644
index 2c41d2d..0000000
--- a/contrib/crossrpms/rtems4.11/gcc-prep.add
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "RTEMS gcc-%{gcc_version}- at GCC_RPMREL@/newlib-%{newlib_version}- at NEWLIB_RPMREL@" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
diff --git a/contrib/crossrpms/rtems4.11/gcc.am b/contrib/crossrpms/rtems4.11/gcc.am
deleted file mode 100644
index f919594..0000000
--- a/contrib/crossrpms/rtems4.11/gcc.am
+++ /dev/null
@@ -1,49 +0,0 @@
-EXTRA_DIST += $(srcdir)/../gcc-prep.add
-EXTRA_DIST += $(srcdir)/gcc-sources.add
-
-GCC_OPTS = --languages=c --newlib
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-go.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-go.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-newlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-newlib.add
-
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
-	cat $(GCC_SUBPACKAGES) \
-	  | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  | sed \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-	  -e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \
-	  -e "s/[@]NEWLIB_PKGVERS[@]/$(NEWLIB_PKGVERS)/g" \
-	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
-	  -e "/--with-sysroot/d" \
-	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
-	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
- at rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
-	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
-
-EXTRA_DIST += $(GCC_SUBPACKAGES)
diff --git a/contrib/crossrpms/rtems4.11/gdb.am b/contrib/crossrpms/rtems4.11/gdb.am
deleted file mode 100644
index b90d25e..0000000
--- a/contrib/crossrpms/rtems4.11/gdb.am
+++ /dev/null
@@ -1,31 +0,0 @@
-EXTRA_DIST += gdb-sources.add
-
-GDB_OPTS =
-
-GDB_SUBPACKAGES = $(top_srcdir)/common/common.add
-GDB_SUBPACKAGES += $(top_srcdir)/gdb/gdb.add
-GDB_SUBPACKAGES += $(top_srcdir)/gdb/prep.add
-GDB_SUBPACKAGES += $(top_srcdir)/gdb/build.add
-GDB_SUBPACKAGES += $(top_srcdir)/gdb/install.add
-GDB_SUBPACKAGES += $(top_srcdir)/gdb/rpm-install.add
-GDB_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GDB_SUBPACKAGES += $(top_srcdir)/gdb/target-gdb.add
-GDB_SUBPACKAGES += $(top_srcdir)/gdb/base-gdb.add
-
-$(TARGET)-gdb.spec.in: $(GDB_SUBPACKAGES) Makefile.am $(srcdir)/gdb-sources.add $(srcdir)/../gdb.am
-	cat $(GDB_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gdb-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]GDB_VERS[@]/$(GDB_VERS)/g" \
-	  -e "s/[@]GDB_PKGVERS[@]/$(GDB_PKGVERS)/g" \
-	  -e "s/[@]GDB_RPMREL[@]/$(GDB_RPMREL)%{?dist}/g" \
-	  -e "/--with-sysroot/d" \
-	  | $(MKSPEC0) > $(TARGET)-gdb.spec.in
-CLEANFILES += $(TARGET)-gdb.spec.in
-
- at rpmprefix@$(TARGET)-gdb.spec: $(TARGET)-gdb.spec.in
-	$(MKSPEC) $(TARGET)-gdb.spec.in | $(SPECSTRIP) $(GDB_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gdb.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gdb.spec
-
-EXTRA_DIST += $(GDB_SUBPACKAGES)
diff --git a/contrib/crossrpms/rtems4.11/h8300/Makefile.am b/contrib/crossrpms/rtems4.11/h8300/Makefile.am
deleted file mode 100644
index a5daef2..0000000
--- a/contrib/crossrpms/rtems4.11/h8300/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = h8300-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.5.3
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 21
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 7`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/h8300/binutils-sources.add b/contrib/crossrpms/rtems4.11/h8300/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/h8300/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/h8300/cpukit-sources.add b/contrib/crossrpms/rtems4.11/h8300/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/h8300/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add b/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/h8300/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/h8300/gdb-sources.add b/contrib/crossrpms/rtems4.11/h8300/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/h8300/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
deleted file mode 100644
index 3f27233..0000000
--- a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-h8300-rtems4.11-binutils
-Summary:	Binutils for target h8300-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target h8300-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=h8300-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/h8300-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/h8300-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/h8300-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/h8300-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/h8300-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/h8300-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/h8300-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/h8300-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# h8300-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-h8300-rtems4.11-binutils
-# Summary:      rtems binutils for h8300-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-h8300-rtems4.11-binutils
-GNU binutils targetting h8300-rtems4.11.
-
-%files -n rtems-4.11-h8300-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/h8300-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/h8300-rtems4.11-*
-
-%dir %{_exec_prefix}/h8300-rtems4.11
-%dir %{_exec_prefix}/h8300-rtems4.11/bin
-%{_exec_prefix}/h8300-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/h8300-rtems4.11/lib
-%{_exec_prefix}/h8300-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-cpukit.spec
deleted file mode 100644
index 50e2ea9..0000000
--- a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-h8300-rtems4.11-cpukit
-Summary:      	h8300-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-h8300-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for h8300-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=h8300-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/h8300-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/h8300-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-h8300-rtems4.11-cpukit
-RTEMS cpukit for target h8300-rtems4.11.
-
-%files -n rtems-4.11-h8300-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/h8300-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec
deleted file mode 100644
index 5371b13..0000000
--- a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.5.3
-%define gcc_version 4.5.3
-%define gcc_rpmvers %{expand:%(echo "4.5.3" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-h8300-rtems4.11-gcc
-Summary:      	h8300-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	21%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-h8300-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-h8300-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-h8300-rtems4.11-binutils
-Requires:	rtems-4.11-h8300-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-28%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for h8300-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-21%{?dist}/newlib-%{newlib_version}-28%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=h8300-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/h8300-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/h8300-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/h8300-rtems4.11-h8300-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/h8300-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/h8300-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/h8300-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/h8300-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/h8300-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-h8300-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-h8300-rtems4.11-gcc
-# Summary:        GNU cc compiler for h8300-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-h8300-rtems4.11-binutils
-# Requires:       rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-28%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-h8300-rtems4.11-gcc
-GNU cc compiler for h8300-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-h8300-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-h8300-rtems4.11-gcc-libgcc
-Summary:        libgcc for h8300-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-28%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-h8300-rtems4.11-gcc-libgcc
-libgcc h8300-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-h8300-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/h8300-rtems4.11-gcc.1*
-%{_mandir}/man1/h8300-rtems4.11-cpp.1*
-%{_mandir}/man1/h8300-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/h8300-rtems4.11-cpp%{_exeext}
-%{_bindir}/h8300-rtems4.11-gcc%{_exeext}
-%{_bindir}/h8300-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/h8300-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/h8300-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/h8300-rtems4.11
-%dir %{_libexecdir}/gcc/h8300-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/h8300-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/h8300-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/h8300-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/h8300-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-h8300-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/h8300-rtems4.11
-%dir %{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-h8300-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-h8300-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for h8300-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-h8300-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-h8300-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-h8300-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-h8300-rtems4.11-gcc-c++
-GCC c++ compiler for h8300-rtems4.11.
-
-
-%package -n rtems-4.11-h8300-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for h8300-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-h8300-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-h8300-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/h8300-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/h8300-rtems4.11-c++%{_exeext}
-%{_bindir}/h8300-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/h8300-rtems4.11
-%dir %{_libexecdir}/gcc/h8300-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/h8300-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-h8300-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/h8300-rtems4.11
-%dir %{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/h8300-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-h8300-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-h8300-rtems4.11-newlib
-Summary:      	C Library (newlib) for h8300-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        28%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-h8300-rtems4.11-newlib
-Newlib C Library for h8300-rtems4.11.
-
-%files -n rtems-4.11-h8300-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/h8300-rtems4.11
-%{_exec_prefix}/h8300-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        28%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec
deleted file mode 100644
index 44c8284..0000000
--- a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,302 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-h8300-rtems4.11-gdb
-Summary:	Gdb for target h8300-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-%ifos mingw mingw32
-# Mingw lacks functions required by the h8300 simulator
-%define build_sim --disable-sim
-%endif
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target h8300-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=h8300-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/h8300-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libh8300-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/h8300-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/h8300-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/h8300-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# h8300-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-h8300-rtems4.11-gdb
-# Summary:      rtems gdb for h8300-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-h8300-rtems4.11-gdb
-GNU gdb targetting h8300-rtems4.11.
-
-%files -n rtems-4.11-h8300-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/h8300-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/h8300-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/h8300-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/i386/Makefile.am b/contrib/crossrpms/rtems4.11/i386/Makefile.am
deleted file mode 100644
index cc72b54..0000000
--- a/contrib/crossrpms/rtems4.11/i386/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = i386-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/i386/binutils-sources.add b/contrib/crossrpms/rtems4.11/i386/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/i386/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/i386/cpukit-sources.add b/contrib/crossrpms/rtems4.11/i386/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/i386/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/i386/gcc-sources.add b/contrib/crossrpms/rtems4.11/i386/gcc-sources.add
deleted file mode 100644
index 491e6bf..0000000
--- a/contrib/crossrpms/rtems4.11/i386/gcc-sources.add
+++ /dev/null
@@ -1,50 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_go
-%if !%build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-Source6:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-go-%{gcc_pkgvers}.tar.bz2
-Patch6:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-go-4.6.0-rtems4.11-20110401.diff
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/i386/gdb-sources.add b/contrib/crossrpms/rtems4.11/i386/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/i386/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
deleted file mode 100644
index cc4f08b..0000000
--- a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-i386-rtems4.11-binutils
-Summary:	Binutils for target i386-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target i386-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=i386-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i386-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-i386-rtems4.11-binutils
-# Summary:      rtems binutils for i386-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-i386-rtems4.11-binutils
-GNU binutils targetting i386-rtems4.11.
-
-%files -n rtems-4.11-i386-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/i386-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/i386-rtems4.11-*
-
-%dir %{_exec_prefix}/i386-rtems4.11
-%dir %{_exec_prefix}/i386-rtems4.11/bin
-%{_exec_prefix}/i386-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/i386-rtems4.11/lib
-%{_exec_prefix}/i386-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-cpukit.spec
deleted file mode 100644
index 95a67e1..0000000
--- a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-i386-rtems4.11-cpukit
-Summary:      	i386-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-i386-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for i386-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=i386-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/i386-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/i386-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-i386-rtems4.11-cpukit
-RTEMS cpukit for target i386-rtems4.11.
-
-%files -n rtems-4.11-i386-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/i386-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec
deleted file mode 100644
index 3604e98..0000000
--- a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-i386-rtems4.11-gcc
-Summary:      	i386-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-i386-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-i386-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-i386-rtems4.11-binutils
-Requires:	rtems-4.11-i386-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for i386-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=i386-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/i386-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i386-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/i386-rtems4.11-i386-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i386-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/i386-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/i386-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/i386-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/i386-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-i386-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-i386-rtems4.11-gcc
-# Summary:        GNU cc compiler for i386-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-i386-rtems4.11-binutils
-# Requires:       rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-i386-rtems4.11-gcc
-GNU cc compiler for i386-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-i386-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-i386-rtems4.11-gcc-libgcc
-Summary:        libgcc for i386-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-i386-rtems4.11-gcc-libgcc
-libgcc i386-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-i386-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/i386-rtems4.11-gcc.1*
-%{_mandir}/man1/i386-rtems4.11-cpp.1*
-%{_mandir}/man1/i386-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/i386-rtems4.11-cpp%{_exeext}
-%{_bindir}/i386-rtems4.11-gcc%{_exeext}
-%{_bindir}/i386-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/i386-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/i386-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i386-rtems4.11
-%dir %{_libexecdir}/gcc/i386-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/i386-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/i386-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/i386-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/i386-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-i386-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i386-rtems4.11
-%dir %{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-i386-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-i386-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for i386-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-i386-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-i386-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-i386-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-i386-rtems4.11-gcc-c++
-GCC c++ compiler for i386-rtems4.11.
-
-
-%package -n rtems-4.11-i386-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for i386-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-i386-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-i386-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/i386-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/i386-rtems4.11-c++%{_exeext}
-%{_bindir}/i386-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/i386-rtems4.11
-%dir %{_libexecdir}/gcc/i386-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/i386-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-i386-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/i386-rtems4.11
-%dir %{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/i386-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-i386-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-i386-rtems4.11-newlib
-Summary:      	C Library (newlib) for i386-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-i386-rtems4.11-newlib
-Newlib C Library for i386-rtems4.11.
-
-%files -n rtems-4.11-i386-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/i386-rtems4.11
-%{_exec_prefix}/i386-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec
deleted file mode 100644
index 4b4c4f3..0000000
--- a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-i386-rtems4.11-gdb
-Summary:	Gdb for target i386-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target i386-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=i386-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/i386-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libi386-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/i386-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/i386-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/i386-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# i386-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-i386-rtems4.11-gdb
-# Summary:      rtems gdb for i386-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-i386-rtems4.11-gdb
-GNU gdb targetting i386-rtems4.11.
-
-%files -n rtems-4.11-i386-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/i386-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/i386-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/i386-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/lm32/Makefile.am b/contrib/crossrpms/rtems4.11/lm32/Makefile.am
deleted file mode 100644
index be205ff..0000000
--- a/contrib/crossrpms/rtems4.11/lm32/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = lm32-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.5.3
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 21
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 7`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/lm32/binutils-sources.add b/contrib/crossrpms/rtems4.11/lm32/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/lm32/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/lm32/cpukit-sources.add b/contrib/crossrpms/rtems4.11/lm32/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/lm32/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add b/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/lm32/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/lm32/gdb-sources.add b/contrib/crossrpms/rtems4.11/lm32/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/lm32/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
deleted file mode 100644
index 44b46b4..0000000
--- a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-lm32-rtems4.11-binutils
-Summary:	Binutils for target lm32-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target lm32-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=lm32-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/lm32-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/lm32-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/lm32-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/lm32-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/lm32-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/lm32-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/lm32-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/lm32-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# lm32-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-lm32-rtems4.11-binutils
-# Summary:      rtems binutils for lm32-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-lm32-rtems4.11-binutils
-GNU binutils targetting lm32-rtems4.11.
-
-%files -n rtems-4.11-lm32-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/lm32-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/lm32-rtems4.11-*
-
-%dir %{_exec_prefix}/lm32-rtems4.11
-%dir %{_exec_prefix}/lm32-rtems4.11/bin
-%{_exec_prefix}/lm32-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/lm32-rtems4.11/lib
-%{_exec_prefix}/lm32-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec
deleted file mode 100644
index cd423fa..0000000
--- a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.5.3
-%define gcc_version 4.5.3
-%define gcc_rpmvers %{expand:%(echo "4.5.3" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-lm32-rtems4.11-gcc
-Summary:      	lm32-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	21%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-lm32-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-lm32-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-lm32-rtems4.11-binutils
-Requires:	rtems-4.11-lm32-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-28%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for lm32-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-21%{?dist}/newlib-%{newlib_version}-28%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=lm32-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/lm32-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/lm32-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/lm32-rtems4.11-lm32-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/lm32-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/lm32-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/lm32-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/lm32-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/lm32-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/lm32-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/lm32-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/lm32-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/lm32-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-lm32-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-lm32-rtems4.11-gcc
-# Summary:        GNU cc compiler for lm32-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-lm32-rtems4.11-binutils
-# Requires:       rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-28%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-lm32-rtems4.11-gcc
-GNU cc compiler for lm32-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-lm32-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-lm32-rtems4.11-gcc-libgcc
-Summary:        libgcc for lm32-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-28%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-lm32-rtems4.11-gcc-libgcc
-libgcc lm32-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-lm32-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/lm32-rtems4.11-gcc.1*
-%{_mandir}/man1/lm32-rtems4.11-cpp.1*
-%{_mandir}/man1/lm32-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/lm32-rtems4.11-cpp%{_exeext}
-%{_bindir}/lm32-rtems4.11-gcc%{_exeext}
-%{_bindir}/lm32-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/lm32-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/lm32-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/lm32-rtems4.11
-%dir %{_libexecdir}/gcc/lm32-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/lm32-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/lm32-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/lm32-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/lm32-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-lm32-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/lm32-rtems4.11
-%dir %{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-lm32-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-lm32-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for lm32-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-lm32-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-lm32-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-lm32-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-lm32-rtems4.11-gcc-c++
-GCC c++ compiler for lm32-rtems4.11.
-
-
-%package -n rtems-4.11-lm32-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for lm32-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-lm32-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-lm32-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/lm32-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/lm32-rtems4.11-c++%{_exeext}
-%{_bindir}/lm32-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/lm32-rtems4.11
-%dir %{_libexecdir}/gcc/lm32-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/lm32-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-lm32-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/lm32-rtems4.11
-%dir %{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/lm32-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-lm32-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-lm32-rtems4.11-newlib
-Summary:      	C Library (newlib) for lm32-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        28%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-lm32-rtems4.11-newlib
-Newlib C Library for lm32-rtems4.11.
-
-%files -n rtems-4.11-lm32-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/lm32-rtems4.11
-%{_exec_prefix}/lm32-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        28%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec
deleted file mode 100644
index 11a8376..0000000
--- a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,302 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-lm32-rtems4.11-gdb
-Summary:	Gdb for target lm32-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-%ifos mingw mingw32
-# Mingw lacks functions required by the lm32 simulator
-%define build_sim --disable-sim
-%endif
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target lm32-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=lm32-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/lm32-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/liblm32-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/lm32-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/lm32-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/lm32-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# lm32-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-lm32-rtems4.11-gdb
-# Summary:      rtems gdb for lm32-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-lm32-rtems4.11-gdb
-GNU gdb targetting lm32-rtems4.11.
-
-%files -n rtems-4.11-lm32-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/lm32-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/lm32-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/lm32-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/m32c/Makefile.am b/contrib/crossrpms/rtems4.11/m32c/Makefile.am
deleted file mode 100644
index bcbd70a..0000000
--- a/contrib/crossrpms/rtems4.11/m32c/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = m32c-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS +=
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/m32c/binutils-sources.add b/contrib/crossrpms/rtems4.11/m32c/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/m32c/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/m32c/cpukit-sources.add b/contrib/crossrpms/rtems4.11/m32c/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/m32c/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/m32c/gcc-sources.add b/contrib/crossrpms/rtems4.11/m32c/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/m32c/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/m32c/gdb-sources.add b/contrib/crossrpms/rtems4.11/m32c/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/m32c/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
deleted file mode 100644
index b28d941..0000000
--- a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-m32c-rtems4.11-binutils
-Summary:	Binutils for target m32c-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target m32c-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=m32c-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m32c-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m32c-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m32c-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m32c-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m32c-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m32c-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m32c-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m32c-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# m32c-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-m32c-rtems4.11-binutils
-# Summary:      rtems binutils for m32c-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-m32c-rtems4.11-binutils
-GNU binutils targetting m32c-rtems4.11.
-
-%files -n rtems-4.11-m32c-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/m32c-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/m32c-rtems4.11-*
-
-%dir %{_exec_prefix}/m32c-rtems4.11
-%dir %{_exec_prefix}/m32c-rtems4.11/bin
-%{_exec_prefix}/m32c-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/m32c-rtems4.11/lib
-%{_exec_prefix}/m32c-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-cpukit.spec
deleted file mode 100644
index a9fb77c..0000000
--- a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-m32c-rtems4.11-cpukit
-Summary:      	m32c-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-m32c-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for m32c-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=m32c-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32c-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m32c-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32c-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m32c-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-m32c-rtems4.11-cpukit
-RTEMS cpukit for target m32c-rtems4.11.
-
-%files -n rtems-4.11-m32c-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/m32c-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec
deleted file mode 100644
index 9fe151a..0000000
--- a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,824 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-m32c-rtems4.11-gcc
-Summary:      	m32c-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-m32c-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-m32c-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-m32c-rtems4.11-binutils
-Requires:	rtems-4.11-m32c-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for m32c-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=m32c-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/m32c-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m32c-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/m32c-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/m32c-rtems4.11-m32c-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32c-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m32c-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/m32c-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/m32c-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/m32c-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/m32c-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/m32c-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/m32c-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32c-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32c-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32c-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32c-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-m32c-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-m32c-rtems4.11-gcc
-# Summary:        GNU cc compiler for m32c-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-m32c-rtems4.11-binutils
-# Requires:       rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-m32c-rtems4.11-gcc
-GNU cc compiler for m32c-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-m32c-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-m32c-rtems4.11-gcc-libgcc
-Summary:        libgcc for m32c-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-m32c-rtems4.11-gcc-libgcc
-libgcc m32c-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-m32c-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/m32c-rtems4.11-gcc.1*
-%{_mandir}/man1/m32c-rtems4.11-cpp.1*
-%{_mandir}/man1/m32c-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/m32c-rtems4.11-cpp%{_exeext}
-%{_bindir}/m32c-rtems4.11-gcc%{_exeext}
-%{_bindir}/m32c-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/m32c-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/m32c-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/m32c-rtems4.11
-%dir %{_libexecdir}/gcc/m32c-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/m32c-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/m32c-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/m32c-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/m32c-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-m32c-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/m32c-rtems4.11
-%dir %{_gcclibdir}/gcc/m32c-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/m32c-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/m32c-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/m32c-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-
-
-
-# ==============================================================
-# rtems-4.11-m32c-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-m32c-rtems4.11-newlib
-Summary:      	C Library (newlib) for m32c-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-m32c-rtems4.11-newlib
-Newlib C Library for m32c-rtems4.11.
-
-%files -n rtems-4.11-m32c-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/m32c-rtems4.11
-%{_exec_prefix}/m32c-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec
deleted file mode 100644
index 0476b03..0000000
--- a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,302 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-m32c-rtems4.11-gdb
-Summary:	Gdb for target m32c-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-%ifos mingw mingw32
-# Mingw lacks functions required by the m32c simulator
-%define build_sim --disable-sim
-%endif
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target m32c-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=m32c-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/m32c-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm32c-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/m32c-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/m32c-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/m32c-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# m32c-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-m32c-rtems4.11-gdb
-# Summary:      rtems gdb for m32c-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-m32c-rtems4.11-gdb
-GNU gdb targetting m32c-rtems4.11.
-
-%files -n rtems-4.11-m32c-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/m32c-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/m32c-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/m32c-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/m32r/Makefile.am b/contrib/crossrpms/rtems4.11/m32r/Makefile.am
deleted file mode 100644
index 7a05501..0000000
--- a/contrib/crossrpms/rtems4.11/m32r/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = m32r-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS +=
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/m32r/binutils-sources.add b/contrib/crossrpms/rtems4.11/m32r/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/m32r/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/m32r/cpukit-sources.add b/contrib/crossrpms/rtems4.11/m32r/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/m32r/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add b/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/m32r/gdb-sources.add b/contrib/crossrpms/rtems4.11/m32r/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/m32r/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
deleted file mode 100644
index 042ca8c..0000000
--- a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-m32r-rtems4.11-binutils
-Summary:	Binutils for target m32r-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target m32r-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=m32r-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m32r-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m32r-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m32r-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m32r-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m32r-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m32r-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m32r-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m32r-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# m32r-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-m32r-rtems4.11-binutils
-# Summary:      rtems binutils for m32r-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-m32r-rtems4.11-binutils
-GNU binutils targetting m32r-rtems4.11.
-
-%files -n rtems-4.11-m32r-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/m32r-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/m32r-rtems4.11-*
-
-%dir %{_exec_prefix}/m32r-rtems4.11
-%dir %{_exec_prefix}/m32r-rtems4.11/bin
-%{_exec_prefix}/m32r-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/m32r-rtems4.11/lib
-%{_exec_prefix}/m32r-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-cpukit.spec
deleted file mode 100644
index 09c5e4f..0000000
--- a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-m32r-rtems4.11-cpukit
-Summary:      	m32r-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-m32r-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for m32r-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=m32r-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32r-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m32r-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32r-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m32r-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-m32r-rtems4.11-cpukit
-RTEMS cpukit for target m32r-rtems4.11.
-
-%files -n rtems-4.11-m32r-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/m32r-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec
deleted file mode 100644
index 23badb2..0000000
--- a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,824 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-m32r-rtems4.11-gcc
-Summary:      	m32r-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-m32r-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-m32r-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-m32r-rtems4.11-binutils
-Requires:	rtems-4.11-m32r-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for m32r-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=m32r-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/m32r-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m32r-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/m32r-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/m32r-rtems4.11-m32r-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32r-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m32r-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/m32r-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/m32r-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/m32r-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/m32r-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/m32r-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/m32r-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32r-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32r-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32r-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32r-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-m32r-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-m32r-rtems4.11-gcc
-# Summary:        GNU cc compiler for m32r-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-m32r-rtems4.11-binutils
-# Requires:       rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-m32r-rtems4.11-gcc
-GNU cc compiler for m32r-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-m32r-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-m32r-rtems4.11-gcc-libgcc
-Summary:        libgcc for m32r-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-m32r-rtems4.11-gcc-libgcc
-libgcc m32r-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-m32r-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/m32r-rtems4.11-gcc.1*
-%{_mandir}/man1/m32r-rtems4.11-cpp.1*
-%{_mandir}/man1/m32r-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/m32r-rtems4.11-cpp%{_exeext}
-%{_bindir}/m32r-rtems4.11-gcc%{_exeext}
-%{_bindir}/m32r-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/m32r-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/m32r-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/m32r-rtems4.11
-%dir %{_libexecdir}/gcc/m32r-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/m32r-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/m32r-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/m32r-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/m32r-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-m32r-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/m32r-rtems4.11
-%dir %{_gcclibdir}/gcc/m32r-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/m32r-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/m32r-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/m32r-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-
-
-
-# ==============================================================
-# rtems-4.11-m32r-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-m32r-rtems4.11-newlib
-Summary:      	C Library (newlib) for m32r-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-m32r-rtems4.11-newlib
-Newlib C Library for m32r-rtems4.11.
-
-%files -n rtems-4.11-m32r-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/m32r-rtems4.11
-%{_exec_prefix}/m32r-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec
deleted file mode 100644
index d656d31..0000000
--- a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-m32r-rtems4.11-gdb
-Summary:	Gdb for target m32r-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target m32r-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=m32r-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/m32r-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm32r-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/m32r-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/m32r-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/m32r-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# m32r-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-m32r-rtems4.11-gdb
-# Summary:      rtems gdb for m32r-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-m32r-rtems4.11-gdb
-GNU gdb targetting m32r-rtems4.11.
-
-%files -n rtems-4.11-m32r-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/m32r-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/m32r-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/m32r-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/m68k/Makefile.am b/contrib/crossrpms/rtems4.11/m68k/Makefile.am
deleted file mode 100644
index db14a69..0000000
--- a/contrib/crossrpms/rtems4.11/m68k/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = m68k-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/m68k/binutils-sources.add b/contrib/crossrpms/rtems4.11/m68k/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/m68k/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/m68k/cpukit-sources.add b/contrib/crossrpms/rtems4.11/m68k/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/m68k/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/m68k/gcc-sources.add b/contrib/crossrpms/rtems4.11/m68k/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/m68k/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/m68k/gdb-sources.add b/contrib/crossrpms/rtems4.11/m68k/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/m68k/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
deleted file mode 100644
index a988abe..0000000
--- a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-m68k-rtems4.11-binutils
-Summary:	Binutils for target m68k-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target m68k-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=m68k-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m68k-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m68k-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m68k-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m68k-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m68k-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m68k-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m68k-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m68k-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# m68k-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-m68k-rtems4.11-binutils
-# Summary:      rtems binutils for m68k-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-m68k-rtems4.11-binutils
-GNU binutils targetting m68k-rtems4.11.
-
-%files -n rtems-4.11-m68k-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/m68k-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/m68k-rtems4.11-*
-
-%dir %{_exec_prefix}/m68k-rtems4.11
-%dir %{_exec_prefix}/m68k-rtems4.11/bin
-%{_exec_prefix}/m68k-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/m68k-rtems4.11/lib
-%{_exec_prefix}/m68k-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-cpukit.spec
deleted file mode 100644
index 25aa40c..0000000
--- a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-m68k-rtems4.11-cpukit
-Summary:      	m68k-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-m68k-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for m68k-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=m68k-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m68k-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m68k-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-m68k-rtems4.11-cpukit
-RTEMS cpukit for target m68k-rtems4.11.
-
-%files -n rtems-4.11-m68k-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/m68k-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
deleted file mode 100644
index 3d6d1f4..0000000
--- a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-m68k-rtems4.11-gcc
-Summary:      	m68k-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-m68k-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-m68k-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-m68k-rtems4.11-binutils
-Requires:	rtems-4.11-m68k-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for m68k-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=m68k-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/m68k-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/m68k-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/m68k-rtems4.11-m68k-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m68k-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/m68k-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/m68k-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/m68k-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/m68k-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-m68k-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-m68k-rtems4.11-gcc
-# Summary:        GNU cc compiler for m68k-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-m68k-rtems4.11-binutils
-# Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-m68k-rtems4.11-gcc
-GNU cc compiler for m68k-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-m68k-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-m68k-rtems4.11-gcc-libgcc
-Summary:        libgcc for m68k-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-m68k-rtems4.11-gcc-libgcc
-libgcc m68k-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-m68k-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/m68k-rtems4.11-gcc.1*
-%{_mandir}/man1/m68k-rtems4.11-cpp.1*
-%{_mandir}/man1/m68k-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/m68k-rtems4.11-cpp%{_exeext}
-%{_bindir}/m68k-rtems4.11-gcc%{_exeext}
-%{_bindir}/m68k-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/m68k-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/m68k-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/m68k-rtems4.11
-%dir %{_libexecdir}/gcc/m68k-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/m68k-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/m68k-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/m68k-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/m68k-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-m68k-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/m68k-rtems4.11
-%dir %{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-m68k-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-m68k-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for m68k-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-m68k-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-m68k-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-m68k-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-m68k-rtems4.11-gcc-c++
-GCC c++ compiler for m68k-rtems4.11.
-
-
-%package -n rtems-4.11-m68k-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for m68k-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-m68k-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-m68k-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/m68k-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/m68k-rtems4.11-c++%{_exeext}
-%{_bindir}/m68k-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/m68k-rtems4.11
-%dir %{_libexecdir}/gcc/m68k-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/m68k-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-m68k-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/m68k-rtems4.11
-%dir %{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/m68k-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-m68k-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-m68k-rtems4.11-newlib
-Summary:      	C Library (newlib) for m68k-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-m68k-rtems4.11-newlib
-Newlib C Library for m68k-rtems4.11.
-
-%files -n rtems-4.11-m68k-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/m68k-rtems4.11
-%{_exec_prefix}/m68k-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec
deleted file mode 100644
index f9b312e..0000000
--- a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-m68k-rtems4.11-gdb
-Summary:	Gdb for target m68k-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target m68k-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=m68k-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/m68k-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm68k-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/m68k-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/m68k-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/m68k-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# m68k-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-m68k-rtems4.11-gdb
-# Summary:      rtems gdb for m68k-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-m68k-rtems4.11-gdb
-GNU gdb targetting m68k-rtems4.11.
-
-%files -n rtems-4.11-m68k-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/m68k-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/m68k-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/m68k-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/mips/Makefile.am b/contrib/crossrpms/rtems4.11/mips/Makefile.am
deleted file mode 100644
index 102f581..0000000
--- a/contrib/crossrpms/rtems4.11/mips/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = mips-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/mips/binutils-sources.add b/contrib/crossrpms/rtems4.11/mips/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/mips/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/mips/cpukit-sources.add b/contrib/crossrpms/rtems4.11/mips/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/mips/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/mips/gcc-sources.add b/contrib/crossrpms/rtems4.11/mips/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/mips/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/mips/gdb-sources.add b/contrib/crossrpms/rtems4.11/mips/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/mips/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
deleted file mode 100644
index 308d38c..0000000
--- a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-mips-rtems4.11-binutils
-Summary:	Binutils for target mips-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target mips-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=mips-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/mips-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mips-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/mips-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mips-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/mips-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mips-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/mips-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mips-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# mips-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-mips-rtems4.11-binutils
-# Summary:      rtems binutils for mips-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-mips-rtems4.11-binutils
-GNU binutils targetting mips-rtems4.11.
-
-%files -n rtems-4.11-mips-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/mips-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/mips-rtems4.11-*
-
-%dir %{_exec_prefix}/mips-rtems4.11
-%dir %{_exec_prefix}/mips-rtems4.11/bin
-%{_exec_prefix}/mips-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/mips-rtems4.11/lib
-%{_exec_prefix}/mips-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-cpukit.spec
deleted file mode 100644
index 552303f..0000000
--- a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-mips-rtems4.11-cpukit
-Summary:      	mips-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-mips-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for mips-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=mips-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/mips-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/mips-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-mips-rtems4.11-cpukit
-RTEMS cpukit for target mips-rtems4.11.
-
-%files -n rtems-4.11-mips-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/mips-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec
deleted file mode 100644
index ae3a8a1..0000000
--- a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-mips-rtems4.11-gcc
-Summary:      	mips-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-mips-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-mips-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-mips-rtems4.11-binutils
-Requires:	rtems-4.11-mips-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for mips-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=mips-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/mips-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/mips-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/mips-rtems4.11-mips-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/mips-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/mips-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/mips-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/mips-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/mips-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-mips-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-mips-rtems4.11-gcc
-# Summary:        GNU cc compiler for mips-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-mips-rtems4.11-binutils
-# Requires:       rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-mips-rtems4.11-gcc
-GNU cc compiler for mips-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-mips-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-mips-rtems4.11-gcc-libgcc
-Summary:        libgcc for mips-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-mips-rtems4.11-gcc-libgcc
-libgcc mips-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-mips-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/mips-rtems4.11-gcc.1*
-%{_mandir}/man1/mips-rtems4.11-cpp.1*
-%{_mandir}/man1/mips-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/mips-rtems4.11-cpp%{_exeext}
-%{_bindir}/mips-rtems4.11-gcc%{_exeext}
-%{_bindir}/mips-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/mips-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/mips-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/mips-rtems4.11
-%dir %{_libexecdir}/gcc/mips-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/mips-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/mips-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/mips-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/mips-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-mips-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/mips-rtems4.11
-%dir %{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-mips-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-mips-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for mips-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-mips-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-mips-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-mips-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-mips-rtems4.11-gcc-c++
-GCC c++ compiler for mips-rtems4.11.
-
-
-%package -n rtems-4.11-mips-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for mips-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-mips-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-mips-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/mips-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/mips-rtems4.11-c++%{_exeext}
-%{_bindir}/mips-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/mips-rtems4.11
-%dir %{_libexecdir}/gcc/mips-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/mips-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-mips-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/mips-rtems4.11
-%dir %{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/mips-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-mips-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-mips-rtems4.11-newlib
-Summary:      	C Library (newlib) for mips-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-mips-rtems4.11-newlib
-Newlib C Library for mips-rtems4.11.
-
-%files -n rtems-4.11-mips-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/mips-rtems4.11
-%{_exec_prefix}/mips-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec
deleted file mode 100644
index 7e33b64..0000000
--- a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-mips-rtems4.11-gdb
-Summary:	Gdb for target mips-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target mips-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=mips-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/mips-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmips-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/mips-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/mips-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mips-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# mips-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-mips-rtems4.11-gdb
-# Summary:      rtems gdb for mips-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-mips-rtems4.11-gdb
-GNU gdb targetting mips-rtems4.11.
-
-%files -n rtems-4.11-mips-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/mips-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/mips-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/mips-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/mipstx39/Makefile.am b/contrib/crossrpms/rtems4.11/mipstx39/Makefile.am
deleted file mode 100644
index de19ad8..0000000
--- a/contrib/crossrpms/rtems4.11/mipstx39/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = mipstx39-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-# We only want a gdb with a tx39 simulator in it.  We share the other tools
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/mipstx39/gdb-sources.add b/contrib/crossrpms/rtems4.11/mipstx39/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/mipstx39/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec
deleted file mode 100644
index 9074512..0000000
--- a/contrib/crossrpms/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,302 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-mipstx39-rtems4.11-gdb
-Summary:	Gdb for target mipstx39-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-%ifos mingw mingw32
-# Mingw lacks functions required by the mipstx39 simulator
-%define build_sim --disable-sim
-%endif
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target mipstx39-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=mipstx39-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/mipstx39-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmipstx39-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/mipstx39-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/mipstx39-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mipstx39-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# mipstx39-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-mipstx39-rtems4.11-gdb
-# Summary:      rtems gdb for mipstx39-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-mipstx39-rtems4.11-gdb
-GNU gdb targetting mipstx39-rtems4.11.
-
-%files -n rtems-4.11-mipstx39-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/mipstx39-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/mipstx39-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/mipstx39-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/powerpc/Makefile.am b/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
deleted file mode 100644
index b6301d5..0000000
--- a/contrib/crossrpms/rtems4.11/powerpc/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = powerpc-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/powerpc/binutils-sources.add b/contrib/crossrpms/rtems4.11/powerpc/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/powerpc/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/powerpc/cpukit-sources.add b/contrib/crossrpms/rtems4.11/powerpc/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/powerpc/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/powerpc/gcc-sources.add b/contrib/crossrpms/rtems4.11/powerpc/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/powerpc/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/powerpc/gdb-sources.add b/contrib/crossrpms/rtems4.11/powerpc/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/powerpc/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
deleted file mode 100644
index f700a38..0000000
--- a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-powerpc-rtems4.11-binutils
-Summary:	Binutils for target powerpc-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target powerpc-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=powerpc-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/powerpc-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/powerpc-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/powerpc-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/powerpc-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/powerpc-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/powerpc-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/powerpc-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/powerpc-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# powerpc-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-powerpc-rtems4.11-binutils
-# Summary:      rtems binutils for powerpc-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-powerpc-rtems4.11-binutils
-GNU binutils targetting powerpc-rtems4.11.
-
-%files -n rtems-4.11-powerpc-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/powerpc-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/powerpc-rtems4.11-*
-
-%dir %{_exec_prefix}/powerpc-rtems4.11
-%dir %{_exec_prefix}/powerpc-rtems4.11/bin
-%{_exec_prefix}/powerpc-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/powerpc-rtems4.11/lib
-%{_exec_prefix}/powerpc-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-cpukit.spec
deleted file mode 100644
index 6a29dbe..0000000
--- a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-powerpc-rtems4.11-cpukit
-Summary:      	powerpc-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-powerpc-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for powerpc-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=powerpc-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/powerpc-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/powerpc-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-powerpc-rtems4.11-cpukit
-RTEMS cpukit for target powerpc-rtems4.11.
-
-%files -n rtems-4.11-powerpc-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/powerpc-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
deleted file mode 100644
index f20ba10..0000000
--- a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-powerpc-rtems4.11-gcc
-Summary:      	powerpc-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-powerpc-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-powerpc-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-powerpc-rtems4.11-binutils
-Requires:	rtems-4.11-powerpc-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for powerpc-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=powerpc-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/powerpc-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/powerpc-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/powerpc-rtems4.11-powerpc-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/powerpc-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/powerpc-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/powerpc-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/powerpc-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/powerpc-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-powerpc-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-powerpc-rtems4.11-gcc
-# Summary:        GNU cc compiler for powerpc-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-powerpc-rtems4.11-binutils
-# Requires:       rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-powerpc-rtems4.11-gcc
-GNU cc compiler for powerpc-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-powerpc-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-powerpc-rtems4.11-gcc-libgcc
-Summary:        libgcc for powerpc-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-powerpc-rtems4.11-gcc-libgcc
-libgcc powerpc-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-powerpc-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/powerpc-rtems4.11-gcc.1*
-%{_mandir}/man1/powerpc-rtems4.11-cpp.1*
-%{_mandir}/man1/powerpc-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/powerpc-rtems4.11-cpp%{_exeext}
-%{_bindir}/powerpc-rtems4.11-gcc%{_exeext}
-%{_bindir}/powerpc-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/powerpc-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/powerpc-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/powerpc-rtems4.11
-%dir %{_libexecdir}/gcc/powerpc-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/powerpc-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/powerpc-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/powerpc-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/powerpc-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-powerpc-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/powerpc-rtems4.11
-%dir %{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-powerpc-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-powerpc-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for powerpc-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-powerpc-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-powerpc-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-powerpc-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-powerpc-rtems4.11-gcc-c++
-GCC c++ compiler for powerpc-rtems4.11.
-
-
-%package -n rtems-4.11-powerpc-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for powerpc-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-powerpc-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-powerpc-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/powerpc-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/powerpc-rtems4.11-c++%{_exeext}
-%{_bindir}/powerpc-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/powerpc-rtems4.11
-%dir %{_libexecdir}/gcc/powerpc-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/powerpc-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-powerpc-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/powerpc-rtems4.11
-%dir %{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/powerpc-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-powerpc-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-powerpc-rtems4.11-newlib
-Summary:      	C Library (newlib) for powerpc-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-powerpc-rtems4.11-newlib
-Newlib C Library for powerpc-rtems4.11.
-
-%files -n rtems-4.11-powerpc-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/powerpc-rtems4.11
-%{_exec_prefix}/powerpc-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec
deleted file mode 100644
index bfeb914..0000000
--- a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,304 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-powerpc-rtems4.11-gdb
-Summary:	Gdb for target powerpc-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-%if "%{_build}" != "%{_host}"
-# psim doesn't support Cdn-X
-%global build_sim --disable-sim
-%else
-%global build_sim --enable-sim --enable-sim-trace
-%endif
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target powerpc-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=powerpc-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/powerpc-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpowerpc-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/powerpc-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/powerpc-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/powerpc-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# powerpc-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-powerpc-rtems4.11-gdb
-# Summary:      rtems gdb for powerpc-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-powerpc-rtems4.11-gdb
-GNU gdb targetting powerpc-rtems4.11.
-
-%files -n rtems-4.11-powerpc-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/powerpc-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/powerpc-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/powerpc-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/sh/Makefile.am b/contrib/crossrpms/rtems4.11/sh/Makefile.am
deleted file mode 100644
index 6f1db55..0000000
--- a/contrib/crossrpms/rtems4.11/sh/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = sh-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/sh/binutils-sources.add b/contrib/crossrpms/rtems4.11/sh/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/sh/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/sh/cpukit-sources.add b/contrib/crossrpms/rtems4.11/sh/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/sh/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/sh/gcc-sources.add b/contrib/crossrpms/rtems4.11/sh/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/sh/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/sh/gdb-sources.add b/contrib/crossrpms/rtems4.11/sh/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/sh/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
deleted file mode 100644
index 7ef3f83..0000000
--- a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-sh-rtems4.11-binutils
-Summary:	Binutils for target sh-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target sh-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=sh-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sh-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sh-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sh-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sh-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sh-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sh-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sh-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sh-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# sh-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-sh-rtems4.11-binutils
-# Summary:      rtems binutils for sh-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-sh-rtems4.11-binutils
-GNU binutils targetting sh-rtems4.11.
-
-%files -n rtems-4.11-sh-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sh-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/sh-rtems4.11-*
-
-%dir %{_exec_prefix}/sh-rtems4.11
-%dir %{_exec_prefix}/sh-rtems4.11/bin
-%{_exec_prefix}/sh-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/sh-rtems4.11/lib
-%{_exec_prefix}/sh-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-cpukit.spec
deleted file mode 100644
index 3e52f9e..0000000
--- a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-sh-rtems4.11-cpukit
-Summary:      	sh-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-sh-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for sh-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=sh-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/sh-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/sh-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-sh-rtems4.11-cpukit
-RTEMS cpukit for target sh-rtems4.11.
-
-%files -n rtems-4.11-sh-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/sh-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec
deleted file mode 100644
index 1253c91..0000000
--- a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-sh-rtems4.11-gcc
-Summary:      	sh-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-sh-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-sh-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-sh-rtems4.11-binutils
-Requires:	rtems-4.11-sh-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for sh-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=sh-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/sh-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/sh-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/sh-rtems4.11-sh-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sh-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/sh-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/sh-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/sh-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/sh-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-sh-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-sh-rtems4.11-gcc
-# Summary:        GNU cc compiler for sh-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-sh-rtems4.11-binutils
-# Requires:       rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-sh-rtems4.11-gcc
-GNU cc compiler for sh-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-sh-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-sh-rtems4.11-gcc-libgcc
-Summary:        libgcc for sh-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-sh-rtems4.11-gcc-libgcc
-libgcc sh-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-sh-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sh-rtems4.11-gcc.1*
-%{_mandir}/man1/sh-rtems4.11-cpp.1*
-%{_mandir}/man1/sh-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/sh-rtems4.11-cpp%{_exeext}
-%{_bindir}/sh-rtems4.11-gcc%{_exeext}
-%{_bindir}/sh-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/sh-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/sh-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sh-rtems4.11
-%dir %{_libexecdir}/gcc/sh-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/sh-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/sh-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/sh-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/sh-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-sh-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/sh-rtems4.11
-%dir %{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-sh-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-sh-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for sh-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-sh-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-sh-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-sh-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-sh-rtems4.11-gcc-c++
-GCC c++ compiler for sh-rtems4.11.
-
-
-%package -n rtems-4.11-sh-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for sh-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-sh-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-sh-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sh-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/sh-rtems4.11-c++%{_exeext}
-%{_bindir}/sh-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sh-rtems4.11
-%dir %{_libexecdir}/gcc/sh-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/sh-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-sh-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/sh-rtems4.11
-%dir %{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/sh-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-sh-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-sh-rtems4.11-newlib
-Summary:      	C Library (newlib) for sh-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-sh-rtems4.11-newlib
-Newlib C Library for sh-rtems4.11.
-
-%files -n rtems-4.11-sh-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/sh-rtems4.11
-%{_exec_prefix}/sh-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec
deleted file mode 100644
index b7f837f..0000000
--- a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-sh-rtems4.11-gdb
-Summary:	Gdb for target sh-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target sh-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=sh-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/sh-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsh-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/sh-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/sh-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/sh-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# sh-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-sh-rtems4.11-gdb
-# Summary:      rtems gdb for sh-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-sh-rtems4.11-gdb
-GNU gdb targetting sh-rtems4.11.
-
-%files -n rtems-4.11-sh-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/sh-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sh-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/sh-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/sparc/Makefile.am b/contrib/crossrpms/rtems4.11/sparc/Makefile.am
deleted file mode 100644
index 0f32ebd..0000000
--- a/contrib/crossrpms/rtems4.11/sparc/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = sparc-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.10.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-# include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/sparc/binutils-sources.add b/contrib/crossrpms/rtems4.11/sparc/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/sparc/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/sparc/cpukit-sources.add b/contrib/crossrpms/rtems4.11/sparc/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/sparc/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/sparc/gcc-sources.add b/contrib/crossrpms/rtems4.11/sparc/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/sparc/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/sparc/gdb-sources.add b/contrib/crossrpms/rtems4.11/sparc/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/sparc/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
deleted file mode 100644
index cdf9a68..0000000
--- a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-sparc-rtems4.11-binutils
-Summary:	Binutils for target sparc-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target sparc-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=sparc-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# sparc-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-sparc-rtems4.11-binutils
-# Summary:      rtems binutils for sparc-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-sparc-rtems4.11-binutils
-GNU binutils targetting sparc-rtems4.11.
-
-%files -n rtems-4.11-sparc-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sparc-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/sparc-rtems4.11-*
-
-%dir %{_exec_prefix}/sparc-rtems4.11
-%dir %{_exec_prefix}/sparc-rtems4.11/bin
-%{_exec_prefix}/sparc-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/sparc-rtems4.11/lib
-%{_exec_prefix}/sparc-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-cpukit.spec b/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-cpukit.spec
deleted file mode 100644
index 0b0f5ce..0000000
--- a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-sparc-rtems4.11-cpukit
-Summary:      	sparc-rtems4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-sparc-rtems4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for sparc-rtems4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=sparc-rtems4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/sparc-rtems4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/sparc-rtems4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-sparc-rtems4.11-cpukit
-RTEMS cpukit for target sparc-rtems4.11.
-
-%files -n rtems-4.11-sparc-rtems4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/sparc-rtems4.11
-# Violates the FHS
-%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec
deleted file mode 100644
index fccee6e..0000000
--- a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-sparc-rtems4.11-gcc
-Summary:      	sparc-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-sparc-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-sparc-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-sparc-rtems4.11-binutils
-Requires:	rtems-4.11-sparc-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for sparc-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=sparc-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/sparc-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-rtems4.11-sparc-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sparc-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/sparc-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/sparc-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/sparc-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/sparc-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-sparc-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-sparc-rtems4.11-gcc
-# Summary:        GNU cc compiler for sparc-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-sparc-rtems4.11-binutils
-# Requires:       rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-sparc-rtems4.11-gcc
-GNU cc compiler for sparc-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-sparc-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-sparc-rtems4.11-gcc-libgcc
-Summary:        libgcc for sparc-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-sparc-rtems4.11-gcc-libgcc
-libgcc sparc-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-sparc-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sparc-rtems4.11-gcc.1*
-%{_mandir}/man1/sparc-rtems4.11-cpp.1*
-%{_mandir}/man1/sparc-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/sparc-rtems4.11-cpp%{_exeext}
-%{_bindir}/sparc-rtems4.11-gcc%{_exeext}
-%{_bindir}/sparc-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/sparc-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/sparc-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sparc-rtems4.11
-%dir %{_libexecdir}/gcc/sparc-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/sparc-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/sparc-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/sparc-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/sparc-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-sparc-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/sparc-rtems4.11
-%dir %{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-sparc-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-sparc-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for sparc-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-sparc-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-sparc-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-sparc-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-sparc-rtems4.11-gcc-c++
-GCC c++ compiler for sparc-rtems4.11.
-
-
-%package -n rtems-4.11-sparc-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for sparc-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-sparc-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-sparc-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sparc-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/sparc-rtems4.11-c++%{_exeext}
-%{_bindir}/sparc-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sparc-rtems4.11
-%dir %{_libexecdir}/gcc/sparc-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/sparc-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-sparc-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/sparc-rtems4.11
-%dir %{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/sparc-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-sparc-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-sparc-rtems4.11-newlib
-Summary:      	C Library (newlib) for sparc-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-sparc-rtems4.11-newlib
-Newlib C Library for sparc-rtems4.11.
-
-%files -n rtems-4.11-sparc-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/sparc-rtems4.11
-%{_exec_prefix}/sparc-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec
deleted file mode 100644
index 437d7f5..0000000
--- a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,302 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-sparc-rtems4.11-gdb
-Summary:	Gdb for target sparc-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-%ifos mingw mingw32
-# Mingw lacks functions required by the sparc simulator
-%define build_sim --disable-sim
-%endif
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target sparc-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=sparc-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/sparc-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsparc-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/sparc-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/sparc-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/sparc-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# sparc-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-sparc-rtems4.11-gdb
-# Summary:      rtems gdb for sparc-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-sparc-rtems4.11-gdb
-GNU gdb targetting sparc-rtems4.11.
-
-%files -n rtems-4.11-sparc-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/sparc-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sparc-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/sparc-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/rtems4.11/sparc64/Makefile.am b/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
deleted file mode 100644
index afb57d6..0000000
--- a/contrib/crossrpms/rtems4.11/sparc64/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-rtems_api = 4.11
-TARGET = sparc64-rtems4.11
-
-include $(top_srcdir)/mkspec.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.6.2
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 4
-NEWLIB_VERS = 1.19.0
-NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 19`
-include ../gcc.am
-GCC_OPTS += --languages=cxx
-
-GDB_VERS = 7.3.91
-GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-include ../gdb.am
-GDB_OPTS +=
-
-# CPUKIT_VERS = 4.9.99.0
-# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
-# CPUKIT_RPMREL = 1
-#include ../cpukit.am
-# CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.11/sparc64/binutils-sources.add b/contrib/crossrpms/rtems4.11/sparc64/binutils-sources.add
deleted file mode 100644
index 59a4e09..0000000
--- a/contrib/crossrpms/rtems4.11/sparc64/binutils-sources.add
+++ /dev/null
@@ -1,4 +0,0 @@
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/sparc64/cpukit-sources.add b/contrib/crossrpms/rtems4.11/sparc64/cpukit-sources.add
deleted file mode 100644
index eca5433..0000000
--- a/contrib/crossrpms/rtems4.11/sparc64/cpukit-sources.add
+++ /dev/null
@@ -1 +0,0 @@
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
diff --git a/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add b/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add
deleted file mode 100644
index 459069a..0000000
--- a/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add
+++ /dev/null
@@ -1,41 +0,0 @@
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if %build_cxx
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-
-%endif
-%if %build_newlib
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-%endif
diff --git a/contrib/crossrpms/rtems4.11/sparc64/gdb-sources.add b/contrib/crossrpms/rtems4.11/sparc64/gdb-sources.add
deleted file mode 100644
index c8f9e27..0000000
--- a/contrib/crossrpms/rtems4.11/sparc64/gdb-sources.add
+++ /dev/null
@@ -1,12 +0,0 @@
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
diff --git a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
deleted file mode 100644
index 3045b9e..0000000
--- a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		rtems-4.11-sparc64-rtems4.11-binutils
-Summary:	Binutils for target sparc64-rtems4.11
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Requires:	rtems-4.11-binutils-common
-
-Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-%if "%{binutils_version}" == "2.21"
-Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
-%endif
-
-%description
-Cross binutils for target sparc64-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=sparc64-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-    install-info
-
-# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# binutils does not install share/locale, however it uses it
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc64-rtems4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc64-rtems4.11-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc64-rtems4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc64-rtems4.11-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc64-rtems4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc64-rtems4.11-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc64-rtems4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc64-rtems4.11-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# sparc64-rtems4.11-binutils
-# ==============================================================
-# %package -n rtems-4.11-sparc64-rtems4.11-binutils
-# Summary:      rtems binutils for sparc64-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-binutils-common
-# %endif
-
-%description -n rtems-4.11-sparc64-rtems4.11-binutils
-GNU binutils targetting sparc64-rtems4.11.
-
-%files -n rtems-4.11-sparc64-rtems4.11-binutils
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sparc64-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/sparc64-rtems4.11-*
-
-%dir %{_exec_prefix}/sparc64-rtems4.11
-%dir %{_exec_prefix}/sparc64-rtems4.11/bin
-%{_exec_prefix}/sparc64-rtems4.11/bin/*
-
-%dir %{_exec_prefix}/sparc64-rtems4.11/lib
-%{_exec_prefix}/sparc64-rtems4.11/lib/ldscripts
-# ==============================================================
-# rtems-4.11-binutils-common
-# ==============================================================
-%package -n rtems-4.11-binutils-common
-Summary:      Base package for RTEMS binutils
-Group: Development/Tools
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-binutils-common
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the base for binutils regardless of target CPU.
-
-%post -n rtems-4.11-binutils-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-
-%preun -n rtems-4.11-binutils-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
-fi
-
-%files -n rtems-4.11-binutils-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/as.info*
-%{_infodir}/bfd.info*
-%{_infodir}/binutils.info*
-%{_infodir}/ld.info*
-%{_infodir}/standards.info*
-%{_infodir}/gprof.info*
-
-%dir %{_prefix}/share
-%dir %{_prefix}/share/locale
-
diff --git a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec
deleted file mode 100644
index 82ded3e..0000000
--- a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec
+++ /dev/null
@@ -1,897 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.6.2
-%define gcc_version 4.6.2
-%define gcc_rpmvers %{expand:%(echo "4.6.2" | tr - _ )}
-
-%define newlib_pkgvers		1.19.0
-%define newlib_version		1.19.0
-
-Name:         	rtems-4.11-sparc64-rtems4.11-gcc
-Summary:      	sparc64-rtems4.11 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	4%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-# FIXME: Disable lto for now, to avoid dependencies on libelf
-%bcond_with lto
-
-# FIXME: Disable python gdb scripts
-# ATM, no idea how to package them
-%bcond_with pygdb
-
-# FIXME: Disable GCC-plugin
-# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
-%bcond_with plugin
-
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
-# Should be applicable to gcc >= 4.5.0
-%bcond_with gcc_stdint
-
-# EXPERIMENTAL: Enable newlib's iconv
-%bcond_without iconv
-
-# versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
-%global libelf_version  0.8.13
-
-# versions of libraries these distros are known to ship
-%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc14}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el6}
-%global mpc_provided %{nil}
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?el5}
-%global mpc_provided %{nil}
-%global mpfr_provided %{nil}
-%global gmp_provided 4.1.4
-%endif
-
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
-%if 0%{?suse11_3}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
-%if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
-%endif
-
-%if 0%{?mingw32}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%define gmp_required		4.1
-%define mpfr_required		2.3.1
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define cloog_required 		0.15
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define mpfr_required		2.3.2
-%endif
-
-%if "%{gcc_version}" >= "4.5.0"
-%define mpc_required 		0.8
-%if %{with lto}
-%define libelf_required 	0.8.12
-%endif
-%endif
-
-%if %{defined mpc_required}
-%if "%{mpc_provided}" >= "%{mpc_required}"
-%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
-%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
-%endif
-%else
-%define _build_mpc 1
-%define gmp_required 		4.2
-%endif
-%endif
-
-%if %{defined gmp_required}
-%if "%{gmp_provided}" >= "%{gmp_required}"
-BuildRequires: gmp-devel >= %{gmp_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
-%endif
-%else
-%define _build_gmp 1
-%endif
-%endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
-%endif
-%else
-%define _build_libelf 1
-%endif
-%endif
-
-
-%if %{defined cloog_required}
-%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%endif
-
-
-%if %{defined mpfr_required}
-%if "%{mpfr_provided}" >= "%{mpfr_required}"
-BuildRequires: mpfr-devel >= %{mpfr_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
-%endif
-%else
-%define _build_mpfr 1
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-sparc64-rtems4.11-gcc = %{gcc_rpmvers}
-%endif
-
-# Not strictly required, but patches may introduce a need to use them.
-# For reasons of simplicity, always require them.
-BuildRequires:	flex bison
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	rtems-4.11-sparc64-rtems4.11-binutils
-
-Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-sparc64-rtems4.11-binutils
-Requires:	rtems-4.11-sparc64-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-
-%if "%{gcc_version}" >= "4.5.0"
-BuildRequires:  zlib-devel
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}zlib-devel
-%endif
-%else
-%endif
-
-%global _gcclibdir %{_prefix}/lib
-
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20111124.diff
-%endif
-%if "%{gcc_version}" == "4.5.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.3" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
-%endif
-
-%if "%{newlib_version}" == "1.19.0"
-Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.19.0-rtems4.11-20111006.diff
-%endif
-
-%if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%if 0%{?_build_mpc}
-Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%endif
-
-%if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%endif
-
-%if 0%{?_build_libelf}
-Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
-%endif
-
-%description
-Cross gcc for sparc64-rtems4.11.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-cd gcc-%{gcc_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%{?SOURCE1:%setup -q -T -D -n %{name}-%{version} -a1}
-cd gcc-%{gcc_pkgvers}
-%{?PATCH1:%patch1 -p1}
-cd ..
-
-
-
-
-
-%if %{with gcc_stdint}
-sed -i -e '/thread_file=.*rtems/,/use_gcc_stdint=wrap/ { s/use_gcc_stdint=wrap/use_gcc_stdint=provide/}' gcc-%{gcc_pkgvers}/gcc/config.gcc
-%endif
-
-%setup -q -T -D -n %{name}-%{version} -a50
-cd newlib-%{newlib_version}
-%{?PATCH50:%patch50 -p1}
-cd ..
-  # Copy the C library into gcc's source tree
-  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
-%if %{with gcc_stdint}
-  rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h
-%endif
-  # Make sure not to be using GPL'ed sources
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux
-  rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-%if 0%{?_build_mpc}
-%setup -q -T -D -n %{name}-%{version} -a61
-%{?PATCH61:%patch61 -p1}
-  # Build mpc one-tree style
-  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
-%endif
-
-%if 0%{?_build_gmp}
-%setup -q -T -D -n %{name}-%{version} -a62
-%{?PATCH62:%patch62 -p1}
-  # Build gmp one-tree style
-  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
-%endif
-
-%if 0%{?_build_libelf}
-%setup -q -T -D -n %{name}-%{version} -a63
-%{?PATCH63:%patch63 -p1}
-  # Build libelf one-tree style
-  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
-%endif
-
-echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-23%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  export PATH="%{_bindir}:${PATH}"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=sparc64-rtems4.11 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-newlib \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
-    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
-    --enable-newlib-io-c99-formats \
-    %{?with_iconv:--enable-newlib-iconv} \
-    --enable-languages="$languages"
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  cd build/sparc64-rtems4.11/newlib
-  make DESTDIR=$RPM_BUILD_ROOT install-info
-  cd ../../..
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/sparc64-rtems4.11-c++filt%{_exeext}
-
-
-  # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-  # We don't want libffi's man-pages
-  rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/sparc64-rtems4.11-sparc64-rtems4.11-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sparc64-rtems4.11/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/sparc64-rtems4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/sparc64-rtems4.11/include/bits
-  fi
-
-%if %{with iconv}
-  # Iconv enabled newlib installs external ccts (target files)
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/iconv_data; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/iconv_data
-  fi
-%endif
-
-%if ! %{with pygdb}
-  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
-  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
-    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
-  fi
-
-%endif
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-  echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/sparc64-rtems4.11/lib"
-  for i in $multilibs; do
-    case $i in
-    \.) echo "%dir ${TGTDIR}" >> build/files.newlib
-      ;;
-    *)  echo "%dir ${TGTDIR}/$i" >> build/files.newlib
-      ;;
-    esac
-  done
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-  cp dirs build/files.go
-
-  TGTDIR="%{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *go1) ;; # ignore: explicitly put into rpm elsewhere
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    */go/*) ;; # ignore : explicitly put into rpm elsewhere
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libgo.*) echo "$i" >> build/files.go ;;
-    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
-    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/sparc64-rtems4.11/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc64-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc64-rtems4.11/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc64-rtems4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc64-rtems4.11/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# rtems-4.11-sparc64-rtems4.11-gcc
-# ==============================================================
-# %package -n rtems-4.11-sparc64-rtems4.11-gcc
-# Summary:        GNU cc compiler for sparc64-rtems4.11
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-sparc64-rtems4.11-binutils
-# Requires:       rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-# License:	GPL
-
-# %if %build_infos
-# Requires:      rtems-4.11-gcc-common
-# %endif
-
-%description -n rtems-4.11-sparc64-rtems4.11-gcc
-GNU cc compiler for sparc64-rtems4.11.
-
-# ==============================================================
-# rtems-4.11-sparc64-rtems4.11-gcc-libgcc
-# ==============================================================
-%package -n rtems-4.11-sparc64-rtems4.11-gcc-libgcc
-Summary:        libgcc for sparc64-rtems4.11-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-23%{?dist}
-License:	GPL
-
-%description -n rtems-4.11-sparc64-rtems4.11-gcc-libgcc
-libgcc sparc64-rtems4.11-gcc.
-
-
-%files -n rtems-4.11-sparc64-rtems4.11-gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sparc64-rtems4.11-gcc.1*
-%{_mandir}/man1/sparc64-rtems4.11-cpp.1*
-%{_mandir}/man1/sparc64-rtems4.11-gcov.1*
-
-%dir %{_bindir}
-%{_bindir}/sparc64-rtems4.11-cpp%{_exeext}
-%{_bindir}/sparc64-rtems4.11-gcc%{_exeext}
-%{_bindir}/sparc64-rtems4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/sparc64-rtems4.11-gcov%{_exeext}
-%if "%{gcc_version}" < "4.6.0"
-%{_bindir}/sparc64-rtems4.11-gccbug
-%endif
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sparc64-rtems4.11
-%dir %{_libexecdir}/gcc/sparc64-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/sparc64-rtems4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/sparc64-rtems4.11/%{gcc_version}/collect2%{_exeext}
-%if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/sparc64-rtems4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/sparc64-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
-%endif
-
-%files -n rtems-4.11-sparc64-rtems4.11-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/sparc64-rtems4.11
-%dir %{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}/include/ssp
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# rtems-4.11-gcc-common
-# ==============================================================
-%package -n rtems-4.11-gcc-common
-Summary:	Base package for rtems gcc and newlib C Library
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-gcc-common
-GCC files that are shared by all targets.
-
-%files -n rtems-4.11-gcc-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
-%{_infodir}/gcc.info*
-%{_infodir}/gccint.info*
-%{_infodir}/gccinstall.info*
-%if "%{gcc_version}" >= "4.6.0"
-%{_infodir}/libquadmath.info*
-%endif
-
-%dir %{_mandir}
-%dir %{_mandir}/man7
-%{_mandir}/man7/fsf-funding.7*
-%{_mandir}/man7/gfdl.7*
-%{_mandir}/man7/gpl.7*
-
-%post -n rtems-4.11-gcc-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-
-%preun -n rtems-4.11-gcc-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-fi
-
-# ==============================================================
-# rtems-4.11-sparc64-rtems4.11-gcc-c++
-# ==============================================================
-%package -n rtems-4.11-sparc64-rtems4.11-gcc-c++
-Summary:	GCC c++ compiler for sparc64-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       rtems-4.11-sparc64-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-sparc64-rtems4.11-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-sparc64-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n rtems-4.11-sparc64-rtems4.11-gcc-c++
-GCC c++ compiler for sparc64-rtems4.11.
-
-
-%package -n rtems-4.11-sparc64-rtems4.11-gcc-libstdc++
-Summary:	libstdc++ for sparc64-rtems4.11
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n rtems-4.11-sparc64-rtems4.11-gcc-libstdc++
-%{summary}
-
-
-%files -n rtems-4.11-sparc64-rtems4.11-gcc-c++
-%defattr(-,root,root)
-%dir %{_prefix}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sparc64-rtems4.11-g++.1*
-
-%dir %{_bindir}
-%{_bindir}/sparc64-rtems4.11-c++%{_exeext}
-%{_bindir}/sparc64-rtems4.11-g++%{_exeext}
-
-%dir %{_libexecdir}
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sparc64-rtems4.11
-%dir %{_libexecdir}/gcc/sparc64-rtems4.11/%{gcc_version}
-%{_libexecdir}/gcc/sparc64-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n rtems-4.11-sparc64-rtems4.11-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/sparc64-rtems4.11
-%dir %{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/sparc64-rtems4.11/%{gcc_version}/include/c++
-
-
-
-# ==============================================================
-# rtems-4.11-sparc64-rtems4.11-newlib
-# ==============================================================
-%package -n rtems-4.11-sparc64-rtems4.11-newlib
-Summary:      	C Library (newlib) for sparc64-rtems4.11
-Group: 		Development/Tools
-License:	Distributable
-Version:	%{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-Requires:	rtems-4.11-newlib-common
-
-%description -n rtems-4.11-sparc64-rtems4.11-newlib
-Newlib C Library for sparc64-rtems4.11.
-
-%files -n rtems-4.11-sparc64-rtems4.11-newlib -f build/files.newlib
-%defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_exec_prefix}/sparc64-rtems4.11
-%{_exec_prefix}/sparc64-rtems4.11/include
-
-# ==============================================================
-# rtems-4.11-newlib-common
-# ==============================================================
-%package -n rtems-4.11-newlib-common
-Summary:	Base package for RTEMS newlib C Library
-Group:          Development/Tools
-Version:        %{newlib_version}
-Release:        23%{?dist}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	Distributable
-
-Requires(post): 	/sbin/install-info
-Requires(preun):	/sbin/install-info
-
-%description -n rtems-4.11-newlib-common
-newlib files that are shared by all targets.
-
-%files -n rtems-4.11-newlib-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/libc.info*
-%{_infodir}/libm.info*
-
-%post -n rtems-4.11-newlib-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-
-%preun -n rtems-4.11-newlib-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
-fi
-
diff --git a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec
deleted file mode 100644
index 96a8b72..0000000
--- a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define gdb_version 7.3.91
-%define gdb_rpmvers %{expand:%(echo 7.3.91 | tr - _)} 
-
-Name:		rtems-4.11-sparc64-rtems4.11-gdb
-Summary:	Gdb for target sparc64-rtems4.11
-Group:		Development/Tools
-Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/gdb
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%global build_sim --enable-sim
-
-# Whether to build against system readline
-# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
-# gdb >= 7.3.91 requires readline6
-# EL5's readline is too old
-%{?el5:%bcond_with system_readline}
-%{!?el5:%bcond_without system_readline}
-%else
-%bcond_without system_readline
-%endif
-
-# Whether to build python support
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-# suse
-%if "%{?suse}" >= "10.3"
-BuildRequires: libexpat-devel
-%else
-# Fedora/CentOS/Cygwin/MinGW
-BuildRequires: %{_host_rpmprefix}expat-devel
-%endif
-
-%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
-BuildRequires:  %{_host_rpmprefix}ncurses-devel
-
-# Required for building the infos
-BuildRequires:	/sbin/install-info
-BuildRequires:	texinfo >= 4.2
-Requires:	rtems-4.11-gdb-common
-
-%if "%{gdb_version}" == "7.3.91"
-Source0:  ftp://sourceware.org/pub/gdb/snapshots/branch/gdb/gdb-7.3.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.91-rtems4.11-20111213.diff
-%endif
-%if "%{gdb_version}" == "7.3.1"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.3.1-rtems4.11-20110905.diff
-%endif
-%if "%{gdb_version}" == "7.2"
-Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
-%endif
-
-%description
-GDB for target sparc64-rtems4.11
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd gdb-%{gdb_version}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-# Force using a system-provided libreadline
-%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../gdb-%{gdb_version}/configure \
-    --build=%_build --host=%_host \
-    --target=sparc64-rtems4.11 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    %{build_sim} \
-    %{?with_system_readline:--with-system-readline} \
-    --with-expat \
-    %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/sparc64-rtems4.11-gdb \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  make info
-  cd ..
-
-%install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  touch $RPM_BUILD_ROOT%{_infodir}/dir
-
-# These come from other packages
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
-  rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsparc64-rtems4.11-sim.a
-
-# Bug in gdb-7.0, bogusly installs linux-only files
-  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/sparc64-rtems4.11-gdb/syscalls/*.xml; do
-    case $f in
-    *linux.xml) rm -f $f;;
-    *.xml) somethinguseful=1;;
-    esac
-  done
-  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/sparc64-rtems4.11-gdb/syscalls"
-  fi
-
-%if "{gdb_version}" >= "7.3"
-%if ! %{with python}
-# gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/sparc64-rtems4.11-gdb/python
-%endif
-%endif
-
-%if "%{gdb_version}" == "7.3.91"
-# gdb-7.3.91, installs host files, we don't want
-  rm ${RPM_BUILD_ROOT}%{_includedir}/gdb/jit-reader.h
-%endif
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# sparc64-rtems4.11-gdb
-# ==============================================================
-# %package -n rtems-4.11-sparc64-rtems4.11-gdb
-# Summary:      rtems gdb for sparc64-rtems4.11
-# Group: Development/Tools
-# %if %build_infos
-# Requires: rtems-4.11-gdb-common
-# %endif
-
-%description -n rtems-4.11-sparc64-rtems4.11-gdb
-GNU gdb targetting sparc64-rtems4.11.
-
-%files -n rtems-4.11-sparc64-rtems4.11-gdb
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-%{?with_python:%{_datadir}/sparc64-rtems4.11-gdb}
-
-%dir %{_mandir}
-%dir %{_mandir}/man1
-%{_mandir}/man1/sparc64-rtems4.11-*.1*
-
-%dir %{_bindir}
-%{_bindir}/sparc64-rtems4.11-*
-
-# ==============================================================
-# rtems-4.11-gdb-common
-# ==============================================================
-%package -n rtems-4.11-gdb-common
-Summary:      Base package for RTEMS gdbs
-Group: Development/Tools
-Requires(post):		/sbin/install-info
-Requires(preun):	/sbin/install-info
-%{?_with_noarch_subpackages:BuildArch: noarch}
-
-%description -n rtems-4.11-gdb-common
-
-GDB files shared by all targets.
-
-%post -n rtems-4.11-gdb-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-
-%preun -n rtems-4.11-gdb-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-fi
-
-%files -n rtems-4.11-gdb-common
-%defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_prefix}/share
-
-%dir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/gdb.info*
-
-%{_infodir}/gdbint.info*
-%{_infodir}/stabs.info*
-%{_infodir}/annotate.info*
-
diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am
deleted file mode 100644
index b34d2a3..0000000
--- a/contrib/crossrpms/solaris2.7/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-SUBDIRS = sparc
diff --git a/contrib/crossrpms/solaris2.7/binutils.am b/contrib/crossrpms/solaris2.7/binutils.am
deleted file mode 100644
index 4fcdb65..0000000
--- a/contrib/crossrpms/solaris2.7/binutils.am
+++ /dev/null
@@ -1,30 +0,0 @@
-EXTRA_DIST += binutils-sources.add
-
-BINUTILS_OPTS =
-
-BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add
-BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add
-
-$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add
-	cat $(BINUTILS_SUBPACKAGES) | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \
-	  | $(MKSPEC0) > $(TARGET)-binutils.spec.in
-CLEANFILES += $(TARGET)-binutils.spec.in
-
-$(rpmprefix)$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
-	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@
-CLEANFILES += $(rpmprefix)$(TARGET)-binutils.spec
-noinst_DATA += $(rpmprefix)$(TARGET)-binutils.spec
-
-EXTRA_DIST += $(BINUTILS_SUBPACKAGES)
diff --git a/contrib/crossrpms/solaris2.7/gcc-prep.add b/contrib/crossrpms/solaris2.7/gcc-prep.add
deleted file mode 100644
index e69de29..0000000
diff --git a/contrib/crossrpms/solaris2.7/gcc.am b/contrib/crossrpms/solaris2.7/gcc.am
deleted file mode 100644
index 466d72e..0000000
--- a/contrib/crossrpms/solaris2.7/gcc.am
+++ /dev/null
@@ -1,42 +0,0 @@
-EXTRA_DIST += $(srcdir)/../gcc-prep.add
-EXTRA_DIST += $(srcdir)/gcc-sources.add
-
-GCC_OPTS =
-
-GCC_SUBPACKAGES = $(top_srcdir)/common/common.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
-GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
-	cat $(GCC_SUBPACKAGES) \
-	  | sed \
-	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-	  -e "/[@]SOURCES[@]/d" \
-	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-	  -e "/[@]PREP[@]/d" \
-	  | sed \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
-	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "/--with-newlib/d" \
-	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
-CLEANFILES += $(TARGET)-gcc.spec.in
-
- at rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
-	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
-
-EXTRA_DIST += $(GCC_SUBPACKAGES)
diff --git a/contrib/crossrpms/solaris2.7/libs.am b/contrib/crossrpms/solaris2.7/libs.am
deleted file mode 100644
index b0fc492..0000000
--- a/contrib/crossrpms/solaris2.7/libs.am
+++ /dev/null
@@ -1,18 +0,0 @@
-LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add
-LIBS_SUBPACKAGES += $(srcdir)/libs.add
-LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
-LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add
-LIBS_SUBPACKAGES += $(srcdir)/target-libs.add
-
-$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
-	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s/[@]SOLARIS_VERS[@]/$(SOLARIS_VERS)/g" \
-	  -e "s/[@]SOLARIS_RPMREL[@]/$(SOLARIS_RPMREL)%{?dist}/g" \
-	  -e "s,%{gcc_rpmvers},%{solaris_rpmvers},g" \
-	> $(TARGET)-libs.spec.in
-CLEANFILES += $(TARGET)-libs.spec.in
-	                      
-$(rpmprefix)$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
-	$(MKSPEC) $(TARGET)-libs.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += $(rpmprefix)$(TARGET)-libs.spec
-noinst_DATA += $(rpmprefix)$(TARGET)-libs.spec
diff --git a/contrib/crossrpms/solaris2.7/sparc/Makefile.am b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
deleted file mode 100644
index f78aaa1..0000000
--- a/contrib/crossrpms/solaris2.7/sparc/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-TARGET = sparc-sun-solaris2.7
-
-include $(top_srcdir)/mkspec.am
-
-SOLARIS_VERS = 2.7
-SOLARIS_RPMREL = 0.20091130.1
-EXTRA_DIST += libs.add
-EXTRA_DIST += target-libs.add
-include ../libs.am
-
-BINUTILS_VERS = 2.22
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 0.20111122.0
-include ../binutils.am
-BINUTILS_OPTS +=
-
-GCC_VERS = 4.4.6
-GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20111123.0
-include ../gcc.am
-GCC_OPTS += --languages=c,cxx,fortran,objc
diff --git a/contrib/crossrpms/solaris2.7/sparc/binutils-sources.add b/contrib/crossrpms/solaris2.7/sparc/binutils-sources.add
deleted file mode 100644
index c583b4c..0000000
--- a/contrib/crossrpms/solaris2.7/sparc/binutils-sources.add
+++ /dev/null
@@ -1,2 +0,0 @@
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-# Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/binutils-2.19-rtems4.10-20081023.diff
diff --git a/contrib/crossrpms/solaris2.7/sparc/gcc-sources.add b/contrib/crossrpms/solaris2.7/sparc/gcc-sources.add
deleted file mode 100644
index 4fe912f..0000000
--- a/contrib/crossrpms/solaris2.7/sparc/gcc-sources.add
+++ /dev/null
@@ -1,33 +0,0 @@
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
- at PATCH0@
-%{?_without_sources:NoSource:	0}
-
-%if %build_cxx
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
- at PATCH1@
-%{?_without_sources:NoSource:	1}
-
-%endif
-%if %build_fortran
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
- at PATCH2@
-%{?_without_sources:NoSource:	2}
-
-%endif
-%if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
- at PATCH3@
-%{?_without_sources:NoSource:	3}
-
-%endif
-%if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
- at PATCH4@
-%{?_without_sources:NoSource:	4}
-
-%endif
-%if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
- at PATCH5@
-%{?_without_sources:NoSource:	5}
-%endif
diff --git a/contrib/crossrpms/solaris2.7/sparc/libs.add b/contrib/crossrpms/solaris2.7/sparc/libs.add
deleted file mode 100644
index 0bb212d..0000000
--- a/contrib/crossrpms/solaris2.7/sparc/libs.add
+++ /dev/null
@@ -1,38 +0,0 @@
-%define solaris_version @SOLARIS_VERS@
-%define solaris_rpmvers %{expand:%(echo @SOLARIS_VERS@ | tr - _)} 
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:         @rpmprefix@@tool_target@
-Release:      @SOLARIS_RPMREL@
-License:      Sun Microsystems
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%solaris_rpmvers
-Summary:      	@tool_target@ Libraries
-
-Source0:	sparc-sun-solaris2.7-libs-%{solaris_version}.tar.bz2
-%{?_without_sources:NoSource:	0}
-
-%description
- at tool_target@ libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf @tool_target@
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root
-  %{__tar} cf - usr/lib usr/include lib | ( cd @tool_target@/sys-root ; %{__tar} xf -)
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
-
diff --git a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec b/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
deleted file mode 100644
index 0399ed6..0000000
--- a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define binutils_pkgvers 2.22
-%define binutils_version 2.22
-%define binutils_rpmvers %{expand:%(echo "2.22" | tr - _ )}
-
-Name:		sparc-sun-solaris2.7-binutils
-Summary:	Binutils for target sparc-sun-solaris2.7
-Group:		Development/Tools
-Version:	%{binutils_rpmvers}
-Release:	0.20111122.0%{?dist}
-License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	%{_host_rpmprefix}gcc
-
-%if "%{binutils_version}" >= "2.18"
-# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires:	texinfo >= 4.2
-%else
-%endif
-BuildRequires:	flex
-BuildRequires:	bison
-
-Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
-# Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/binutils-2.19-rtems4.10-20081023.diff
-
-%description
-Cross binutils for target sparc-sun-solaris2.7
-%prep
-%setup -q -c -T -n %{name}-%{version}
-
-%setup -q -D -T -n %{name}-%{version} -a0
-cd binutils-%{binutils_pkgvers}
-%{?PATCH0:%patch0 -p1}
-cd ..
-
-%build
-  mkdir -p build
-  cd build
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-%endif
-  CFLAGS="$RPM_OPT_FLAGS" \
-  ../binutils-%{binutils_pkgvers}/configure \
-    --build=%_build --host=%_host \
-    --target=sparc-sun-solaris2.7 \
-    --verbose --disable-nls \
-    --without-included-gettext \
-    --disable-win32-registry \
-    --disable-werror \
-    --with-sysroot=%{_prefix}/sparc-sun-solaris2.7/sys-root \
-    --prefix=%{_prefix} --bindir=%{_bindir} \
-    --exec-prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} --libdir=%{_libdir} \
-    --mandir=%{_mandir} --infodir=%{_infodir}
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-
-
-# Conflict with a native binutils' infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-
-# manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-sun-solaris2.7-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-sun-solaris2.7-dlltool*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-sun-solaris2.7-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-sun-solaris2.7-nlmconv*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-sun-solaris2.7-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-sun-solaris2.7-windres*
-  fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-sun-solaris2.7-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-sun-solaris2.7-windmc*
-  fi
-
-  cd ..
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# sparc-sun-solaris2.7-binutils
-# ==============================================================
-# %package -n sparc-sun-solaris2.7-binutils
-# Summary:      rtems binutils for sparc-sun-solaris2.7
-# Group: Development/Tools
-# %if %build_infos
-# Requires: binutils-common
-# %endif
-
-%description -n sparc-sun-solaris2.7-binutils
-GNU binutils targetting sparc-sun-solaris2.7.
-
-%files -n sparc-sun-solaris2.7-binutils
-%defattr(-,root,root)
-
-%{_mandir}/man1/sparc-sun-solaris2.7-*.1*
-
-%{_bindir}/sparc-sun-solaris2.7-*
-
-%dir %{_exec_prefix}/sparc-sun-solaris2.7
-%dir %{_exec_prefix}/sparc-sun-solaris2.7/bin
-%{_exec_prefix}/sparc-sun-solaris2.7/bin/*
-
-%dir %{_exec_prefix}/sparc-sun-solaris2.7/lib
-%{_exec_prefix}/sparc-sun-solaris2.7/lib/ldscripts
-
diff --git a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec b/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
deleted file mode 100644
index a8134ca..0000000
--- a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
+++ /dev/null
@@ -1,628 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define gcc_pkgvers 4.4.3
-%define gcc_version 4.4.3
-%define gcc_rpmvers %{expand:%(echo "4.4.3" | tr - _ )}
-
-
-Name:         	sparc-sun-solaris2.7-gcc
-Summary:      	sparc-sun-solaris2.7 gcc
-
-Group:	      	Development/Tools
-Version:        %{gcc_rpmvers}
-Release:      	0.20100317.1%{?dist}
-License:      	GPL
-URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%define _use_internal_dependency_generator 0
-
-BuildRequires:  %{_host_rpmprefix}gcc
-
-%if "%{gcc_version}" >= "4.3.0"
-%define _gmp_minvers		4.1
-%else
-%if "%{gcc_version}" >= "4.2.0"
-%define _gmp_minvers		4.1
-%endif
-%endif
-
-%if %{defined _gmp_minvers}
-BuildRequires: gmp-devel >= %{_gmp_minvers}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers}
-%endif
-%endif
-
-%if "%{gcc_version}" >= "4.3.3"
-%define _cloog_minvers 0.15
-%endif
-
-%if %{defined _cloog_minvers}
-%{?fc11:BuildRequires: cloog-ppl-devel >= %_cloog_minvers}
-%{?fc12:BuildRequires: cloog-ppl-devel >= %_cloog_minvers}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %_cloog_minvers}
-%{?suse11_2:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel}
-%{?suse11_1:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel}
-%endif
-
-%if "%{gcc_version}" >= "4.4.0"
-%define _mpfr_minvers	2.3.2
-%define mpfr_version	2.4.1
-%else
-%if "%{gcc_version}" >= "4.3.0"
-%define _mpfr_minvers	2.3.1
-%define mpfr_version	2.3.2
-%else
-%if "%{gcc_version}" >= "4.2.0"
-%define _mpfr_minvers	2.2.1
-%define mpfr_version	2.3.2
-%endif
-%endif
-%endif
-
-%if %{defined _mpfr_minvers}
-# FIXME: This is an ugly cludge
-%{?fc11:%global mpfr_provided 2.4.1}
-%{?fc12:%global mpfr_provided 2.4.1}
-%{?fc13:%global mpfr_provided 2.4.1}
-%{?suse11_0:%global mpfr_provided 2.3.1}
-%{?suse11_1:%global mpfr_provided 2.3.2}
-%{?suse11_2:%global mpfr_provided 2.4.1}
-%{?cygwin:%global mpfr_provided 2.4.1}
-%{?mingw32:%global mpfr_provided %{nil}}
-
-%if %{defined mpfr_provided}
-%if "%{mpfr_provided}" < "%{_mpfr_minvers}"
-%define _build_mpfr 1
-%else
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers}
-%else
-BuildRequires: mpfr-devel >= %{_mpfr_minvers}
-%endif
-%endif
-%else
-%define _build_mpfr 1
-%endif
-
-%endif
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  sparc-sun-solaris2.7-gcc = %{gcc_rpmvers}
-%endif
-
-%if "%{gcc_version}" >= "4.2.0"
-BuildRequires:	flex bison
-%endif
-
-
-BuildRequires:	texinfo >= 4.2
-BuildRequires:	sparc-sun-solaris2.7-binutils
-BuildRequires:	sparc-sun-solaris2.7-sys-root
-
-Requires:	sparc-sun-solaris2.7-binutils
-Requires:	sparc-sun-solaris2.7-sys-root
-Requires:	sparc-sun-solaris2.7-gcc-libgcc = %{gcc_rpmvers}-%{release}
-
-
-%define _gcclibdir %{_prefix}/lib
-
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	0}
-
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	1}
-
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	2}
-
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	5}
-
-%if "%{gcc_version}" >= "4.3.0"
-Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
-%endif
-
-%description
-Cross gcc for sparc-sun-solaris2.7.
-
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
-
-%setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
-
-%setup -q -T -D -n %{name}-%{version} -a2
-%{?PATCH2:%patch2 -p0}
-
-
-
-%setup -q -T -D -n %{name}-%{version} -a5
-%{?PATCH5:%patch5 -p0}
-
-
-%if 0%{?_build_mpfr}
-%setup -q -T -D -n %{name}-%{version} -a60
-%{?PATCH60:%patch60 -p1}
-  # Build mpfr one-tree style
-  ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
-%endif
-
-
-  # Fix timestamps
-  cd gcc-%{gcc_pkgvers}
-  contrib/gcc_update --touch
-  cd ..
-%build
-  mkdir -p build
-
-  cd build
-
-  languages="c"
-  languages="$languages,c++"
-  languages="$languages,fortran"
-  languages="$languages,objc"
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
-%else
-# gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
-%endif
-  ../gcc-%{gcc_pkgvers}/configure \
-    --prefix=%{_prefix} \
-    --bindir=%{_bindir} \
-    --exec_prefix=%{_exec_prefix} \
-    --includedir=%{_includedir} \
-    --libdir=%{_gcclibdir} \
-    --libexecdir=%{_libexecdir} \
-    --mandir=%{_mandir} \
-    --infodir=%{_infodir} \
-    --datadir=%{_datadir} \
-    --build=%_build --host=%_host \
-    --target=sparc-sun-solaris2.7 \
-    --disable-libstdcxx-pch \
-    --with-gnu-as --with-gnu-ld --verbose \
-    --with-system-zlib \
-    --disable-nls --without-included-gettext \
-    --disable-win32-registry \
-    --enable-version-specific-runtime-libs \
-    --enable-threads \
-    --with-sysroot=%{_exec_prefix}/sparc-sun-solaris2.7/sys-root \
-    --enable-languages="$languages" $optargs
-
-%if "%_host" != "%_build"
-  # Bug in gcc-3.2.1:
-  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
-  mkdir -p gcc/include
-  cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h
-%endif
-
-  make %{?_smp_mflags} all
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-
-  cd build
-
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-
-%if "%{gcc_version}" <= "4.1.2"
-# Misplaced header file
-  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
-    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/include/
-  fi
-%endif
-
-  # host library
-%if "%{gcc_version}" >= "4.2.0"
-  # libiberty doesn't honor --libdir, but always installs to a 
-  # magically guessed _libdir
-  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
-%else
-  # libiberty installs to --libdir=...
-  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
-%endif
-
-  # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-sun-solaris2.7-c++filt%{_exeext}
-
-
-# Conflict with a native GCC's infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-
-# Conflict with a native GCC's man pages
-  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
-
-  # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-sun-solaris2.7-sparc-sun-solaris2.7-gcjh%{_exeext}
-
-  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
-  # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/install-tools
-
-  # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/sparc-sun-solaris2.7/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/sparc-sun-solaris2.7/include/bits
-  fi
-
-  # Collect multilib subdirectories
-  multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
-
-
-  rm -f dirs ;
-  echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}"
-  for i in $multilibs; do
-    case $i in
-    \.) ;; # ignore, handled elsewhere
-    *)  echo "%dir ${TGTDIR}/$i" >> dirs
-      ;;
-    esac
-  done
-
-  # Collect files to go into different packages
-  cp dirs build/files.gcc
-  cp dirs build/files.gfortran
-  cp dirs build/files.objc
-  cp dirs build/files.gcj
-  cp dirs build/files.g++
-
-  TGTDIR="%{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
-    *f771) ;;
-    *f951) ;;
-    *cc1) ;;
-    *cc1obj) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
-    *collect2) ;;
-    *libobjc*) echo "$i" >> build/files.objc ;;
-    *include/objc*) ;;
-    *include/g++*);;
-    *include/c++*);;
-    *include-fixed/*);;
-    *finclude/*);;
-    *adainclude*);;
-    *adalib*);;
-    *gnat1);;
-    *jc1) ;;
-    *jvgenmain) ;;
-    */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
-    */libstdc++.*) echo "$i" >> build/files.g++ ;;
-    */libsupc++.*) echo "$i" >> build/files.g++ ;;
-    *) echo "$i" >> build/files.gcc ;;
-    esac
-  done
-
-  TGTDIR="%{_exec_prefix}/sparc-sun-solaris2.7/lib"
-  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
-  for i in $f; do
-    case $i in
-    *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
-    *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
-# all other files belong to newlib
-    *) echo "$i" >> build/files.newlib ;; 
-    esac
-  done
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-sun-solaris2.7/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-sun-solaris2.7/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-sun-solaris2.7/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-sun-solaris2.7/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-# ==============================================================
-# sparc-sun-solaris2.7-gcc
-# ==============================================================
-# %package -n sparc-sun-solaris2.7-gcc
-# Summary:        GNU cc compiler for sparc-sun-solaris2.7
-# Group:          Development/Tools
-# Version:        %{gcc_rpmvers}
-# Requires:       sparc-sun-solaris2.7-binutils
-# License:	GPL
-
-# %if %build_infos
-# Requires:      gcc-common
-# %endif
-
-%description -n sparc-sun-solaris2.7-gcc
-GNU cc compiler for sparc-sun-solaris2.7.
-
-# ==============================================================
-# sparc-sun-solaris2.7-gcc-libgcc
-# ==============================================================
-%package -n sparc-sun-solaris2.7-gcc-libgcc
-Summary:        libgcc for sparc-sun-solaris2.7-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n sparc-sun-solaris2.7-gcc-libgcc
-libgcc sparc-sun-solaris2.7-gcc.
-
-
-%files -n sparc-sun-solaris2.7-gcc
-%defattr(-,root,root)
-
-%{_mandir}/man1/sparc-sun-solaris2.7-gcc.1*
-%{_mandir}/man1/sparc-sun-solaris2.7-cpp.1*
-%{_mandir}/man1/sparc-sun-solaris2.7-gcov.1*
-
-%{_bindir}/sparc-sun-solaris2.7-cpp%{_exeext}
-%{_bindir}/sparc-sun-solaris2.7-gcc%{_exeext}
-%{_bindir}/sparc-sun-solaris2.7-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/sparc-sun-solaris2.7-gcov%{_exeext}
-%{_bindir}/sparc-sun-solaris2.7-gccbug
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sparc-sun-solaris2.7
-%dir %{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
-%{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/collect2%{_exeext}
-
-
-%files -n sparc-sun-solaris2.7-gcc-libgcc -f build/files.gcc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/include
-
-%if "%{gcc_version}" > "4.0.3"
-%if "sparc-sun-solaris2.7" != "bfin-rtems4.10"
-%if "sparc-sun-solaris2.7" != "avr-rtems4.10"
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/include/ssp
-%endif
-%endif
-%endif
-
-%if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/include-fixed
-%endif
-
-# ==============================================================
-# sparc-sun-solaris2.7-gcc-c++
-# ==============================================================
-%package -n sparc-sun-solaris2.7-gcc-c++
-Summary:	GCC c++ compiler for sparc-sun-solaris2.7
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Requires:       sparc-sun-solaris2.7-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
-
-%if "%{_build}" != "%{_host}"
-BuildRequires:  sparc-sun-solaris2.7-gcc-c++ = %{gcc_rpmvers}
-%endif
-
-Requires:       sparc-sun-solaris2.7-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n sparc-sun-solaris2.7-gcc-c++
-GCC c++ compiler for sparc-sun-solaris2.7.
-
-
-%package -n sparc-sun-solaris2.7-gcc-libstdc++
-Summary:	libstdc++ for sparc-sun-solaris2.7
-Group:		Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n sparc-sun-solaris2.7-gcc-libstdc++
-%{summary}
-
-
-%files -n sparc-sun-solaris2.7-gcc-c++
-%defattr(-,root,root)
-
-%{_mandir}/man1/sparc-sun-solaris2.7-g++.1*
-
-%{_bindir}/sparc-sun-solaris2.7-c++%{_exeext}
-%{_bindir}/sparc-sun-solaris2.7-g++%{_exeext}
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sparc-sun-solaris2.7
-%dir %{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
-%{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/cc1plus%{_exeext}
-
-
-%files -n sparc-sun-solaris2.7-gcc-libstdc++ -f build/files.g++
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/include
-%{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/include/c++
-
-# ==============================================================
-# sparc-sun-solaris2.7-gcc-gfortran
-# ==============================================================
-%package -n sparc-sun-solaris2.7-gcc-gfortran
-Summary:	Fortran 95 support for sparc-sun-solaris2.7-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       sparc-sun-solaris2.7-gcc = %{gcc_rpmvers}-%{release}
-Requires:       sparc-sun-solaris2.7-gcc-libgfortran = %{gcc_rpmvers}-%{release}
-
-%description -n sparc-sun-solaris2.7-gcc-gfortran
-GCC fortran compiler for sparc-sun-solaris2.7.
-
-%files -n sparc-sun-solaris2.7-gcc-gfortran
-%defattr(-,root,root)
-%{_bindir}/sparc-sun-solaris2.7-gfortran%{_exeext}
-
-%{_mandir}/man1/sparc-sun-solaris2.7-gfortran.1*
-
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sparc-sun-solaris2.7
-%dir %{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
-%{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/f951%{_exeext}
-
-# ==============================================================
-# sparc-sun-solaris2.7-gcc-libgfortran
-# ==============================================================
-%package -n sparc-sun-solaris2.7-gcc-libgfortran
-Summary:	Fortran 95 support libraries for sparc-sun-solaris2.7-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n sparc-sun-solaris2.7-gcc-libgfortran
-%{summary}
-
-%files -n sparc-sun-solaris2.7-gcc-libgfortran -f build/files.gfortran
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
-%if "%{gcc_version}" >= "4.2.0"
-%{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/finclude
-%endif
-
-# ==============================================================
-# sparc-sun-solaris2.7-gcc-objc
-# ==============================================================
-%package -n sparc-sun-solaris2.7-gcc-objc
-Summary:        Objective C support for sparc-sun-solaris2.7-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires:       sparc-sun-solaris2.7-gcc = %{gcc_rpmvers}-%{release}
-Requires:       sparc-sun-solaris2.7-gcc-libobjc = %{gcc_rpmvers}-%{release}
-
-%description -n sparc-sun-solaris2.7-gcc-objc
-GCC objc compiler for sparc-sun-solaris2.7.
-
-%files -n sparc-sun-solaris2.7-gcc-objc
-%defattr(-,root,root)
-%dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/sparc-sun-solaris2.7
-%dir %{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
-%{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/cc1obj%{_exeext}
-
-# ==============================================================
-# sparc-sun-solaris2.7-gcc-libobjc
-# ==============================================================
-%package -n sparc-sun-solaris2.7-gcc-libobjc
-Summary:        Objective C support for sparc-sun-solaris2.7-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-%{?_with_noarch_subpackages:BuildArch: noarch}
-License:	GPL
-
-%description -n sparc-sun-solaris2.7-gcc-libobjc
-Support libraries for GCC's objc compiler for sparc-sun-solaris2.7.
-
-%files -n sparc-sun-solaris2.7-gcc-libobjc -f build/files.objc
-%defattr(-,root,root)
-%dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
-%dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/include
-%{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}/include/objc
-
diff --git a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec b/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec
deleted file mode 100644
index 14c2bed..0000000
--- a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%define solaris_version 2.7
-%define solaris_rpmvers %{expand:%(echo 2.7 | tr - _)} 
-
-%define _use_internal_dependency_generator 0
-%define __debug_install_post %{nil}
-
-Name:         sparc-sun-solaris2.7
-Release:      0.20091130.1%{?dist}
-License:      Sun Microsystems
-Group:        Development/Tools
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Version:      	%solaris_rpmvers
-Summary:      	sparc-sun-solaris2.7 Libraries
-
-Source0:	sparc-sun-solaris2.7-libs-%{solaris_version}.tar.bz2
-%{?_without_sources:NoSource:	0}
-
-%description
-sparc-sun-solaris2.7 libraries.
-
-%prep
-%setup -c -q
-
-%build
-  rm -rf sparc-sun-solaris2.7
-
-  # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p sparc-sun-solaris2.7/sys-root
-  %{__tar} cf - usr/lib usr/include lib | ( cd sparc-sun-solaris2.7/sys-root ; %{__tar} xf -)
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  mkdir -p $RPM_BUILD_ROOT%{_prefix}
-  cp -a sparc-sun-solaris2.7 $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{solaris_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-sun-solaris2.7/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-sun-solaris2.7/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{solaris_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{solaris_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{solaris_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-sun-solaris2.7/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-sun-solaris2.7/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{solaris_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{solaris_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
-  b=$(basename $a)
-  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post 
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%package sys-root
-Group: Development/Tools
-Summary: sparc-sun-solaris2.7 target files for gcc >= 3.4
-
-%description sys-root
-sparc-sun-solaris2.7 target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/sparc-sun-solaris2.7
-%{_prefix}/sparc-sun-solaris2.7/sys-root
diff --git a/contrib/crossrpms/solaris2.7/sparc/target-libs.add b/contrib/crossrpms/solaris2.7/sparc/target-libs.add
deleted file mode 100644
index 0550fc7..0000000
--- a/contrib/crossrpms/solaris2.7/sparc/target-libs.add
+++ /dev/null
@@ -1,11 +0,0 @@
-%package sys-root
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc >= 3.4
-
-%description sys-root
- at tool_target@ target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/sys-root
diff --git a/contrib/crossrpms/specstrip b/contrib/crossrpms/specstrip
deleted file mode 100755
index fb741e6..0000000
--- a/contrib/crossrpms/specstrip
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/usr/bin/perl -w
-
-
-# Helper script to strip unused parts out of crossrpms's rpm.specs
-#
-# Usage: specstrip < infile > outfile
-
-
-# Copyright (C) 2005,2006,2010	Ralf Corsépius, Ulm, Germany,
-#
-# 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.
-#
-# For a copy of the GNU General Public License, visit
-# http://www.gnu.org or write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-# $Id$
-
-use Getopt::Long;
-
-use strict;
-
-my $newlib = 0;
-my $infos = 0;
-my $prefix = '/usr';
-
-my $verbose = 0;
-my @languages = ();
-my %options = ();
-
-GetOptions(
-  \%options,
-  'prefix=s' => \$prefix,
-  'enable-infos' => sub { $options{infos} = 1 },
-  'disable-infos' => sub { $options{infos} = 0 },
-  'newlib!',
-  'languages=s' => \@languages,
-  'verbose+' => \$verbose
-) or die( "failed to GetOptions" );
-
-if ( !defined($options{infos}) )
-{ # User did not override, use defaults
-  if ( $prefix =~ m/^\/usr$/ ) {
-    $infos = 0;
-  } elsif ( $prefix =~ m/^\/usr\/local$/ ) {
-    $infos = 0;
-  } else {
-    $infos = 1;
-  }
-} else {
-  $infos = int($options{infos});
-}
-
-if ( defined($options{newlib}) )
-{
-  $newlib = $options{newlib};
-} else {
-  $newlib = 0;
-}
-
-if ( $verbose ) {
-  print STDERR "INFOS  : $infos\n";
-  print STDERR "PREFIX : $prefix\n";
-}
-
-my %langs;
-
-foreach ( split(/,/,join(',', at languages)) ){
-  $langs{$_} = 1;
-}
-
-my @npatterns = (
-  "(\"%\{_prefix\}\" (!=|==) \"/usr\")",
-
-  "(%build_cxx)",
-  "(%build_fortran)",
-  "(%build_gcj)",
-  "(%build_gnat)",
-  "(%build_go)",
-  "(%build_libgcj)",
-  "(%build_newlib)",
-  "(%build_objc)",
-  "(%build_infos)"
-);
-
-my @ppatterns = (
-);
-
-push @ppatterns,  "(\"%\{_prefix\}\" " . (("$prefix" eq '/usr') ? '!=' : '==' ) . " \"/usr\")";
-
-push @ppatterns, "(%build_cxx "		. ( ($langs{cxx}) ? "==" : "!=" ) . " 0)";
-push @ppatterns, "(%build_fortran "	. ( ($langs{fortran}) ? "==" : "!=" ) . " 0)";
-push @ppatterns, "(%build_objc "	. ( ($langs{objc}) ? "==" : "!=" ) . " 0)";
-push @ppatterns, "(%build_gcj "		. ( ($langs{gcj}) ? "==" : "!=" ) . " 0)";
-push @ppatterns, "(%build_gnat "	. ( ($langs{gnat}) ? "==" : "!=" ) . " 0)";
-push @ppatterns, "(%build_go "		. ( ($langs{go}) ? "==" : "!=" ) . " 0)";
-push @ppatterns, "(%build_libgcj "	. ( ($langs{libgcj}) ? "==" : "!=" ) . " 0)";
-
-push @ppatterns, "(%build_newlib "	. ( ($newlib) ? "==" : "!=" ) . " 0)";
-push @ppatterns, "(%build_infos "	. ( ($infos) ? "==" : "!=" ) . " 0)";
-
-my $npat = join('|', at npatterns);
-my $ppat = join('|', at ppatterns);
-
-if ( $verbose > 1 ) {
-  print STDERR "PPAT: ", $ppat, "\n"; 
-  print STDERR "NPAT: ", $npat, "\n";
-}
-
-my @buffer0 = <> ;
-
-my @buffer2 ;
-
-my @condstack ;
-
- at condstack = ();
-push @condstack,'<>';
-foreach (@buffer0)
-{
-   chomp $_;
-   if ( /^%if(os|)\s+(.*)$/ )
-   {
-     push @condstack,"<$2>";
-     if ( $condstack[$#condstack] =~ m/$npat/ ) {
-       # transform unary conditionals into binary conditionals
-       if ( $condstack[$#condstack] =~/.*<(%[a-zA-Z_0-9]+)>.*/ ) {
-         $condstack[$#condstack] = "<$1 != 0>";
-       }
-     } else {
-       push @buffer2, { state => join('', at condstack), line => "$_" };
-     }
-   } elsif ( /^%else.*$/ )
-   {
-     my %ops = (
-         "!=" => "==",
-         "==" => "!="
-       );
-
-     if ( $condstack[$#condstack] =~/.*<(.*) (!=|==) (.*)>.*/ ) {
-       $condstack[$#condstack] = "<$1 " .  $ops{$2} . " $3>";
-       if ( $condstack[$#condstack] =~ m/$npat/ ) {
-       } else {
-         push @buffer2, { state => join('', at condstack), line => "$_" };
-       }
-     } else {
-         push @buffer2, { state => join('', at condstack), line => "$_" };
-     }
-   } elsif ( /^%endif.*$/ )
-   {
-     if ( $condstack[$#condstack] =~ m/$npat/ ) {
-     } else {
-       push @buffer2, { state => join('', at condstack), line => "$_" };
-     }
-     pop @condstack;
-   } else {
-     push @buffer2, { state => join('', at condstack), line => "$_" };
-   }
-}
-
-my @buffer3;
-foreach my $i ( @buffer2 )
-{
-  print STDERR "STATE:", $i->{state}, " LINE:", $i->{line}, "\n" if $verbose > 1;
-  if ( $i->{state} =~ m/($ppat)/ ) {
-  } else {
-          push @buffer3, $i->{line};
-  }
-}
-
-#foreach my $line ( @buffer3 )
-#{
-#  print STDERR "L:<$line>\n";
-#}
-
-my @buffer4;
- at condstack = ();
-push @condstack, "<>";
-foreach my $line ( @buffer3 )
-{
-#  print STDERR "READ:{", $line, "}\n";
-  if ( $line =~/^%if\s+"([a-zA-Z_0-9\.\-]+)"\s+==\s+"([a-zA-Z_0-9\.\-]+)"\s*$/ )
-  {
-    if ( "$1" eq "$2" ) {
-      push @condstack,"<TRUE:$1 == $2>";
-    } else {
-      push @condstack,"<FALSE:$1 == $2>";
-    }
-  } elsif ( $line =~/^%if\s+"([a-zA-Z_0-9\.\-]+)"\s+!=\s+"([a-zA-Z_0-9\.\-]+)"\s*$/ )
-  {
-    if ( "$1" ne "$2" ) {
-      push @condstack,"<TRUE:$1 != $2>";
-    } else {
-      push @condstack,"<FALSE:$1 != $2>";
-    }
-  } elsif ( $line =~/^%if\s+(.*)\s*$/ )
-  {
-    my $exp = $1;
-    push @condstack,"<IFOT:$exp>";
-    push @buffer4, "@condstack:$line\n";
-  } elsif ( $line =~/^%if((os|narch)\s+.*)\s*$/ )
-  {
-    my $exp = $1;
-    push @condstack,"<IFOT:$exp>";
-    push @buffer4, "@condstack:$line\n";
-  } elsif ( $line =~ /^%else\s*$/ ) {
-    if ( $condstack[$#condstack] =~ m/<TRUE:(.*)\s*>$/ ) {
-      $condstack[$#condstack] = "<FALSE:$1>";
-    } elsif ( $condstack[$#condstack] =~ m/<FALSE:(.*)\s*>$/ ) {
-      $condstack[$#condstack] = "<TRUE:$1>";
-    } else {
-      push @buffer4, "@condstack:$line\n";
-    }
-  } elsif ( $line =~ /^%endif\s*$/ ) {
-
-    if ( $condstack[$#condstack] =~ m/<TRUE:.*>$/ ) {
-#    print STDERR "ENDIF: TRUE\n";
-    } elsif ( $condstack[$#condstack] =~ m/<FALSE:.*>$/ ) {
-#    print STDERR "ENDIF: FALSE\n";
-    } else {
-      push @buffer4, "@condstack:$line\n";
-    }
-#    print STDERR "POP: $line\n";
-    pop @condstack;
-  } else {
-#  print STDERR "CATCH $condstack[$#condstack]:$line\n";
-    if ( $condstack[$#condstack] =~ m/<TRUE:.*>$/ ) {
-      push @buffer4, "@condstack:$line\n";
-    } elsif ( $condstack[$#condstack] =~ m/<FALSE:.*>$/ ) {
-    } else {
-      push @buffer4, "@condstack:$line\n";
-    }
-  }
-
-#  print STDERR @condstack, "LINE: $line\n";
-}
-
-print STDERR @buffer4 if $verbose > 2;
-
-foreach my $line (@buffer4) {
-  if ( $line =~ /^(<.*>):(.*)$/ ) {
-    if ( $1 =~ m/.*<FALSE:.*$/ ) {
-    } else {
-      print STDOUT "$2\n";
-    }
-  } else {
-    die "Unexpected value: $line\n";
-  }
-}
-




More information about the vc mailing list