From 98bc4decdeab1361bdc585c86591718fb08c8ffb Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sat, 2 Dec 2017 12:44:39 -0800
Subject: [PATCH] Run all patches through renumbering and update

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 .../{120-sh-conf.patch => 0000-sh-conf.patch} |   9 +-
 .../0001-001_ld_makefile_patch.patch}         |  13 +-
 ... => 0002-012_check_ldrunpath_length.patch} |  13 +-
 .../0003-fix-gold-pthreads-typo.patch}        |   8 +-
 .../{500-sysroot.patch => 0004-sysroot.patch} |   6 +-
 ...h => 0005-poison-system-directories.patch} |  30 +-
 ...es.patch => 0006-xtensa-trampolines.patch} |  73 +--
 ...007-xtensa-gas-first-frag-alignment.patch} |   9 +-
 ...tensa-gas-ld-diff-relocation-signed.patch} |  21 +-
 ...segfault-when-linking-linux-modules.patch} |   9 +-
 ...t-out-of-range-xtensa-ld-relaxation.patch} |   9 +-
 ...earch-code-for-conditional-branches.patch} |  17 +-
 ...zed-symbol-refcounting-with-gc-sect.patch} |   9 +-
 ...segfault-with-text-section-literals.patch} |   9 +-
 ...a-fix-signedness-of-gas-relocations.patch} |   9 +-
 ...nsa-fix-.init-.fini-literals-moving.patch} |  12 +-
 .../2.23.2/300-001_ld_makefile_patch.patch    |  24 -
 ...0-fix-enable-install-libiberty-flag.patch} |  13 +-
 ...gv-on-initial-instructions-overflow.patch} |  14 +-
 packages/binutils/2.24/0002-sh-conf.patch     |  34 ++
 .../0003-001_ld_makefile_patch.patch}         |  13 +-
 ... => 0004-012_check_ldrunpath_length.patch} |  13 +-
 .../0005-fix-gold-pthreads-typo.patch}        |   8 +-
 .../0006-sysroot.patch}                       |   6 +-
 ...h => 0007-poison-system-directories.patch} |  30 +-
 ...> 0008-Fix-library-paths-on-PowerPC.patch} |   9 +-
 ...es.patch => 0009-xtensa-trampolines.patch} |  73 +--
 ...010-xtensa-gas-first-frag-alignment.patch} |   9 +-
 ...tensa-gas-ld-diff-relocation-signed.patch} |  21 +-
 ...segfault-when-linking-linux-modules.patch} |   9 +-
 ...t-out-of-range-xtensa-ld-relaxation.patch} |   9 +-
 ...earch-code-for-conditional-branches.patch} |  17 +-
 ...timize-check_section_ebb_pcrels_fit.patch} |  29 +-
 ...-xtensa-optimize-removed_by_actions.patch} |  33 +-
 ...tensa-optimize-find_removed_literal.patch} |  15 +-
 ...replace-action-list-with-splay-tree.patch} | 135 +++--
 ...nsa-optimize-trampolines-relaxation.patch} |  27 +-
 ...zed-symbol-refcounting-with-gc-sect.patch} |   9 +-
 ...segfault-with-text-section-literals.patch} |   9 +-
 ...022-xtensa-add-auto-litpools-option.patch} |  64 +--
 ...a-fix-signedness-of-gas-relocations.patch} |   9 +-
 ...nsa-fix-.init-.fini-literals-moving.patch} |  11 +-
 packages/binutils/2.24/120-sh-conf.patch      |  31 --
 .../2.24/300-001_ld_makefile_patch.patch      |  24 -
 .../0000-sh-conf.patch}                       |  13 +-
 .../0001-001_ld_makefile_patch.patch}         |  13 +-
 ... => 0002-012_check_ldrunpath_length.patch} |  10 +-
 ...atch => 0003-fix-gold-pthreads-typo.patch} |   8 +-
 ...esnt-have-pthread_mutexattr_settype.patch} |   8 +-
 ...ont-link-to-libfl-as-its-unnecessary.patch | 105 ++++
 ...binary-cc-include-string-not-cstring.patch |  15 +
 ...d-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch} |  23 +-
 ...x.patch => 0008-arm-rotate_left-fix.patch} |  11 +-
 .../0009-sysroot.patch}                       |   6 +-
 ...h => 0010-poison-system-directories.patch} |  57 +-
 .../0011-Fix-library-paths-on-PowerPC.patch}  |   9 +-
 ...earch-code-for-conditional-branches.patch} |  17 +-
 ...timize-check_section_ebb_pcrels_fit.patch} |  29 +-
 ...-xtensa-optimize-removed_by_actions.patch} |  33 +-
 ...tensa-optimize-find_removed_literal.patch} |  15 +-
 ...replace-action-list-with-splay-tree.patch} | 133 +++--
 ...nsa-optimize-trampolines-relaxation.patch} |  27 +-
 ...zed-symbol-refcounting-with-gc-sect.patch} |   9 +-
 ...segfault-with-text-section-literals.patch} |   9 +-
 ...020-xtensa-add-auto-litpools-option.patch} |  63 +--
 ...a-fix-signedness-of-gas-relocations.patch} |  25 +-
 ...nsa-fix-.init-.fini-literals-moving.patch} |  27 +-
 ...ont-link-to-libfl-as-its-unnecessary.patch | 102 ----
 ...binary-cc-include-string-not-cstring.patch |  11 -
 .../0000-sh-conf.patch}                       |  13 +-
 .../0001-001_ld_makefile_patch.patch}         |  13 +-
 ... => 0002-012_check_ldrunpath_length.patch} |  10 +-
 .../0003-fix-gold-pthreads-typo.patch}        |   8 +-
 ...esnt-have-pthread_mutexattr_settype.patch} |   8 +-
 ...nt-link-to-libfl-as-its-unnecessary.patch} |  39 +-
 ...inary-cc-include-string-not-cstring.patch} |   6 +-
 ...d-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch} |  23 +-
 .../0008-sysroot.patch}                       |   6 +-
 ...h => 0009-poison-system-directories.patch} |  56 +-
 .../0010-Fix-library-paths-on-PowerPC.patch}  |   9 +-
 ...a-fix-signedness-of-gas-relocations.patch} |  25 +-
 ...nsa-fix-.init-.fini-literals-moving.patch} |  27 +-
 ...g-break.patch => 0000-missing-break.patch} |  12 +-
 .../0001-sh-conf.patch}                       |  13 +-
 .../2.27/0002-001_ld_makefile_patch.patch     |  27 +
 ... => 0003-012_check_ldrunpath_length.patch} |  10 +-
 ...esnt-have-pthread_mutexattr_settype.patch} |   8 +-
 ...nt-link-to-libfl-as-its-unnecessary.patch} |  33 +-
 ...inary-cc-include-string-not-cstring.patch} |   6 +-
 ...d-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch} |  23 +-
 .../{500-sysroot.patch => 0008-sysroot.patch} |   4 +
 ...h => 0009-poison-system-directories.patch} |  56 +-
 .../0010-Fix-library-paths-on-PowerPC.patch}  |   9 +-
 ... => 0011-xtensa-reverse-shift-count.patch} |  12 +-
 .../0000-sh-conf.patch}                       |  13 +-
 .../2.28.1/0001-001_ld_makefile_patch.patch   |  27 +
 ... => 0002-012_check_ldrunpath_length.patch} |  10 +-
 ...esnt-have-pthread_mutexattr_settype.patch} |   8 +-
 ...nt-link-to-libfl-as-its-unnecessary.patch} |  37 +-
 ...inary-cc-include-string-not-cstring.patch} |   6 +-
 ...d-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch} |  23 +-
 .../{500-sysroot.patch => 0007-sysroot.patch} |   4 +
 ...h => 0008-poison-system-directories.patch} |  56 +-
 .../{120-sh-conf.patch => 0000-sh-conf.patch} |  13 +-
 .../2.29.1/0001-001_ld_makefile_patch.patch   |  27 +
 ... => 0002-012_check_ldrunpath_length.patch} |  10 +-
 ...esnt-have-pthread_mutexattr_settype.patch} |   8 +-
 ...nt-link-to-libfl-as-its-unnecessary.patch} |  37 +-
 ...inary-cc-include-string-not-cstring.patch} |   6 +-
 ...id-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch |  70 +++
 .../{500-sysroot.patch => 0007-sysroot.patch} |   6 +-
 ...h => 0008-poison-system-directories.patch} |  60 +--
 .../2.29.1/300-001_ld_makefile_patch.patch    |  26 -
 ...id-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch |  77 ---
 ...compile.patch => 0000-cross-compile.patch} |   9 +-
 ...rate_cpp.patch => 0001-separate_cpp.patch} |   9 +-
 ...or.patch => 0002-cpp11-new-operator.patch} |  17 +-
 .../4.8-2015.06/0000-gcc_bug_62231.patch}     |  29 +-
 .../0001-gcc_bug_62231.patch}                 |  11 +-
 ... 0002-libtool-leave-framework-alone.patch} |   8 +-
 .../0003-uclibc-conf.patch}                   |   6 +-
 .../4.8-2015.06/0004-pr65730.patch}           |   9 +-
 .../4.8-2015.06/0005-pr43538.patch}           |   7 +-
 ...mt-ospace-preserve-FLAGS_FOR_TARGET.patch} |   7 +-
 ...atch => 0007-build_gcc-5_with_gcc-6.patch} |  37 +-
 .../0008-missing-execinfo_h.patch}            |   6 +-
 ...tch => 0009-libmudflap-susv3-legacy.patch} |  10 +-
 ...-undefined-extern-var-refs-nor-fpic.patch} |  27 +-
 .../0011-arm-softfloat-libgcc.patch           |  31 ++
 ...4t.patch => 0012-arm_unbreak_armv4t.patch} |   4 +
 .../4.8-2015.06/0013-PR57717-E500v2.patch}    |  11 +-
 .../4.8-2015.06/0014-PR60155.patch}           |  16 +-
 ...=> 0015-aarch64-vmlaq_lane_s32-typo.patch} |   8 +-
 ....patch => 0016-libstdcxx-uclibc-c99.patch} |  60 +--
 .../4.8-2015.06/0017-PR-other-56780.patch}    |  33 +-
 ...018-xtensa-add-mauto-litpools-option.patch | 273 ++++++++++
 ...tensa-reimplement-register-spilling.patch} |  11 +-
 ...-dw2-fde-dip-instead-of-unwind-dw2-.patch} |   9 +-
 .../0021-xtensa-fix-_Unwind_GetCFA.patch}     |   9 +-
 ...tensa-fix-fprintf-format-specifiers.patch} |  15 +-
 .../0023-xtensa-fix-PR-target-82181.patch}    |   9 +-
 .../4.8-2015.06/0024-musl-support.patch}      |  90 ++--
 .../4.8-2015.06/0025-cygwin64.patch}          |   8 +-
 .../4.8-2015.06/100-uclibc-conf.patch         |  15 -
 .../4.8-2015.06/301-missing-execinfo_h.patch  |  13 -
 .../810-arm-softfloat-libgcc.patch            |  30 --
 ...870-xtensa-add-mauto-litpools-option.patch | 290 -----------
 ...t-struct-ucontext-in-linux-unwind.h.patch} |  65 +--
 .../4.9-2017.01/0001-gcc_bug_62231.patch}     |  35 +-
 .../4.9-2017.01/0002-gcc_bug_62231.patch}     |  11 +-
 .../0003-libtool-leave-framework-alone.patch} |   8 +-
 .../0004-uclibc-conf.patch}                   |   6 +-
 .../0005-msp430-string-literals.patch}        |   8 +-
 .../4.9-2017.01/0006-pr65730.patch}           |   4 +-
 ...x-typo-for-powerpc-e6500-cpu_is_64b.patch} |   8 +-
 .../0008-pr43538.patch}                       |   7 +-
 ...mt-ospace-preserve-FLAGS_FOR_TARGET.patch} |   7 +-
 ...Fix-build-with-_FILE_OFFSET_BITS-64.patch} |  10 +-
 .../0011-missing-execinfo_h.patch}            |   6 +-
 ...-undefined-extern-var-refs-nor-fpic.patch} |  27 +-
 .../0013-arm-softfloat-libgcc.patch}          |   9 +-
 ...4t.patch => 0014-arm_unbreak_armv4t.patch} |   4 +
 ...-microblaze-enable-dwarf-eh-support.patch} |  20 +-
 ....patch => 0016-libstdcxx-uclibc-c99.patch} |  60 +--
 .../0017-cilk-wchar.patch}                    |   2 -
 ...18-xtensa-add-mauto-litpools-option.patch} |  28 +-
 ...tensa-reimplement-register-spilling.patch} |  11 +-
 ...-dw2-fde-dip-instead-of-unwind-dw2-.patch} |   9 +-
 ...h => 0021-xtensa-fix-_Unwind_GetCFA.patch} |   9 +-
 .../0022-xtensa-add-uclinux-support.patch}    |  20 +-
 ...tensa-fix-fprintf-format-specifiers.patch} |  15 +-
 .../0024-xtensa-fix-PR-target-82181.patch}    |   9 +-
 ...ch => 0025-nios2_legitimize_address.patch} |   9 +-
 ...pile.patch => 0026-fix-m68k-compile.patch} |   9 +-
 .../0027-fix-m68k-uclinux.patch}              |  11 +-
 ...ibgcc-disable-split-stack-nothreads.patch} |   9 +-
 ...atch => 0029-uclinux-enable-threads.patch} |   8 +-
 .../4.9-2017.01/100-uclibc-conf.patch         |  15 -
 .../4.9-2017.01/301-missing-execinfo_h.patch  |  13 -
 .../4.9-2017.01/860-cilk-wchar.patch          |  56 --
 ...t-struct-ucontext-in-linux-unwind.h.patch} |  65 +--
 .../0001-libtool-leave-framework-alone.patch} |   8 +-
 .../5.4-2017.05/0002-uclibc-conf.patch}       |   6 +-
 .../0003-msp430-string-literals.patch}        |  22 +-
 .../0004-xtensa-implement-trap-pattern.patch} |  13 +-
 ...x-typo-for-powerpc-e6500-cpu_is_64b.patch} |  11 +-
 .../0006-missing-execinfo_h.patch}            |   6 +-
 ...-undefined-extern-var-refs-nor-fpic.patch} |  27 +-
 ...cc-plugin-POSIX-include-sys-select-h.patch |  14 +
 .../0009-arm-softfloat-libgcc.patch}          |   9 +-
 .../0010-arm_unbreak_armv4t.patch}            |   4 +
 ...-microblaze-enable-dwarf-eh-support.patch} |  20 +-
 ....patch => 0012-libstdcxx-uclibc-c99.patch} |  62 +--
 .../5.4-2017.05/0013-cilk-wchar.patch}        |   2 -
 ...14-xtensa-add-mauto-litpools-option.patch} |  43 +-
 ...tensa-reimplement-register-spilling.patch} |  15 +-
 ...-dw2-fde-dip-instead-of-unwind-dw2-.patch} |   7 +-
 ...h => 0017-xtensa-fix-_Unwind_GetCFA.patch} |   9 +-
 ... => 0018-xtensa-add-uclinux-support.patch} |  25 +-
 ..._fallback_frame_state-for-call0-ABI.patch} |  21 +-
 ...cc-build-with-text-section-literals.patch} |  19 +-
 ...unwind-dw2-fde-dip-with-elf-targets.patch} |  17 +-
 ... => 0022-xtensa-Fix-PR-target-78603.patch} |   9 +-
 ...tensa-fix-fprintf-format-specifiers.patch} |  15 +-
 ... => 0024-xtensa-fix-PR-target-82181.patch} |   9 +-
 .../5.4-2017.05/0025-fix-m68k-compile.patch}  |   9 +-
 .../0026-fix-m68k-uclinux.patch}              |  11 +-
 .../5.4-2017.05/0027-microblaze-uclibc.patch} |   9 +-
 .../0028-unwind-fix-for-musl.patch}           |   8 +-
 ... => 0029-nios2-bad-multilib-default.patch} |  15 +-
 ...ibgcc-disable-split-stack-nothreads.patch} |   9 +-
 .../0031-uclinux-enable-threads.patch}        |  11 +-
 ...cc-plugin-POSIX-include-sys-select-h.patch |  11 -
 .../5.4-2017.05/830-arm_unbreak_armv4t.patch  |  15 -
 .../0000-libtool-leave-framework-alone.patch} |   8 +-
 ...libc-conf.patch => 0001-uclibc-conf.patch} |   6 +-
 .../0002-missing-execinfo_h.patch}            |   6 +-
 ...-undefined-extern-var-refs-nor-fpic.patch} |  33 +-
 ...cc-plugin-POSIX-include-sys-select-h.patch |  14 +
 ....patch => 0005-arm-softfloat-libgcc.patch} |   9 +-
 .../0006-arm_unbreak_armv4t.patch}            |   4 +
 .../0007-cilk-wchar.patch}                    |   2 -
 .../0008-xtensa-fix-PR-target-82181.patch}    |   9 +-
 .../0009-fix-m68k-compile.patch}              |   9 +-
 .../0010-fix-m68k-uclinux.patch}              |  11 +-
 ...kmap-symver-support-skip_underscore.patch} |   9 +-
 ...n-use-the-generic-linker-version-in.patch} |  11 +-
 ...WARF-compilation-with-FDPIC-targets.patch} |  13 +-
 ...patch => 0014-bfin-define-REENTRANT.patch} |   9 +-
 ...=> 0015-libgfortran-missing-include.patch} |   8 +-
 .../0016-nios2-bad-multilib-default.patch}    |  15 +-
 ...ibgcc-disable-split-stack-nothreads.patch} |   9 +-
 .../0018-uclinux-enable-threads.patch}        |  11 +-
 .../6.4-2017.08/0019-bionic-ndk.patch}        |   8 +-
 .../6.4-2017.08/0020-bionic-errno.patch}      |   8 +-
 .../{970-crystax.patch => 0021-crystax.patch} | 110 ++--
 .../6.4-2017.08/0022-crystax.patch}           |   6 +-
 .../6.4-2017.08/0023-crystax.patch}           |  67 ++-
 .../0024-crystax.patch}                       |   8 +-
 .../6.4-2017.08/0025-crystax.patch}           |   8 +-
 .../6.4-2017.08/0026-crystax.patch}           |   8 +-
 .../6.4-2017.08/0027-crystax.patch}           |   6 +-
 .../6.4-2017.08/0028-crystax.patch}           |  11 +-
 ...cc-plugin-POSIX-include-sys-select-h.patch |  11 -
 .../6.4-2017.08/830-arm_unbreak_armv4t.patch  |  15 -
 .../0000-libtool-leave-framework-alone.patch} |   8 +-
 .../7.1-2017.08/0001-uclibc-conf.patch        |  17 +
 ...-undefined-extern-var-refs-nor-fpic.patch} |  33 +-
 ...cc-plugin-POSIX-include-sys-select-h.patch |  14 +
 .../0004-arm-softfloat-libgcc.patch}          |   9 +-
 .../7.1-2017.08/0005-cilk-wchar.patch}        |   2 -
 .../0006-xtensa-fix-PR-target-82181.patch}    |   9 +-
 .../0007-fix-m68k-uclinux.patch}              |  11 +-
 ...=> 0008-libgfortran-missing-include.patch} |   8 +-
 .../0009-nios2-bad-multilib-default.patch}    |  15 +-
 ...ibgcc-disable-split-stack-nothreads.patch} |   9 +-
 .../0011-bionic-ndk.patch}                    |   8 +-
 ...ic-errno.patch => 0012-bionic-errno.patch} |   8 +-
 .../7.1-2017.08/0013-crystax.patch}           | 102 ++--
 .../0014-crystax.patch}                       |   6 +-
 .../{972-crystax.patch => 0015-crystax.patch} |  67 ++-
 .../7.1-2017.08/0016-crystax.patch}           |   8 +-
 .../{974-crystax.patch => 0017-crystax.patch} |   8 +-
 .../7.1-2017.08/0018-crystax.patch}           |   8 +-
 .../7.1-2017.08/0019-crystax.patch}           |   6 +-
 .../0020-crystax.patch}                       |  13 +-
 ...cc-plugin-POSIX-include-sys-select-h.patch |  11 -
 .../4.8.5/0000-gcc_bug_62231.patch}           |  29 +-
 .../4.8.5/0001-gcc_bug_62231.patch}           |  11 +-
 .../0002-libtool-leave-framework-alone.patch} |   8 +-
 packages/gcc/4.8.5/0003-uclibc-conf.patch     |  17 +
 .../0004-alpha-bad-eh_frame.patch}            |   6 +-
 .../4.8.5/0005-pr65730.patch}                 |   9 +-
 .../{130-pr43538.patch => 0006-pr43538.patch} |   7 +-
 ...mt-ospace-preserve-FLAGS_FOR_TARGET.patch} |   7 +-
 ...atch => 0008-build_gcc-5_with_gcc-6.patch} |  37 +-
 .../gcc/4.8.5/0009-missing-execinfo_h.patch   |  15 +
 ...tch => 0010-libmudflap-susv3-legacy.patch} |  10 +-
 ...-undefined-extern-var-refs-nor-fpic.patch} |  27 +-
 .../gcc/4.8.5/0012-arm-softfloat-libgcc.patch |  31 ++
 .../gcc/4.8.5/0013-arm_unbreak_armv4t.patch   |  17 +
 .../4.8.5/0014-PR57717-E500v2.patch}          |  11 +-
 .../4.8.5/0015-PR60155.patch}                 |  16 +-
 ...=> 0016-aarch64-vmlaq_lane_s32-typo.patch} |   6 +-
 ....patch => 0017-libstdcxx-uclibc-c99.patch} |  60 +--
 .../4.8.5/0018-PR-other-56780.patch}          |  33 +-
 ...019-xtensa-add-mauto-litpools-option.patch | 273 ++++++++++
 ...tensa-reimplement-register-spilling.patch} |  11 +-
 ...-dw2-fde-dip-instead-of-unwind-dw2-.patch} |   9 +-
 .../0022-xtensa-fix-_Unwind_GetCFA.patch}     |   9 +-
 ...tensa-fix-fprintf-format-specifiers.patch} |  15 +-
 .../0024-xtensa-fix-PR-target-82181.patch}    |   9 +-
 .../4.8.5/0025-musl-support.patch}            |  86 ++-
 .../4.8.5/0026-cygwin64.patch}                |   8 +-
 packages/gcc/4.8.5/100-uclibc-conf.patch      |  15 -
 .../gcc/4.8.5/301-missing-execinfo_h.patch    |  13 -
 .../gcc/4.8.5/810-arm-softfloat-libgcc.patch  |  30 --
 ...t-struct-ucontext-in-linux-unwind.h.patch} |  65 +--
 .../4.9.4/0001-gcc_bug_62231.patch}           |  35 +-
 ...g_62231.patch => 0002-gcc_bug_62231.patch} |  11 +-
 ... 0003-libtool-leave-framework-alone.patch} |   8 +-
 packages/gcc/4.9.4/0004-uclibc-conf.patch     |  17 +
 .../4.9.4/0005-msp430-string-literals.patch}  |   8 +-
 .../0006-alpha-bad-eh_frame.patch}            |   6 +-
 .../4.9.4/0007-pr65730.patch}                 |   4 +-
 ...x-typo-for-powerpc-e6500-cpu_is_64b.patch} |   6 +-
 .../4.9.4/0009-pr43538.patch}                 |   7 +-
 ...mt-ospace-preserve-FLAGS_FOR_TARGET.patch} |   7 +-
 ...Fix-build-with-_FILE_OFFSET_BITS-64.patch} |  10 +-
 .../gcc/4.9.4/0012-missing-execinfo_h.patch   |  15 +
 ...-undefined-extern-var-refs-nor-fpic.patch} |  27 +-
 .../4.9.4/0014-arm-softfloat-libgcc.patch}    |   9 +-
 .../gcc/4.9.4/0015-arm_unbreak_armv4t.patch   |  17 +
 ...-microblaze-enable-dwarf-eh-support.patch} |  20 +-
 ....patch => 0017-libstdcxx-uclibc-c99.patch} |  60 +--
 .../4.9.4/0018-cilk-wchar.patch}              |   2 -
 ...19-xtensa-add-mauto-litpools-option.patch} |  28 +-
 ...tensa-reimplement-register-spilling.patch} |  11 +-
 ...-dw2-fde-dip-instead-of-unwind-dw2-.patch} |   9 +-
 .../0022-xtensa-fix-_Unwind_GetCFA.patch}     |   9 +-
 .../0023-xtensa-add-uclinux-support.patch}    |  16 +-
 ...tensa-fix-fprintf-format-specifiers.patch} |  15 +-
 .../0025-xtensa-fix-PR-target-82181.patch}    |   9 +-
 ...ch => 0026-nios2_legitimize_address.patch} |   9 +-
 .../4.9.4/0027-fix-m68k-compile.patch}        |   9 +-
 ...inux.patch => 0028-fix-m68k-uclinux.patch} |   9 +-
 ...-support.patch => 0029-musl-support.patch} |  72 +--
 ...ibc.patch => 0030-microblaze-uclibc.patch} |   9 +-
 ...libgcc-disable-split-stack-nothreads.patch |  17 +
 ...atch => 0032-uclinux-enable-threads.patch} |   6 +-
 packages/gcc/4.9.4/100-uclibc-conf.patch      |  15 -
 .../gcc/4.9.4/301-missing-execinfo_h.patch    |  13 -
 .../gcc/4.9.4/810-arm-softfloat-libgcc.patch  |  30 --
 packages/gcc/4.9.4/860-cilk-wchar.patch       |  56 --
 ...libgcc-disable-split-stack-nothreads.patch |  14 -
 ... 0000-libtool-leave-framework-alone.patch} |   8 +-
 packages/gcc/5.5.0/0001-uclibc-conf.patch     |  17 +
 .../5.5.0/0002-msp430-string-literals.patch}  |  22 +-
 .../0003-xtensa-implement-trap-pattern.patch} |  13 +-
 .../0004-alpha-bad-eh_frame.patch}            |   6 +-
 ...x-typo-for-powerpc-e6500-cpu_is_64b.patch} |  11 +-
 .../gcc/5.5.0/0006-missing-execinfo_h.patch   |  15 +
 ...-undefined-extern-var-refs-nor-fpic.patch} |  27 +-
 ...cc-plugin-POSIX-include-sys-select-h.patch |  14 +
 .../gcc/5.5.0/0009-arm-softfloat-libgcc.patch |  31 ++
 .../gcc/5.5.0/0010-arm_unbreak_armv4t.patch   |  17 +
 ...-microblaze-enable-dwarf-eh-support.patch} |  20 +-
 ....patch => 0012-libstdcxx-uclibc-c99.patch} |  62 +--
 packages/gcc/5.5.0/0013-cilk-wchar.patch      |  54 ++
 ...14-xtensa-add-mauto-litpools-option.patch} |  43 +-
 ...tensa-reimplement-register-spilling.patch} |  15 +-
 ... => 0016-xtensa-add-uclinux-support.patch} |  25 +-
 .../gcc/5.5.0/0017-fix-m68k-compile.patch     |  18 +
 .../gcc/5.5.0/0018-fix-m68k-uclinux.patch     |  21 +
 .../5.5.0/0019-microblaze-uclibc.patch}       |   9 +-
 ... 0020-libitm-fixes-for-musl-support.patch} |   9 +-
 ...fixincludes-update-for-musl-support.patch} |   6 +-
 .../5.5.0/0022-unwind-fix-for-musl.patch}     |   6 +-
 ...ibgfortran-gthr-workaround-for-musl.patch} |  19 +-
 ...nfig.patch => 0024-musl-libc-config.patch} |  29 +-
 ...tch => 0025-add-musl-support-to-gcc.patch} |  18 +-
 ...ort.patch => 0026-mips-musl-support.patch} |   6 +-
 ...port.patch => 0027-x86-musl-support.patch} |   9 +-
 ...port.patch => 0028-arm-musl-support.patch} |   6 +-
 ....patch => 0029-aarch64-musl-support.patch} |   6 +-
 ... => 0030-nios2-bad-multilib-default.patch} |  15 +-
 ...libgcc-disable-split-stack-nothreads.patch |  17 +
 .../5.5.0/0032-uclinux-enable-threads.patch   |  22 +
 ...cc-plugin-POSIX-include-sys-select-h.patch |  11 -
 .../gcc/5.5.0/810-arm-softfloat-libgcc.patch  |  30 --
 .../gcc/5.5.0/830-arm_unbreak_armv4t.patch    |  15 -
 ...870-xtensa-add-mauto-litpools-option.patch | 290 -----------
 packages/gcc/5.5.0/890-fix-m68k-compile.patch |  15 -
 packages/gcc/5.5.0/891-fix-m68k-uclinux.patch |  18 -
 ...libgcc-disable-split-stack-nothreads.patch |  14 -
 .../5.5.0/940-uclinux-enable-threads.patch    |  19 -
 ...t-struct-ucontext-in-linux-unwind.h.patch} |  65 +--
 .../0001-libtool-leave-framework-alone.patch  |  18 +
 packages/gcc/6.4.0/0002-uclibc-conf.patch     |  17 +
 .../gcc/6.4.0/0003-missing-execinfo_h.patch   |  15 +
 ...d-undefined-extern-var-refs-nor-fpic.patch | 163 ++++++
 ...cc-plugin-POSIX-include-sys-select-h.patch |  14 +
 .../gcc/6.4.0/0006-arm-softfloat-libgcc.patch |  31 ++
 .../gcc/6.4.0/0007-arm_unbreak_armv4t.patch   |  17 +
 ...73-Reduce-size-of-Cortex-A8-automat.patch} |   7 +-
 packages/gcc/6.4.0/0009-cilk-wchar.patch      |  54 ++
 .../0010-xtensa-fix-PR-target-82181.patch}    |   9 +-
 .../gcc/6.4.0/0011-fix-m68k-compile.patch     |  18 +
 .../gcc/6.4.0/0012-fix-m68k-uclinux.patch     |  21 +
 ...kmap-symver-support-skip_underscore.patch} |   9 +-
 ...n-use-the-generic-linker-version-in.patch} |  11 +-
 ...WARF-compilation-with-FDPIC-targets.patch} |  13 +-
 ...patch => 0016-bfin-define-REENTRANT.patch} |   9 +-
 ...=> 0017-libgfortran-missing-include.patch} |   8 +-
 .../0018-nios2-bad-multilib-default.patch}    |  15 +-
 ...libgcc-disable-split-stack-nothreads.patch |  17 +
 .../6.4.0/0020-uclinux-enable-threads.patch   |  22 +
 .../6.4.0/0021-bionic-ndk.patch}              |   8 +-
 .../6.4.0/0022-bionic-errno.patch}            |   8 +-
 .../{970-crystax.patch => 0023-crystax.patch} | 108 ++--
 .../6.4.0/0024-crystax.patch}                 |   6 +-
 .../6.4.0/0025-crystax.patch}                 |  67 ++-
 .../0026-crystax.patch}                       |   8 +-
 .../0027-crystax.patch}                       |   8 +-
 .../6.4.0/0028-crystax.patch}                 |   8 +-
 .../6.4.0/0029-crystax.patch}                 |   6 +-
 .../{977-crystax.patch => 0030-crystax.patch} |  13 +-
 packages/gcc/6.4.0/100-uclibc-conf.patch      |  15 -
 .../1000-libtool-leave-framework-alone.patch  |  14 -
 ...d-undefined-extern-var-refs-nor-fpic.patch | 160 ------
 ...cc-plugin-POSIX-include-sys-select-h.patch |  11 -
 .../gcc/6.4.0/810-arm-softfloat-libgcc.patch  |  30 --
 .../gcc/6.4.0/830-arm_unbreak_armv4t.patch    |  15 -
 packages/gcc/6.4.0/860-cilk-wchar.patch       |  56 --
 packages/gcc/6.4.0/890-fix-m68k-compile.patch |  15 -
 packages/gcc/6.4.0/891-fix-m68k-uclinux.patch |  18 -
 ...libgcc-disable-split-stack-nothreads.patch |  14 -
 .../6.4.0/940-uclinux-enable-threads.patch    |  19 -
 .../0000-libtool-leave-framework-alone.patch  |  18 +
 packages/gcc/7.2.0/0001-uclibc-conf.patch     |  17 +
 ...-undefined-extern-var-refs-nor-fpic.patch} |  21 +-
 ...cc-plugin-POSIX-include-sys-select-h.patch |  14 +
 .../gcc/7.2.0/0004-arm-softfloat-libgcc.patch |  31 ++
 packages/gcc/7.2.0/0005-cilk-wchar.patch      |  54 ++
 .../0006-xtensa-fix-PR-target-82181.patch}    |   9 +-
 ...inux.patch => 0007-fix-m68k-uclinux.patch} |   9 +-
 ...=> 0008-libgfortran-missing-include.patch} |   8 +-
 ... => 0009-nios2-bad-multilib-default.patch} |  15 +-
 ...libgcc-disable-split-stack-nothreads.patch |  17 +
 .../0011-bionic-ndk.patch}                    |   8 +-
 ...ic-errno.patch => 0012-bionic-errno.patch} |   8 +-
 .../7.2.0/0013-crystax.patch}                 | 118 ++---
 .../{971-crystax.patch => 0014-crystax.patch} |   6 +-
 .../{972-crystax.patch => 0015-crystax.patch} |  65 +--
 .../7.2.0/0016-crystax.patch}                 |   8 +-
 .../7.2.0/0017-crystax.patch}                 |   8 +-
 .../7.2.0/0018-crystax.patch}                 |   8 +-
 .../7.2.0/0019-crystax.patch}                 |   6 +-
 .../7.2.0/0020-crystax.patch}                 |  13 +-
 packages/gcc/7.2.0/100-uclibc-conf.patch      |  15 -
 .../1000-libtool-leave-framework-alone.patch  |  14 -
 ...cc-plugin-POSIX-include-sys-select-h.patch |  11 -
 ...libgcc-disable-split-stack-nothreads.patch |  14 -
 ....patch => 0000-dwarf-stack-overflow.patch} |   9 +-
 ...ch => 0001-security-errata-20050610.patch} |  33 +-
 ...0002-tdep-opcode-include-workaround.patch} |  15 +-
 ....patch => 0003-reg-no-longer-active.patch} |  11 +-
 .../0004-sim-ppc-have-config-h.patch}         |  81 +--
 ....patch => 0005-handle-stpcpy-define.patch} |   9 +-
 .../0000-sim-ppc-have-config-h.patch}         |  85 +--
 .../0000-sim-ppc-have-config-h.patch}         |  85 +--
 ...100-musl_fix.patch => 0000-musl_fix.patch} |   5 +
 ...-initialize-call_abi-in-xtensa_tdep.patch} |   9 +-
 ...sa-make-sure-ar_base-is-initialized.patch} |   9 +-
 ...-WIP-end-of-prologue-detection-hack.patch} |   9 +-
 ...100-musl_fix.patch => 0000-musl_fix.patch} |   7 +-
 ...0001-uclibc-no-gettimeofday-clobber.patch} |   8 +-
 ...sa-make-sure-ar_base-is-initialized.patch} |   9 +-
 ...-WIP-end-of-prologue-detection-hack.patch} |   9 +-
 ...100-musl_fix.patch => 0000-musl_fix.patch} |   7 +-
 ...0001-uclibc-no-gettimeofday-clobber.patch} |  19 +-
 ...sa-make-sure-ar_base-is-initialized.patch} |   9 +-
 ...-WIP-end-of-prologue-detection-hack.patch} |   9 +-
 .../0004-allow-android.patch}                 |  19 +-
 ...lz-fix.patch => 0000-sim-ppc-lz-fix.patch} |  14 +-
 ...patch => 0000-all_ptrace_setsiginfo.patch} |  71 +--
 ....patch => 0001-all_readline-headers.patch} |   6 +
 ...100-musl_fix.patch => 0000-musl_fix.patch} |   7 +-
 ...0001-uclibc-no-gettimeofday-clobber.patch} |  19 +-
 ...sa-make-sure-ar_base-is-initialized.patch} |   9 +-
 ...-WIP-end-of-prologue-detection-hack.patch} |   9 +-
 .../0004-allow-android.patch}                 |  19 +-
 ...ker-error-redefinition-of-vasprintf.patch} |   7 +-
 ...-link-errors-when-compiling-with-O0.patch} | 140 +++--
 ...64-build-environ-is-always-dllimport.patch |  75 +++
 ...patch => 0003-Fix-Cygwin-sys-select.patch} |   7 +-
 ...tch => 0004-Fix-Cygwin-sys-select-2.patch} |   4 +
 ...64-build-environ-is-always-dllimport.patch |  72 ---
 ...ker-error-redefinition-of-vasprintf.patch} |   7 +-
 ...-link-errors-when-compiling-with-O0.patch} | 156 +++---
 ...64-build-environ-is-always-dllimport.patch |  75 +++
 ...64-build-environ-is-always-dllimport.patch |  72 ---
 ...sparc-nptl.patch => 0000-sparc-nptl.patch} |   8 +-
 ...rning-about-ambiguous-else-with-Wpa.patch} |  31 +-
 .../0002-fix-signed-shift-overlow.patch}      |  23 +-
 .../0003-dl-openat64-variadic.patch}          |   6 +-
 .../2.20-2014.11/0004-unused-variables.patch} |  60 ++-
 ...atch => 0005-misleading-indentation.patch} |   8 +-
 .../0006-dl-open-array-bounds.patch}          |  10 +-
 ...=> 0007-Fix-combreloc-test-BSD-grep.patch} |  18 +-
 ....patch => 0008-fix-rpc_parse-format.patch} |   8 +-
 ...lean.patch => 0009-explicit-boolean.patch} |   8 +-
 .../0010-nis-bogus-conditional.patch}         |   8 +-
 .../0000-Fix-ARM-build-with-GCC-trunk.patch}  |  20 +-
 ...ys-user.patch => 0001-m68k-sys-user.patch} |   9 +-
 .../0002-alpha-cache-shape.patch}             |  11 +-
 .../0003-alpha-fix-gcc-4.1-warnings.patch}    |   7 +-
 .../0004-alpha-fix-rtld-fPIC.patch}           |   7 +-
 ...m-cirrus-ep93xx-maverick-crunch-fpu.patch} |  69 +--
 .../0006-nptl-lowlevellock.patch}             |   9 +-
 .../0007-fpu-cw-mips.patch}                   |   9 +-
 .../2.12.1/0008-support-hard-float-eabi.patch |  25 +
 .../2.12.1/440-alpha-cache-shape.patch        |  13 -
 .../2.12.1/670-support-hard-float-eabi.patch  |  22 -
 .../0000-Fix-ARM-build-with-GCC-trunk.patch}  |  20 +-
 .../0001-m68k-sys-user.patch}                 |   9 +-
 ...patch => 0002-alpha-SETPIPE-GETPIPE.patch} |  11 +-
 ...a-statfs.patch => 0003-alpha-statfs.patch} |  16 +-
 .../0004-alpha-cache-shape.patch}             |  11 +-
 ...h => 0005-alpha-DEFAULT_STACK_PERMS.patch} |  11 +-
 .../0006-alpha-fix-gcc-4.1-warnings.patch}    |   7 +-
 .../2.13/0007-alpha-feupdateenv.patch         |  26 +
 .../0008-alpha-fix-rtld-fPIC.patch}           |   7 +-
 ...m-cirrus-ep93xx-maverick-crunch-fpu.patch} |  69 +--
 .../0010-nptl-lowlevellock.patch}             |   9 +-
 .../0011-fpu-cw-mips.patch}                   |   9 +-
 .../2.13/0012-support-hard-float-eabi.patch   |  25 +
 .../2.13/470-alpha-feupdateenv.patch          |  26 -
 .../2.13/670-support-hard-float-eabi.patch    |  22 -
 .../0000-Fix-ARM-build-with-GCC-trunk.patch}  |  20 +-
 .../0001-m68k-sys-user.patch}                 |   9 +-
 .../0002-alpha-cache-shape.patch}             |  11 +-
 .../0003-alpha-fix-gcc-4.1-warnings.patch}    |   7 +-
 .../0004-alpha-fix-rtld-fPIC.patch}           |   7 +-
 ...m-cirrus-ep93xx-maverick-crunch-fpu.patch} |  69 +--
 ...ock.patch => 0006-nptl-lowlevellock.patch} |   9 +-
 .../0007-fpu-cw-mips.patch}                   |   9 +-
 .../0000-Fix-ARM-build-with-GCC-trunk.patch}  |  20 +-
 ...ch => 0001-libmemusage-link-failure.patch} |   8 +-
 ...ys-user.patch => 0002-m68k-sys-user.patch} |   9 +-
 .../0003-alpha-cache-shape.patch}             |  11 +-
 .../0004-alpha-fix-gcc-4.1-warnings.patch}    |   7 +-
 .../0005-alpha-fix-rtld-fPIC.patch}           |   7 +-
 ...m-cirrus-ep93xx-maverick-crunch-fpu.patch} |  69 +--
 .../0007-nptl-lowlevellock.patch}             |   9 +-
 .../0008-fpu-cw-mips.patch}                   |   9 +-
 ...> 0000-Fix-ARM-build-with-GCC-trunk.patch} |  13 +-
 .../0001-m68k-sys-user.patch}                 |   9 +-
 .../2.16.0/0002-alpha-cache-shape.patch       |  16 +
 .../0003-alpha-fix-gcc-4.1-warnings.patch     |  54 ++
 .../2.16.0/0004-alpha-fix-rtld-fPIC.patch     |  19 +
 .../2.16.0/0005-nptl-lowlevellock.patch       |  25 +
 .../glibc-ports/2.16.0/0006-fpu-cw-mips.patch |  17 +
 .../460-alpha-fix-gcc-4.1-warnings.patch      |  55 --
 .../2.16.0/530-alpha-fix-rtld-fPIC.patch      |  20 -
 .../2.16.0/580-nptl-lowlevellock.patch        |  22 -
 .../glibc-ports/2.16.0/610-fpu-cw-mips.patch  |  14 -
 ....patch => 0000-respect-env-CPPFLAGS.patch} |  15 +-
 ...rning-about-ambiguous-else-with-Wpa.patch} |  31 +-
 .../0002-fix-signed-shift-overlow.patch}      |  23 +-
 .../0003-unused-variables.patch}              |  62 +--
 ...atch => 0004-misleading-indentation.patch} |   8 +-
 ....patch => 0005-dl-open-array-bounds.patch} |   8 +-
 .../0006-i386-x86_64-revert-clone-cfi.patch}  |  20 +-
 .../0007-disable-ldconfig.patch}              |   9 +-
 ...=> 0008-Fix-combreloc-test-BSD-grep.patch} |  21 +-
 .../0009-queue-header-updates.patch}          |   9 +-
 .../0010-manual-no-perl.patch}                |   9 +-
 .../0011-localedef-fix-trampoline.patch}      |   9 +-
 .../0012-resolv-dynamic.patch}                |   9 +-
 .../0013-localedef-mmap.patch}                |   9 +-
 .../0014-fadvise64_64.patch}                  |   5 +-
 .../0015-section-comments.patch}              |   9 +-
 .../0016-no-inline-gmon.patch}                |  10 +-
 .../0017-check_native-headers.patch}          |   9 +-
 .../0018-fix-pr631.patch}                     |  15 +-
 .../0019-assume-pipe2.patch}                  |   9 +-
 .../0020-china.patch}                         |   9 +-
 .../0021-new-valencian-locale.patch}          |  15 +-
 .../0022-macos-cross-rpcgen.patch}            |   8 +-
 .../0023-nscd-one-fork.patch}                 |   9 +-
 ...rlos.patch => 0024-hppa-nptl-carlos.patch} |  45 +-
 .../0025-dl_execstack-PaX-support.patch}      |  15 +-
 .../0026-pre20040117-pt_pax.patch}            |   9 +-
 .../0027-tests-sandbox-libdl-paths.patch}     |  75 +--
 .../{370-fnmatch.patch => 0028-fnmatch.patch} |  10 +-
 .../0029-dont-build-timezone.patch}           |   9 +-
 .../0030-alpha-xstat.patch}                   |   9 +-
 packages/glibc/2.12.1/0031-alpha-creat.patch  |  17 +
 ...2-alpha_alpha-add-fdatasync-support.patch} |  20 +-
 .../0033-ppc-atomic.patch}                    |  25 +-
 .../0034-mips_shn_undef-hack.patch}           |  11 +-
 .../0035-alpha-atfcts.patch}                  |   8 +-
 .../{650-syslog.patch => 0036-syslog.patch}   |   9 +-
 ...7-debug-readlink_chk-readklinkat_chk.patch |  27 +
 ...march-i686.patch => 0038-march-i686.patch} |  15 +-
 .../0039-typedef-caddr.patch}                 |  17 +-
 .../0040-fix-rpc_parse-format.patch}          |   8 +-
 ...920-make-382.patch => 0041-make-382.patch} |  10 +-
 .../2.12.1/0042-nis-bogus-conditional.patch}  |   8 +-
 ...common.patch => 0043-obstack-common.patch} |   8 +-
 ...9-new-tools.patch => 0044-new-tools.patch} |  27 +-
 .../120-i386-x86_64-revert-clone-cfi.patch    |  55 --
 .../glibc/2.12.1/140-disable-ldconfig.patch   |  16 -
 .../2.12.1/150-queue-header-updates.patch     |  85 ---
 .../2.12.1/170-localedef-fix-trampoline.patch |  53 --
 .../glibc/2.12.1/180-resolv-dynamic.patch     |  39 --
 packages/glibc/2.12.1/200-fadvise64_64.patch  |  28 -
 packages/glibc/2.12.1/270-china.patch         |  32 --
 .../2.12.1/280-new-valencian-locale.patch     | 115 ----
 .../2.12.1/340-dl_execstack-PaX-support.patch |  66 ---
 .../glibc/2.12.1/350-pre20040117-pt_pax.patch |  32 --
 .../360-tests-sandbox-libdl-paths.patch       | 193 -------
 .../2.12.1/380-dont-build-timezone.patch      |  14 -
 packages/glibc/2.12.1/400-alpha-xstat.patch   |  15 -
 packages/glibc/2.12.1/430-alpha-creat.patch   |  14 -
 packages/glibc/2.12.1/560-ppc-atomic.patch    | 415 ---------------
 .../2.12.1/630-mips_shn_undef-hack.patch      |  16 -
 ...0-debug-readlink_chk-readklinkat_chk.patch |  24 -
 packages/glibc/2.12.1/910-typedef-caddr.patch |  28 -
 ...=> 0000-Fix-combreloc-test-BSD-grep.patch} |  21 +-
 .../0001-macos-cross-rpcgen.patch}            |   8 +-
 ...march-i686.patch => 0002-march-i686.patch} |  15 +-
 .../0003-typedef-caddr.patch}                 |  17 +-
 .../0004-fix-rpc_parse-format.patch}          |   8 +-
 .../0005-nis-bogus-conditional.patch}         |   8 +-
 ...common.patch => 0006-obstack-common.patch} |   8 +-
 ...9-new-tools.patch => 0007-new-tools.patch} |  27 +-
 ....patch => 0000-respect-env-CPPFLAGS.patch} |   9 +-
 ...rning-about-ambiguous-else-with-Wpa.patch} |  31 +-
 .../0002-fix-signed-shift-overlow.patch}      |  23 +-
 .../0003-unused-variables.patch}              |  62 +--
 ...atch => 0004-misleading-indentation.patch} |   8 +-
 ....patch => 0005-dl-open-array-bounds.patch} |   8 +-
 .../0006-i386-x86_64-revert-clone-cfi.patch}  |  20 +-
 ...nfig.patch => 0007-disable-ldconfig.patch} |   9 +-
 ...=> 0008-Fix-combreloc-test-BSD-grep.patch} |  21 +-
 .../0009-queue-header-updates.patch}          |   9 +-
 .../0010-manual-no-perl.patch}                |   9 +-
 ...ch => 0011-localedef-fix-trampoline.patch} |   9 +-
 .../0012-resolv-dynamic.patch}                |   9 +-
 ...f-mmap.patch => 0013-localedef-mmap.patch} |   9 +-
 ...ise64_64.patch => 0014-fadvise64_64.patch} |   5 +-
 .../0015-section-comments.patch}              |   9 +-
 .../0016-no-inline-gmon.patch}                |  10 +-
 .../0017-check_native-headers.patch}          |   9 +-
 .../0018-fix-pr631.patch}                     |  15 +-
 ...me-pipe2.patch => 0019-assume-pipe2.patch} |   9 +-
 .../{270-china.patch => 0020-china.patch}     |   9 +-
 .../0021-new-valencian-locale.patch}          |  15 +-
 .../0022-macos-cross-rpcgen.patch}            |   8 +-
 .../0023-nscd-one-fork.patch}                 |   9 +-
 .../0024-hppa-nptl-carlos.patch}              |  45 +-
 ...ch => 0025-dl_execstack-PaX-support.patch} |  15 +-
 ...ax.patch => 0026-pre20040117-pt_pax.patch} |   9 +-
 .../0027-tests-sandbox-libdl-paths.patch}     |  75 +--
 ...e.patch => 0028-dont-build-timezone.patch} |   9 +-
 ...pha-xstat.patch => 0029-alpha-xstat.patch} |   9 +-
 packages/glibc/2.13/0030-alpha-creat.patch    |  17 +
 ...1-alpha_alpha-add-fdatasync-support.patch} |  20 +-
 .../0032-ppc-atomic.patch}                    |  25 +-
 .../0033-mips_shn_undef-hack.patch}           |  11 +-
 .../0034-alpha-atfcts.patch}                  |   8 +-
 .../{650-syslog.patch => 0035-syslog.patch}   |   9 +-
 ...6-debug-readlink_chk-readklinkat_chk.patch |  27 +
 ...march-i686.patch => 0037-march-i686.patch} |  15 +-
 .../0038-typedef-caddr.patch}                 |  17 +-
 ....patch => 0039-fix-rpc_parse-format.patch} |   8 +-
 .../0040-nis-bogus-conditional.patch}         |   8 +-
 .../0041-initfini-ppc64.patch}                |  10 +-
 ...common.patch => 0042-obstack-common.patch} |   8 +-
 .../0043-new-tools.patch}                     |  27 +-
 packages/glibc/2.13/430-alpha-creat.patch     |  14 -
 ...0-debug-readlink_chk-readklinkat_chk.patch |  24 -
 ....patch => 0000-respect-env-CPPFLAGS.patch} |  11 +-
 ...rning-about-ambiguous-else-with-Wpa.patch} |  31 +-
 .../0002-fix-signed-shift-overlow.patch}      |  23 +-
 .../2.14.1/0003-dl-openat64-variadic.patch    | 197 +++++++
 .../0004-unused-variables.patch}              |  62 +--
 ...atch => 0005-misleading-indentation.patch} |   8 +-
 ....patch => 0006-dl-open-array-bounds.patch} |   8 +-
 .../0007-i386-x86_64-revert-clone-cfi.patch}  |  20 +-
 ...nfig.patch => 0008-disable-ldconfig.patch} |   9 +-
 ...=> 0009-Fix-combreloc-test-BSD-grep.patch} |  21 +-
 .../0010-queue-header-updates.patch}          |   9 +-
 .../0011-manual-no-perl.patch}                |  11 +-
 .../0012-localedef-fix-trampoline.patch}      |   9 +-
 .../0013-resolv-dynamic.patch}                |   9 +-
 .../0014-localedef-mmap.patch}                |   9 +-
 ...ise64_64.patch => 0015-fadvise64_64.patch} |   5 +-
 ...ents.patch => 0016-section-comments.patch} |  11 +-
 .../0017-no-inline-gmon.patch}                |  10 +-
 ...me-pipe2.patch => 0018-assume-pipe2.patch} |   9 +-
 .../{270-china.patch => 0019-china.patch}     |   9 +-
 .../0020-new-valencian-locale.patch}          |  17 +-
 .../0021-macos-cross-rpcgen.patch}            |   8 +-
 .../0022-nscd-one-fork.patch}                 |   9 +-
 .../0023-hppa-nptl-carlos.patch}              |  47 +-
 ...ch => 0024-dl_execstack-PaX-support.patch} |  17 +-
 .../0025-pre20040117-pt_pax.patch}            |   9 +-
 .../0026-tests-sandbox-libdl-paths.patch}     |  75 +--
 ...e.patch => 0027-dont-build-timezone.patch} |  11 +-
 ...pha-xstat.patch => 0028-alpha-xstat.patch} |   9 +-
 packages/glibc/2.14.1/0029-alpha-creat.patch  |  17 +
 ...0-alpha_alpha-add-fdatasync-support.patch} |  24 +-
 ...ppc-atomic.patch => 0031-ppc-atomic.patch} |  25 +-
 .../0032-mips_shn_undef-hack.patch}           |  13 +-
 .../0033-alpha-atfcts.patch}                  |   8 +-
 .../{650-syslog.patch => 0034-syslog.patch}   |   9 +-
 ...5-debug-readlink_chk-readklinkat_chk.patch |  27 +
 ...include.patch => 0036-cpuid-include.patch} |  16 +-
 .../0037-asm-i686.patch}                      |  16 +-
 .../2.14.1/0038-fix-rpc_parse-format.patch    |  62 +++
 .../2.14.1/0039-nis-bogus-conditional.patch   |  64 +++
 .../0040-initfini-ppc64.patch}                |   8 +-
 ...lete-rpc.patch => 0041-obsolete-rpc.patch} | 491 ++++++++----------
 ...common.patch => 0042-obstack-common.patch} |   8 +-
 .../0043-new-tools.patch}                     |  27 +-
 packages/glibc/2.14.1/430-alpha-creat.patch   |  14 -
 ...0-debug-readlink_chk-readklinkat_chk.patch |  24 -
 .../2.14.1/920-fix-rpc_parse-format.patch     |  60 ---
 .../2.14.1/940-nis-bogus-conditional.patch    |  62 ---
 ....patch => 0000-respect-env-CPPFLAGS.patch} |  11 +-
 ...arning-about-ambiguous-else-with-Wpa.patch |  75 +++
 .../2.15/0002-fix-signed-shift-overlow.patch  |  97 ++++
 .../2.15/0003-dl-openat64-variadic.patch      | 197 +++++++
 ...bles.patch => 0004-unused-variables.patch} |  56 +-
 .../2.15/0005-misleading-indentation.patch    |  26 +
 ....patch => 0006-dl-open-array-bounds.patch} |   8 +-
 ...> 0007-i386-x86_64-revert-clone-cfi.patch} |  20 +-
 ...nfig.patch => 0008-disable-ldconfig.patch} |  11 +-
 ...=> 0009-Fix-combreloc-test-BSD-grep.patch} |  21 +-
 .../0010-queue-header-updates.patch}          |   9 +-
 .../0011-manual-no-perl.patch}                |  11 +-
 .../0012-localedef-fix-trampoline.patch}      |   9 +-
 .../0013-resolv-dynamic.patch}                |   9 +-
 ...ise64_64.patch => 0014-fadvise64_64.patch} |   5 +-
 .../0015-section-comments.patch}              |  11 +-
 .../0016-no-inline-gmon.patch}                |  10 +-
 .../0017-assume-pipe2.patch}                  |   9 +-
 .../{270-china.patch => 0018-china.patch}     |   9 +-
 .../0019-new-valencian-locale.patch}          |  17 +-
 .../glibc/2.15/0020-macos-cross-rpcgen.patch  |  34 ++
 .../0021-nscd-one-fork.patch}                 |  15 +-
 ...rlos.patch => 0022-hppa-nptl-carlos.patch} |  49 +-
 ...ch => 0023-dl_execstack-PaX-support.patch} |  17 +-
 .../0024-pre20040117-pt_pax.patch}            |  13 +-
 .../0025-tests-sandbox-libdl-paths.patch}     |  75 +--
 ...e.patch => 0026-dont-build-timezone.patch} |  11 +-
 ...pha-xstat.patch => 0027-alpha-xstat.patch} |   9 +-
 packages/glibc/2.15/0028-alpha-creat.patch    |  17 +
 ...9-alpha_alpha-add-fdatasync-support.patch} |  22 +-
 .../0030-ppc-atomic.patch}                    |  25 +-
 .../0031-mips_shn_undef-hack.patch}           |  13 +-
 .../0032-alpha-atfcts.patch}                  |   8 +-
 .../{650-syslog.patch => 0033-syslog.patch}   |   9 +-
 ...4-debug-readlink_chk-readklinkat_chk.patch |  27 +
 ...include.patch => 0035-cpuid-include.patch} |  23 +-
 .../0036-asm-i686.patch}                      |  16 +-
 .../2.15/0037-fix-rpc_parse-format.patch      |  62 +++
 .../2.15/0038-nis-bogus-conditional.patch     |  64 +++
 ...tatic.patch => 0039-try-link-static.patch} |  33 +-
 ...expect.patch => 0040-builtin_expect.patch} |  19 +-
 ...s-suffix.patch => 0041-gcc_s-suffix.patch} |  41 +-
 ...lete-rpc.patch => 0042-obsolete-rpc.patch} | 491 ++++++++----------
 packages/glibc/2.15/0043-obstack-common.patch |  32 ++
 .../0044-new-tools.patch}                     |  27 +-
 ...arning-about-ambiguous-else-with-Wpa.patch |  84 ---
 .../2.15/102-fix-signed-shift-overlow.patch   |  98 ----
 .../2.15/105-misleading-indentation.patch     |  24 -
 .../glibc/2.15/300-macos-cross-rpcgen.patch   |  32 --
 packages/glibc/2.15/430-alpha-creat.patch     |  14 -
 ...0-debug-readlink_chk-readklinkat_chk.patch |  24 -
 .../glibc/2.15/920-fix-rpc_parse-format.patch |  60 ---
 .../2.15/940-nis-bogus-conditional.patch      |  62 ---
 packages/glibc/2.15/998-obstack-common.patch  |  30 --
 ....patch => 0000-respect-env-CPPFLAGS.patch} |   9 +-
 ...arning-about-ambiguous-else-with-Wpa.patch |  75 +++
 .../0002-fix-signed-shift-overlow.patch       |  97 ++++
 ....patch => 0003-dl-openat64-variadic.patch} |   6 +-
 ...bles.patch => 0004-unused-variables.patch} |  48 +-
 .../2.16.0/0005-misleading-indentation.patch  |  26 +
 ....patch => 0006-dl-open-array-bounds.patch} |   8 +-
 .../0007-i386-x86_64-revert-clone-cfi.patch   |  51 ++
 .../glibc/2.16.0/0008-disable-ldconfig.patch  |  19 +
 ...=> 0009-Fix-combreloc-test-BSD-grep.patch} |  18 +-
 .../2.16.0/0010-queue-header-updates.patch    |  86 +++
 .../0011-localedef-fix-trampoline.patch       |  56 ++
 .../glibc/2.16.0/0012-resolv-dynamic.patch    |  42 ++
 packages/glibc/2.16.0/0013-fadvise64_64.patch |  27 +
 ...me-pipe2.patch => 0014-assume-pipe2.patch} |   9 +-
 packages/glibc/2.16.0/0015-china.patch        |  35 ++
 .../2.16.0/0016-new-valencian-locale.patch    | 118 +++++
 .../2.16.0/0017-macos-cross-rpcgen.patch      |  34 ++
 ...ne-fork.patch => 0018-nscd-one-fork.patch} |  11 +-
 ...rlos.patch => 0019-hppa-nptl-carlos.patch} |  83 +--
 .../0020-dl_execstack-PaX-support.patch       |  69 +++
 .../2.16.0/0021-pre20040117-pt_pax.patch      |  35 ++
 .../0022-tests-sandbox-libdl-paths.patch      | 196 +++++++
 .../2.16.0/0023-dont-build-timezone.patch     |  17 +
 packages/glibc/2.16.0/0024-alpha-xstat.patch  |  18 +
 packages/glibc/2.16.0/0025-alpha-creat.patch  |  17 +
 ...6-alpha_alpha-add-fdatasync-support.patch} |  26 +-
 ...of-numeric-hosts-in-gethostbyname_r.patch} |  22 +-
 packages/glibc/2.16.0/0028-ppc-atomic.patch   | 412 +++++++++++++++
 .../2.16.0/0029-mips_shn_undef-hack.patch     |  19 +
 packages/glibc/2.16.0/0030-alpha-atfcts.patch |  16 +
 packages/glibc/2.16.0/0031-syslog.patch       |  15 +
 ...2-debug-readlink_chk-readklinkat_chk.patch |  27 +
 .../2.16.0/0033-fix-rpc_parse-format.patch    |  62 +++
 .../2.16.0/0034-nis-bogus-conditional.patch   |  64 +++
 .../glibc/2.16.0/0035-obstack-common.patch    |  32 ++
 ...9-new-tools.patch => 0036-new-tools.patch} |  21 +-
 ...arning-about-ambiguous-else-with-Wpa.patch |  84 ---
 .../2.16.0/102-fix-signed-shift-overlow.patch |  98 ----
 .../2.16.0/105-misleading-indentation.patch   |  24 -
 .../glibc/2.16.0/300-macos-cross-rpcgen.patch |  32 --
 packages/glibc/2.16.0/430-alpha-creat.patch   |  14 -
 packages/glibc/2.16.0/640-alpha-atfcts.patch  |  12 -
 packages/glibc/2.16.0/650-syslog.patch        |  12 -
 ...0-debug-readlink_chk-readklinkat_chk.patch |  24 -
 .../2.16.0/920-fix-rpc_parse-format.patch     |  60 ---
 .../2.16.0/940-nis-bogus-conditional.patch    |  62 ---
 .../glibc/2.16.0/998-obstack-common.patch     |  30 --
 ...> 0000-Fix-ARM-build-with-GCC-trunk.patch} |  13 +-
 ...arning-about-ambiguous-else-with-Wpa.patch |  75 +++
 .../2.17/0002-fix-signed-shift-overlow.patch  |  97 ++++
 .../2.17/0003-dl-openat64-variadic.patch}     |   6 +-
 ...bles.patch => 0004-unused-variables.patch} |  48 +-
 .../2.17/0005-misleading-indentation.patch    |  26 +
 ....patch => 0006-dl-open-array-bounds.patch} |   8 +-
 .../0007-support-make4.patch}                 |  13 +-
 ...=> 0008-Fix-combreloc-test-BSD-grep.patch} |  18 +-
 .../glibc/2.17/0009-macos-cross-rpcgen.patch  |  34 ++
 .../2.17/0010-fix-rpc_parse-format.patch      |  62 +++
 .../2.17/0011-nis-bogus-conditional.patch     |  64 +++
 packages/glibc/2.17/0012-obstack-common.patch |  32 ++
 ...arning-about-ambiguous-else-with-Wpa.patch |  84 ---
 .../2.17/102-fix-signed-shift-overlow.patch   |  98 ----
 .../glibc/2.17/103-dl-openat64-variadic.patch | 195 -------
 .../2.17/105-misleading-indentation.patch     |  24 -
 .../glibc/2.17/300-macos-cross-rpcgen.patch   |  32 --
 .../glibc/2.17/920-fix-rpc_parse-format.patch |  60 ---
 .../2.17/940-nis-bogus-conditional.patch      |  62 ---
 packages/glibc/2.17/998-obstack-common.patch  |  30 --
 ...Fix-clone-code-when-built-for-Thumb.patch} |  16 +-
 ...arning-about-ambiguous-else-with-Wpa.patch |  75 +++
 .../2.18/0002-fix-signed-shift-overlow.patch  |  97 ++++
 .../0003-dl-openat64-variadic.patch}          |   6 +-
 .../glibc/2.18/0004-unused-variables.patch    | 151 ++++++
 .../2.18/0005-misleading-indentation.patch    |  26 +
 .../0006-dl-open-array-bounds.patch}          |  10 +-
 ...d_broadcast-and-pthread_cond_signal.patch} |  21 +-
 .../0008-support-make4.patch}                 |  13 +-
 ...arm-unwind.patch => 0009-arm-unwind.patch} |  27 +-
 ...=> 0010-Fix-combreloc-test-BSD-grep.patch} |  18 +-
 .../glibc/2.18/0011-macos-cross-rpcgen.patch  |  34 ++
 .../2.18/0012-fix-rpc_parse-format.patch      |  62 +++
 .../2.18/0013-nis-bogus-conditional.patch     |  64 +++
 ...arning-about-ambiguous-else-with-Wpa.patch |  84 ---
 .../2.18/102-fix-signed-shift-overlow.patch   |  98 ----
 .../glibc/2.18/103-dl-openat64-variadic.patch | 195 -------
 .../2.18/105-misleading-indentation.patch     |  24 -
 .../glibc/2.18/300-macos-cross-rpcgen.patch   |  32 --
 .../glibc/2.18/920-fix-rpc_parse-format.patch |  60 ---
 .../2.18/940-nis-bogus-conditional.patch      |  62 ---
 ...arning-about-ambiguous-else-with-Wpa.patch |  75 +++
 .../2.19/0001-fix-signed-shift-overlow.patch  |  97 ++++
 .../2.19/0002-dl-openat64-variadic.patch      | 197 +++++++
 ...bles.patch => 0003-unused-variables.patch} |  45 +-
 .../2.19/0004-misleading-indentation.patch    |  26 +
 .../0005-dl-open-array-bounds.patch}          |  10 +-
 ...arm-unwind.patch => 0006-arm-unwind.patch} |  27 +-
 ...=> 0007-Fix-combreloc-test-BSD-grep.patch} |  18 +-
 packages/glibc/2.19/0008-typedef-caddr.patch  |  31 ++
 .../2.19/0009-fix-rpc_parse-format.patch      |  62 +++
 ...lean.patch => 0010-explicit-boolean.patch} |   8 +-
 .../2.19/0011-nis-bogus-conditional.patch     |  64 +++
 ...arning-about-ambiguous-else-with-Wpa.patch |  84 ---
 .../2.19/102-fix-signed-shift-overlow.patch   |  98 ----
 .../glibc/2.19/103-dl-openat64-variadic.patch | 195 -------
 .../2.19/105-misleading-indentation.patch     |  24 -
 .../glibc/2.19/920-fix-rpc_parse-format.patch |  60 ---
 .../2.19/940-nis-bogus-conditional.patch      |  62 ---
 ...sparc-nptl.patch => 0000-sparc-nptl.patch} |   8 +-
 ...arning-about-ambiguous-else-with-Wpa.patch |  75 +++
 .../2.20/0002-fix-signed-shift-overlow.patch  |  97 ++++
 .../2.20/0003-dl-openat64-variadic.patch      | 197 +++++++
 .../2.20/0004-unused-variables.patch}         |  45 +-
 .../2.20/0005-misleading-indentation.patch    |  26 +
 .../2.20/0006-dl-open-array-bounds.patch}     |  10 +-
 ...=> 0007-Fix-combreloc-test-BSD-grep.patch} |  18 +-
 .../0008-typedef-caddr.patch}                 |  12 +-
 .../2.20/0009-fix-rpc_parse-format.patch      |  62 +++
 ...lean.patch => 0010-explicit-boolean.patch} |   8 +-
 .../2.20/0011-nis-bogus-conditional.patch     |  64 +++
 ...arning-about-ambiguous-else-with-Wpa.patch |  84 ---
 .../2.20/102-fix-signed-shift-overlow.patch   |  98 ----
 .../glibc/2.20/103-dl-openat64-variadic.patch | 195 -------
 .../glibc/2.20/104-unused-variables.patch     | 178 -------
 .../2.20/105-misleading-indentation.patch     |  24 -
 .../glibc/2.20/920-fix-rpc_parse-format.patch |  60 ---
 .../2.20/940-nis-bogus-conditional.patch      |  62 ---
 ...arning-about-ambiguous-else-with-Wpa.patch |  75 +++
 .../2.21/0001-fix-signed-shift-overlow.patch  |  97 ++++
 .../2.21/0002-dl-openat64-variadic.patch      | 197 +++++++
 ...bles.patch => 0003-unused-variables.patch} |  45 +-
 .../2.21/0004-misleading-indentation.patch    |  26 +
 .../2.21/0005-dl-open-array-bounds.patch      |  38 ++
 ...=> 0006-Fix-combreloc-test-BSD-grep.patch} |  18 +-
 .../0007-typedef-caddr.patch}                 |  12 +-
 .../2.21/0008-fix-rpc_parse-format.patch      |  62 +++
 ...lean.patch => 0009-explicit-boolean.patch} |   8 +-
 .../2.21/0010-nis-bogus-conditional.patch     |  64 +++
 ...assert.patch => 0011-dlclose-assert.patch} |  10 +-
 ...arning-about-ambiguous-else-with-Wpa.patch |  84 ---
 .../2.21/102-fix-signed-shift-overlow.patch   |  98 ----
 .../glibc/2.21/103-dl-openat64-variadic.patch | 195 -------
 .../2.21/105-misleading-indentation.patch     |  24 -
 .../glibc/2.21/106-dl-open-array-bounds.patch |  36 --
 .../glibc/2.21/920-fix-rpc_parse-format.patch |  60 ---
 .../2.21/940-nis-bogus-conditional.patch      |  62 ---
 ...00-sparc32-sem_open-missing-include.patch} |   6 +-
 ...arning-about-ambiguous-else-with-Wpa.patch |  75 +++
 .../2.22/0002-fix-signed-shift-overlow.patch  |  97 ++++
 ....patch => 0003-dl-openat64-variadic.patch} |   6 +-
 ...bles.patch => 0004-unused-variables.patch} |  45 +-
 .../2.22/0005-misleading-indentation.patch    |  26 +
 ...006-cve-2105-7547-getaddrinfo-stack.patch} |  21 +-
 .../0007-Fix-combreloc-test-BSD-grep.patch    |  41 ++
 .../0008-typedef-caddr.patch}                 |  12 +-
 .../2.22/0009-fix-rpc_parse-format.patch      |  62 +++
 .../glibc/2.22/0010-explicit-boolean.patch    |  35 ++
 .../2.22/0011-nis-bogus-conditional.patch     |  64 +++
 ...arning-about-ambiguous-else-with-Wpa.patch |  84 ---
 .../2.22/102-fix-signed-shift-overlow.patch   |  98 ----
 .../2.22/105-misleading-indentation.patch     |  24 -
 .../140-Fix-combreloc-test-BSD-grep.patch     |  49 --
 .../glibc/2.22/920-fix-rpc_parse-format.patch |  60 ---
 .../glibc/2.22/930-explicit-boolean.patch     |  33 --
 .../2.22/940-nis-bogus-conditional.patch      |  62 ---
 ...arning-about-ambiguous-else-with-Wpa.patch |  75 +++
 ...01-Fix-build-with-enable-static-nss.patch} |  12 +-
 .../0002-Fix-combreloc-test-BSD-grep.patch    |  41 ++
 .../0003-typedef-caddr.patch}                 |  12 +-
 .../2.23/0004-fix-rpc_parse-format.patch      |  62 +++
 .../glibc/2.23/0005-explicit-boolean.patch    |  35 ++
 .../2.23/0006-nis-bogus-conditional.patch     |  64 +++
 .../0007-regexp-common.patch}                 |   6 +-
 ...arning-about-ambiguous-else-with-Wpa.patch |  84 ---
 .../140-Fix-combreloc-test-BSD-grep.patch     |  49 --
 .../glibc/2.23/920-fix-rpc_parse-format.patch |  60 ---
 .../glibc/2.23/930-explicit-boolean.patch     |  33 --
 .../2.23/940-nis-bogus-conditional.patch      |  62 ---
 ...-fix-gcc6.patch => 0000-sh-fix-gcc6.patch} |   9 +-
 ...01-Fix-build-with-enable-static-nss.patch} |  12 +-
 .../0002-Fix-combreloc-test-BSD-grep.patch    |  41 ++
 packages/glibc/2.24/0003-typedef-caddr.patch  |  17 +
 .../2.24/0004-fix-rpc_parse-format.patch      |  62 +++
 .../glibc/2.24/0005-explicit-boolean.patch    |  35 ++
 .../2.24/0006-nis-bogus-conditional.patch     |  64 +++
 ...-common.patch => 0007-regexp-common.patch} |   6 +-
 .../140-Fix-combreloc-test-BSD-grep.patch     |  49 --
 packages/glibc/2.24/910-typedef-caddr.patch   |  15 -
 .../glibc/2.24/920-fix-rpc_parse-format.patch |  60 ---
 .../glibc/2.24/930-explicit-boolean.patch     |  33 --
 .../2.24/940-nis-bogus-conditional.patch      |  62 ---
 ...-fix-gcc6.patch => 0000-sh-fix-gcc6.patch} |   9 +-
 ...01-Fix-build-with-enable-static-nss.patch} |  12 +-
 .../0002-Fix-combreloc-test-BSD-grep.patch    |  41 ++
 packages/glibc/2.25/0003-typedef-caddr.patch  |  17 +
 ...ivdi3.patch => 0004-sh4-trap-divdi3.patch} |  49 +-
 ....patch => 0005-sparc-extra-plt-call.patch} |  23 +-
 .../0006-regexp-common.patch}                 |   6 +-
 .../140-Fix-combreloc-test-BSD-grep.patch     |  49 --
 packages/glibc/2.25/910-typedef-caddr.patch   |  15 -
 packages/glibc/2.26/0000-typedef-caddr.patch  |  17 +
 packages/glibc/2.26/910-typedef-caddr.patch   |  15 -
 ...tch => 0000-fix-r0-clobbering-issue.patch} |  10 +-
 ....patch => 0000-fix-64-bit-detection.patch} |  15 +-
 ...stdio.in.h-remove-gets-declarations.patch} |   9 +-
 ...gs.patch => 0000-2.4.5-pass-ldflags.patch} |  10 +-
 ...rclpy.patch => 0000-unifdef-strclpy.patch} |   8 +-
 ...e.patch => 0000-allow-cross-compile.patch} |  36 +-
 .../ltrace/0.5.3/0001-alpha-support.patch     |  14 +
 ...patch => 0002-debian-ltrace_0.5.3-2.patch} |  28 +-
 ...add-sysdep.patch => 0003-add-sysdep.patch} |  12 +-
 .../0.5.3/{140-mips.patch => 0004-mips.patch} |  26 +-
 .../ltrace/0.5.3/0005-mips-remove-CP.patch    |  18 +
 ...tch => 0006-allow-configurable-arch.patch} |  24 +-
 ... => 0007-fix-missing-ptrace-defines.patch} |  26 +-
 ...0-lib-supcc.patch => 0008-lib-supcc.patch} |  12 +-
 .../0.5.3/0009-libltrace-genindex.patch       |  15 +
 ...rable.patch => 0010-ar-configurable.patch} |  18 +-
 ...stos.patch => 0011-configure-hostos.patch} |   9 +-
 packages/ltrace/0.5.3/110-alpha-support.patch |  11 -
 .../ltrace/0.5.3/140-mips-remove-CP.patch     |  16 -
 .../ltrace/0.5.3/180-libltrace-genindex.patch |  12 -
 ...tdc++.patch => 0000-avoid-libstdc++.patch} |  15 +-
 ...002-printf-p.patch => 0001-printf-p.patch} |  10 +-
 ...debug.h.patch => 0002-alpha-debug.h.patch} |   8 +-
 ...rning.patch => 0003-compile-warning.patch} |  17 +-
 ...arc-ftbfs.patch => 0004-sparc-ftbfs.patch} |  13 +-
 ...patch => 0005-unexpected-breakpoint.patch} |  10 +-
 .../{007-gcc-5.patch => 0006-gcc-5.patch}     |  11 +-
 ...glibc-2.24.patch => 0007-glibc-2.24.patch} |  11 +-
 .../v2.0.10/0000-mingw64-malloc.patch         |  30 ++
 ...=> 0001-gendef-explicit-fallthrough.patch} |  12 +-
 .../v2.0.10/100-mingw64-malloc.patch          |  27 -
 .../v3.0.0/0000-mingw64-malloc.patch          |  30 ++
 ...=> 0001-gendef-explicit-fallthrough.patch} |  12 +-
 ... 0002-genpeimg-explicit-fallthrough.patch} |  10 +-
 .../mingw-w64/v3.0.0/100-mingw64-malloc.patch |  27 -
 .../v3.1.0/0000-mingw64-malloc.patch          |  30 ++
 ...=> 0001-gendef-explicit-fallthrough.patch} |  12 +-
 ... 0002-genpeimg-explicit-fallthrough.patch} |  10 +-
 .../mingw-w64/v3.1.0/100-mingw64-malloc.patch |  27 -
 .../v3.2.0/0000-mingw64-malloc.patch          |  30 ++
 ...=> 0001-gendef-explicit-fallthrough.patch} |  12 +-
 ... 0002-genpeimg-explicit-fallthrough.patch} |  10 +-
 .../mingw-w64/v3.2.0/100-mingw64-malloc.patch |  27 -
 .../v3.3.0/0000-mingw64-malloc.patch          |  30 ++
 .../0001-gendef-explicit-fallthrough.patch    |  44 ++
 ... 0002-genpeimg-explicit-fallthrough.patch} |  10 +-
 .../mingw-w64/v3.3.0/100-mingw64-malloc.patch |  27 -
 .../200-gendef-explicit-fallthrough.patch     |  42 --
 .../v4.0.6/0000-mingw64-malloc.patch          |  30 ++
 .../0001-gendef-explicit-fallthrough.patch    |  44 ++
 .../0002-genpeimg-explicit-fallthrough.patch  |  31 ++
 .../mingw-w64/v4.0.6/100-mingw64-malloc.patch |  27 -
 .../200-gendef-explicit-fallthrough.patch     |  42 --
 .../300-genpeimg-explicit-fallthrough.patch   |  29 --
 .../v5.0.2/0000-mingw64-malloc.patch          |  58 +++
 .../0001-gendef-explicit-fallthrough.patch    |  44 ++
 .../0002-genpeimg-explicit-fallthrough.patch  |  31 ++
 .../mingw-w64/v5.0.2/100-mingw64-malloc.patch |  55 --
 .../200-gendef-explicit-fallthrough.patch     |  42 --
 .../300-genpeimg-explicit-fallthrough.patch   |  29 --
 ...low.patch => 0000-sin_cos_underflow.patch} |  47 +-
 ...longlong.h.patch => 0001-longlong.h.patch} |  36 +-
 packages/mpfr/2.4.2/0002-gmp5.patch           |  80 +++
 packages/mpfr/2.4.2/120-gmp5.patch            |  75 ---
 ...xprange.patch => 0000-asin_exprange.patch} |  39 +-
 ...-carry.patch => 0001-rec_sqrt-carry.patch} |  36 +-
 ...range.patch => 0002-atan-expo-range.patch} |  43 +-
 packages/mpfr/3.0.1/0003-texp-zero.patch      |  53 ++
 packages/mpfr/3.0.1/140-texp-zero.patch       |  47 --
 ....patch => 0000-ncurses-6.0-20150810.patch} |  54 +-
 ....patch => 0001-ncurses-6.0-20150815.patch} | 177 +++----
 ....patch => 0002-ncurses-6.0-20150822.patch} | 116 ++---
 ....patch => 0003-ncurses-6.0-20150905.patch} | 289 ++++-------
 ....patch => 0004-ncurses-6.0-20150912.patch} |  73 +--
 ....patch => 0005-ncurses-6.0-20150919.patch} | 163 +++---
 ....patch => 0006-ncurses-6.0-20150926.patch} | 167 +++---
 ....patch => 0007-ncurses-6.0-20151010.patch} | 121 ++---
 ....patch => 0008-ncurses-6.0-20151017.patch} | 117 ++---
 ....patch => 0009-ncurses-6.0-20151024.patch} | 187 +++----
 ....patch => 0010-ncurses-6.0-20151101.patch} |  91 ++--
 ....patch => 0011-ncurses-6.0-20151107.patch} |  79 ++-
 ...un_tic.patch => 0012-create-run_tic.patch} |  19 +-
 ...00-fix-unaligned-access-memcpy-m68k.patch} |   6 +-
 .../2.1.0-2014.09/0001-fix-eabihf.patch       |  27 +
 .../2.1.0-2014.09/0002-fix-mt-cflags.patch    |  28 +
 .../2.1.0-2014.09/110-fix-eabihf.patch        |  24 -
 .../2.1.0-2014.09/200-fix-mt-cflags.patch     |  25 -
 ...00-fix-unaligned-access-memcpy-m68k.patch} |   6 +-
 .../2.2.0-2015.01/0001-fix-eabihf.patch       |  27 +
 .../2.2.0-2015.01/0002-fix-mt-cflags.patch    |  28 +
 .../2.2.0-2015.01/110-fix-eabihf.patch        |  24 -
 .../2.2.0-2015.01/200-fix-mt-cflags.patch     |  25 -
 packages/newlib/1.17.0/0000-fix-eabihf.patch  |  27 +
 ...-cflags.patch => 0001-fix-mt-cflags.patch} |  21 +-
 ...m-build.patch => 0002-fix-arm-build.patch} |  12 +-
 packages/newlib/1.17.0/110-fix-eabihf.patch   |  24 -
 ...00-fix-unaligned-access-memcpy-m68k.patch} |   6 +-
 packages/newlib/1.18.0/0001-fix-eabihf.patch  |  27 +
 .../newlib/1.18.0/0002-fix-mt-cflags.patch    |  28 +
 packages/newlib/1.18.0/110-fix-eabihf.patch   |  24 -
 .../newlib/1.18.0/200-fix-mt-cflags.patch     |  25 -
 ...00-fix-unaligned-access-memcpy-m68k.patch} |   6 +-
 packages/newlib/1.19.0/0001-fix-eabihf.patch  |  27 +
 .../newlib/1.19.0/0002-fix-mt-cflags.patch    |  28 +
 packages/newlib/1.19.0/110-fix-eabihf.patch   |  24 -
 .../newlib/1.19.0/200-fix-mt-cflags.patch     |  25 -
 ...00-fix-unaligned-access-memcpy-m68k.patch} |   6 +-
 packages/newlib/1.20.0/0001-fix-eabihf.patch  |  27 +
 .../newlib/1.20.0/0002-fix-mt-cflags.patch    |  28 +
 packages/newlib/1.20.0/110-fix-eabihf.patch   |  24 -
 .../newlib/1.20.0/200-fix-mt-cflags.patch     |  25 -
 ...00-fix-unaligned-access-memcpy-m68k.patch} |   6 +-
 packages/newlib/2.0.0/0001-fix-eabihf.patch   |  27 +
 .../newlib/2.0.0/0002-fix-mt-cflags.patch     |  28 +
 packages/newlib/2.0.0/110-fix-eabihf.patch    |  24 -
 packages/newlib/2.0.0/200-fix-mt-cflags.patch |  25 -
 ...000-fix-unaligned-access-memcpy-m68k.patch |  25 +
 packages/newlib/2.1.0/0001-fix-eabihf.patch   |  27 +
 .../newlib/2.1.0/0002-fix-mt-cflags.patch     |  28 +
 ...100-fix-unaligned-access-memcpy-m68k.patch |  27 -
 packages/newlib/2.1.0/110-fix-eabihf.patch    |  24 -
 packages/newlib/2.1.0/200-fix-mt-cflags.patch |  25 -
 ...000-fix-unaligned-access-memcpy-m68k.patch |  25 +
 .../2.2.0.20151023/0001-fix-eabihf.patch      |  27 +
 .../2.2.0.20151023/0002-fix-mt-cflags.patch   |  28 +
 ...100-fix-unaligned-access-memcpy-m68k.patch |  27 -
 .../2.2.0.20151023/110-fix-eabihf.patch       |  24 -
 .../2.2.0.20151023/200-fix-mt-cflags.patch    |  25 -
 ...000-fix-unaligned-access-memcpy-m68k.patch |  25 +
 .../2.3.0.20160226/0001-fix-eabihf.patch      |  27 +
 .../2.3.0.20160226/0002-fix-mt-cflags.patch   |  28 +
 ...100-fix-unaligned-access-memcpy-m68k.patch |  27 -
 .../2.3.0.20160226/110-fix-eabihf.patch       |  24 -
 .../2.3.0.20160226/200-fix-mt-cflags.patch    |  25 -
 ...000-fix-unaligned-access-memcpy-m68k.patch |  25 +
 .../2.4.0.20161025/0001-fix-eabihf.patch      |  27 +
 ...-cflags.patch => 0002-fix-mt-cflags.patch} |   9 +-
 ...100-fix-unaligned-access-memcpy-m68k.patch |  27 -
 .../2.4.0.20161025/110-fix-eabihf.patch       |  24 -
 ...000-fix-unaligned-access-memcpy-m68k.patch |  25 +
 ...-cflags.patch => 0001-fix-mt-cflags.patch} |   9 +-
 ...100-fix-unaligned-access-memcpy-m68k.patch |  27 -
 ....patch => 0000-aarch64_rt_sigreturn.patch} |   8 +-
 ...2_arm_mmap2.patch => 0001-arm_mmap2.patch} |   6 +-
 ...egs.patch => 0002-aarch64_arch_regs.patch} |  13 +-
 ...-v.test.patch => 0003-stat64-v.test.patch} |  10 +-
 ...lect_test.patch => 0004-select_test.patch} |   9 +-
 ... => 0005-fix_aarch64_ioctl_decoding.patch} |  15 +-
 ...st.patch => 0006-fix_bexecve64_test.patch} |   4 +
 ...> 0007-decode_mips_indirect_syscall.patch} |  26 +-
 ...atch => 0008-upstream-musl_includes.patch} |   8 +
 ...-ioctl.patch => 0009-use-host-ioctl.patch} |  37 +-
 ...-ioctl.patch => 0000-use-host-ioctl.patch} |  37 +-
 ...-ioctl.patch => 0000-use-host-ioctl.patch} |  39 +-
 .../0000-use-host-ioctl.patch}                |  39 +-
 .../0000-use-host-ioctl.patch}                |  39 +-
 ...-ioctl.patch => 0000-use-host-ioctl.patch} |  39 +-
 ...decl.patch => 0000-conflicting-decl.patch} |   6 +-
 ...0-strace-4.8-glibc_2.18_build_fix-1.patch} |  31 +-
 .../{0001-gdb8.patch => 0000-gdb8.patch}      |  13 +-
 .../{0001-gdb8.patch => 0000-gdb8.patch}      |  13 +-
 ...100-m68k-ice.patch => 0000-m68k-ice.patch} |   9 +-
 ...ch => 0001-fix-kernel-3.4plus-build.patch} | 141 ++---
 ...uild.patch => 0002-fix-darwin-build.patch} |  11 +-
 ...arm-unwind.patch => 0003-arm-unwind.patch} |   8 +-
 ...nstall-D.patch => 0004-no-install-D.patch} |   8 +-
 ...tilib.patch => 0005-prefer-multilib.patch} |  19 +-
 ...-static.patch => 0006-dlopen-static.patch} |  11 +-
 ...fig.patch => 0007-make-olddefconfig.patch} |  23 +-
 ...-fail.patch => 0000-make-check-fail.patch} |   8 +-
 ...gwin.patch => 0001-no-_wopen-cygwin.patch} |   7 +-
 ...nly.patch => 0002-mingw-static-only.patch} |  13 +-
 1140 files changed, 17168 insertions(+), 18001 deletions(-)
 rename packages/binutils/2.23.2/{120-sh-conf.patch => 0000-sh-conf.patch} (83%)
 rename packages/binutils/{2.26.1/300-001_ld_makefile_patch.patch => 2.23.2/0001-001_ld_makefile_patch.patch} (76%)
 rename packages/binutils/2.23.2/{300-012_check_ldrunpath_length.patch => 0002-012_check_ldrunpath_length.patch} (66%)
 rename packages/binutils/{2.24/310-fix-gold-pthreads-typo.patch => 2.23.2/0003-fix-gold-pthreads-typo.patch} (76%)
 rename packages/binutils/2.23.2/{500-sysroot.patch => 0004-sysroot.patch} (91%)
 rename packages/binutils/2.23.2/{600-poison-system-directories.patch => 0005-poison-system-directories.patch} (91%)
 rename packages/binutils/2.23.2/{900-xtensa-trampolines.patch => 0006-xtensa-trampolines.patch} (91%)
 rename packages/binutils/{2.24/901-xtensa-gas-first-frag-alignment.patch => 2.23.2/0007-xtensa-gas-first-frag-alignment.patch} (88%)
 rename packages/binutils/2.23.2/{902-xtensa-gas-ld-diff-relocation-signed.patch => 0008-xtensa-gas-ld-diff-relocation-signed.patch} (84%)
 rename packages/binutils/{2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch => 2.23.2/0009-xtensa-fix-ld-segfault-when-linking-linux-modules.patch} (88%)
 rename packages/binutils/2.23.2/{904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch => 0010-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch} (92%)
 rename packages/binutils/2.23.2/{905-Fix-trampolines-search-code-for-conditional-branches.patch => 0011-Fix-trampolines-search-code-for-conditional-branches.patch} (76%)
 rename packages/binutils/{2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch => 2.23.2/0012-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch} (90%)
 rename packages/binutils/{2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch => 2.23.2/0013-xtensa-fix-gas-segfault-with-text-section-literals.patch} (89%)
 rename packages/binutils/{2.24/914-xtensa-fix-signedness-of-gas-relocations.patch => 2.23.2/0014-xtensa-fix-signedness-of-gas-relocations.patch} (85%)
 rename packages/binutils/2.23.2/{915-xtensa-fix-.init-.fini-literals-moving.patch => 0015-xtensa-fix-.init-.fini-literals-moving.patch} (90%)
 delete mode 100644 packages/binutils/2.23.2/300-001_ld_makefile_patch.patch
 rename packages/binutils/2.24/{001-fix-enable-install-libiberty-flag.patch => 0000-fix-enable-install-libiberty-flag.patch} (80%)
 rename packages/binutils/2.24/{002-dont-segv-on-initial-instructions-overflow.patch => 0001-dont-segv-on-initial-instructions-overflow.patch} (88%)
 create mode 100644 packages/binutils/2.24/0002-sh-conf.patch
 rename packages/binutils/{2.27/300-001_ld_makefile_patch.patch => 2.24/0003-001_ld_makefile_patch.patch} (76%)
 rename packages/binutils/2.24/{300-012_check_ldrunpath_length.patch => 0004-012_check_ldrunpath_length.patch} (66%)
 rename packages/binutils/{2.26.1/310-fix-gold-pthreads-typo.patch => 2.24/0005-fix-gold-pthreads-typo.patch} (76%)
 rename packages/binutils/{2.25.1/500-sysroot.patch => 2.24/0006-sysroot.patch} (91%)
 rename packages/binutils/2.24/{600-poison-system-directories.patch => 0007-poison-system-directories.patch} (91%)
 rename packages/binutils/2.24/{700-Fix-library-paths-on-PowerPC.patch => 0008-Fix-library-paths-on-PowerPC.patch} (87%)
 rename packages/binutils/2.24/{900-xtensa-trampolines.patch => 0009-xtensa-trampolines.patch} (91%)
 rename packages/binutils/{2.23.2/901-xtensa-gas-first-frag-alignment.patch => 2.24/0010-xtensa-gas-first-frag-alignment.patch} (88%)
 rename packages/binutils/2.24/{902-xtensa-gas-ld-diff-relocation-signed.patch => 0011-xtensa-gas-ld-diff-relocation-signed.patch} (84%)
 rename packages/binutils/{2.23.2/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch => 2.24/0012-xtensa-fix-ld-segfault-when-linking-linux-modules.patch} (88%)
 rename packages/binutils/2.24/{904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch => 0013-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch} (92%)
 rename packages/binutils/{2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch => 2.24/0014-Fix-trampolines-search-code-for-conditional-branches.patch} (76%)
 rename packages/binutils/2.24/{906-xtensa-optimize-check_section_ebb_pcrels_fit.patch => 0015-xtensa-optimize-check_section_ebb_pcrels_fit.patch} (94%)
 rename packages/binutils/{2.25.1/907-xtensa-optimize-removed_by_actions.patch => 2.24/0016-xtensa-optimize-removed_by_actions.patch} (89%)
 rename packages/binutils/2.24/{908-xtensa-optimize-find_removed_literal.patch => 0017-xtensa-optimize-find_removed_literal.patch} (89%)
 rename packages/binutils/{2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch => 2.24/0018-xtensa-replace-action-list-with-splay-tree.patch} (91%)
 rename packages/binutils/2.24/{910-xtensa-optimize-trampolines-relaxation.patch => 0019-xtensa-optimize-trampolines-relaxation.patch} (94%)
 rename packages/binutils/{2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch => 2.24/0020-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch} (90%)
 rename packages/binutils/{2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch => 2.24/0021-xtensa-fix-gas-segfault-with-text-section-literals.patch} (89%)
 rename packages/binutils/2.24/{913-xtensa-add-auto-litpools-option.patch => 0022-xtensa-add-auto-litpools-option.patch} (91%)
 rename packages/binutils/{2.23.2/914-xtensa-fix-signedness-of-gas-relocations.patch => 2.24/0023-xtensa-fix-signedness-of-gas-relocations.patch} (85%)
 rename packages/binutils/2.24/{915-xtensa-fix-.init-.fini-literals-moving.patch => 0024-xtensa-fix-.init-.fini-literals-moving.patch} (90%)
 delete mode 100644 packages/binutils/2.24/120-sh-conf.patch
 delete mode 100644 packages/binutils/2.24/300-001_ld_makefile_patch.patch
 rename packages/binutils/{2.28.1/120-sh-conf.patch => 2.25.1/0000-sh-conf.patch} (77%)
 rename packages/binutils/{2.28.1/300-001_ld_makefile_patch.patch => 2.25.1/0001-001_ld_makefile_patch.patch} (76%)
 rename packages/binutils/2.25.1/{300-012_check_ldrunpath_length.patch => 0002-012_check_ldrunpath_length.patch} (76%)
 rename packages/binutils/2.25.1/{310-fix-gold-pthreads-typo.patch => 0003-fix-gold-pthreads-typo.patch} (76%)
 rename packages/binutils/2.25.1/{320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch => 0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch} (72%)
 create mode 100644 packages/binutils/2.25.1/0005-Dont-link-to-libfl-as-its-unnecessary.patch
 create mode 100644 packages/binutils/2.25.1/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch
 rename packages/binutils/{2.26.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch => 2.25.1/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch} (70%)
 rename packages/binutils/2.25.1/{400-arm-rotate_left-fix.patch => 0008-arm-rotate_left-fix.patch} (69%)
 rename packages/binutils/{2.26.1/500-sysroot.patch => 2.25.1/0009-sysroot.patch} (91%)
 rename packages/binutils/2.25.1/{600-poison-system-directories.patch => 0010-poison-system-directories.patch} (86%)
 rename packages/binutils/{2.26.1/700-Fix-library-paths-on-PowerPC.patch => 2.25.1/0011-Fix-library-paths-on-PowerPC.patch} (87%)
 rename packages/binutils/{2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch => 2.25.1/0012-Fix-trampolines-search-code-for-conditional-branches.patch} (76%)
 rename packages/binutils/2.25.1/{906-xtensa-optimize-check_section_ebb_pcrels_fit.patch => 0013-xtensa-optimize-check_section_ebb_pcrels_fit.patch} (94%)
 rename packages/binutils/{2.24/907-xtensa-optimize-removed_by_actions.patch => 2.25.1/0014-xtensa-optimize-removed_by_actions.patch} (89%)
 rename packages/binutils/2.25.1/{908-xtensa-optimize-find_removed_literal.patch => 0015-xtensa-optimize-find_removed_literal.patch} (89%)
 rename packages/binutils/{2.24/909-xtensa-replace-action-list-with-splay-tree.patch => 2.25.1/0016-xtensa-replace-action-list-with-splay-tree.patch} (91%)
 rename packages/binutils/2.25.1/{910-xtensa-optimize-trampolines-relaxation.patch => 0017-xtensa-optimize-trampolines-relaxation.patch} (94%)
 rename packages/binutils/{2.23.2/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch => 2.25.1/0018-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch} (90%)
 rename packages/binutils/{2.23.2/912-xtensa-fix-gas-segfault-with-text-section-literals.patch => 2.25.1/0019-xtensa-fix-gas-segfault-with-text-section-literals.patch} (89%)
 rename packages/binutils/2.25.1/{913-xtensa-add-auto-litpools-option.patch => 0020-xtensa-add-auto-litpools-option.patch} (91%)
 rename packages/binutils/2.25.1/{914-xtensa-fix-signedness-of-gas-relocations.patch => 0021-xtensa-fix-signedness-of-gas-relocations.patch} (74%)
 rename packages/binutils/{2.26.1/915-xtensa-fix-.init-.fini-literals-moving.patch => 2.25.1/0022-xtensa-fix-.init-.fini-literals-moving.patch} (82%)
 delete mode 100644 packages/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
 delete mode 100644 packages/binutils/2.25.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
 rename packages/binutils/{2.27/120-sh-conf.patch => 2.26.1/0000-sh-conf.patch} (77%)
 rename packages/binutils/{2.25.1/300-001_ld_makefile_patch.patch => 2.26.1/0001-001_ld_makefile_patch.patch} (76%)
 rename packages/binutils/2.26.1/{300-012_check_ldrunpath_length.patch => 0002-012_check_ldrunpath_length.patch} (76%)
 rename packages/binutils/{2.23.2/310-fix-gold-pthreads-typo.patch => 2.26.1/0003-fix-gold-pthreads-typo.patch} (76%)
 rename packages/binutils/2.26.1/{320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch => 0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch} (72%)
 rename packages/binutils/2.26.1/{330-Dont-link-to-libfl-as-its-unnecessary.patch => 0005-Dont-link-to-libfl-as-its-unnecessary.patch} (70%)
 rename packages/binutils/{2.29.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch => 2.26.1/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch} (70%)
 rename packages/binutils/{2.27/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch => 2.26.1/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch} (70%)
 rename packages/binutils/{2.24/500-sysroot.patch => 2.26.1/0008-sysroot.patch} (91%)
 rename packages/binutils/2.26.1/{600-poison-system-directories.patch => 0009-poison-system-directories.patch} (86%)
 rename packages/binutils/{2.27/700-Fix-library-paths-on-PowerPC.patch => 2.26.1/0010-Fix-library-paths-on-PowerPC.patch} (87%)
 rename packages/binutils/2.26.1/{914-xtensa-fix-signedness-of-gas-relocations.patch => 0011-xtensa-fix-signedness-of-gas-relocations.patch} (74%)
 rename packages/binutils/{2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch => 2.26.1/0012-xtensa-fix-.init-.fini-literals-moving.patch} (82%)
 rename packages/binutils/2.27/{100-missing-break.patch => 0000-missing-break.patch} (71%)
 rename packages/binutils/{2.26.1/120-sh-conf.patch => 2.27/0001-sh-conf.patch} (77%)
 create mode 100644 packages/binutils/2.27/0002-001_ld_makefile_patch.patch
 rename packages/binutils/2.27/{300-012_check_ldrunpath_length.patch => 0003-012_check_ldrunpath_length.patch} (76%)
 rename packages/binutils/{2.29.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch => 2.27/0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch} (72%)
 rename packages/binutils/2.27/{330-Dont-link-to-libfl-as-its-unnecessary.patch => 0005-Dont-link-to-libfl-as-its-unnecessary.patch} (73%)
 rename packages/binutils/{2.26.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch => 2.27/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch} (70%)
 rename packages/binutils/{2.25.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch => 2.27/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch} (70%)
 rename packages/binutils/2.27/{500-sysroot.patch => 0008-sysroot.patch} (93%)
 rename packages/binutils/2.27/{600-poison-system-directories.patch => 0009-poison-system-directories.patch} (86%)
 rename packages/binutils/{2.25.1/700-Fix-library-paths-on-PowerPC.patch => 2.27/0010-Fix-library-paths-on-PowerPC.patch} (87%)
 rename packages/binutils/2.27/{999-xtensa-reverse-shift-count.patch => 0011-xtensa-reverse-shift-count.patch} (72%)
 rename packages/binutils/{2.25.1/120-sh-conf.patch => 2.28.1/0000-sh-conf.patch} (77%)
 create mode 100644 packages/binutils/2.28.1/0001-001_ld_makefile_patch.patch
 rename packages/binutils/2.28.1/{300-012_check_ldrunpath_length.patch => 0002-012_check_ldrunpath_length.patch} (76%)
 rename packages/binutils/{2.27/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch => 2.28.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch} (72%)
 rename packages/binutils/2.28.1/{330-Dont-link-to-libfl-as-its-unnecessary.patch => 0004-Dont-link-to-libfl-as-its-unnecessary.patch} (71%)
 rename packages/binutils/{2.27/340-Darwin-gold-binary-cc-include-string-not-cstring.patch => 2.28.1/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch} (70%)
 rename packages/binutils/2.28.1/{350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch => 0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch} (70%)
 rename packages/binutils/2.28.1/{500-sysroot.patch => 0007-sysroot.patch} (93%)
 rename packages/binutils/2.28.1/{600-poison-system-directories.patch => 0008-poison-system-directories.patch} (86%)
 rename packages/binutils/2.29.1/{120-sh-conf.patch => 0000-sh-conf.patch} (76%)
 create mode 100644 packages/binutils/2.29.1/0001-001_ld_makefile_patch.patch
 rename packages/binutils/2.29.1/{300-012_check_ldrunpath_length.patch => 0002-012_check_ldrunpath_length.patch} (75%)
 rename packages/binutils/{2.28.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch => 2.29.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch} (72%)
 rename packages/binutils/2.29.1/{330-Dont-link-to-libfl-as-its-unnecessary.patch => 0004-Dont-link-to-libfl-as-its-unnecessary.patch} (72%)
 rename packages/binutils/{2.28.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch => 2.29.1/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch} (70%)
 create mode 100644 packages/binutils/2.29.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
 rename packages/binutils/2.29.1/{500-sysroot.patch => 0007-sysroot.patch} (91%)
 rename packages/binutils/2.29.1/{600-poison-system-directories.patch => 0008-poison-system-directories.patch} (85%)
 delete mode 100644 packages/binutils/2.29.1/300-001_ld_makefile_patch.patch
 delete mode 100644 packages/binutils/2.29.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
 rename packages/duma/2_5_15/{100-cross-compile.patch => 0000-cross-compile.patch} (77%)
 rename packages/duma/2_5_15/{110-separate_cpp.patch => 0001-separate_cpp.patch} (75%)
 rename packages/duma/2_5_15/{200-cpp11-new-operator.patch => 0002-cpp11-new-operator.patch} (92%)
 rename packages/{gcc/4.8.5/001_gcc_bug_62231.patch => gcc-linaro/4.8-2015.06/0000-gcc_bug_62231.patch} (88%)
 rename packages/gcc-linaro/{4.9-2017.01/002-gcc_bug_62231.patch => 4.8-2015.06/0001-gcc_bug_62231.patch} (64%)
 rename packages/gcc-linaro/4.8-2015.06/{1000-libtool-leave-framework-alone.patch => 0002-libtool-leave-framework-alone.patch} (73%)
 rename packages/gcc-linaro/{7.1-2017.08/100-uclibc-conf.patch => 4.8-2015.06/0003-uclibc-conf.patch} (82%)
 rename packages/{gcc/4.8.5/111-pr65730.patch => gcc-linaro/4.8-2015.06/0004-pr65730.patch} (82%)
 rename packages/{gcc/4.9.4/130-pr43538.patch => gcc-linaro/4.8-2015.06/0005-pr43538.patch} (85%)
 rename packages/{gcc/4.8.5/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch => gcc-linaro/4.8-2015.06/0006-mt-ospace-preserve-FLAGS_FOR_TARGET.patch} (87%)
 rename packages/gcc-linaro/4.8-2015.06/{132-build_gcc-5_with_gcc-6.patch => 0007-build_gcc-5_with_gcc-6.patch} (81%)
 rename packages/gcc-linaro/{5.4-2017.05/301-missing-execinfo_h.patch => 4.8-2015.06/0008-missing-execinfo_h.patch} (79%)
 rename packages/gcc-linaro/4.8-2015.06/{305-libmudflap-susv3-legacy.patch => 0009-libmudflap-susv3-legacy.patch} (81%)
 rename packages/gcc-linaro/{4.9-2017.01/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch => 4.8-2015.06/0010-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch} (77%)
 create mode 100644 packages/gcc-linaro/4.8-2015.06/0011-arm-softfloat-libgcc.patch
 rename packages/gcc-linaro/4.8-2015.06/{830-arm_unbreak_armv4t.patch => 0012-arm_unbreak_armv4t.patch} (83%)
 rename packages/{gcc/4.8.5/841-PR57717-E500v2.patch => gcc-linaro/4.8-2015.06/0013-PR57717-E500v2.patch} (71%)
 rename packages/{gcc/4.8.5/842-PR60155.patch => gcc-linaro/4.8-2015.06/0014-PR60155.patch} (90%)
 rename packages/gcc-linaro/4.8-2015.06/{843-aarch64-vmlaq_lane_s32-typo.patch => 0015-aarch64-vmlaq_lane_s32-typo.patch} (88%)
 rename packages/gcc-linaro/4.8-2015.06/{850-libstdcxx-uclibc-c99.patch => 0016-libstdcxx-uclibc-c99.patch} (76%)
 rename packages/{gcc/4.8.5/851-PR-other-56780.patch => gcc-linaro/4.8-2015.06/0017-PR-other-56780.patch} (89%)
 create mode 100644 packages/gcc-linaro/4.8-2015.06/0018-xtensa-add-mauto-litpools-option.patch
 rename packages/{gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch => gcc-linaro/4.8-2015.06/0019-xtensa-reimplement-register-spilling.patch} (84%)
 rename packages/gcc-linaro/{4.9-2017.01/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch => 4.8-2015.06/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch} (79%)
 rename packages/{gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch => gcc-linaro/4.8-2015.06/0021-xtensa-fix-_Unwind_GetCFA.patch} (81%)
 rename packages/gcc-linaro/4.8-2015.06/{874-gcc-xtensa-fix-fprintf-format-specifiers.patch => 0022-gcc-xtensa-fix-fprintf-format-specifiers.patch} (83%)
 rename packages/{gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch => gcc-linaro/4.8-2015.06/0023-xtensa-fix-PR-target-82181.patch} (76%)
 rename packages/{gcc/4.8.5/900-musl-support.patch => gcc-linaro/4.8-2015.06/0024-musl-support.patch} (88%)
 rename packages/{gcc/4.8.5/950-cygwin64.patch => gcc-linaro/4.8-2015.06/0025-cygwin64.patch} (64%)
 delete mode 100644 packages/gcc-linaro/4.8-2015.06/100-uclibc-conf.patch
 delete mode 100644 packages/gcc-linaro/4.8-2015.06/301-missing-execinfo_h.patch
 delete mode 100644 packages/gcc-linaro/4.8-2015.06/810-arm-softfloat-libgcc.patch
 delete mode 100644 packages/gcc-linaro/4.8-2015.06/870-xtensa-add-mauto-litpools-option.patch
 rename packages/gcc-linaro/{5.4-2017.05/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch => 4.9-2017.01/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch} (65%)
 rename packages/{gcc/4.9.4/001-gcc_bug_62231.patch => gcc-linaro/4.9-2017.01/0001-gcc_bug_62231.patch} (85%)
 rename packages/{gcc/4.8.5/002_gcc_bug_62231.patch => gcc-linaro/4.9-2017.01/0002-gcc_bug_62231.patch} (64%)
 rename packages/{gcc/4.8.5/1000-libtool-leave-framework-alone.patch => gcc-linaro/4.9-2017.01/0003-libtool-leave-framework-alone.patch} (73%)
 rename packages/gcc-linaro/{5.4-2017.05/100-uclibc-conf.patch => 4.9-2017.01/0004-uclibc-conf.patch} (82%)
 rename packages/{gcc/4.9.4/1100-msp430-string-literals.patch => gcc-linaro/4.9-2017.01/0005-msp430-string-literals.patch} (85%)
 rename packages/{gcc/4.9.4/111-pr65730.patch => gcc-linaro/4.9-2017.01/0006-pr65730.patch} (89%)
 rename packages/gcc-linaro/4.9-2017.01/{120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch => 0007-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch} (82%)
 rename packages/gcc-linaro/{4.8-2015.06/130-pr43538.patch => 4.9-2017.01/0008-pr43538.patch} (85%)
 rename packages/gcc-linaro/4.9-2017.01/{131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch => 0009-mt-ospace-preserve-FLAGS_FOR_TARGET.patch} (87%)
 rename packages/gcc-linaro/4.9-2017.01/{140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch => 0010-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch} (82%)
 rename packages/{gcc/5.5.0/301-missing-execinfo_h.patch => gcc-linaro/4.9-2017.01/0011-missing-execinfo_h.patch} (79%)
 rename packages/{gcc/4.8.5/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch => gcc-linaro/4.9-2017.01/0012-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch} (77%)
 rename packages/gcc-linaro/{7.1-2017.08/810-arm-softfloat-libgcc.patch => 4.9-2017.01/0013-arm-softfloat-libgcc.patch} (80%)
 rename packages/gcc-linaro/4.9-2017.01/{830-arm_unbreak_armv4t.patch => 0014-arm_unbreak_armv4t.patch} (83%)
 rename packages/{gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch => gcc-linaro/4.9-2017.01/0015-microblaze-enable-dwarf-eh-support.patch} (84%)
 rename packages/gcc-linaro/4.9-2017.01/{850-libstdcxx-uclibc-c99.patch => 0016-libstdcxx-uclibc-c99.patch} (76%)
 rename packages/gcc-linaro/{7.1-2017.08/860-cilk-wchar.patch => 4.9-2017.01/0017-cilk-wchar.patch} (95%)
 rename packages/{gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch => gcc-linaro/4.9-2017.01/0018-xtensa-add-mauto-litpools-option.patch} (89%)
 rename packages/gcc-linaro/{4.8-2015.06/871-xtensa-reimplement-register-spilling.patch => 4.9-2017.01/0019-xtensa-reimplement-register-spilling.patch} (84%)
 rename packages/{gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch => gcc-linaro/4.9-2017.01/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch} (79%)
 rename packages/gcc-linaro/4.9-2017.01/{873-xtensa-fix-_Unwind_GetCFA.patch => 0021-xtensa-fix-_Unwind_GetCFA.patch} (81%)
 rename packages/{gcc/4.9.4/874-xtensa-add-uclinux-support.patch => gcc-linaro/4.9-2017.01/0022-xtensa-add-uclinux-support.patch} (88%)
 rename packages/gcc-linaro/4.9-2017.01/{875-gcc-xtensa-fix-fprintf-format-specifiers.patch => 0023-gcc-xtensa-fix-fprintf-format-specifiers.patch} (83%)
 rename packages/{gcc/4.9.4/876-xtensa-fix-PR-target-82181.patch => gcc-linaro/4.9-2017.01/0024-xtensa-fix-PR-target-82181.patch} (76%)
 rename packages/gcc-linaro/4.9-2017.01/{880-nios2_legitimize_address.patch => 0025-nios2_legitimize_address.patch} (87%)
 rename packages/gcc-linaro/4.9-2017.01/{890-fix-m68k-compile.patch => 0026-fix-m68k-compile.patch} (52%)
 rename packages/gcc-linaro/{5.4-2017.05/891-fix-m68k-uclinux.patch => 4.9-2017.01/0027-fix-m68k-uclinux.patch} (66%)
 rename packages/gcc-linaro/{5.4-2017.05/930-libgcc-disable-split-stack-nothreads.patch => 4.9-2017.01/0028-libgcc-disable-split-stack-nothreads.patch} (62%)
 rename packages/gcc-linaro/4.9-2017.01/{940-uclinux-enable-threads.patch => 0029-uclinux-enable-threads.patch} (80%)
 delete mode 100644 packages/gcc-linaro/4.9-2017.01/100-uclibc-conf.patch
 delete mode 100644 packages/gcc-linaro/4.9-2017.01/301-missing-execinfo_h.patch
 delete mode 100644 packages/gcc-linaro/4.9-2017.01/860-cilk-wchar.patch
 rename packages/{gcc/4.9.4/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch => gcc-linaro/5.4-2017.05/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch} (65%)
 rename packages/gcc-linaro/{7.1-2017.08/1000-libtool-leave-framework-alone.patch => 5.4-2017.05/0001-libtool-leave-framework-alone.patch} (74%)
 rename packages/{gcc/5.5.0/100-uclibc-conf.patch => gcc-linaro/5.4-2017.05/0002-uclibc-conf.patch} (82%)
 rename packages/{gcc/5.5.0/1100-msp430-string-literals.patch => gcc-linaro/5.4-2017.05/0003-msp430-string-literals.patch} (79%)
 rename packages/{gcc/5.5.0/110-xtensa-implement-trap-pattern.patch => gcc-linaro/5.4-2017.05/0004-xtensa-implement-trap-pattern.patch} (83%)
 rename packages/{gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch => gcc-linaro/5.4-2017.05/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch} (82%)
 rename packages/gcc-linaro/{6.4-2017.08/301-missing-execinfo_h.patch => 5.4-2017.05/0006-missing-execinfo_h.patch} (79%)
 rename packages/gcc-linaro/{7.1-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch => 5.4-2017.05/0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch} (84%)
 create mode 100644 packages/gcc-linaro/5.4-2017.05/0008-gcc-plugin-POSIX-include-sys-select-h.patch
 rename packages/gcc-linaro/{4.9-2017.01/810-arm-softfloat-libgcc.patch => 5.4-2017.05/0009-arm-softfloat-libgcc.patch} (80%)
 rename packages/{gcc/4.8.5/830-arm_unbreak_armv4t.patch => gcc-linaro/5.4-2017.05/0010-arm_unbreak_armv4t.patch} (83%)
 rename packages/{gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch => gcc-linaro/5.4-2017.05/0011-microblaze-enable-dwarf-eh-support.patch} (84%)
 rename packages/gcc-linaro/5.4-2017.05/{850-libstdcxx-uclibc-c99.patch => 0012-libstdcxx-uclibc-c99.patch} (75%)
 rename packages/{gcc/5.5.0/860-cilk-wchar.patch => gcc-linaro/5.4-2017.05/0013-cilk-wchar.patch} (95%)
 rename packages/{gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch => gcc-linaro/5.4-2017.05/0014-xtensa-add-mauto-litpools-option.patch} (86%)
 rename packages/gcc-linaro/5.4-2017.05/{871-xtensa-reimplement-register-spilling.patch => 0015-xtensa-reimplement-register-spilling.patch} (84%)
 rename packages/gcc-linaro/5.4-2017.05/{872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch => 0016-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch} (84%)
 rename packages/gcc-linaro/5.4-2017.05/{873-xtensa-fix-_Unwind_GetCFA.patch => 0017-xtensa-fix-_Unwind_GetCFA.patch} (81%)
 rename packages/gcc-linaro/5.4-2017.05/{874-xtensa-add-uclinux-support.patch => 0018-xtensa-add-uclinux-support.patch} (87%)
 rename packages/gcc-linaro/5.4-2017.05/{875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch => 0019-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch} (79%)
 rename packages/gcc-linaro/5.4-2017.05/{876-xtensa-fix-libgcc-build-with-text-section-literals.patch => 0020-xtensa-fix-libgcc-build-with-text-section-literals.patch} (76%)
 rename packages/gcc-linaro/5.4-2017.05/{877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch => 0021-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch} (79%)
 rename packages/gcc-linaro/5.4-2017.05/{878-xtensa-Fix-PR-target-78603.patch => 0022-xtensa-Fix-PR-target-78603.patch} (83%)
 rename packages/gcc-linaro/5.4-2017.05/{879-gcc-xtensa-fix-fprintf-format-specifiers.patch => 0023-gcc-xtensa-fix-fprintf-format-specifiers.patch} (83%)
 rename packages/gcc-linaro/5.4-2017.05/{880-xtensa-fix-PR-target-82181.patch => 0024-xtensa-fix-PR-target-82181.patch} (76%)
 rename packages/{gcc/4.9.4/890-fix-m68k-compile.patch => gcc-linaro/5.4-2017.05/0025-fix-m68k-compile.patch} (52%)
 rename packages/gcc-linaro/{6.4-2017.08/891-fix-m68k-uclinux.patch => 5.4-2017.05/0026-fix-m68k-uclinux.patch} (66%)
 rename packages/{gcc/5.5.0/892-microblaze-uclibc.patch => gcc-linaro/5.4-2017.05/0027-microblaze-uclibc.patch} (67%)
 rename packages/{gcc/5.5.0/902-unwind-fix-for-musl.patch => gcc-linaro/5.4-2017.05/0028-unwind-fix-for-musl.patch} (89%)
 rename packages/gcc-linaro/5.4-2017.05/{910-nios2-bad-multilib-default.patch => 0029-nios2-bad-multilib-default.patch} (58%)
 rename packages/gcc-linaro/{6.4-2017.08/930-libgcc-disable-split-stack-nothreads.patch => 5.4-2017.05/0030-libgcc-disable-split-stack-nothreads.patch} (62%)
 rename packages/gcc-linaro/{6.4-2017.08/940-uclinux-enable-threads.patch => 5.4-2017.05/0031-uclinux-enable-threads.patch} (65%)
 delete mode 100644 packages/gcc-linaro/5.4-2017.05/380-gcc-plugin-POSIX-include-sys-select-h.patch
 delete mode 100644 packages/gcc-linaro/5.4-2017.05/830-arm_unbreak_armv4t.patch
 rename packages/gcc-linaro/{5.4-2017.05/1000-libtool-leave-framework-alone.patch => 6.4-2017.08/0000-libtool-leave-framework-alone.patch} (74%)
 rename packages/gcc-linaro/6.4-2017.08/{100-uclibc-conf.patch => 0001-uclibc-conf.patch} (82%)
 rename packages/{gcc/6.4.0/301-missing-execinfo_h.patch => gcc-linaro/6.4-2017.08/0002-missing-execinfo_h.patch} (79%)
 rename packages/gcc-linaro/6.4-2017.08/{370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch => 0003-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch} (83%)
 create mode 100644 packages/gcc-linaro/6.4-2017.08/0004-gcc-plugin-POSIX-include-sys-select-h.patch
 rename packages/gcc-linaro/6.4-2017.08/{810-arm-softfloat-libgcc.patch => 0005-arm-softfloat-libgcc.patch} (80%)
 rename packages/{gcc/4.9.4/830-arm_unbreak_armv4t.patch => gcc-linaro/6.4-2017.08/0006-arm_unbreak_armv4t.patch} (83%)
 rename packages/gcc-linaro/{5.4-2017.05/860-cilk-wchar.patch => 6.4-2017.08/0007-cilk-wchar.patch} (95%)
 rename packages/{gcc/6.4.0/870-xtensa-fix-PR-target-82181.patch => gcc-linaro/6.4-2017.08/0008-xtensa-fix-PR-target-82181.patch} (76%)
 rename packages/gcc-linaro/{5.4-2017.05/890-fix-m68k-compile.patch => 6.4-2017.08/0009-fix-m68k-compile.patch} (52%)
 rename packages/gcc-linaro/{7.1-2017.08/891-fix-m68k-uclinux.patch => 6.4-2017.08/0010-fix-m68k-uclinux.patch} (66%)
 rename packages/{gcc/6.4.0/892-libgcc-mkmap-symver-support-skip_underscore.patch => gcc-linaro/6.4-2017.08/0011-libgcc-mkmap-symver-support-skip_underscore.patch} (91%)
 rename packages/{gcc/6.4.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch => gcc-linaro/6.4-2017.08/0012-libgcc-config-bfin-use-the-generic-linker-version-in.patch} (99%)
 rename packages/{gcc/6.4.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch => gcc-linaro/6.4-2017.08/0013-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch} (80%)
 rename packages/gcc-linaro/6.4-2017.08/{895-bfin-define-REENTRANT.patch => 0014-bfin-define-REENTRANT.patch} (64%)
 rename packages/gcc-linaro/6.4-2017.08/{900-libgfortran-missing-include.patch => 0015-libgfortran-missing-include.patch} (51%)
 rename packages/{gcc/6.4.0/910-nios2-bad-multilib-default.patch => gcc-linaro/6.4-2017.08/0016-nios2-bad-multilib-default.patch} (59%)
 rename packages/gcc-linaro/{4.9-2017.01/930-libgcc-disable-split-stack-nothreads.patch => 6.4-2017.08/0017-libgcc-disable-split-stack-nothreads.patch} (62%)
 rename packages/gcc-linaro/{5.4-2017.05/940-uclinux-enable-threads.patch => 6.4-2017.08/0018-uclinux-enable-threads.patch} (65%)
 rename packages/{gcc/7.2.0/951-bionic-ndk.patch => gcc-linaro/6.4-2017.08/0019-bionic-ndk.patch} (91%)
 rename packages/{gcc/6.4.0/952-bionic-errno.patch => gcc-linaro/6.4-2017.08/0020-bionic-errno.patch} (66%)
 rename packages/gcc-linaro/6.4-2017.08/{970-crystax.patch => 0021-crystax.patch} (82%)
 rename packages/{gcc/6.4.0/971-crystax.patch => gcc-linaro/6.4-2017.08/0022-crystax.patch} (88%)
 rename packages/{gcc/6.4.0/972-crystax.patch => gcc-linaro/6.4-2017.08/0023-crystax.patch} (82%)
 rename packages/gcc-linaro/{7.1-2017.08/973-crystax.patch => 6.4-2017.08/0024-crystax.patch} (77%)
 rename packages/{gcc/6.4.0/974-crystax.patch => gcc-linaro/6.4-2017.08/0025-crystax.patch} (73%)
 rename packages/{gcc/6.4.0/975-crystax.patch => gcc-linaro/6.4-2017.08/0026-crystax.patch} (88%)
 rename packages/{gcc/6.4.0/976-crystax.patch => gcc-linaro/6.4-2017.08/0027-crystax.patch} (84%)
 rename packages/{gcc/7.2.0/977-crystax.patch => gcc-linaro/6.4-2017.08/0028-crystax.patch} (74%)
 delete mode 100644 packages/gcc-linaro/6.4-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch
 delete mode 100644 packages/gcc-linaro/6.4-2017.08/830-arm_unbreak_armv4t.patch
 rename packages/gcc-linaro/{6.4-2017.08/1000-libtool-leave-framework-alone.patch => 7.1-2017.08/0000-libtool-leave-framework-alone.patch} (74%)
 create mode 100644 packages/gcc-linaro/7.1-2017.08/0001-uclibc-conf.patch
 rename packages/gcc-linaro/{5.4-2017.05/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch => 7.1-2017.08/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch} (83%)
 create mode 100644 packages/gcc-linaro/7.1-2017.08/0003-gcc-plugin-POSIX-include-sys-select-h.patch
 rename packages/{gcc/7.2.0/810-arm-softfloat-libgcc.patch => gcc-linaro/7.1-2017.08/0004-arm-softfloat-libgcc.patch} (80%)
 rename packages/{gcc/7.2.0/860-cilk-wchar.patch => gcc-linaro/7.1-2017.08/0005-cilk-wchar.patch} (95%)
 rename packages/{gcc/7.2.0/870-xtensa-fix-PR-target-82181.patch => gcc-linaro/7.1-2017.08/0006-xtensa-fix-PR-target-82181.patch} (76%)
 rename packages/gcc-linaro/{4.9-2017.01/891-fix-m68k-uclinux.patch => 7.1-2017.08/0007-fix-m68k-uclinux.patch} (66%)
 rename packages/gcc-linaro/7.1-2017.08/{900-libgfortran-missing-include.patch => 0008-libgfortran-missing-include.patch} (51%)
 rename packages/gcc-linaro/{6.4-2017.08/910-nios2-bad-multilib-default.patch => 7.1-2017.08/0009-nios2-bad-multilib-default.patch} (59%)
 rename packages/gcc-linaro/7.1-2017.08/{930-libgcc-disable-split-stack-nothreads.patch => 0010-libgcc-disable-split-stack-nothreads.patch} (62%)
 rename packages/gcc-linaro/{6.4-2017.08/951-bionic-ndk.patch => 7.1-2017.08/0011-bionic-ndk.patch} (91%)
 rename packages/gcc-linaro/7.1-2017.08/{952-bionic-errno.patch => 0012-bionic-errno.patch} (66%)
 rename packages/{gcc/7.2.0/970-crystax.patch => gcc-linaro/7.1-2017.08/0013-crystax.patch} (83%)
 rename packages/gcc-linaro/{6.4-2017.08/971-crystax.patch => 7.1-2017.08/0014-crystax.patch} (88%)
 rename packages/gcc-linaro/7.1-2017.08/{972-crystax.patch => 0015-crystax.patch} (82%)
 rename packages/{gcc/6.4.0/973-crystax.patch => gcc-linaro/7.1-2017.08/0016-crystax.patch} (77%)
 rename packages/gcc-linaro/7.1-2017.08/{974-crystax.patch => 0017-crystax.patch} (73%)
 rename packages/{gcc/7.2.0/975-crystax.patch => gcc-linaro/7.1-2017.08/0018-crystax.patch} (88%)
 rename packages/{gcc/7.2.0/976-crystax.patch => gcc-linaro/7.1-2017.08/0019-crystax.patch} (84%)
 rename packages/gcc-linaro/{6.4-2017.08/977-crystax.patch => 7.1-2017.08/0020-crystax.patch} (73%)
 delete mode 100644 packages/gcc-linaro/7.1-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch
 rename packages/{gcc-linaro/4.8-2015.06/001_gcc_bug_62231.patch => gcc/4.8.5/0000-gcc_bug_62231.patch} (88%)
 rename packages/{gcc-linaro/4.8-2015.06/002_gcc_bug_62231.patch => gcc/4.8.5/0001-gcc_bug_62231.patch} (64%)
 rename packages/{gcc-linaro/4.9-2017.01/1000-libtool-leave-framework-alone.patch => gcc/4.8.5/0002-libtool-leave-framework-alone.patch} (73%)
 create mode 100644 packages/gcc/4.8.5/0003-uclibc-conf.patch
 rename packages/gcc/{4.9.4/111-alpha-bad-eh_frame.patch => 4.8.5/0004-alpha-bad-eh_frame.patch} (80%)
 rename packages/{gcc-linaro/4.8-2015.06/111-pr65730.patch => gcc/4.8.5/0005-pr65730.patch} (82%)
 rename packages/gcc/4.8.5/{130-pr43538.patch => 0006-pr43538.patch} (85%)
 rename packages/{gcc-linaro/4.8-2015.06/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch => gcc/4.8.5/0007-mt-ospace-preserve-FLAGS_FOR_TARGET.patch} (87%)
 rename packages/gcc/4.8.5/{132-build_gcc-5_with_gcc-6.patch => 0008-build_gcc-5_with_gcc-6.patch} (81%)
 create mode 100644 packages/gcc/4.8.5/0009-missing-execinfo_h.patch
 rename packages/gcc/4.8.5/{305-libmudflap-susv3-legacy.patch => 0010-libmudflap-susv3-legacy.patch} (81%)
 rename packages/gcc/{4.9.4/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch => 4.8.5/0011-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch} (77%)
 create mode 100644 packages/gcc/4.8.5/0012-arm-softfloat-libgcc.patch
 create mode 100644 packages/gcc/4.8.5/0013-arm_unbreak_armv4t.patch
 rename packages/{gcc-linaro/4.8-2015.06/841-PR57717-E500v2.patch => gcc/4.8.5/0014-PR57717-E500v2.patch} (71%)
 rename packages/{gcc-linaro/4.8-2015.06/842-PR60155.patch => gcc/4.8.5/0015-PR60155.patch} (90%)
 rename packages/gcc/4.8.5/{843-aarch64-vmlaq_lane_s32-typo.patch => 0016-aarch64-vmlaq_lane_s32-typo.patch} (90%)
 rename packages/gcc/4.8.5/{850-libstdcxx-uclibc-c99.patch => 0017-libstdcxx-uclibc-c99.patch} (76%)
 rename packages/{gcc-linaro/4.8-2015.06/851-PR-other-56780.patch => gcc/4.8.5/0018-PR-other-56780.patch} (89%)
 create mode 100644 packages/gcc/4.8.5/0019-xtensa-add-mauto-litpools-option.patch
 rename packages/gcc/4.8.5/{871-xtensa-reimplement-register-spilling.patch => 0020-xtensa-reimplement-register-spilling.patch} (84%)
 rename packages/{gcc-linaro/4.8-2015.06/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch => gcc/4.8.5/0021-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch} (79%)
 rename packages/{gcc-linaro/4.8-2015.06/873-xtensa-fix-_Unwind_GetCFA.patch => gcc/4.8.5/0022-xtensa-fix-_Unwind_GetCFA.patch} (81%)
 rename packages/gcc/4.8.5/{874-gcc-xtensa-fix-fprintf-format-specifiers.patch => 0023-gcc-xtensa-fix-fprintf-format-specifiers.patch} (83%)
 rename packages/{gcc-linaro/4.8-2015.06/875-xtensa-fix-PR-target-82181.patch => gcc/4.8.5/0024-xtensa-fix-PR-target-82181.patch} (76%)
 rename packages/{gcc-linaro/4.8-2015.06/900-musl-support.patch => gcc/4.8.5/0025-musl-support.patch} (88%)
 rename packages/{gcc-linaro/4.8-2015.06/950-cygwin64.patch => gcc/4.8.5/0026-cygwin64.patch} (64%)
 delete mode 100644 packages/gcc/4.8.5/100-uclibc-conf.patch
 delete mode 100644 packages/gcc/4.8.5/301-missing-execinfo_h.patch
 delete mode 100644 packages/gcc/4.8.5/810-arm-softfloat-libgcc.patch
 rename packages/{gcc-linaro/4.9-2017.01/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch => gcc/4.9.4/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch} (65%)
 rename packages/{gcc-linaro/4.9-2017.01/001-gcc_bug_62231.patch => gcc/4.9.4/0001-gcc_bug_62231.patch} (85%)
 rename packages/gcc/4.9.4/{002-gcc_bug_62231.patch => 0002-gcc_bug_62231.patch} (64%)
 rename packages/gcc/4.9.4/{1000-libtool-leave-framework-alone.patch => 0003-libtool-leave-framework-alone.patch} (73%)
 create mode 100644 packages/gcc/4.9.4/0004-uclibc-conf.patch
 rename packages/{gcc-linaro/4.9-2017.01/1100-msp430-string-literals.patch => gcc/4.9.4/0005-msp430-string-literals.patch} (85%)
 rename packages/gcc/{5.5.0/111-alpha-bad-eh_frame.patch => 4.9.4/0006-alpha-bad-eh_frame.patch} (80%)
 rename packages/{gcc-linaro/4.9-2017.01/111-pr65730.patch => gcc/4.9.4/0007-pr65730.patch} (89%)
 rename packages/gcc/4.9.4/{120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch => 0008-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch} (84%)
 rename packages/{gcc-linaro/4.9-2017.01/130-pr43538.patch => gcc/4.9.4/0009-pr43538.patch} (85%)
 rename packages/gcc/4.9.4/{131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch => 0010-mt-ospace-preserve-FLAGS_FOR_TARGET.patch} (87%)
 rename packages/gcc/4.9.4/{140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch => 0011-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch} (82%)
 create mode 100644 packages/gcc/4.9.4/0012-missing-execinfo_h.patch
 rename packages/{gcc-linaro/4.8-2015.06/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch => gcc/4.9.4/0013-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch} (77%)
 rename packages/{gcc-linaro/5.4-2017.05/810-arm-softfloat-libgcc.patch => gcc/4.9.4/0014-arm-softfloat-libgcc.patch} (80%)
 create mode 100644 packages/gcc/4.9.4/0015-arm_unbreak_armv4t.patch
 rename packages/{gcc-linaro/4.9-2017.01/840-microblaze-enable-dwarf-eh-support.patch => gcc/4.9.4/0016-microblaze-enable-dwarf-eh-support.patch} (84%)
 rename packages/gcc/4.9.4/{850-libstdcxx-uclibc-c99.patch => 0017-libstdcxx-uclibc-c99.patch} (76%)
 rename packages/{gcc-linaro/6.4-2017.08/860-cilk-wchar.patch => gcc/4.9.4/0018-cilk-wchar.patch} (95%)
 rename packages/{gcc-linaro/4.9-2017.01/870-xtensa-add-mauto-litpools-option.patch => gcc/4.9.4/0019-xtensa-add-mauto-litpools-option.patch} (89%)
 rename packages/{gcc-linaro/4.9-2017.01/871-xtensa-reimplement-register-spilling.patch => gcc/4.9.4/0020-xtensa-reimplement-register-spilling.patch} (84%)
 rename packages/gcc/{4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch => 4.9.4/0021-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch} (79%)
 rename packages/gcc/{4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch => 4.9.4/0022-xtensa-fix-_Unwind_GetCFA.patch} (81%)
 rename packages/{gcc-linaro/4.9-2017.01/874-xtensa-add-uclinux-support.patch => gcc/4.9.4/0023-xtensa-add-uclinux-support.patch} (88%)
 rename packages/gcc/4.9.4/{875-gcc-xtensa-fix-fprintf-format-specifiers.patch => 0024-gcc-xtensa-fix-fprintf-format-specifiers.patch} (83%)
 rename packages/{gcc-linaro/4.9-2017.01/876-xtensa-fix-PR-target-82181.patch => gcc/4.9.4/0025-xtensa-fix-PR-target-82181.patch} (76%)
 rename packages/gcc/4.9.4/{880-nios2_legitimize_address.patch => 0026-nios2_legitimize_address.patch} (87%)
 rename packages/{gcc-linaro/6.4-2017.08/890-fix-m68k-compile.patch => gcc/4.9.4/0027-fix-m68k-compile.patch} (52%)
 rename packages/gcc/4.9.4/{891-fix-m68k-uclinux.patch => 0028-fix-m68k-uclinux.patch} (69%)
 rename packages/gcc/4.9.4/{900-musl-support.patch => 0029-musl-support.patch} (89%)
 rename packages/gcc/4.9.4/{901-microblaze-uclibc.patch => 0030-microblaze-uclibc.patch} (67%)
 create mode 100644 packages/gcc/4.9.4/0031-libgcc-disable-split-stack-nothreads.patch
 rename packages/gcc/4.9.4/{940-uclinux-enable-threads.patch => 0032-uclinux-enable-threads.patch} (83%)
 delete mode 100644 packages/gcc/4.9.4/100-uclibc-conf.patch
 delete mode 100644 packages/gcc/4.9.4/301-missing-execinfo_h.patch
 delete mode 100644 packages/gcc/4.9.4/810-arm-softfloat-libgcc.patch
 delete mode 100644 packages/gcc/4.9.4/860-cilk-wchar.patch
 delete mode 100644 packages/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch
 rename packages/gcc/5.5.0/{1000-libtool-leave-framework-alone.patch => 0000-libtool-leave-framework-alone.patch} (74%)
 create mode 100644 packages/gcc/5.5.0/0001-uclibc-conf.patch
 rename packages/{gcc-linaro/5.4-2017.05/1100-msp430-string-literals.patch => gcc/5.5.0/0002-msp430-string-literals.patch} (79%)
 rename packages/{gcc-linaro/5.4-2017.05/110-xtensa-implement-trap-pattern.patch => gcc/5.5.0/0003-xtensa-implement-trap-pattern.patch} (83%)
 rename packages/gcc/{4.8.5/111-alpha-bad-eh_frame.patch => 5.5.0/0004-alpha-bad-eh_frame.patch} (80%)
 rename packages/{gcc-linaro/5.4-2017.05/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch => gcc/5.5.0/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch} (82%)
 create mode 100644 packages/gcc/5.5.0/0006-missing-execinfo_h.patch
 rename packages/gcc/5.5.0/{370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch => 0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch} (84%)
 create mode 100644 packages/gcc/5.5.0/0008-gcc-plugin-POSIX-include-sys-select-h.patch
 create mode 100644 packages/gcc/5.5.0/0009-arm-softfloat-libgcc.patch
 create mode 100644 packages/gcc/5.5.0/0010-arm_unbreak_armv4t.patch
 rename packages/{gcc-linaro/5.4-2017.05/840-microblaze-enable-dwarf-eh-support.patch => gcc/5.5.0/0011-microblaze-enable-dwarf-eh-support.patch} (84%)
 rename packages/gcc/5.5.0/{850-libstdcxx-uclibc-c99.patch => 0012-libstdcxx-uclibc-c99.patch} (75%)
 create mode 100644 packages/gcc/5.5.0/0013-cilk-wchar.patch
 rename packages/{gcc-linaro/5.4-2017.05/870-xtensa-add-mauto-litpools-option.patch => gcc/5.5.0/0014-xtensa-add-mauto-litpools-option.patch} (86%)
 rename packages/gcc/5.5.0/{871-xtensa-reimplement-register-spilling.patch => 0015-xtensa-reimplement-register-spilling.patch} (84%)
 rename packages/gcc/5.5.0/{874-xtensa-add-uclinux-support.patch => 0016-xtensa-add-uclinux-support.patch} (87%)
 create mode 100644 packages/gcc/5.5.0/0017-fix-m68k-compile.patch
 create mode 100644 packages/gcc/5.5.0/0018-fix-m68k-uclinux.patch
 rename packages/{gcc-linaro/5.4-2017.05/892-microblaze-uclibc.patch => gcc/5.5.0/0019-microblaze-uclibc.patch} (67%)
 rename packages/gcc/5.5.0/{900-libitm-fixes-for-musl-support.patch => 0020-libitm-fixes-for-musl-support.patch} (88%)
 rename packages/gcc/5.5.0/{901-fixincludes-update-for-musl-support.patch => 0021-fixincludes-update-for-musl-support.patch} (89%)
 rename packages/{gcc-linaro/5.4-2017.05/902-unwind-fix-for-musl.patch => gcc/5.5.0/0022-unwind-fix-for-musl.patch} (91%)
 rename packages/gcc/5.5.0/{903-libstdc++-libgfortran-gthr-workaround-for-musl.patch => 0023-libstdc++-libgfortran-gthr-workaround-for-musl.patch} (82%)
 rename packages/gcc/5.5.0/{904-musl-libc-config.patch => 0024-musl-libc-config.patch} (93%)
 rename packages/gcc/5.5.0/{905-add-musl-support-to-gcc.patch => 0025-add-musl-support-to-gcc.patch} (90%)
 rename packages/gcc/5.5.0/{906-mips-musl-support.patch => 0026-mips-musl-support.patch} (93%)
 rename packages/gcc/5.5.0/{907-x86-musl-support.patch => 0027-x86-musl-support.patch} (87%)
 rename packages/gcc/5.5.0/{908-arm-musl-support.patch => 0028-arm-musl-support.patch} (93%)
 rename packages/gcc/5.5.0/{909-aarch64-musl-support.patch => 0029-aarch64-musl-support.patch} (89%)
 rename packages/gcc/5.5.0/{910-nios2-bad-multilib-default.patch => 0030-nios2-bad-multilib-default.patch} (58%)
 create mode 100644 packages/gcc/5.5.0/0031-libgcc-disable-split-stack-nothreads.patch
 create mode 100644 packages/gcc/5.5.0/0032-uclinux-enable-threads.patch
 delete mode 100644 packages/gcc/5.5.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
 delete mode 100644 packages/gcc/5.5.0/810-arm-softfloat-libgcc.patch
 delete mode 100644 packages/gcc/5.5.0/830-arm_unbreak_armv4t.patch
 delete mode 100644 packages/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch
 delete mode 100644 packages/gcc/5.5.0/890-fix-m68k-compile.patch
 delete mode 100644 packages/gcc/5.5.0/891-fix-m68k-uclinux.patch
 delete mode 100644 packages/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch
 delete mode 100644 packages/gcc/5.5.0/940-uclinux-enable-threads.patch
 rename packages/gcc/6.4.0/{0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch => 0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch} (65%)
 create mode 100644 packages/gcc/6.4.0/0001-libtool-leave-framework-alone.patch
 create mode 100644 packages/gcc/6.4.0/0002-uclibc-conf.patch
 create mode 100644 packages/gcc/6.4.0/0003-missing-execinfo_h.patch
 create mode 100644 packages/gcc/6.4.0/0004-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
 create mode 100644 packages/gcc/6.4.0/0005-gcc-plugin-POSIX-include-sys-select-h.patch
 create mode 100644 packages/gcc/6.4.0/0006-arm-softfloat-libgcc.patch
 create mode 100644 packages/gcc/6.4.0/0007-arm_unbreak_armv4t.patch
 rename packages/gcc/6.4.0/{831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch => 0008-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch} (93%)
 create mode 100644 packages/gcc/6.4.0/0009-cilk-wchar.patch
 rename packages/{gcc-linaro/6.4-2017.08/870-xtensa-fix-PR-target-82181.patch => gcc/6.4.0/0010-xtensa-fix-PR-target-82181.patch} (76%)
 create mode 100644 packages/gcc/6.4.0/0011-fix-m68k-compile.patch
 create mode 100644 packages/gcc/6.4.0/0012-fix-m68k-uclinux.patch
 rename packages/{gcc-linaro/6.4-2017.08/892-libgcc-mkmap-symver-support-skip_underscore.patch => gcc/6.4.0/0013-libgcc-mkmap-symver-support-skip_underscore.patch} (91%)
 rename packages/{gcc-linaro/6.4-2017.08/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch => gcc/6.4.0/0014-libgcc-config-bfin-use-the-generic-linker-version-in.patch} (99%)
 rename packages/{gcc-linaro/6.4-2017.08/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch => gcc/6.4.0/0015-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch} (80%)
 rename packages/gcc/6.4.0/{895-bfin-define-REENTRANT.patch => 0016-bfin-define-REENTRANT.patch} (64%)
 rename packages/gcc/6.4.0/{900-libgfortran-missing-include.patch => 0017-libgfortran-missing-include.patch} (51%)
 rename packages/{gcc-linaro/7.1-2017.08/910-nios2-bad-multilib-default.patch => gcc/6.4.0/0018-nios2-bad-multilib-default.patch} (59%)
 create mode 100644 packages/gcc/6.4.0/0019-libgcc-disable-split-stack-nothreads.patch
 create mode 100644 packages/gcc/6.4.0/0020-uclinux-enable-threads.patch
 rename packages/{gcc-linaro/7.1-2017.08/951-bionic-ndk.patch => gcc/6.4.0/0021-bionic-ndk.patch} (91%)
 rename packages/{gcc-linaro/6.4-2017.08/952-bionic-errno.patch => gcc/6.4.0/0022-bionic-errno.patch} (66%)
 rename packages/gcc/6.4.0/{970-crystax.patch => 0023-crystax.patch} (82%)
 rename packages/{gcc-linaro/7.1-2017.08/971-crystax.patch => gcc/6.4.0/0024-crystax.patch} (88%)
 rename packages/{gcc-linaro/6.4-2017.08/972-crystax.patch => gcc/6.4.0/0025-crystax.patch} (82%)
 rename packages/gcc/{7.2.0/973-crystax.patch => 6.4.0/0026-crystax.patch} (77%)
 rename packages/gcc/{7.2.0/974-crystax.patch => 6.4.0/0027-crystax.patch} (73%)
 rename packages/{gcc-linaro/7.1-2017.08/975-crystax.patch => gcc/6.4.0/0028-crystax.patch} (88%)
 rename packages/{gcc-linaro/6.4-2017.08/976-crystax.patch => gcc/6.4.0/0029-crystax.patch} (84%)
 rename packages/gcc/6.4.0/{977-crystax.patch => 0030-crystax.patch} (73%)
 delete mode 100644 packages/gcc/6.4.0/100-uclibc-conf.patch
 delete mode 100644 packages/gcc/6.4.0/1000-libtool-leave-framework-alone.patch
 delete mode 100644 packages/gcc/6.4.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
 delete mode 100644 packages/gcc/6.4.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
 delete mode 100644 packages/gcc/6.4.0/810-arm-softfloat-libgcc.patch
 delete mode 100644 packages/gcc/6.4.0/830-arm_unbreak_armv4t.patch
 delete mode 100644 packages/gcc/6.4.0/860-cilk-wchar.patch
 delete mode 100644 packages/gcc/6.4.0/890-fix-m68k-compile.patch
 delete mode 100644 packages/gcc/6.4.0/891-fix-m68k-uclinux.patch
 delete mode 100644 packages/gcc/6.4.0/930-libgcc-disable-split-stack-nothreads.patch
 delete mode 100644 packages/gcc/6.4.0/940-uclinux-enable-threads.patch
 create mode 100644 packages/gcc/7.2.0/0000-libtool-leave-framework-alone.patch
 create mode 100644 packages/gcc/7.2.0/0001-uclibc-conf.patch
 rename packages/gcc/7.2.0/{370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch => 0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch} (86%)
 create mode 100644 packages/gcc/7.2.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch
 create mode 100644 packages/gcc/7.2.0/0004-arm-softfloat-libgcc.patch
 create mode 100644 packages/gcc/7.2.0/0005-cilk-wchar.patch
 rename packages/{gcc-linaro/7.1-2017.08/870-xtensa-fix-PR-target-82181.patch => gcc/7.2.0/0006-xtensa-fix-PR-target-82181.patch} (76%)
 rename packages/gcc/7.2.0/{891-fix-m68k-uclinux.patch => 0007-fix-m68k-uclinux.patch} (69%)
 rename packages/gcc/7.2.0/{900-libgfortran-missing-include.patch => 0008-libgfortran-missing-include.patch} (51%)
 rename packages/gcc/7.2.0/{910-nios2-bad-multilib-default.patch => 0009-nios2-bad-multilib-default.patch} (59%)
 create mode 100644 packages/gcc/7.2.0/0010-libgcc-disable-split-stack-nothreads.patch
 rename packages/gcc/{6.4.0/951-bionic-ndk.patch => 7.2.0/0011-bionic-ndk.patch} (91%)
 rename packages/gcc/7.2.0/{952-bionic-errno.patch => 0012-bionic-errno.patch} (66%)
 rename packages/{gcc-linaro/7.1-2017.08/970-crystax.patch => gcc/7.2.0/0013-crystax.patch} (81%)
 rename packages/gcc/7.2.0/{971-crystax.patch => 0014-crystax.patch} (88%)
 rename packages/gcc/7.2.0/{972-crystax.patch => 0015-crystax.patch} (82%)
 rename packages/{gcc-linaro/6.4-2017.08/973-crystax.patch => gcc/7.2.0/0016-crystax.patch} (77%)
 rename packages/{gcc-linaro/6.4-2017.08/974-crystax.patch => gcc/7.2.0/0017-crystax.patch} (73%)
 rename packages/{gcc-linaro/6.4-2017.08/975-crystax.patch => gcc/7.2.0/0018-crystax.patch} (88%)
 rename packages/{gcc-linaro/7.1-2017.08/976-crystax.patch => gcc/7.2.0/0019-crystax.patch} (84%)
 rename packages/{gcc-linaro/7.1-2017.08/977-crystax.patch => gcc/7.2.0/0020-crystax.patch} (73%)
 delete mode 100644 packages/gcc/7.2.0/100-uclibc-conf.patch
 delete mode 100644 packages/gcc/7.2.0/1000-libtool-leave-framework-alone.patch
 delete mode 100644 packages/gcc/7.2.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
 delete mode 100644 packages/gcc/7.2.0/930-libgcc-disable-split-stack-nothreads.patch
 rename packages/gdb/6.8a/{100-dwarf-stack-overflow.patch => 0000-dwarf-stack-overflow.patch} (88%)
 rename packages/gdb/6.8a/{110-security-errata-20050610.patch => 0001-security-errata-20050610.patch} (82%)
 rename packages/gdb/6.8a/{120-tdep-opcode-include-workaround.patch => 0002-tdep-opcode-include-workaround.patch} (66%)
 rename packages/gdb/6.8a/{130-reg-no-longer-active.patch => 0003-reg-no-longer-active.patch} (81%)
 rename packages/gdb/{7.0a/100-sim-ppc-have-config-h.patch => 6.8a/0004-sim-ppc-have-config-h.patch} (51%)
 rename packages/gdb/6.8a/{150-handle-stpcpy-define.patch => 0005-handle-stpcpy-define.patch} (50%)
 rename packages/gdb/{6.8a/140-sim-ppc-have-config-h.patch => 7.0.1a/0000-sim-ppc-have-config-h.patch} (51%)
 rename packages/gdb/{7.0.1a/100-sim-ppc-have-config-h.patch => 7.0a/0000-sim-ppc-have-config-h.patch} (51%)
 rename packages/gdb/7.10.1/{100-musl_fix.patch => 0000-musl_fix.patch} (86%)
 rename packages/gdb/7.10.1/{110-xtensa-initialize-call_abi-in-xtensa_tdep.patch => 0001-xtensa-initialize-call_abi-in-xtensa_tdep.patch} (87%)
 rename packages/gdb/7.10.1/{111-xtensa-make-sure-ar_base-is-initialized.patch => 0002-xtensa-make-sure-ar_base-is-initialized.patch} (80%)
 rename packages/gdb/{7.11.1/112-WIP-end-of-prologue-detection-hack.patch => 7.10.1/0003-WIP-end-of-prologue-detection-hack.patch} (82%)
 rename packages/gdb/7.11.1/{100-musl_fix.patch => 0000-musl_fix.patch} (84%)
 rename packages/gdb/7.11.1/{101-uclibc-no-gettimeofday-clobber.patch => 0001-uclibc-no-gettimeofday-clobber.patch} (84%)
 rename packages/gdb/{7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch => 7.11.1/0002-xtensa-make-sure-ar_base-is-initialized.patch} (80%)
 rename packages/gdb/{7.12.1/112-WIP-end-of-prologue-detection-hack.patch => 7.11.1/0003-WIP-end-of-prologue-detection-hack.patch} (82%)
 rename packages/gdb/7.12.1/{100-musl_fix.patch => 0000-musl_fix.patch} (84%)
 rename packages/gdb/7.12.1/{101-uclibc-no-gettimeofday-clobber.patch => 0001-uclibc-no-gettimeofday-clobber.patch} (63%)
 rename packages/gdb/{7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch => 7.12.1/0002-xtensa-make-sure-ar_base-is-initialized.patch} (80%)
 rename packages/gdb/{7.10.1/112-WIP-end-of-prologue-detection-hack.patch => 7.12.1/0003-WIP-end-of-prologue-detection-hack.patch} (82%)
 rename packages/gdb/{8.0.1/200-allow-android.patch => 7.12.1/0004-allow-android.patch} (71%)
 rename packages/gdb/7.2a/{100-sim-ppc-lz-fix.patch => 0000-sim-ppc-lz-fix.patch} (75%)
 rename packages/gdb/7.4.1/{00_all_ptrace_setsiginfo.patch => 0000-all_ptrace_setsiginfo.patch} (76%)
 rename packages/gdb/7.4.1/{05_all_readline-headers.patch => 0001-all_readline-headers.patch} (84%)
 rename packages/gdb/8.0.1/{100-musl_fix.patch => 0000-musl_fix.patch} (84%)
 rename packages/gdb/8.0.1/{101-uclibc-no-gettimeofday-clobber.patch => 0001-uclibc-no-gettimeofday-clobber.patch} (63%)
 rename packages/gdb/8.0.1/{111-xtensa-make-sure-ar_base-is-initialized.patch => 0002-xtensa-make-sure-ar_base-is-initialized.patch} (80%)
 rename packages/gdb/8.0.1/{112-WIP-end-of-prologue-detection-hack.patch => 0003-WIP-end-of-prologue-detection-hack.patch} (82%)
 rename packages/gdb/{7.12.1/200-allow-android.patch => 8.0.1/0004-allow-android.patch} (71%)
 rename packages/gettext/{0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch => 0.19.7/0000-Fix-linker-error-redefinition-of-vasprintf.patch} (82%)
 rename packages/gettext/0.19.7/{120-Fix-Woe32-link-errors-when-compiling-with-O0.patch => 0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch} (72%)
 create mode 100644 packages/gettext/0.19.7/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
 rename packages/gettext/0.19.7/{140-Fix-Cygwin-sys-select.patch => 0003-Fix-Cygwin-sys-select.patch} (85%)
 rename packages/gettext/0.19.7/{150-Fix-Cygwin-sys-select-2.patch => 0004-Fix-Cygwin-sys-select-2.patch} (89%)
 delete mode 100644 packages/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
 rename packages/gettext/{0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch => 0.19.8.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch} (82%)
 rename packages/gettext/0.19.8.1/{120-Fix-Woe32-link-errors-when-compiling-with-O0.patch => 0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch} (65%)
 create mode 100644 packages/gettext/0.19.8.1/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
 delete mode 100644 packages/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
 rename packages/glibc-linaro/2.20-2014.11/{100-sparc-nptl.patch => 0000-sparc-nptl.patch} (66%)
 rename packages/glibc-linaro/2.20-2014.11/{101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch => 0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch} (78%)
 rename packages/{glibc/2.14.1/102-fix-signed-shift-overlow.patch => glibc-linaro/2.20-2014.11/0002-fix-signed-shift-overlow.patch} (84%)
 rename packages/{glibc/2.15/103-dl-openat64-variadic.patch => glibc-linaro/2.20-2014.11/0003-dl-openat64-variadic.patch} (98%)
 rename packages/{glibc/2.18/104-unused-variables.patch => glibc-linaro/2.20-2014.11/0004-unused-variables.patch} (81%)
 rename packages/glibc-linaro/2.20-2014.11/{105-misleading-indentation.patch => 0005-misleading-indentation.patch} (72%)
 rename packages/{glibc/2.19/106-dl-open-array-bounds.patch => glibc-linaro/2.20-2014.11/0006-dl-open-array-bounds.patch} (87%)
 rename packages/glibc-linaro/2.20-2014.11/{140-Fix-combreloc-test-BSD-grep.patch => 0007-Fix-combreloc-test-BSD-grep.patch} (77%)
 rename packages/glibc-linaro/2.20-2014.11/{920-fix-rpc_parse-format.patch => 0008-fix-rpc_parse-format.patch} (95%)
 rename packages/glibc-linaro/2.20-2014.11/{930-explicit-boolean.patch => 0009-explicit-boolean.patch} (85%)
 rename packages/{glibc/2.12.2/940-nis-bogus-conditional.patch => glibc-linaro/2.20-2014.11/0010-nis-bogus-conditional.patch} (91%)
 rename packages/glibc-ports/{2.15/090-Fix-ARM-build-with-GCC-trunk.patch => 2.12.1/0000-Fix-ARM-build-with-GCC-trunk.patch} (88%)
 rename packages/glibc-ports/2.12.1/{330-m68k-sys-user.patch => 0001-m68k-sys-user.patch} (92%)
 rename packages/glibc-ports/{2.16.0/440-alpha-cache-shape.patch => 2.12.1/0002-alpha-cache-shape.patch} (56%)
 rename packages/glibc-ports/{2.13/460-alpha-fix-gcc-4.1-warnings.patch => 2.12.1/0003-alpha-fix-gcc-4.1-warnings.patch} (81%)
 rename packages/glibc-ports/{2.13/530-alpha-fix-rtld-fPIC.patch => 2.12.1/0004-alpha-fix-rtld-fPIC.patch} (62%)
 rename packages/glibc-ports/{2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch => 2.12.1/0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch} (71%)
 rename packages/glibc-ports/{2.13/580-nptl-lowlevellock.patch => 2.12.1/0006-nptl-lowlevellock.patch} (89%)
 rename packages/glibc-ports/{2.13/610-fpu-cw-mips.patch => 2.12.1/0007-fpu-cw-mips.patch} (54%)
 create mode 100644 packages/glibc-ports/2.12.1/0008-support-hard-float-eabi.patch
 delete mode 100644 packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch
 delete mode 100644 packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch
 rename packages/glibc-ports/{2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch => 2.13/0000-Fix-ARM-build-with-GCC-trunk.patch} (88%)
 rename packages/glibc-ports/{2.16.0/330-m68k-sys-user.patch => 2.13/0001-m68k-sys-user.patch} (92%)
 rename packages/glibc-ports/2.13/{410-alpha-SETPIPE-GETPIPE.patch => 0002-alpha-SETPIPE-GETPIPE.patch} (65%)
 rename packages/glibc-ports/2.13/{420-alpha-statfs.patch => 0003-alpha-statfs.patch} (55%)
 rename packages/glibc-ports/{2.15/440-alpha-cache-shape.patch => 2.13/0004-alpha-cache-shape.patch} (56%)
 rename packages/glibc-ports/2.13/{450-alpha-DEFAULT_STACK_PERMS.patch => 0005-alpha-DEFAULT_STACK_PERMS.patch} (68%)
 rename packages/glibc-ports/{2.15/460-alpha-fix-gcc-4.1-warnings.patch => 2.13/0006-alpha-fix-gcc-4.1-warnings.patch} (81%)
 create mode 100644 packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch
 rename packages/glibc-ports/{2.15/530-alpha-fix-rtld-fPIC.patch => 2.13/0008-alpha-fix-rtld-fPIC.patch} (62%)
 rename packages/glibc-ports/2.13/{570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch => 0009-arm-cirrus-ep93xx-maverick-crunch-fpu.patch} (71%)
 rename packages/glibc-ports/{2.15/580-nptl-lowlevellock.patch => 2.13/0010-nptl-lowlevellock.patch} (89%)
 rename packages/glibc-ports/{2.15/610-fpu-cw-mips.patch => 2.13/0011-fpu-cw-mips.patch} (54%)
 create mode 100644 packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch
 delete mode 100644 packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
 delete mode 100644 packages/glibc-ports/2.13/670-support-hard-float-eabi.patch
 rename packages/glibc-ports/{2.13/090-Fix-ARM-build-with-GCC-trunk.patch => 2.14.1/0000-Fix-ARM-build-with-GCC-trunk.patch} (88%)
 rename packages/glibc-ports/{2.13/330-m68k-sys-user.patch => 2.14.1/0001-m68k-sys-user.patch} (92%)
 rename packages/glibc-ports/{2.13/440-alpha-cache-shape.patch => 2.14.1/0002-alpha-cache-shape.patch} (56%)
 rename packages/glibc-ports/{2.12.1/460-alpha-fix-gcc-4.1-warnings.patch => 2.14.1/0003-alpha-fix-gcc-4.1-warnings.patch} (80%)
 rename packages/glibc-ports/{2.12.1/530-alpha-fix-rtld-fPIC.patch => 2.14.1/0004-alpha-fix-rtld-fPIC.patch} (61%)
 rename packages/glibc-ports/2.14.1/{570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch => 0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch} (70%)
 rename packages/glibc-ports/2.14.1/{580-nptl-lowlevellock.patch => 0006-nptl-lowlevellock.patch} (88%)
 rename packages/glibc-ports/{2.12.1/610-fpu-cw-mips.patch => 2.14.1/0007-fpu-cw-mips.patch} (53%)
 rename packages/glibc-ports/{2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch => 2.15/0000-Fix-ARM-build-with-GCC-trunk.patch} (88%)
 rename packages/glibc-ports/2.15/{091-libmemusage-link-failure.patch => 0001-libmemusage-link-failure.patch} (80%)
 rename packages/glibc-ports/2.15/{330-m68k-sys-user.patch => 0002-m68k-sys-user.patch} (92%)
 rename packages/glibc-ports/{2.14.1/440-alpha-cache-shape.patch => 2.15/0003-alpha-cache-shape.patch} (55%)
 rename packages/glibc-ports/{2.14.1/460-alpha-fix-gcc-4.1-warnings.patch => 2.15/0004-alpha-fix-gcc-4.1-warnings.patch} (80%)
 rename packages/glibc-ports/{2.14.1/530-alpha-fix-rtld-fPIC.patch => 2.15/0005-alpha-fix-rtld-fPIC.patch} (61%)
 rename packages/glibc-ports/{2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch => 2.15/0006-arm-cirrus-ep93xx-maverick-crunch-fpu.patch} (70%)
 rename packages/glibc-ports/{2.12.1/580-nptl-lowlevellock.patch => 2.15/0007-nptl-lowlevellock.patch} (88%)
 rename packages/glibc-ports/{2.14.1/610-fpu-cw-mips.patch => 2.15/0008-fpu-cw-mips.patch} (53%)
 rename packages/glibc-ports/2.16.0/{090-Fix-ARM-build-with-GCC-trunk.patch => 0000-Fix-ARM-build-with-GCC-trunk.patch} (79%)
 rename packages/glibc-ports/{2.14.1/330-m68k-sys-user.patch => 2.16.0/0001-m68k-sys-user.patch} (92%)
 create mode 100644 packages/glibc-ports/2.16.0/0002-alpha-cache-shape.patch
 create mode 100644 packages/glibc-ports/2.16.0/0003-alpha-fix-gcc-4.1-warnings.patch
 create mode 100644 packages/glibc-ports/2.16.0/0004-alpha-fix-rtld-fPIC.patch
 create mode 100644 packages/glibc-ports/2.16.0/0005-nptl-lowlevellock.patch
 create mode 100644 packages/glibc-ports/2.16.0/0006-fpu-cw-mips.patch
 delete mode 100644 packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
 delete mode 100644 packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch
 delete mode 100644 packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
 delete mode 100644 packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
 rename packages/glibc/2.12.1/{100-respect-env-CPPFLAGS.patch => 0000-respect-env-CPPFLAGS.patch} (63%)
 rename packages/glibc/{2.13/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch => 2.12.1/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch} (78%)
 rename packages/{glibc-linaro/2.20-2014.11/102-fix-signed-shift-overlow.patch => glibc/2.12.1/0002-fix-signed-shift-overlow.patch} (84%)
 rename packages/glibc/{2.13/104-unused-variables.patch => 2.12.1/0003-unused-variables.patch} (79%)
 rename packages/glibc/2.12.1/{105-misleading-indentation.patch => 0004-misleading-indentation.patch} (72%)
 rename packages/glibc/2.12.1/{106-dl-open-array-bounds.patch => 0005-dl-open-array-bounds.patch} (88%)
 rename packages/glibc/{2.14.1/120-i386-x86_64-revert-clone-cfi.patch => 2.12.1/0006-i386-x86_64-revert-clone-cfi.patch} (56%)
 rename packages/glibc/{2.16.0/140-disable-ldconfig.patch => 2.12.1/0007-disable-ldconfig.patch} (73%)
 rename packages/glibc/2.12.1/{140-Fix-combreloc-test-BSD-grep.patch => 0008-Fix-combreloc-test-BSD-grep.patch} (69%)
 rename packages/glibc/{2.14.1/150-queue-header-updates.patch => 2.12.1/0009-queue-header-updates.patch} (90%)
 rename packages/glibc/{2.14.1/160-manual-no-perl.patch => 2.12.1/0010-manual-no-perl.patch} (76%)
 rename packages/glibc/{2.15/170-localedef-fix-trampoline.patch => 2.12.1/0011-localedef-fix-trampoline.patch} (87%)
 rename packages/glibc/{2.16.0/180-resolv-dynamic.patch => 2.12.1/0012-resolv-dynamic.patch} (81%)
 rename packages/glibc/{2.14.1/190-localedef-mmap.patch => 2.12.1/0013-localedef-mmap.patch} (82%)
 rename packages/glibc/{2.16.0/200-fadvise64_64.patch => 2.12.1/0014-fadvise64_64.patch} (67%)
 rename packages/glibc/{2.13/220-section-comments.patch => 2.12.1/0015-section-comments.patch} (76%)
 rename packages/glibc/{2.13/230-no-inline-gmon.patch => 2.12.1/0016-no-inline-gmon.patch} (71%)
 rename packages/glibc/{2.13/240-check_native-headers.patch => 2.12.1/0017-check_native-headers.patch} (57%)
 rename packages/glibc/{2.13/250-fix-pr631.patch => 2.12.1/0018-fix-pr631.patch} (77%)
 rename packages/glibc/{2.15/260-assume-pipe2.patch => 2.12.1/0019-assume-pipe2.patch} (82%)
 rename packages/glibc/{2.16.0/270-china.patch => 2.12.1/0020-china.patch} (70%)
 rename packages/glibc/{2.14.1/280-new-valencian-locale.patch => 2.12.1/0021-new-valencian-locale.patch} (81%)
 rename packages/glibc/{2.12.2/300-macos-cross-rpcgen.patch => 2.12.1/0022-macos-cross-rpcgen.patch} (87%)
 rename packages/glibc/{2.13/300-nscd-one-fork.patch => 2.12.1/0023-nscd-one-fork.patch} (81%)
 rename packages/glibc/2.12.1/{310-hppa-nptl-carlos.patch => 0024-hppa-nptl-carlos.patch} (84%)
 rename packages/glibc/{2.16.0/340-dl_execstack-PaX-support.patch => 2.12.1/0025-dl_execstack-PaX-support.patch} (74%)
 rename packages/glibc/{2.14.1/350-pre20040117-pt_pax.patch => 2.12.1/0026-pre20040117-pt_pax.patch} (88%)
 rename packages/glibc/{2.13/360-tests-sandbox-libdl-paths.patch => 2.12.1/0027-tests-sandbox-libdl-paths.patch} (67%)
 rename packages/glibc/2.12.1/{370-fnmatch.patch => 0028-fnmatch.patch} (85%)
 rename packages/glibc/{2.16.0/380-dont-build-timezone.patch => 2.12.1/0029-dont-build-timezone.patch} (72%)
 rename packages/glibc/{2.16.0/400-alpha-xstat.patch => 2.12.1/0030-alpha-xstat.patch} (57%)
 create mode 100644 packages/glibc/2.12.1/0031-alpha-creat.patch
 rename packages/glibc/2.12.1/{490-alpha_alpha-add-fdatasync-support.patch => 0032-alpha_alpha-add-fdatasync-support.patch} (74%)
 rename packages/glibc/{2.13/560-ppc-atomic.patch => 2.12.1/0033-ppc-atomic.patch} (93%)
 rename packages/glibc/{2.14.1/630-mips_shn_undef-hack.patch => 2.12.1/0034-mips_shn_undef-hack.patch} (62%)
 rename packages/glibc/{2.14.1/640-alpha-atfcts.patch => 2.12.1/0035-alpha-atfcts.patch} (63%)
 rename packages/glibc/2.12.1/{650-syslog.patch => 0036-syslog.patch} (57%)
 create mode 100644 packages/glibc/2.12.1/0037-debug-readlink_chk-readklinkat_chk.patch
 rename packages/glibc/2.12.1/{900-march-i686.patch => 0038-march-i686.patch} (55%)
 rename packages/glibc/{2.12.2/910-typedef-caddr.patch => 2.12.1/0039-typedef-caddr.patch} (51%)
 rename packages/glibc/{2.12.2/920-fix-rpc_parse-format.patch => 2.12.1/0040-fix-rpc_parse-format.patch} (95%)
 rename packages/glibc/2.12.1/{920-make-382.patch => 0041-make-382.patch} (71%)
 rename packages/{glibc-linaro/2.20-2014.11/940-nis-bogus-conditional.patch => glibc/2.12.1/0042-nis-bogus-conditional.patch} (91%)
 rename packages/glibc/2.12.1/{998-obstack-common.patch => 0043-obstack-common.patch} (87%)
 rename packages/glibc/2.12.1/{999-new-tools.patch => 0044-new-tools.patch} (78%)
 delete mode 100644 packages/glibc/2.12.1/120-i386-x86_64-revert-clone-cfi.patch
 delete mode 100644 packages/glibc/2.12.1/140-disable-ldconfig.patch
 delete mode 100644 packages/glibc/2.12.1/150-queue-header-updates.patch
 delete mode 100644 packages/glibc/2.12.1/170-localedef-fix-trampoline.patch
 delete mode 100644 packages/glibc/2.12.1/180-resolv-dynamic.patch
 delete mode 100644 packages/glibc/2.12.1/200-fadvise64_64.patch
 delete mode 100644 packages/glibc/2.12.1/270-china.patch
 delete mode 100644 packages/glibc/2.12.1/280-new-valencian-locale.patch
 delete mode 100644 packages/glibc/2.12.1/340-dl_execstack-PaX-support.patch
 delete mode 100644 packages/glibc/2.12.1/350-pre20040117-pt_pax.patch
 delete mode 100644 packages/glibc/2.12.1/360-tests-sandbox-libdl-paths.patch
 delete mode 100644 packages/glibc/2.12.1/380-dont-build-timezone.patch
 delete mode 100644 packages/glibc/2.12.1/400-alpha-xstat.patch
 delete mode 100644 packages/glibc/2.12.1/430-alpha-creat.patch
 delete mode 100644 packages/glibc/2.12.1/560-ppc-atomic.patch
 delete mode 100644 packages/glibc/2.12.1/630-mips_shn_undef-hack.patch
 delete mode 100644 packages/glibc/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
 delete mode 100644 packages/glibc/2.12.1/910-typedef-caddr.patch
 rename packages/glibc/2.12.2/{140-Fix-combreloc-test-BSD-grep.patch => 0000-Fix-combreloc-test-BSD-grep.patch} (69%)
 rename packages/glibc/{2.14.1/300-macos-cross-rpcgen.patch => 2.12.2/0001-macos-cross-rpcgen.patch} (87%)
 rename packages/glibc/2.12.2/{900-march-i686.patch => 0002-march-i686.patch} (55%)
 rename packages/glibc/{2.13/910-typedef-caddr.patch => 2.12.2/0003-typedef-caddr.patch} (51%)
 rename packages/glibc/{2.12.1/920-fix-rpc_parse-format.patch => 2.12.2/0004-fix-rpc_parse-format.patch} (95%)
 rename packages/glibc/{2.13/940-nis-bogus-conditional.patch => 2.12.2/0005-nis-bogus-conditional.patch} (91%)
 rename packages/glibc/2.12.2/{998-obstack-common.patch => 0006-obstack-common.patch} (87%)
 rename packages/glibc/2.12.2/{999-new-tools.patch => 0007-new-tools.patch} (78%)
 rename packages/glibc/2.13/{100-respect-env-CPPFLAGS.patch => 0000-respect-env-CPPFLAGS.patch} (73%)
 rename packages/glibc/{2.14.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch => 2.13/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch} (78%)
 rename packages/glibc/{2.12.1/102-fix-signed-shift-overlow.patch => 2.13/0002-fix-signed-shift-overlow.patch} (84%)
 rename packages/glibc/{2.14.1/104-unused-variables.patch => 2.13/0003-unused-variables.patch} (79%)
 rename packages/glibc/2.13/{105-misleading-indentation.patch => 0004-misleading-indentation.patch} (72%)
 rename packages/glibc/2.13/{106-dl-open-array-bounds.patch => 0005-dl-open-array-bounds.patch} (88%)
 rename packages/glibc/{2.16.0/120-i386-x86_64-revert-clone-cfi.patch => 2.13/0006-i386-x86_64-revert-clone-cfi.patch} (56%)
 rename packages/glibc/2.13/{140-disable-ldconfig.patch => 0007-disable-ldconfig.patch} (73%)
 rename packages/glibc/2.13/{140-Fix-combreloc-test-BSD-grep.patch => 0008-Fix-combreloc-test-BSD-grep.patch} (70%)
 rename packages/glibc/{2.15/150-queue-header-updates.patch => 2.13/0009-queue-header-updates.patch} (90%)
 rename packages/glibc/{2.15/160-manual-no-perl.patch => 2.13/0010-manual-no-perl.patch} (76%)
 rename packages/glibc/2.13/{170-localedef-fix-trampoline.patch => 0011-localedef-fix-trampoline.patch} (87%)
 rename packages/glibc/{2.15/180-resolv-dynamic.patch => 2.13/0012-resolv-dynamic.patch} (81%)
 rename packages/glibc/2.13/{190-localedef-mmap.patch => 0013-localedef-mmap.patch} (82%)
 rename packages/glibc/2.13/{200-fadvise64_64.patch => 0014-fadvise64_64.patch} (67%)
 rename packages/glibc/{2.15/220-section-comments.patch => 2.13/0015-section-comments.patch} (76%)
 rename packages/glibc/{2.14.1/230-no-inline-gmon.patch => 2.13/0016-no-inline-gmon.patch} (71%)
 rename packages/glibc/{2.12.1/240-check_native-headers.patch => 2.13/0017-check_native-headers.patch} (56%)
 rename packages/glibc/{2.12.1/250-fix-pr631.patch => 2.13/0018-fix-pr631.patch} (77%)
 rename packages/glibc/2.13/{260-assume-pipe2.patch => 0019-assume-pipe2.patch} (82%)
 rename packages/glibc/2.13/{270-china.patch => 0020-china.patch} (70%)
 rename packages/glibc/{2.15/280-new-valencian-locale.patch => 2.13/0021-new-valencian-locale.patch} (81%)
 rename packages/glibc/{2.12.1/300-macos-cross-rpcgen.patch => 2.13/0022-macos-cross-rpcgen.patch} (87%)
 rename packages/glibc/{2.14.1/300-nscd-one-fork.patch => 2.13/0023-nscd-one-fork.patch} (81%)
 rename packages/glibc/{2.14.1/310-hppa-nptl-carlos.patch => 2.13/0024-hppa-nptl-carlos.patch} (85%)
 rename packages/glibc/2.13/{340-dl_execstack-PaX-support.patch => 0025-dl_execstack-PaX-support.patch} (74%)
 rename packages/glibc/2.13/{350-pre20040117-pt_pax.patch => 0026-pre20040117-pt_pax.patch} (88%)
 rename packages/glibc/{2.14.1/360-tests-sandbox-libdl-paths.patch => 2.13/0027-tests-sandbox-libdl-paths.patch} (67%)
 rename packages/glibc/2.13/{380-dont-build-timezone.patch => 0028-dont-build-timezone.patch} (72%)
 rename packages/glibc/2.13/{400-alpha-xstat.patch => 0029-alpha-xstat.patch} (57%)
 create mode 100644 packages/glibc/2.13/0030-alpha-creat.patch
 rename packages/glibc/2.13/{490-alpha_alpha-add-fdatasync-support.patch => 0031-alpha_alpha-add-fdatasync-support.patch} (75%)
 rename packages/glibc/{2.15/560-ppc-atomic.patch => 2.13/0032-ppc-atomic.patch} (93%)
 rename packages/glibc/{2.16.0/630-mips_shn_undef-hack.patch => 2.13/0033-mips_shn_undef-hack.patch} (62%)
 rename packages/glibc/{2.12.1/640-alpha-atfcts.patch => 2.13/0034-alpha-atfcts.patch} (63%)
 rename packages/glibc/2.13/{650-syslog.patch => 0035-syslog.patch} (57%)
 create mode 100644 packages/glibc/2.13/0036-debug-readlink_chk-readklinkat_chk.patch
 rename packages/glibc/2.13/{900-march-i686.patch => 0037-march-i686.patch} (55%)
 rename packages/glibc/{2.19/910-typedef-caddr.patch => 2.13/0038-typedef-caddr.patch} (51%)
 rename packages/glibc/2.13/{920-fix-rpc_parse-format.patch => 0039-fix-rpc_parse-format.patch} (95%)
 rename packages/glibc/{2.12.1/940-nis-bogus-conditional.patch => 2.13/0040-nis-bogus-conditional.patch} (91%)
 rename packages/glibc/{2.14.1/950-initfini-ppc64.patch => 2.13/0041-initfini-ppc64.patch} (73%)
 rename packages/glibc/2.13/{998-obstack-common.patch => 0042-obstack-common.patch} (87%)
 rename packages/glibc/{2.15/999-new-tools.patch => 2.13/0043-new-tools.patch} (79%)
 delete mode 100644 packages/glibc/2.13/430-alpha-creat.patch
 delete mode 100644 packages/glibc/2.13/660-debug-readlink_chk-readklinkat_chk.patch
 rename packages/glibc/2.14.1/{100-respect-env-CPPFLAGS.patch => 0000-respect-env-CPPFLAGS.patch} (71%)
 rename packages/glibc/{2.12.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch => 2.14.1/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch} (78%)
 rename packages/glibc/{2.13/102-fix-signed-shift-overlow.patch => 2.14.1/0002-fix-signed-shift-overlow.patch} (84%)
 create mode 100644 packages/glibc/2.14.1/0003-dl-openat64-variadic.patch
 rename packages/glibc/{2.12.1/104-unused-variables.patch => 2.14.1/0004-unused-variables.patch} (79%)
 rename packages/glibc/2.14.1/{105-misleading-indentation.patch => 0005-misleading-indentation.patch} (72%)
 rename packages/glibc/2.14.1/{106-dl-open-array-bounds.patch => 0006-dl-open-array-bounds.patch} (88%)
 rename packages/glibc/{2.13/120-i386-x86_64-revert-clone-cfi.patch => 2.14.1/0007-i386-x86_64-revert-clone-cfi.patch} (56%)
 rename packages/glibc/2.14.1/{140-disable-ldconfig.patch => 0008-disable-ldconfig.patch} (73%)
 rename packages/glibc/2.14.1/{140-Fix-combreloc-test-BSD-grep.patch => 0009-Fix-combreloc-test-BSD-grep.patch} (69%)
 rename packages/glibc/{2.13/150-queue-header-updates.patch => 2.14.1/0010-queue-header-updates.patch} (90%)
 rename packages/glibc/{2.13/160-manual-no-perl.patch => 2.14.1/0011-manual-no-perl.patch} (74%)
 rename packages/glibc/{2.16.0/170-localedef-fix-trampoline.patch => 2.14.1/0012-localedef-fix-trampoline.patch} (87%)
 rename packages/glibc/{2.13/180-resolv-dynamic.patch => 2.14.1/0013-resolv-dynamic.patch} (81%)
 rename packages/glibc/{2.12.1/190-localedef-mmap.patch => 2.14.1/0014-localedef-mmap.patch} (81%)
 rename packages/glibc/2.14.1/{200-fadvise64_64.patch => 0015-fadvise64_64.patch} (67%)
 rename packages/glibc/2.14.1/{220-section-comments.patch => 0016-section-comments.patch} (73%)
 rename packages/glibc/{2.15/230-no-inline-gmon.patch => 2.14.1/0017-no-inline-gmon.patch} (71%)
 rename packages/glibc/2.14.1/{260-assume-pipe2.patch => 0018-assume-pipe2.patch} (82%)
 rename packages/glibc/2.14.1/{270-china.patch => 0019-china.patch} (70%)
 rename packages/glibc/{2.13/280-new-valencian-locale.patch => 2.14.1/0020-new-valencian-locale.patch} (81%)
 rename packages/glibc/{2.13/300-macos-cross-rpcgen.patch => 2.14.1/0021-macos-cross-rpcgen.patch} (87%)
 rename packages/glibc/{2.15/300-nscd-one-fork.patch => 2.14.1/0022-nscd-one-fork.patch} (81%)
 rename packages/glibc/{2.13/310-hppa-nptl-carlos.patch => 2.14.1/0023-hppa-nptl-carlos.patch} (84%)
 rename packages/glibc/2.14.1/{340-dl_execstack-PaX-support.patch => 0024-dl_execstack-PaX-support.patch} (73%)
 rename packages/glibc/{2.15/350-pre20040117-pt_pax.patch => 2.14.1/0025-pre20040117-pt_pax.patch} (88%)
 rename packages/glibc/{2.15/360-tests-sandbox-libdl-paths.patch => 2.14.1/0026-tests-sandbox-libdl-paths.patch} (67%)
 rename packages/glibc/2.14.1/{380-dont-build-timezone.patch => 0027-dont-build-timezone.patch} (69%)
 rename packages/glibc/2.14.1/{400-alpha-xstat.patch => 0028-alpha-xstat.patch} (57%)
 create mode 100644 packages/glibc/2.14.1/0029-alpha-creat.patch
 rename packages/glibc/2.14.1/{490-alpha_alpha-add-fdatasync-support.patch => 0030-alpha_alpha-add-fdatasync-support.patch} (74%)
 rename packages/glibc/2.14.1/{560-ppc-atomic.patch => 0031-ppc-atomic.patch} (93%)
 rename packages/glibc/{2.15/630-mips_shn_undef-hack.patch => 2.14.1/0032-mips_shn_undef-hack.patch} (58%)
 rename packages/glibc/{2.15/640-alpha-atfcts.patch => 2.14.1/0033-alpha-atfcts.patch} (63%)
 rename packages/glibc/2.14.1/{650-syslog.patch => 0034-syslog.patch} (57%)
 create mode 100644 packages/glibc/2.14.1/0035-debug-readlink_chk-readklinkat_chk.patch
 rename packages/glibc/2.14.1/{900-cpuid-include.patch => 0036-cpuid-include.patch} (97%)
 rename packages/glibc/{2.15/910-asm-i686.patch => 2.14.1/0037-asm-i686.patch} (76%)
 create mode 100644 packages/glibc/2.14.1/0038-fix-rpc_parse-format.patch
 create mode 100644 packages/glibc/2.14.1/0039-nis-bogus-conditional.patch
 rename packages/glibc/{2.13/950-initfini-ppc64.patch => 2.14.1/0040-initfini-ppc64.patch} (75%)
 rename packages/glibc/2.14.1/{996-obsolete-rpc.patch => 0041-obsolete-rpc.patch} (71%)
 rename packages/glibc/2.14.1/{998-obstack-common.patch => 0042-obstack-common.patch} (87%)
 rename packages/glibc/{2.13/999-new-tools.patch => 2.14.1/0043-new-tools.patch} (79%)
 delete mode 100644 packages/glibc/2.14.1/430-alpha-creat.patch
 delete mode 100644 packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
 delete mode 100644 packages/glibc/2.14.1/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.14.1/940-nis-bogus-conditional.patch
 rename packages/glibc/2.15/{100-respect-env-CPPFLAGS.patch => 0000-respect-env-CPPFLAGS.patch} (71%)
 create mode 100644 packages/glibc/2.15/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 create mode 100644 packages/glibc/2.15/0002-fix-signed-shift-overlow.patch
 create mode 100644 packages/glibc/2.15/0003-dl-openat64-variadic.patch
 rename packages/glibc/2.15/{104-unused-variables.patch => 0004-unused-variables.patch} (79%)
 create mode 100644 packages/glibc/2.15/0005-misleading-indentation.patch
 rename packages/glibc/2.15/{106-dl-open-array-bounds.patch => 0006-dl-open-array-bounds.patch} (88%)
 rename packages/glibc/2.15/{120-i386-x86_64-revert-clone-cfi.patch => 0007-i386-x86_64-revert-clone-cfi.patch} (56%)
 rename packages/glibc/2.15/{140-disable-ldconfig.patch => 0008-disable-ldconfig.patch} (70%)
 rename packages/glibc/2.15/{140-Fix-combreloc-test-BSD-grep.patch => 0009-Fix-combreloc-test-BSD-grep.patch} (70%)
 rename packages/glibc/{2.16.0/150-queue-header-updates.patch => 2.15/0010-queue-header-updates.patch} (90%)
 rename packages/glibc/{2.12.1/160-manual-no-perl.patch => 2.15/0011-manual-no-perl.patch} (73%)
 rename packages/glibc/{2.14.1/170-localedef-fix-trampoline.patch => 2.15/0012-localedef-fix-trampoline.patch} (87%)
 rename packages/glibc/{2.14.1/180-resolv-dynamic.patch => 2.15/0013-resolv-dynamic.patch} (81%)
 rename packages/glibc/2.15/{200-fadvise64_64.patch => 0014-fadvise64_64.patch} (67%)
 rename packages/glibc/{2.12.1/220-section-comments.patch => 2.15/0015-section-comments.patch} (73%)
 rename packages/glibc/{2.12.1/230-no-inline-gmon.patch => 2.15/0016-no-inline-gmon.patch} (70%)
 rename packages/glibc/{2.12.1/260-assume-pipe2.patch => 2.15/0017-assume-pipe2.patch} (81%)
 rename packages/glibc/2.15/{270-china.patch => 0018-china.patch} (70%)
 rename packages/glibc/{2.16.0/280-new-valencian-locale.patch => 2.15/0019-new-valencian-locale.patch} (81%)
 create mode 100644 packages/glibc/2.15/0020-macos-cross-rpcgen.patch
 rename packages/glibc/{2.12.1/300-nscd-one-fork.patch => 2.15/0021-nscd-one-fork.patch} (75%)
 rename packages/glibc/2.15/{310-hppa-nptl-carlos.patch => 0022-hppa-nptl-carlos.patch} (84%)
 rename packages/glibc/2.15/{340-dl_execstack-PaX-support.patch => 0023-dl_execstack-PaX-support.patch} (73%)
 rename packages/glibc/{2.16.0/350-pre20040117-pt_pax.patch => 2.15/0024-pre20040117-pt_pax.patch} (85%)
 rename packages/glibc/{2.16.0/360-tests-sandbox-libdl-paths.patch => 2.15/0025-tests-sandbox-libdl-paths.patch} (67%)
 rename packages/glibc/2.15/{380-dont-build-timezone.patch => 0026-dont-build-timezone.patch} (69%)
 rename packages/glibc/2.15/{400-alpha-xstat.patch => 0027-alpha-xstat.patch} (57%)
 create mode 100644 packages/glibc/2.15/0028-alpha-creat.patch
 rename packages/glibc/{2.16.0/490-alpha_alpha-add-fdatasync-support.patch => 2.15/0029-alpha_alpha-add-fdatasync-support.patch} (74%)
 rename packages/glibc/{2.16.0/560-ppc-atomic.patch => 2.15/0030-ppc-atomic.patch} (93%)
 rename packages/glibc/{2.13/630-mips_shn_undef-hack.patch => 2.15/0031-mips_shn_undef-hack.patch} (58%)
 rename packages/glibc/{2.13/640-alpha-atfcts.patch => 2.15/0032-alpha-atfcts.patch} (63%)
 rename packages/glibc/2.15/{650-syslog.patch => 0033-syslog.patch} (57%)
 create mode 100644 packages/glibc/2.15/0034-debug-readlink_chk-readklinkat_chk.patch
 rename packages/glibc/2.15/{900-cpuid-include.patch => 0035-cpuid-include.patch} (96%)
 rename packages/glibc/{2.14.1/910-asm-i686.patch => 2.15/0036-asm-i686.patch} (76%)
 create mode 100644 packages/glibc/2.15/0037-fix-rpc_parse-format.patch
 create mode 100644 packages/glibc/2.15/0038-nis-bogus-conditional.patch
 rename packages/glibc/2.15/{990-try-link-static.patch => 0039-try-link-static.patch} (85%)
 rename packages/glibc/2.15/{991-builtin_expect.patch => 0040-builtin_expect.patch} (81%)
 rename packages/glibc/2.15/{992-gcc_s-suffix.patch => 0041-gcc_s-suffix.patch} (73%)
 rename packages/glibc/2.15/{996-obsolete-rpc.patch => 0042-obsolete-rpc.patch} (71%)
 create mode 100644 packages/glibc/2.15/0043-obstack-common.patch
 rename packages/glibc/{2.14.1/999-new-tools.patch => 2.15/0044-new-tools.patch} (78%)
 delete mode 100644 packages/glibc/2.15/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 delete mode 100644 packages/glibc/2.15/102-fix-signed-shift-overlow.patch
 delete mode 100644 packages/glibc/2.15/105-misleading-indentation.patch
 delete mode 100644 packages/glibc/2.15/300-macos-cross-rpcgen.patch
 delete mode 100644 packages/glibc/2.15/430-alpha-creat.patch
 delete mode 100644 packages/glibc/2.15/660-debug-readlink_chk-readklinkat_chk.patch
 delete mode 100644 packages/glibc/2.15/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.15/940-nis-bogus-conditional.patch
 delete mode 100644 packages/glibc/2.15/998-obstack-common.patch
 rename packages/glibc/2.16.0/{100-respect-env-CPPFLAGS.patch => 0000-respect-env-CPPFLAGS.patch} (74%)
 create mode 100644 packages/glibc/2.16.0/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 create mode 100644 packages/glibc/2.16.0/0002-fix-signed-shift-overlow.patch
 rename packages/glibc/2.16.0/{103-dl-openat64-variadic.patch => 0003-dl-openat64-variadic.patch} (98%)
 rename packages/glibc/2.16.0/{104-unused-variables.patch => 0004-unused-variables.patch} (80%)
 create mode 100644 packages/glibc/2.16.0/0005-misleading-indentation.patch
 rename packages/glibc/2.16.0/{106-dl-open-array-bounds.patch => 0006-dl-open-array-bounds.patch} (88%)
 create mode 100644 packages/glibc/2.16.0/0007-i386-x86_64-revert-clone-cfi.patch
 create mode 100644 packages/glibc/2.16.0/0008-disable-ldconfig.patch
 rename packages/glibc/2.16.0/{140-Fix-combreloc-test-BSD-grep.patch => 0009-Fix-combreloc-test-BSD-grep.patch} (77%)
 create mode 100644 packages/glibc/2.16.0/0010-queue-header-updates.patch
 create mode 100644 packages/glibc/2.16.0/0011-localedef-fix-trampoline.patch
 create mode 100644 packages/glibc/2.16.0/0012-resolv-dynamic.patch
 create mode 100644 packages/glibc/2.16.0/0013-fadvise64_64.patch
 rename packages/glibc/2.16.0/{260-assume-pipe2.patch => 0014-assume-pipe2.patch} (81%)
 create mode 100644 packages/glibc/2.16.0/0015-china.patch
 create mode 100644 packages/glibc/2.16.0/0016-new-valencian-locale.patch
 create mode 100644 packages/glibc/2.16.0/0017-macos-cross-rpcgen.patch
 rename packages/glibc/2.16.0/{300-nscd-one-fork.patch => 0018-nscd-one-fork.patch} (80%)
 rename packages/glibc/2.16.0/{310-hppa-nptl-carlos.patch => 0019-hppa-nptl-carlos.patch} (81%)
 create mode 100644 packages/glibc/2.16.0/0020-dl_execstack-PaX-support.patch
 create mode 100644 packages/glibc/2.16.0/0021-pre20040117-pt_pax.patch
 create mode 100644 packages/glibc/2.16.0/0022-tests-sandbox-libdl-paths.patch
 create mode 100644 packages/glibc/2.16.0/0023-dont-build-timezone.patch
 create mode 100644 packages/glibc/2.16.0/0024-alpha-xstat.patch
 create mode 100644 packages/glibc/2.16.0/0025-alpha-creat.patch
 rename packages/glibc/{2.15/490-alpha_alpha-add-fdatasync-support.patch => 2.16.0/0026-alpha_alpha-add-fdatasync-support.patch} (74%)
 rename packages/glibc/2.16.0/{500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch => 0027-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch} (89%)
 create mode 100644 packages/glibc/2.16.0/0028-ppc-atomic.patch
 create mode 100644 packages/glibc/2.16.0/0029-mips_shn_undef-hack.patch
 create mode 100644 packages/glibc/2.16.0/0030-alpha-atfcts.patch
 create mode 100644 packages/glibc/2.16.0/0031-syslog.patch
 create mode 100644 packages/glibc/2.16.0/0032-debug-readlink_chk-readklinkat_chk.patch
 create mode 100644 packages/glibc/2.16.0/0033-fix-rpc_parse-format.patch
 create mode 100644 packages/glibc/2.16.0/0034-nis-bogus-conditional.patch
 create mode 100644 packages/glibc/2.16.0/0035-obstack-common.patch
 rename packages/glibc/2.16.0/{999-new-tools.patch => 0036-new-tools.patch} (69%)
 delete mode 100644 packages/glibc/2.16.0/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 delete mode 100644 packages/glibc/2.16.0/102-fix-signed-shift-overlow.patch
 delete mode 100644 packages/glibc/2.16.0/105-misleading-indentation.patch
 delete mode 100644 packages/glibc/2.16.0/300-macos-cross-rpcgen.patch
 delete mode 100644 packages/glibc/2.16.0/430-alpha-creat.patch
 delete mode 100644 packages/glibc/2.16.0/640-alpha-atfcts.patch
 delete mode 100644 packages/glibc/2.16.0/650-syslog.patch
 delete mode 100644 packages/glibc/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
 delete mode 100644 packages/glibc/2.16.0/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.16.0/940-nis-bogus-conditional.patch
 delete mode 100644 packages/glibc/2.16.0/998-obstack-common.patch
 rename packages/glibc/2.17/{100-Fix-ARM-build-with-GCC-trunk.patch => 0000-Fix-ARM-build-with-GCC-trunk.patch} (79%)
 create mode 100644 packages/glibc/2.17/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 create mode 100644 packages/glibc/2.17/0002-fix-signed-shift-overlow.patch
 rename packages/{glibc-linaro/2.20-2014.11/103-dl-openat64-variadic.patch => glibc/2.17/0003-dl-openat64-variadic.patch} (98%)
 rename packages/glibc/2.17/{104-unused-variables.patch => 0004-unused-variables.patch} (80%)
 create mode 100644 packages/glibc/2.17/0005-misleading-indentation.patch
 rename packages/glibc/2.17/{106-dl-open-array-bounds.patch => 0006-dl-open-array-bounds.patch} (88%)
 rename packages/glibc/{2.18/120-support-make4.patch => 2.17/0007-support-make4.patch} (81%)
 rename packages/glibc/2.17/{140-Fix-combreloc-test-BSD-grep.patch => 0008-Fix-combreloc-test-BSD-grep.patch} (77%)
 create mode 100644 packages/glibc/2.17/0009-macos-cross-rpcgen.patch
 create mode 100644 packages/glibc/2.17/0010-fix-rpc_parse-format.patch
 create mode 100644 packages/glibc/2.17/0011-nis-bogus-conditional.patch
 create mode 100644 packages/glibc/2.17/0012-obstack-common.patch
 delete mode 100644 packages/glibc/2.17/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 delete mode 100644 packages/glibc/2.17/102-fix-signed-shift-overlow.patch
 delete mode 100644 packages/glibc/2.17/103-dl-openat64-variadic.patch
 delete mode 100644 packages/glibc/2.17/105-misleading-indentation.patch
 delete mode 100644 packages/glibc/2.17/300-macos-cross-rpcgen.patch
 delete mode 100644 packages/glibc/2.17/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.17/940-nis-bogus-conditional.patch
 delete mode 100644 packages/glibc/2.17/998-obstack-common.patch
 rename packages/glibc/2.18/{100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch => 0000-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch} (80%)
 create mode 100644 packages/glibc/2.18/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 create mode 100644 packages/glibc/2.18/0002-fix-signed-shift-overlow.patch
 rename packages/glibc/{2.14.1/103-dl-openat64-variadic.patch => 2.18/0003-dl-openat64-variadic.patch} (98%)
 create mode 100644 packages/glibc/2.18/0004-unused-variables.patch
 create mode 100644 packages/glibc/2.18/0005-misleading-indentation.patch
 rename packages/glibc/{2.20/106-dl-open-array-bounds.patch => 2.18/0006-dl-open-array-bounds.patch} (87%)
 rename packages/glibc/2.18/{110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch => 0007-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch} (82%)
 rename packages/glibc/{2.17/120-support-make4.patch => 2.18/0008-support-make4.patch} (81%)
 rename packages/glibc/2.18/{130-arm-unwind.patch => 0009-arm-unwind.patch} (53%)
 rename packages/glibc/2.18/{140-Fix-combreloc-test-BSD-grep.patch => 0010-Fix-combreloc-test-BSD-grep.patch} (77%)
 create mode 100644 packages/glibc/2.18/0011-macos-cross-rpcgen.patch
 create mode 100644 packages/glibc/2.18/0012-fix-rpc_parse-format.patch
 create mode 100644 packages/glibc/2.18/0013-nis-bogus-conditional.patch
 delete mode 100644 packages/glibc/2.18/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 delete mode 100644 packages/glibc/2.18/102-fix-signed-shift-overlow.patch
 delete mode 100644 packages/glibc/2.18/103-dl-openat64-variadic.patch
 delete mode 100644 packages/glibc/2.18/105-misleading-indentation.patch
 delete mode 100644 packages/glibc/2.18/300-macos-cross-rpcgen.patch
 delete mode 100644 packages/glibc/2.18/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.18/940-nis-bogus-conditional.patch
 create mode 100644 packages/glibc/2.19/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 create mode 100644 packages/glibc/2.19/0001-fix-signed-shift-overlow.patch
 create mode 100644 packages/glibc/2.19/0002-dl-openat64-variadic.patch
 rename packages/glibc/2.19/{104-unused-variables.patch => 0003-unused-variables.patch} (80%)
 create mode 100644 packages/glibc/2.19/0004-misleading-indentation.patch
 rename packages/glibc/{2.18/106-dl-open-array-bounds.patch => 2.19/0005-dl-open-array-bounds.patch} (87%)
 rename packages/glibc/2.19/{130-arm-unwind.patch => 0006-arm-unwind.patch} (53%)
 rename packages/glibc/2.19/{140-Fix-combreloc-test-BSD-grep.patch => 0007-Fix-combreloc-test-BSD-grep.patch} (77%)
 create mode 100644 packages/glibc/2.19/0008-typedef-caddr.patch
 create mode 100644 packages/glibc/2.19/0009-fix-rpc_parse-format.patch
 rename packages/glibc/2.19/{930-explicit-boolean.patch => 0010-explicit-boolean.patch} (85%)
 create mode 100644 packages/glibc/2.19/0011-nis-bogus-conditional.patch
 delete mode 100644 packages/glibc/2.19/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 delete mode 100644 packages/glibc/2.19/102-fix-signed-shift-overlow.patch
 delete mode 100644 packages/glibc/2.19/103-dl-openat64-variadic.patch
 delete mode 100644 packages/glibc/2.19/105-misleading-indentation.patch
 delete mode 100644 packages/glibc/2.19/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.19/940-nis-bogus-conditional.patch
 rename packages/glibc/2.20/{100-sparc-nptl.patch => 0000-sparc-nptl.patch} (66%)
 create mode 100644 packages/glibc/2.20/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 create mode 100644 packages/glibc/2.20/0002-fix-signed-shift-overlow.patch
 create mode 100644 packages/glibc/2.20/0003-dl-openat64-variadic.patch
 rename packages/{glibc-linaro/2.20-2014.11/104-unused-variables.patch => glibc/2.20/0004-unused-variables.patch} (80%)
 create mode 100644 packages/glibc/2.20/0005-misleading-indentation.patch
 rename packages/{glibc-linaro/2.20-2014.11/106-dl-open-array-bounds.patch => glibc/2.20/0006-dl-open-array-bounds.patch} (87%)
 rename packages/glibc/2.20/{140-Fix-combreloc-test-BSD-grep.patch => 0007-Fix-combreloc-test-BSD-grep.patch} (77%)
 rename packages/glibc/{2.23/910-typedef-caddr.patch => 2.20/0008-typedef-caddr.patch} (50%)
 create mode 100644 packages/glibc/2.20/0009-fix-rpc_parse-format.patch
 rename packages/glibc/2.20/{930-explicit-boolean.patch => 0010-explicit-boolean.patch} (85%)
 create mode 100644 packages/glibc/2.20/0011-nis-bogus-conditional.patch
 delete mode 100644 packages/glibc/2.20/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 delete mode 100644 packages/glibc/2.20/102-fix-signed-shift-overlow.patch
 delete mode 100644 packages/glibc/2.20/103-dl-openat64-variadic.patch
 delete mode 100644 packages/glibc/2.20/104-unused-variables.patch
 delete mode 100644 packages/glibc/2.20/105-misleading-indentation.patch
 delete mode 100644 packages/glibc/2.20/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.20/940-nis-bogus-conditional.patch
 create mode 100644 packages/glibc/2.21/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 create mode 100644 packages/glibc/2.21/0001-fix-signed-shift-overlow.patch
 create mode 100644 packages/glibc/2.21/0002-dl-openat64-variadic.patch
 rename packages/glibc/2.21/{104-unused-variables.patch => 0003-unused-variables.patch} (80%)
 create mode 100644 packages/glibc/2.21/0004-misleading-indentation.patch
 create mode 100644 packages/glibc/2.21/0005-dl-open-array-bounds.patch
 rename packages/glibc/2.21/{140-Fix-combreloc-test-BSD-grep.patch => 0006-Fix-combreloc-test-BSD-grep.patch} (77%)
 rename packages/glibc/{2.22/910-typedef-caddr.patch => 2.21/0007-typedef-caddr.patch} (50%)
 create mode 100644 packages/glibc/2.21/0008-fix-rpc_parse-format.patch
 rename packages/glibc/2.21/{930-explicit-boolean.patch => 0009-explicit-boolean.patch} (85%)
 create mode 100644 packages/glibc/2.21/0010-nis-bogus-conditional.patch
 rename packages/glibc/2.21/{950-dlclose-assert.patch => 0011-dlclose-assert.patch} (85%)
 delete mode 100644 packages/glibc/2.21/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 delete mode 100644 packages/glibc/2.21/102-fix-signed-shift-overlow.patch
 delete mode 100644 packages/glibc/2.21/103-dl-openat64-variadic.patch
 delete mode 100644 packages/glibc/2.21/105-misleading-indentation.patch
 delete mode 100644 packages/glibc/2.21/106-dl-open-array-bounds.patch
 delete mode 100644 packages/glibc/2.21/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.21/940-nis-bogus-conditional.patch
 rename packages/glibc/2.22/{100-sparc32-sem_open-missing-include.patch => 0000-sparc32-sem_open-missing-include.patch} (81%)
 create mode 100644 packages/glibc/2.22/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 create mode 100644 packages/glibc/2.22/0002-fix-signed-shift-overlow.patch
 rename packages/glibc/2.22/{103-dl-openat64-variadic.patch => 0003-dl-openat64-variadic.patch} (98%)
 rename packages/glibc/2.22/{104-unused-variables.patch => 0004-unused-variables.patch} (80%)
 create mode 100644 packages/glibc/2.22/0005-misleading-indentation.patch
 rename packages/glibc/2.22/{120-cve-2105-7547-getaddrinfo-stack.patch => 0006-cve-2105-7547-getaddrinfo-stack.patch} (96%)
 create mode 100644 packages/glibc/2.22/0007-Fix-combreloc-test-BSD-grep.patch
 rename packages/glibc/{2.20/910-typedef-caddr.patch => 2.22/0008-typedef-caddr.patch} (50%)
 create mode 100644 packages/glibc/2.22/0009-fix-rpc_parse-format.patch
 create mode 100644 packages/glibc/2.22/0010-explicit-boolean.patch
 create mode 100644 packages/glibc/2.22/0011-nis-bogus-conditional.patch
 delete mode 100644 packages/glibc/2.22/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 delete mode 100644 packages/glibc/2.22/102-fix-signed-shift-overlow.patch
 delete mode 100644 packages/glibc/2.22/105-misleading-indentation.patch
 delete mode 100644 packages/glibc/2.22/140-Fix-combreloc-test-BSD-grep.patch
 delete mode 100644 packages/glibc/2.22/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.22/930-explicit-boolean.patch
 delete mode 100644 packages/glibc/2.22/940-nis-bogus-conditional.patch
 create mode 100644 packages/glibc/2.23/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 rename packages/glibc/2.23/{120-Fix-build-with-enable-static-nss.patch => 0001-Fix-build-with-enable-static-nss.patch} (74%)
 create mode 100644 packages/glibc/2.23/0002-Fix-combreloc-test-BSD-grep.patch
 rename packages/glibc/{2.21/910-typedef-caddr.patch => 2.23/0003-typedef-caddr.patch} (50%)
 create mode 100644 packages/glibc/2.23/0004-fix-rpc_parse-format.patch
 create mode 100644 packages/glibc/2.23/0005-explicit-boolean.patch
 create mode 100644 packages/glibc/2.23/0006-nis-bogus-conditional.patch
 rename packages/glibc/{2.25/997-regexp-common.patch => 2.23/0007-regexp-common.patch} (96%)
 delete mode 100644 packages/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
 delete mode 100644 packages/glibc/2.23/140-Fix-combreloc-test-BSD-grep.patch
 delete mode 100644 packages/glibc/2.23/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.23/930-explicit-boolean.patch
 delete mode 100644 packages/glibc/2.23/940-nis-bogus-conditional.patch
 rename packages/glibc/2.24/{110-sh-fix-gcc6.patch => 0000-sh-fix-gcc6.patch} (76%)
 rename packages/glibc/{2.25/120-Fix-build-with-enable-static-nss.patch => 2.24/0001-Fix-build-with-enable-static-nss.patch} (74%)
 create mode 100644 packages/glibc/2.24/0002-Fix-combreloc-test-BSD-grep.patch
 create mode 100644 packages/glibc/2.24/0003-typedef-caddr.patch
 create mode 100644 packages/glibc/2.24/0004-fix-rpc_parse-format.patch
 create mode 100644 packages/glibc/2.24/0005-explicit-boolean.patch
 create mode 100644 packages/glibc/2.24/0006-nis-bogus-conditional.patch
 rename packages/glibc/2.24/{997-regexp-common.patch => 0007-regexp-common.patch} (96%)
 delete mode 100644 packages/glibc/2.24/140-Fix-combreloc-test-BSD-grep.patch
 delete mode 100644 packages/glibc/2.24/910-typedef-caddr.patch
 delete mode 100644 packages/glibc/2.24/920-fix-rpc_parse-format.patch
 delete mode 100644 packages/glibc/2.24/930-explicit-boolean.patch
 delete mode 100644 packages/glibc/2.24/940-nis-bogus-conditional.patch
 rename packages/glibc/2.25/{110-sh-fix-gcc6.patch => 0000-sh-fix-gcc6.patch} (76%)
 rename packages/glibc/{2.24/120-Fix-build-with-enable-static-nss.patch => 2.25/0001-Fix-build-with-enable-static-nss.patch} (74%)
 create mode 100644 packages/glibc/2.25/0002-Fix-combreloc-test-BSD-grep.patch
 create mode 100644 packages/glibc/2.25/0003-typedef-caddr.patch
 rename packages/glibc/2.25/{960-sh4-trap-divdi3.patch => 0004-sh4-trap-divdi3.patch} (88%)
 rename packages/glibc/2.25/{961-sparc-extra-plt-call.patch => 0005-sparc-extra-plt-call.patch} (74%)
 rename packages/glibc/{2.23/997-regexp-common.patch => 2.25/0006-regexp-common.patch} (96%)
 delete mode 100644 packages/glibc/2.25/140-Fix-combreloc-test-BSD-grep.patch
 delete mode 100644 packages/glibc/2.25/910-typedef-caddr.patch
 create mode 100644 packages/glibc/2.26/0000-typedef-caddr.patch
 delete mode 100644 packages/glibc/2.26/910-typedef-caddr.patch
 rename packages/gmp/5.0.5/{120-fix-r0-clobbering-issue.patch => 0000-fix-r0-clobbering-issue.patch} (87%)
 rename packages/libelf/0.8.13/{100-fix-64-bit-detection.patch => 0000-fix-64-bit-detection.patch} (51%)
 rename packages/libiconv/1.14/{100-srclib_stdio.in.h-remove-gets-declarations.patch => 0000-srclib_stdio.in.h-remove-gets-declarations.patch} (78%)
 rename packages/libtool/2.4.6/{2.4.5-pass-ldflags.patch => 0000-2.4.5-pass-ldflags.patch} (74%)
 rename packages/linux/2.6.32.27/{100-unifdef-strclpy.patch => 0000-unifdef-strclpy.patch} (58%)
 rename packages/ltrace/0.5.3/{100-allow-cross-compile.patch => 0000-allow-cross-compile.patch} (59%)
 create mode 100644 packages/ltrace/0.5.3/0001-alpha-support.patch
 rename packages/ltrace/0.5.3/{120-debian-ltrace_0.5.3-2.patch => 0002-debian-ltrace_0.5.3-2.patch} (68%)
 rename packages/ltrace/0.5.3/{130-add-sysdep.patch => 0003-add-sysdep.patch} (53%)
 rename packages/ltrace/0.5.3/{140-mips.patch => 0004-mips.patch} (50%)
 create mode 100644 packages/ltrace/0.5.3/0005-mips-remove-CP.patch
 rename packages/ltrace/0.5.3/{150-allow-configurable-arch.patch => 0006-allow-configurable-arch.patch} (55%)
 rename packages/ltrace/0.5.3/{160-fix-missing-ptrace-defines.patch => 0007-fix-missing-ptrace-defines.patch} (68%)
 rename packages/ltrace/0.5.3/{170-lib-supcc.patch => 0008-lib-supcc.patch} (58%)
 create mode 100644 packages/ltrace/0.5.3/0009-libltrace-genindex.patch
 rename packages/ltrace/0.5.3/{190-ar-configurable.patch => 0010-ar-configurable.patch} (58%)
 rename packages/ltrace/0.5.3/{200-configure-hostos.patch => 0011-configure-hostos.patch} (61%)
 delete mode 100644 packages/ltrace/0.5.3/110-alpha-support.patch
 delete mode 100644 packages/ltrace/0.5.3/140-mips-remove-CP.patch
 delete mode 100644 packages/ltrace/0.5.3/180-libltrace-genindex.patch
 rename packages/ltrace/0.7.3/{001-avoid-libstdc++.patch => 0000-avoid-libstdc++.patch} (76%)
 rename packages/ltrace/0.7.3/{002-printf-p.patch => 0001-printf-p.patch} (80%)
 rename packages/ltrace/0.7.3/{003-alpha-debug.h.patch => 0002-alpha-debug.h.patch} (69%)
 rename packages/ltrace/0.7.3/{004-compile-warning.patch => 0003-compile-warning.patch} (74%)
 rename packages/ltrace/0.7.3/{005-sparc-ftbfs.patch => 0004-sparc-ftbfs.patch} (62%)
 rename packages/ltrace/0.7.3/{006-unexpected-breakpoint.patch => 0005-unexpected-breakpoint.patch} (80%)
 rename packages/ltrace/0.7.3/{007-gcc-5.patch => 0006-gcc-5.patch} (79%)
 rename packages/ltrace/0.7.3/{008-glibc-2.24.patch => 0007-glibc-2.24.patch} (59%)
 create mode 100644 packages/mingw-w64/v2.0.10/0000-mingw64-malloc.patch
 rename packages/mingw-w64/v2.0.10/{200-gendef-explicit-fallthrough.patch => 0001-gendef-explicit-fallthrough.patch} (80%)
 delete mode 100644 packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch
 create mode 100644 packages/mingw-w64/v3.0.0/0000-mingw64-malloc.patch
 rename packages/mingw-w64/v3.0.0/{200-gendef-explicit-fallthrough.patch => 0001-gendef-explicit-fallthrough.patch} (80%)
 rename packages/mingw-w64/v3.0.0/{300-genpeimg-explicit-fallthrough.patch => 0002-genpeimg-explicit-fallthrough.patch} (75%)
 delete mode 100644 packages/mingw-w64/v3.0.0/100-mingw64-malloc.patch
 create mode 100644 packages/mingw-w64/v3.1.0/0000-mingw64-malloc.patch
 rename packages/mingw-w64/v3.1.0/{200-gendef-explicit-fallthrough.patch => 0001-gendef-explicit-fallthrough.patch} (80%)
 rename packages/mingw-w64/v3.1.0/{300-genpeimg-explicit-fallthrough.patch => 0002-genpeimg-explicit-fallthrough.patch} (75%)
 delete mode 100644 packages/mingw-w64/v3.1.0/100-mingw64-malloc.patch
 create mode 100644 packages/mingw-w64/v3.2.0/0000-mingw64-malloc.patch
 rename packages/mingw-w64/v3.2.0/{200-gendef-explicit-fallthrough.patch => 0001-gendef-explicit-fallthrough.patch} (80%)
 rename packages/mingw-w64/v3.2.0/{300-genpeimg-explicit-fallthrough.patch => 0002-genpeimg-explicit-fallthrough.patch} (75%)
 delete mode 100644 packages/mingw-w64/v3.2.0/100-mingw64-malloc.patch
 create mode 100644 packages/mingw-w64/v3.3.0/0000-mingw64-malloc.patch
 create mode 100644 packages/mingw-w64/v3.3.0/0001-gendef-explicit-fallthrough.patch
 rename packages/mingw-w64/v3.3.0/{300-genpeimg-explicit-fallthrough.patch => 0002-genpeimg-explicit-fallthrough.patch} (75%)
 delete mode 100644 packages/mingw-w64/v3.3.0/100-mingw64-malloc.patch
 delete mode 100644 packages/mingw-w64/v3.3.0/200-gendef-explicit-fallthrough.patch
 create mode 100644 packages/mingw-w64/v4.0.6/0000-mingw64-malloc.patch
 create mode 100644 packages/mingw-w64/v4.0.6/0001-gendef-explicit-fallthrough.patch
 create mode 100644 packages/mingw-w64/v4.0.6/0002-genpeimg-explicit-fallthrough.patch
 delete mode 100644 packages/mingw-w64/v4.0.6/100-mingw64-malloc.patch
 delete mode 100644 packages/mingw-w64/v4.0.6/200-gendef-explicit-fallthrough.patch
 delete mode 100644 packages/mingw-w64/v4.0.6/300-genpeimg-explicit-fallthrough.patch
 create mode 100644 packages/mingw-w64/v5.0.2/0000-mingw64-malloc.patch
 create mode 100644 packages/mingw-w64/v5.0.2/0001-gendef-explicit-fallthrough.patch
 create mode 100644 packages/mingw-w64/v5.0.2/0002-genpeimg-explicit-fallthrough.patch
 delete mode 100644 packages/mingw-w64/v5.0.2/100-mingw64-malloc.patch
 delete mode 100644 packages/mingw-w64/v5.0.2/200-gendef-explicit-fallthrough.patch
 delete mode 100644 packages/mingw-w64/v5.0.2/300-genpeimg-explicit-fallthrough.patch
 rename packages/mpfr/2.4.2/{100-sin_cos_underflow.patch => 0000-sin_cos_underflow.patch} (84%)
 rename packages/mpfr/2.4.2/{110-longlong.h.patch => 0001-longlong.h.patch} (63%)
 create mode 100644 packages/mpfr/2.4.2/0002-gmp5.patch
 delete mode 100644 packages/mpfr/2.4.2/120-gmp5.patch
 rename packages/mpfr/3.0.1/{110-asin_exprange.patch => 0000-asin_exprange.patch} (72%)
 rename packages/mpfr/3.0.1/{120-rec_sqrt-carry.patch => 0001-rec_sqrt-carry.patch} (72%)
 rename packages/mpfr/3.0.1/{130-atan-expo-range.patch => 0002-atan-expo-range.patch} (67%)
 create mode 100644 packages/mpfr/3.0.1/0003-texp-zero.patch
 delete mode 100644 packages/mpfr/3.0.1/140-texp-zero.patch
 rename packages/ncurses/6.0/{100-ncurses-6.0-20150810.patch => 0000-ncurses-6.0-20150810.patch} (74%)
 rename packages/ncurses/6.0/{110-ncurses-6.0-20150815.patch => 0001-ncurses-6.0-20150815.patch} (98%)
 rename packages/ncurses/6.0/{120-ncurses-6.0-20150822.patch => 0002-ncurses-6.0-20150822.patch} (99%)
 rename packages/ncurses/6.0/{130-ncurses-6.0-20150905.patch => 0003-ncurses-6.0-20150905.patch} (87%)
 rename packages/ncurses/6.0/{140-ncurses-6.0-20150912.patch => 0004-ncurses-6.0-20150912.patch} (99%)
 rename packages/ncurses/6.0/{150-ncurses-6.0-20150919.patch => 0005-ncurses-6.0-20150919.patch} (97%)
 rename packages/ncurses/6.0/{160-ncurses-6.0-20150926.patch => 0006-ncurses-6.0-20150926.patch} (75%)
 rename packages/ncurses/6.0/{170-ncurses-6.0-20151010.patch => 0007-ncurses-6.0-20151010.patch} (97%)
 rename packages/ncurses/6.0/{180-ncurses-6.0-20151017.patch => 0008-ncurses-6.0-20151017.patch} (99%)
 rename packages/ncurses/6.0/{190-ncurses-6.0-20151024.patch => 0009-ncurses-6.0-20151024.patch} (83%)
 rename packages/ncurses/6.0/{200-ncurses-6.0-20151101.patch => 0010-ncurses-6.0-20151101.patch} (99%)
 rename packages/ncurses/6.0/{210-ncurses-6.0-20151107.patch => 0011-ncurses-6.0-20151107.patch} (89%)
 rename packages/ncurses/6.0/{999-create-run_tic.patch => 0012-create-run_tic.patch} (55%)
 rename packages/newlib-linaro/2.1.0-2014.09/{100-fix-unaligned-access-memcpy-m68k.patch => 0000-fix-unaligned-access-memcpy-m68k.patch} (79%)
 create mode 100644 packages/newlib-linaro/2.1.0-2014.09/0001-fix-eabihf.patch
 create mode 100644 packages/newlib-linaro/2.1.0-2014.09/0002-fix-mt-cflags.patch
 delete mode 100644 packages/newlib-linaro/2.1.0-2014.09/110-fix-eabihf.patch
 delete mode 100644 packages/newlib-linaro/2.1.0-2014.09/200-fix-mt-cflags.patch
 rename packages/newlib-linaro/2.2.0-2015.01/{100-fix-unaligned-access-memcpy-m68k.patch => 0000-fix-unaligned-access-memcpy-m68k.patch} (79%)
 create mode 100644 packages/newlib-linaro/2.2.0-2015.01/0001-fix-eabihf.patch
 create mode 100644 packages/newlib-linaro/2.2.0-2015.01/0002-fix-mt-cflags.patch
 delete mode 100644 packages/newlib-linaro/2.2.0-2015.01/110-fix-eabihf.patch
 delete mode 100644 packages/newlib-linaro/2.2.0-2015.01/200-fix-mt-cflags.patch
 create mode 100644 packages/newlib/1.17.0/0000-fix-eabihf.patch
 rename packages/newlib/1.17.0/{200-fix-mt-cflags.patch => 0001-fix-mt-cflags.patch} (50%)
 rename packages/newlib/1.17.0/{999-fix-arm-build.patch => 0002-fix-arm-build.patch} (72%)
 delete mode 100644 packages/newlib/1.17.0/110-fix-eabihf.patch
 rename packages/newlib/1.18.0/{100-fix-unaligned-access-memcpy-m68k.patch => 0000-fix-unaligned-access-memcpy-m68k.patch} (74%)
 create mode 100644 packages/newlib/1.18.0/0001-fix-eabihf.patch
 create mode 100644 packages/newlib/1.18.0/0002-fix-mt-cflags.patch
 delete mode 100644 packages/newlib/1.18.0/110-fix-eabihf.patch
 delete mode 100644 packages/newlib/1.18.0/200-fix-mt-cflags.patch
 rename packages/newlib/1.19.0/{100-fix-unaligned-access-memcpy-m68k.patch => 0000-fix-unaligned-access-memcpy-m68k.patch} (77%)
 create mode 100644 packages/newlib/1.19.0/0001-fix-eabihf.patch
 create mode 100644 packages/newlib/1.19.0/0002-fix-mt-cflags.patch
 delete mode 100644 packages/newlib/1.19.0/110-fix-eabihf.patch
 delete mode 100644 packages/newlib/1.19.0/200-fix-mt-cflags.patch
 rename packages/newlib/1.20.0/{100-fix-unaligned-access-memcpy-m68k.patch => 0000-fix-unaligned-access-memcpy-m68k.patch} (79%)
 create mode 100644 packages/newlib/1.20.0/0001-fix-eabihf.patch
 create mode 100644 packages/newlib/1.20.0/0002-fix-mt-cflags.patch
 delete mode 100644 packages/newlib/1.20.0/110-fix-eabihf.patch
 delete mode 100644 packages/newlib/1.20.0/200-fix-mt-cflags.patch
 rename packages/newlib/2.0.0/{100-fix-unaligned-access-memcpy-m68k.patch => 0000-fix-unaligned-access-memcpy-m68k.patch} (79%)
 create mode 100644 packages/newlib/2.0.0/0001-fix-eabihf.patch
 create mode 100644 packages/newlib/2.0.0/0002-fix-mt-cflags.patch
 delete mode 100644 packages/newlib/2.0.0/110-fix-eabihf.patch
 delete mode 100644 packages/newlib/2.0.0/200-fix-mt-cflags.patch
 create mode 100644 packages/newlib/2.1.0/0000-fix-unaligned-access-memcpy-m68k.patch
 create mode 100644 packages/newlib/2.1.0/0001-fix-eabihf.patch
 create mode 100644 packages/newlib/2.1.0/0002-fix-mt-cflags.patch
 delete mode 100644 packages/newlib/2.1.0/100-fix-unaligned-access-memcpy-m68k.patch
 delete mode 100644 packages/newlib/2.1.0/110-fix-eabihf.patch
 delete mode 100644 packages/newlib/2.1.0/200-fix-mt-cflags.patch
 create mode 100644 packages/newlib/2.2.0.20151023/0000-fix-unaligned-access-memcpy-m68k.patch
 create mode 100644 packages/newlib/2.2.0.20151023/0001-fix-eabihf.patch
 create mode 100644 packages/newlib/2.2.0.20151023/0002-fix-mt-cflags.patch
 delete mode 100644 packages/newlib/2.2.0.20151023/100-fix-unaligned-access-memcpy-m68k.patch
 delete mode 100644 packages/newlib/2.2.0.20151023/110-fix-eabihf.patch
 delete mode 100644 packages/newlib/2.2.0.20151023/200-fix-mt-cflags.patch
 create mode 100644 packages/newlib/2.3.0.20160226/0000-fix-unaligned-access-memcpy-m68k.patch
 create mode 100644 packages/newlib/2.3.0.20160226/0001-fix-eabihf.patch
 create mode 100644 packages/newlib/2.3.0.20160226/0002-fix-mt-cflags.patch
 delete mode 100644 packages/newlib/2.3.0.20160226/100-fix-unaligned-access-memcpy-m68k.patch
 delete mode 100644 packages/newlib/2.3.0.20160226/110-fix-eabihf.patch
 delete mode 100644 packages/newlib/2.3.0.20160226/200-fix-mt-cflags.patch
 create mode 100644 packages/newlib/2.4.0.20161025/0000-fix-unaligned-access-memcpy-m68k.patch
 create mode 100644 packages/newlib/2.4.0.20161025/0001-fix-eabihf.patch
 rename packages/newlib/2.4.0.20161025/{200-fix-mt-cflags.patch => 0002-fix-mt-cflags.patch} (53%)
 delete mode 100644 packages/newlib/2.4.0.20161025/100-fix-unaligned-access-memcpy-m68k.patch
 delete mode 100644 packages/newlib/2.4.0.20161025/110-fix-eabihf.patch
 create mode 100644 packages/newlib/2.5.0.20170922/0000-fix-unaligned-access-memcpy-m68k.patch
 rename packages/newlib/2.5.0.20170922/{200-fix-mt-cflags.patch => 0001-fix-mt-cflags.patch} (53%)
 delete mode 100644 packages/newlib/2.5.0.20170922/100-fix-unaligned-access-memcpy-m68k.patch
 rename packages/strace/4.10/{001_aarch64_rt_sigreturn.patch => 0000-aarch64_rt_sigreturn.patch} (82%)
 rename packages/strace/4.10/{002_arm_mmap2.patch => 0001-arm_mmap2.patch} (88%)
 rename packages/strace/4.10/{003_aarch64_arch_regs.patch => 0002-aarch64_arch_regs.patch} (70%)
 rename packages/strace/4.10/{004_stat64-v.test.patch => 0003-stat64-v.test.patch} (92%)
 rename packages/strace/4.10/{005_select_test.patch => 0004-select_test.patch} (90%)
 rename packages/strace/4.10/{006_fix_aarch64_ioctl_decoding.patch => 0005-fix_aarch64_ioctl_decoding.patch} (73%)
 rename packages/strace/4.10/{007_fix_bexecve64_test.patch => 0006-fix_bexecve64_test.patch} (86%)
 rename packages/strace/4.10/{008_decode_mips_indirect_syscall.patch => 0007-decode_mips_indirect_syscall.patch} (67%)
 rename packages/strace/4.10/{009-upstream-musl_includes.patch => 0008-upstream-musl_includes.patch} (85%)
 rename packages/strace/4.10/{010-use-host-ioctl.patch => 0009-use-host-ioctl.patch} (82%)
 rename packages/strace/4.11/{010-use-host-ioctl.patch => 0000-use-host-ioctl.patch} (83%)
 rename packages/strace/4.12/{010-use-host-ioctl.patch => 0000-use-host-ioctl.patch} (82%)
 rename packages/strace/{4.14/010-use-host-ioctl.patch => 4.13/0000-use-host-ioctl.patch} (82%)
 rename packages/strace/{4.13/010-use-host-ioctl.patch => 4.14/0000-use-host-ioctl.patch} (82%)
 rename packages/strace/4.15/{010-use-host-ioctl.patch => 0000-use-host-ioctl.patch} (82%)
 rename packages/strace/4.19/{100-conflicting-decl.patch => 0000-conflicting-decl.patch} (93%)
 rename packages/strace/4.8/{001-strace-4.8-glibc_2.18_build_fix-1.patch => 0000-strace-4.8-glibc_2.18_build_fix-1.patch} (74%)
 rename packages/uClibc-ng/1.0.25/{0001-gdb8.patch => 0000-gdb8.patch} (79%)
 rename packages/uClibc-ng/1.0.26/{0001-gdb8.patch => 0000-gdb8.patch} (79%)
 rename packages/uClibc/0.9.33.2/{100-m68k-ice.patch => 0000-m68k-ice.patch} (70%)
 rename packages/uClibc/0.9.33.2/{200-fix-kernel-3.4plus-build.patch => 0001-fix-kernel-3.4plus-build.patch} (66%)
 rename packages/uClibc/0.9.33.2/{300-fix-darwin-build.patch => 0002-fix-darwin-build.patch} (50%)
 rename packages/uClibc/0.9.33.2/{400-arm-unwind.patch => 0003-arm-unwind.patch} (83%)
 rename packages/uClibc/0.9.33.2/{500-no-install-D.patch => 0004-no-install-D.patch} (89%)
 rename packages/uClibc/0.9.33.2/{600-prefer-multilib.patch => 0005-prefer-multilib.patch} (60%)
 rename packages/uClibc/0.9.33.2/{998-dlopen-static.patch => 0006-dlopen-static.patch} (85%)
 rename packages/uClibc/0.9.33.2/{999-make-olddefconfig.patch => 0007-make-olddefconfig.patch} (56%)
 rename packages/zlib/1.2.11/{100-make-check-fail.patch => 0000-make-check-fail.patch} (82%)
 rename packages/zlib/1.2.11/{110-no-_wopen-cygwin.patch => 0001-no-_wopen-cygwin.patch} (88%)
 rename packages/zlib/1.2.11/{120-mingw-static-only.patch => 0002-mingw-static-only.patch} (69%)

diff --git a/packages/binutils/2.23.2/120-sh-conf.patch b/packages/binutils/2.23.2/0000-sh-conf.patch
similarity index 83%
rename from packages/binutils/2.23.2/120-sh-conf.patch
rename to packages/binutils/2.23.2/0000-sh-conf.patch
index ea3d1b60..b10d279c 100644
--- a/packages/binutils/2.23.2/120-sh-conf.patch
+++ b/packages/binutils/2.23.2/0000-sh-conf.patch
@@ -5,9 +5,14 @@ fix that up too.. now we're able to actually build a real toolchain for
 sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
 inept targets than that one, really. Go look, I promise).
 
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/configure
 +++ b/configure
-@@ -1495,7 +1495,7 @@
+@@ -3595,7 +3595,7 @@
    mips*-*-*)
      noconfigdirs="$noconfigdirs gprof"
      ;;
@@ -18,7 +23,7 @@ inept targets than that one, really. Go look, I promise).
           ;;
 --- a/configure.ac
 +++ b/configure.ac
-@@ -712,7 +712,7 @@
+@@ -1021,7 +1021,7 @@
    mips*-*-*)
      noconfigdirs="$noconfigdirs gprof"
      ;;
diff --git a/packages/binutils/2.26.1/300-001_ld_makefile_patch.patch b/packages/binutils/2.23.2/0001-001_ld_makefile_patch.patch
similarity index 76%
rename from packages/binutils/2.26.1/300-001_ld_makefile_patch.patch
rename to packages/binutils/2.23.2/0001-001_ld_makefile_patch.patch
index 2a1320cb..3992be3f 100644
--- a/packages/binutils/2.26.1/300-001_ld_makefile_patch.patch
+++ b/packages/binutils/2.23.2/0001-001_ld_makefile_patch.patch
@@ -1,8 +1,11 @@
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 9575f1f..84df0bf 100644
+---
+ ld/Makefile.am |    2 +-
+ ld/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
-@@ -54,7 +54,7 @@ endif
+@@ -37,7 +37,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
  # directives need to be different for native and cross linkers.
@@ -11,11 +14,9 @@ index 9575f1f..84df0bf 100644
  
  EMUL = @EMUL@
  EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 9f56ca1..272860f 100644
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+@@ -367,7 +367,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
  # directives need to be different for native and cross linkers.
diff --git a/packages/binutils/2.23.2/300-012_check_ldrunpath_length.patch b/packages/binutils/2.23.2/0002-012_check_ldrunpath_length.patch
similarity index 66%
rename from packages/binutils/2.23.2/300-012_check_ldrunpath_length.patch
rename to packages/binutils/2.23.2/0002-012_check_ldrunpath_length.patch
index df783109..a24df5e4 100644
--- a/packages/binutils/2.23.2/300-012_check_ldrunpath_length.patch
+++ b/packages/binutils/2.23.2/0002-012_check_ldrunpath_length.patch
@@ -1,7 +1,10 @@
-diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
---- binutils-2.21.orig/ld/emultempl/elf32.em	2010-10-29 09:10:36.000000000 -0300
-+++ binutils-2.21/ld/emultempl/elf32.em	2010-12-10 09:26:56.746102724 -0300
-@@ -1270,6 +1270,8 @@
+---
+ ld/emultempl/elf32.em |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1278,6 +1278,8 @@
  	      && command_line.rpath == NULL)
  	    {
  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -10,7 +13,7 @@ diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/e
  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
  						      force))
  		break;
-@@ -1497,6 +1499,8 @@
+@@ -1505,6 +1507,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/packages/binutils/2.24/310-fix-gold-pthreads-typo.patch b/packages/binutils/2.23.2/0003-fix-gold-pthreads-typo.patch
similarity index 76%
rename from packages/binutils/2.24/310-fix-gold-pthreads-typo.patch
rename to packages/binutils/2.23.2/0003-fix-gold-pthreads-typo.patch
index f2e6ff25..40861f56 100644
--- a/packages/binutils/2.24/310-fix-gold-pthreads-typo.patch
+++ b/packages/binutils/2.23.2/0003-fix-gold-pthreads-typo.patch
@@ -1,5 +1,9 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2014-10-14 08:32:04.000000000 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:38:18.640819300 +0100
+---
+ gold/gold-threads.cc |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
 @@ -102,9 +102,9 @@
    if (err != 0)
      gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
diff --git a/packages/binutils/2.23.2/500-sysroot.patch b/packages/binutils/2.23.2/0004-sysroot.patch
similarity index 91%
rename from packages/binutils/2.23.2/500-sysroot.patch
rename to packages/binutils/2.23.2/0004-sysroot.patch
index e49c7953..13b52888 100644
--- a/packages/binutils/2.23.2/500-sysroot.patch
+++ b/packages/binutils/2.23.2/0004-sysroot.patch
@@ -5,9 +5,13 @@ Always try to prepend the sysroot prefix to absolute filenames first.
 http://bugs.gentoo.org/275666
 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
+---
+ ld/ldfile.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -308,18 +308,25 @@
+@@ -341,18 +341,25 @@
       directory first.  */
    if (! entry->flags.maybe_archive)
      {
diff --git a/packages/binutils/2.23.2/600-poison-system-directories.patch b/packages/binutils/2.23.2/0005-poison-system-directories.patch
similarity index 91%
rename from packages/binutils/2.23.2/600-poison-system-directories.patch
rename to packages/binutils/2.23.2/0005-poison-system-directories.patch
index 780e48e8..539da419 100644
--- a/packages/binutils/2.23.2/600-poison-system-directories.patch
+++ b/packages/binutils/2.23.2/0005-poison-system-directories.patch
@@ -57,8 +57,18 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
-Index: b/ld/config.in
-===================================================================
+---
+ ld/config.in    |    3 +++
+ ld/configure    |   14 ++++++++++++++
+ ld/configure.in |   10 ++++++++++
+ ld/ld.h         |    8 ++++++++
+ ld/ld.texinfo   |   12 ++++++++++++
+ ld/ldfile.c     |   17 +++++++++++++++++
+ ld/ldlex.h      |    2 ++
+ ld/ldmain.c     |    2 ++
+ ld/lexsup.c     |   21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
 --- a/ld/config.in
 +++ b/ld/config.in
 @@ -11,6 +11,9 @@
@@ -71,8 +81,6 @@ Index: b/ld/config.in
  /* Additional extension a shared object might have. */
  #undef EXTRA_SHLIB_EXTENSION
  
-Index: b/ld/configure
-===================================================================
 --- a/ld/configure
 +++ b/ld/configure
 @@ -773,6 +773,7 @@
@@ -111,8 +119,6 @@ Index: b/ld/configure
  
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
-Index: b/ld/configure.in
-===================================================================
 --- a/ld/configure.in
 +++ b/ld/configure.in
 @@ -70,6 +70,16 @@
@@ -132,8 +138,6 @@ Index: b/ld/configure.in
  dnl Use --enable-gold to decide if this linker should be the default.
  dnl "install_as_default" is set to false if gold is the default linker.
  dnl "installed_linker" is the installed BFD linker name.
-Index: b/ld/ldfile.c
-===================================================================
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
 @@ -116,6 +116,23 @@
@@ -160,8 +164,6 @@ Index: b/ld/ldfile.c
  }
  
  /* Try to open a BFD for a lang_input_statement.  */
-Index: b/ld/ld.h
-===================================================================
 --- a/ld/ld.h
 +++ b/ld/ld.h
 @@ -203,6 +203,14 @@
@@ -179,8 +181,6 @@ Index: b/ld/ld.h
    /* Big or little endian as set on command line.  */
    enum endian_enum endian;
  
-Index: b/ld/ldmain.c
-===================================================================
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
 @@ -265,6 +265,8 @@
@@ -192,8 +192,6 @@ Index: b/ld/ldmain.c
  
    /* We initialize DEMANGLING based on the environment variable
       COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-Index: b/ld/ld.texinfo
-===================================================================
 --- a/ld/ld.texinfo
 +++ b/ld/ld.texinfo
 @@ -2154,6 +2154,18 @@
@@ -215,8 +213,6 @@ Index: b/ld/ld.texinfo
  @end table
  
  @c man end
-Index: b/ld/lexsup.c
-===================================================================
 --- a/ld/lexsup.c
 +++ b/ld/lexsup.c
 @@ -498,6 +498,14 @@
@@ -264,8 +260,6 @@ Index: b/ld/lexsup.c
    while (ingroup)
      {
        lang_leave_group ();
-Index: b/ld/ldlex.h
-===================================================================
 --- a/ld/ldlex.h
 +++ b/ld/ldlex.h
 @@ -136,6 +136,8 @@
diff --git a/packages/binutils/2.23.2/900-xtensa-trampolines.patch b/packages/binutils/2.23.2/0006-xtensa-trampolines.patch
similarity index 91%
rename from packages/binutils/2.23.2/900-xtensa-trampolines.patch
rename to packages/binutils/2.23.2/0006-xtensa-trampolines.patch
index b5b934fc..b4670bc3 100644
--- a/packages/binutils/2.23.2/900-xtensa-trampolines.patch
+++ b/packages/binutils/2.23.2/0006-xtensa-trampolines.patch
@@ -35,22 +35,20 @@ Subject: [PATCH] Add support to the Xtensa target for creating trampolines for
 Backported from: a82c7d9030b67a6a76a5403d0e1641f9e42141ac
 Changes to Changelog files are dropped.
 
- gas/config/tc-xtensa.c                | 558 +++++++++++++++++++++++++++++++++-
- gas/config/tc-xtensa.h                |   5 +
- gas/frags.c                           |  15 +
- gas/frags.h                           |   3 +
- gas/testsuite/gas/xtensa/all.exp      |   1 +
- gas/testsuite/gas/xtensa/trampoline.d |  26 ++
- gas/testsuite/gas/xtensa/trampoline.s |  21 ++
- 11 files changed, 753 insertions(+), 2 deletions(-)
+ gas/config/tc-xtensa.c                |  558 +++++++++++++++++++++++++++++++++-
+ gas/config/tc-xtensa.h                |    5 
+ gas/frags.c                           |   15 
+ gas/frags.h                           |    3 
+ gas/testsuite/gas/xtensa/all.exp      |    1 
+ gas/testsuite/gas/xtensa/trampoline.d |   26 +
+ gas/testsuite/gas/xtensa/trampoline.s |   21 +
+ 7 files changed, 627 insertions(+), 2 deletions(-)
  create mode 100644 gas/testsuite/gas/xtensa/trampoline.d
  create mode 100644 gas/testsuite/gas/xtensa/trampoline.s
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index fe8ec0f..ea23c96 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -468,6 +468,12 @@ static void xtensa_set_frag_assembly_state (fragS *);
+@@ -469,6 +469,12 @@
  static void finish_vinsn (vliw_insn *);
  static bfd_boolean emit_single_op (TInsn *);
  static int total_frag_text_expansion (fragS *);
@@ -63,7 +61,7 @@ index fe8ec0f..ea23c96 100644
  
  /* Alignment Functions.  */
  
-@@ -520,6 +526,7 @@ static void tinsn_from_chars (TInsn *, char *, int);
+@@ -521,6 +527,7 @@
  static void tinsn_immed_from_frag (TInsn *, fragS *, int);
  static int get_num_stack_text_bytes (IStack *);
  static int get_num_stack_literal_bytes (IStack *);
@@ -71,7 +69,7 @@ index fe8ec0f..ea23c96 100644
  
  /* vliw_insn functions.  */
  
-@@ -687,7 +694,10 @@ enum
+@@ -688,7 +695,10 @@
    option_prefer_l32r,
    option_prefer_const16,
  
@@ -83,7 +81,7 @@ index fe8ec0f..ea23c96 100644
  };
  
  const char *md_shortopts = "";
-@@ -760,6 +770,9 @@ struct option md_longopts[] =
+@@ -761,6 +771,9 @@
  
    { "target-hardware", required_argument, NULL, option_target_hardware },
  
@@ -93,7 +91,7 @@ index fe8ec0f..ea23c96 100644
    { NULL, no_argument, NULL, 0 }
  };
  
-@@ -940,6 +953,14 @@ md_parse_option (int c, char *arg)
+@@ -941,6 +954,14 @@
        directive_state[directive_transform] = FALSE;
        return 1;
  
@@ -108,7 +106,7 @@ index fe8ec0f..ea23c96 100644
      default:
        return 0;
      }
-@@ -963,7 +984,9 @@ Xtensa options:\n\
+@@ -964,7 +985,9 @@
                            flix bundles\n\
    --no-allow-flix         neither allow hand-written nor generate\n\
                            flix bundles\n\
@@ -119,7 +117,7 @@ index fe8ec0f..ea23c96 100644
  }
  
  
-@@ -5568,6 +5591,8 @@ md_assemble (char *str)
+@@ -5569,6 +5592,8 @@
  
    /* We've just emitted a new instruction so clear the list of labels.  */
    xtensa_clear_insn_labels ();
@@ -128,7 +126,7 @@ index fe8ec0f..ea23c96 100644
  }
  
  
-@@ -6372,6 +6397,8 @@ finish_vinsn (vliw_insn *vinsn)
+@@ -6373,6 +6398,8 @@
    xg_assemble_vliw_tokens (vinsn);
  
    xg_clear_vinsn (vinsn);
@@ -137,7 +135,7 @@ index fe8ec0f..ea23c96 100644
  }
  
  
-@@ -7140,6 +7167,7 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
+@@ -7141,6 +7168,7 @@
  		    RELAX_UNREACHABLE,
  		    frag_now->fr_symbol, frag_now->fr_offset, NULL);
  	  xtensa_set_frag_assembly_state (frag_now);
@@ -145,7 +143,7 @@ index fe8ec0f..ea23c96 100644
  	}
        else if (is_branch && do_align_targets ())
  	{
-@@ -7222,9 +7250,164 @@ xtensa_end (void)
+@@ -7223,9 +7251,164 @@
    xtensa_sanity_check ();
  
    xtensa_add_config_info ();
@@ -310,7 +308,7 @@ index fe8ec0f..ea23c96 100644
  static void
  xtensa_cleanup_align_frags (void)
  {
-@@ -8708,6 +8891,149 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -8709,6 +8892,149 @@
  	new_stretch += relax_frag_for_align (fragP, stretch);
        break;
  
@@ -460,7 +458,7 @@ index fe8ec0f..ea23c96 100644
      default:
        as_bad (_("bad relaxation state"));
      }
-@@ -9146,6 +9472,200 @@ bytes_to_stretch (fragS *this_frag,
+@@ -9147,6 +9473,200 @@
  }
  
  
@@ -661,7 +659,7 @@ index fe8ec0f..ea23c96 100644
  static long
  relax_frag_immed (segT segP,
  		  fragS *fragP,
-@@ -9284,6 +9804,37 @@ relax_frag_immed (segT segP,
+@@ -9285,6 +9805,37 @@
    if (negatable_branch && istack.ninsn > 1)
      update_next_frag_state (fragP);
  
@@ -699,7 +697,7 @@ index fe8ec0f..ea23c96 100644
    return this_text_diff;
  }
  
-@@ -9404,6 +9955,9 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT sec, fragS *fragp)
+@@ -9405,6 +9956,9 @@
        else
  	as_bad (_("invalid relaxation fragment result"));
        break;
@@ -709,11 +707,9 @@ index fe8ec0f..ea23c96 100644
      }
  
    fragp->fr_var = 0;
-diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
-index 0bf1240..4672bc6 100644
 --- a/gas/config/tc-xtensa.h
 +++ b/gas/config/tc-xtensa.h
-@@ -180,6 +180,11 @@ enum xtensa_relax_statesE
+@@ -181,6 +181,11 @@
       prevent the linker from changing the size of any frag between the
       section start and the org frag.  */
  
@@ -725,11 +721,9 @@ index 0bf1240..4672bc6 100644
    RELAX_NONE
  };
  
-diff --git a/gas/frags.c b/gas/frags.c
-index 5f68480..e14099d 100644
 --- a/gas/frags.c
 +++ b/gas/frags.c
-@@ -24,6 +24,20 @@
+@@ -26,6 +26,20 @@
  
  extern fragS zero_address_frag;
  extern fragS predefined_address_frag;
@@ -750,7 +744,7 @@ index 5f68480..e14099d 100644
  
  /* Initialization for frag routines.  */
  
-@@ -70,6 +84,7 @@ frag_alloc (struct obstack *ob)
+@@ -72,6 +86,7 @@
    ptr = (fragS *) obstack_alloc (ob, SIZEOF_STRUCT_FRAG);
    obstack_alignment_mask (ob) = oalign;
    memset (ptr, 0, SIZEOF_STRUCT_FRAG);
@@ -758,11 +752,9 @@ index 5f68480..e14099d 100644
    return ptr;
  }
  
-diff --git a/gas/frags.h b/gas/frags.h
-index 319898f..2f9e1b5 100644
 --- a/gas/frags.h
 +++ b/gas/frags.h
-@@ -155,4 +155,7 @@ char *frag_var (relax_stateT type,
+@@ -157,4 +157,7 @@
  
  bfd_boolean frag_offset_fixed_p (const fragS *, const fragS *, offsetT *);
  
@@ -770,11 +762,9 @@ index 319898f..2f9e1b5 100644
 +void clear_frag_count (void);
 +
  #endif /* FRAGS_H */
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 2b2c294..3683b78 100644
 --- a/gas/testsuite/gas/xtensa/all.exp
 +++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -98,6 +98,7 @@ if [istarget xtensa*-*-*] then {
+@@ -82,6 +82,7 @@
      run_dump_test "pcrel"
      run_dump_test "weak-call"
      run_dump_test "jlong"
@@ -782,9 +772,6 @@ index 2b2c294..3683b78 100644
  }
  
  if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-new file mode 100644
-index 0000000..b4f65dc
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/trampoline.d
 @@ -0,0 +1,26 @@
@@ -814,9 +801,6 @@ index 0000000..b4f65dc
 +.*33462:.*j.0x49407
 +#...
 +.*49407:.*j.0x49407
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-new file mode 100644
-index 0000000..259a3bb
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/trampoline.s
 @@ -0,0 +1,21 @@
@@ -841,6 +825,3 @@ index 0000000..259a3bb
 +	.endr
 +3:
 +	j	3b
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/901-xtensa-gas-first-frag-alignment.patch b/packages/binutils/2.23.2/0007-xtensa-gas-first-frag-alignment.patch
similarity index 88%
rename from packages/binutils/2.24/901-xtensa-gas-first-frag-alignment.patch
rename to packages/binutils/2.23.2/0007-xtensa-gas-first-frag-alignment.patch
index e1c2d85a..88e6990a 100644
--- a/packages/binutils/2.24/901-xtensa-gas-first-frag-alignment.patch
+++ b/packages/binutils/2.23.2/0007-xtensa-gas-first-frag-alignment.patch
@@ -31,14 +31,12 @@ gas/
 Backported from: a35d5e823fdfe8a6e7e05ca8e3fb8bb5697335b1
 Changes to Changelog files and tests are dropped.
 
- gas/config/tc-xtensa.c                      | 1 -
+ gas/config/tc-xtensa.c |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index ea23c96..58ace38 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -5609,7 +5609,6 @@ xtensa_handle_align (fragS *fragP)
+@@ -5610,7 +5610,6 @@
        && ! fragP->tc_frag_data.is_literal
        && (fragP->fr_type == rs_align
  	  || fragP->fr_type == rs_align_code)
@@ -46,6 +44,3 @@ index ea23c96..58ace38 100644
        && fragP->fr_offset > 0
        && now_seg != bss_section)
      {
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.23.2/902-xtensa-gas-ld-diff-relocation-signed.patch b/packages/binutils/2.23.2/0008-xtensa-gas-ld-diff-relocation-signed.patch
similarity index 84%
rename from packages/binutils/2.23.2/902-xtensa-gas-ld-diff-relocation-signed.patch
rename to packages/binutils/2.23.2/0008-xtensa-gas-ld-diff-relocation-signed.patch
index ba24f4e4..1989e0a4 100644
--- a/packages/binutils/2.23.2/902-xtensa-gas-ld-diff-relocation-signed.patch
+++ b/packages/binutils/2.23.2/0008-xtensa-gas-ld-diff-relocation-signed.patch
@@ -22,15 +22,13 @@ gas/
 Backported from: 1058c7532d0b012ac329219264ddad59049fb6e6
 Changes to Changelog files and tests are dropped.
 
- bfd/elf32-xtensa.c                       | 32 ++++++++++++-----------
- gas/config/tc-xtensa.c                   |  3 +++
+ bfd/elf32-xtensa.c     |   32 +++++++++++++++++---------------
+ gas/config/tc-xtensa.c |    3 +++
  2 files changed, 20 insertions(+), 15 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index edb04b4..8818d67 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -222,11 +222,11 @@ static reloc_howto_type elf_howto_table[] =
+@@ -223,11 +223,11 @@
  	 FALSE, 0, 0, FALSE),
  
    /* Relocations for supporting difference of symbols.  */
@@ -45,7 +43,7 @@ index edb04b4..8818d67 100644
  	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF32", FALSE, 0, 0xffffffff, FALSE),
  
    /* General immediate operand relocations.  */
-@@ -9013,7 +9013,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9016,7 +9016,8 @@
  		  || r_type == R_XTENSA_DIFF16
  		  || r_type == R_XTENSA_DIFF32)
  		{
@@ -55,7 +53,7 @@ index edb04b4..8818d67 100644
  
  		  if (bfd_get_section_limit (abfd, sec) < old_source_offset)
  		    {
-@@ -9027,15 +9028,15 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9030,15 +9031,15 @@
  		    {
  		    case R_XTENSA_DIFF8:
  		      diff_value =
@@ -74,7 +72,7 @@ index edb04b4..8818d67 100644
  		      break;
  		    }
  
-@@ -9047,24 +9048,25 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9050,24 +9051,25 @@
  		  switch (r_type)
  		    {
  		    case R_XTENSA_DIFF8:
@@ -108,11 +106,9 @@ index edb04b4..8818d67 100644
  		    {
  		      (*link_info->callbacks->reloc_dangerous)
  			(link_info, _("overflow after relaxation"),
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 58ace38..7547c0a0 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -5867,12 +5867,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
+@@ -5868,12 +5868,15 @@
  	    {
  	    case BFD_RELOC_8:
  	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
@@ -128,6 +124,3 @@ index 58ace38..7547c0a0 100644
  	      break;
  	    default:
  	      break;
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch b/packages/binutils/2.23.2/0009-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
similarity index 88%
rename from packages/binutils/2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
rename to packages/binutils/2.23.2/0009-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
index 6a0846ef..57cd0bf7 100644
--- a/packages/binutils/2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
+++ b/packages/binutils/2.23.2/0009-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
@@ -26,14 +26,12 @@ ld/
 Backported from: e7d17e71cdc10a2e81e454ce3b9637f1b2a587f2
 Changes to ld/ChangeLog file are dropped.
 
- ld/emultempl/xtensaelf.em | 2 +-
+ ld/emultempl/xtensaelf.em |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em
-index 151eea4..948d18d 100644
 --- a/ld/emultempl/xtensaelf.em
 +++ b/ld/emultempl/xtensaelf.em
-@@ -1310,7 +1310,7 @@ is_inconsistent_linkonce_section (asection *sec)
+@@ -1311,7 +1311,7 @@
       for Tensilica's XCC compiler.  */
    name = sec_name + linkonce_len;
    if (CONST_STRNEQ (name, "prop."))
@@ -42,6 +40,3 @@ index 151eea4..948d18d 100644
    else if (name[1] == '.'
  	   && (name[0] == 'p' || name[0] == 'e' || name[0] == 'h'))
      name += 2;
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.23.2/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch b/packages/binutils/2.23.2/0010-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
similarity index 92%
rename from packages/binutils/2.23.2/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
rename to packages/binutils/2.23.2/0010-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
index dba7620b..58186676 100644
--- a/packages/binutils/2.23.2/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
+++ b/packages/binutils/2.23.2/0010-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
@@ -19,14 +19,12 @@ bfd/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- bfd/elf32-xtensa.c | 41 +++++++++++++++++++++++++++++++++++++----
+ bfd/elf32-xtensa.c |   41 +++++++++++++++++++++++++++++++++++++----
  1 file changed, 37 insertions(+), 4 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 09862e3..e32496a 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -7124,10 +7124,43 @@ is_resolvable_asm_expansion (bfd *abfd,
+@@ -7128,10 +7128,43 @@
  	  || is_reloc_sym_weak (abfd, irel)))
      return FALSE;
  
@@ -74,6 +72,3 @@ index 09862e3..e32496a 100644
        
    *is_reachable_p = pcrel_reloc_fits (direct_call_opcode, 0,
  				      self_address, dest_address);
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.23.2/905-Fix-trampolines-search-code-for-conditional-branches.patch b/packages/binutils/2.23.2/0011-Fix-trampolines-search-code-for-conditional-branches.patch
similarity index 76%
rename from packages/binutils/2.23.2/905-Fix-trampolines-search-code-for-conditional-branches.patch
rename to packages/binutils/2.23.2/0011-Fix-trampolines-search-code-for-conditional-branches.patch
index 8aeb0642..a4e7b5cc 100644
--- a/packages/binutils/2.23.2/905-Fix-trampolines-search-code-for-conditional-branches.patch
+++ b/packages/binutils/2.23.2/0011-Fix-trampolines-search-code-for-conditional-branches.patch
@@ -28,16 +28,14 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: d92b6eece424f0ad35d96fdd85bf207295e8c4c3
 Changes to ChangeLogs are dropped.
 
- gas/config/tc-xtensa.c                | 8 ++++----
- gas/testsuite/gas/xtensa/trampoline.d | 9 +++++++++
- gas/testsuite/gas/xtensa/trampoline.s | 7 +++++++
+ gas/config/tc-xtensa.c                |    8 ++++----
+ gas/testsuite/gas/xtensa/trampoline.d |    9 +++++++++
+ gas/testsuite/gas/xtensa/trampoline.s |    7 +++++++
  3 files changed, 20 insertions(+), 4 deletions(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d11b0c7..f23ccf8 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -9514,11 +9514,11 @@ search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only)
+@@ -9515,11 +9515,11 @@
  	      if (next_addr == 0 || addr - next_addr > J_RANGE)
  		break;
  	    }
@@ -53,8 +51,6 @@ index d11b0c7..f23ccf8 100644
      }
    for ( ; tf; tf = tf->next)
      {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-index b4f65dc..5ae32a6 100644
 --- a/gas/testsuite/gas/xtensa/trampoline.d
 +++ b/gas/testsuite/gas/xtensa/trampoline.d
 @@ -24,3 +24,12 @@
@@ -70,8 +66,6 @@ index b4f65dc..5ae32a6 100644
 +#...
 +.*927f5:.*j.0x927f5
 +#...
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-index 259a3bb..4465786 100644
 --- a/gas/testsuite/gas/xtensa/trampoline.s
 +++ b/gas/testsuite/gas/xtensa/trampoline.s
 @@ -19,3 +19,10 @@
@@ -85,6 +79,3 @@ index 259a3bb..4465786 100644
 +	.endr
 +4:
 +	j	4b
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch b/packages/binutils/2.23.2/0012-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
similarity index 90%
rename from packages/binutils/2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
rename to packages/binutils/2.23.2/0012-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
index 9ad6b3be..624ce116 100644
--- a/packages/binutils/2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
+++ b/packages/binutils/2.23.2/0012-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
@@ -29,14 +29,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: e6c9a083ec5ae7a45bd71682b26aae1939849388
 Changes to ChangeLog are dropped.
 
- bfd/elf32-xtensa.c | 6 +++++-
+ bfd/elf32-xtensa.c |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 53af1c6..2523670 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -1360,10 +1360,14 @@ elf_xtensa_gc_sweep_hook (bfd *abfd,
+@@ -1362,10 +1362,14 @@
  	{
  	  if (is_plt)
  	    {
@@ -52,6 +50,3 @@ index 53af1c6..2523670 100644
  	    {
  	      if (h->got.refcount > 0)
  		h->got.refcount--;
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch b/packages/binutils/2.23.2/0013-xtensa-fix-gas-segfault-with-text-section-literals.patch
similarity index 89%
rename from packages/binutils/2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
rename to packages/binutils/2.23.2/0013-xtensa-fix-gas-segfault-with-text-section-literals.patch
index 4a3de2c8..013534a0 100644
--- a/packages/binutils/2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
+++ b/packages/binutils/2.23.2/0013-xtensa-fix-gas-segfault-with-text-section-literals.patch
@@ -21,14 +21,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: 4de0562a4c69fef4952aa7e19d7bda359f02e8b4
 Changes to ChangeLog are dropped.
 
- gas/config/tc-xtensa.c | 10 +++++++++-
+ gas/config/tc-xtensa.c |   10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 31c0b6b..18307c1 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -10808,13 +10808,21 @@ xtensa_move_literals (void)
+@@ -10643,13 +10643,21 @@
        frchain_to = NULL;
        frag_splice = &(frchain_from->frch_root);
  
@@ -51,6 +49,3 @@ index 31c0b6b..18307c1 100644
        gas_assert (search_frag->tc_frag_data.literal_frag->fr_subtype
  	      == RELAX_LITERAL_POOL_BEGIN);
        xtensa_switch_section_emit_state (&state, segment->seg, 0);
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/914-xtensa-fix-signedness-of-gas-relocations.patch b/packages/binutils/2.23.2/0014-xtensa-fix-signedness-of-gas-relocations.patch
similarity index 85%
rename from packages/binutils/2.24/914-xtensa-fix-signedness-of-gas-relocations.patch
rename to packages/binutils/2.23.2/0014-xtensa-fix-signedness-of-gas-relocations.patch
index 2955e114..7139f5e0 100644
--- a/packages/binutils/2.24/914-xtensa-fix-signedness-of-gas-relocations.patch
+++ b/packages/binutils/2.23.2/0014-xtensa-fix-signedness-of-gas-relocations.patch
@@ -16,14 +16,12 @@ gas/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gas/config/tc-xtensa.c           |  6 +++---
+ gas/config/tc-xtensa.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index a119871..36a06cc 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
+@@ -5868,15 +5868,15 @@
  	    {
  	    case BFD_RELOC_8:
  	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
@@ -42,6 +40,3 @@ index a119871..36a06cc 100644
  	      break;
  	    default:
  	      break;
--- 
-2.1.4
-
diff --git a/packages/binutils/2.23.2/915-xtensa-fix-.init-.fini-literals-moving.patch b/packages/binutils/2.23.2/0015-xtensa-fix-.init-.fini-literals-moving.patch
similarity index 90%
rename from packages/binutils/2.23.2/915-xtensa-fix-.init-.fini-literals-moving.patch
rename to packages/binutils/2.23.2/0015-xtensa-fix-.init-.fini-literals-moving.patch
index 62bc4b5e..ee41d547 100644
--- a/packages/binutils/2.23.2/915-xtensa-fix-.init-.fini-literals-moving.patch
+++ b/packages/binutils/2.23.2/0015-xtensa-fix-.init-.fini-literals-moving.patch
@@ -32,14 +32,13 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: 4111950f363221c4641dc2f33bea61cc94f34906
 
- gas/config/tc-xtensa.c                        | 12 ++++++++++--
+ gas/config/tc-xtensa.c |   12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 36a06cc..5773634 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -10625,5 +10625,9 @@ xtensa_move_literals (void)
+@@ -10624,6 +10624,10 @@
+   segT dest_seg;
    fixS *fix, *next_fix, **fix_splice;
    sym_list *lit;
 +  const char *init_name = INIT_SECTION_NAME;
@@ -49,7 +48,7 @@ index 36a06cc..5773634 100644
  
    mark_literal_frags (literal_head->next);
  
-@@ -10632,9 +10636,13 @@ xtensa_move_literals (void)
+@@ -10632,9 +10636,13 @@
  
    for (segment = literal_head->next; segment; segment = segment->next)
      {
@@ -65,6 +64,3 @@ index 36a06cc..5773634 100644
  	continue;
  
        frchain_from = seg_info (segment->seg)->frchainP;
--- 
-2.1.4
-
diff --git a/packages/binutils/2.23.2/300-001_ld_makefile_patch.patch b/packages/binutils/2.23.2/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 5cb0f614..00000000
--- a/packages/binutils/2.23.2/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
---- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
-@@ -18,7 +18,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
---- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
-@@ -287,7 +287,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/packages/binutils/2.24/001-fix-enable-install-libiberty-flag.patch b/packages/binutils/2.24/0000-fix-enable-install-libiberty-flag.patch
similarity index 80%
rename from packages/binutils/2.24/001-fix-enable-install-libiberty-flag.patch
rename to packages/binutils/2.24/0000-fix-enable-install-libiberty-flag.patch
index e4084019..9088d467 100644
--- a/packages/binutils/2.24/001-fix-enable-install-libiberty-flag.patch
+++ b/packages/binutils/2.24/0000-fix-enable-install-libiberty-flag.patch
@@ -15,13 +15,11 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-8
 ---
  libiberty/configure    |    1 -
  libiberty/configure.ac |    1 -
- 3 files changed, 6 insertions(+), 2 deletions(-)
+ 2 files changed, 2 deletions(-)
 
-diff --git a/libiberty/configure b/libiberty/configure
-index 8ea54da..7bde9b3 100755
 --- a/libiberty/configure
 +++ b/libiberty/configure
-@@ -5507,7 +5507,6 @@ fi
+@@ -5507,7 +5507,6 @@
  
  setobjs=
  CHECK=
@@ -29,11 +27,9 @@ index 8ea54da..7bde9b3 100755
  if test -n "${with_target_subdir}"; then
  
    # We are being configured as a target library.  AC_REPLACE_FUNCS
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index 4ad88a9..d6180bc 100644
 --- a/libiberty/configure.ac
 +++ b/libiberty/configure.ac
-@@ -405,7 +405,6 @@ fi
+@@ -405,7 +405,6 @@
  
  setobjs=
  CHECK=
@@ -41,6 +37,3 @@ index 4ad88a9..d6180bc 100644
  if test -n "${with_target_subdir}"; then
  
    # We are being configured as a target library.  AC_REPLACE_FUNCS
--- 
-1.7.1
-
diff --git a/packages/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch b/packages/binutils/2.24/0001-dont-segv-on-initial-instructions-overflow.patch
similarity index 88%
rename from packages/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch
rename to packages/binutils/2.24/0001-dont-segv-on-initial-instructions-overflow.patch
index 78816469..02c56b32 100644
--- a/packages/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch
+++ b/packages/binutils/2.24/0001-dont-segv-on-initial-instructions-overflow.patch
@@ -16,11 +16,13 @@ fit in the buffer.
 	save as much of insns to initial_instructions[] as will fit.
 ---
 
-diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
-index 832a991..4b6e8ea 100644
+---
+ bfd/elf-eh-frame.c |   16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
 --- a/bfd/elf-eh-frame.c
 +++ b/bfd/elf-eh-frame.c
-@@ -235,6 +235,7 @@ cie_eq (const void *e1, const void *e2)
+@@ -235,6 +235,7 @@
        && c1->lsda_encoding == c2->lsda_encoding
        && c1->fde_encoding == c2->fde_encoding
        && c1->initial_insn_length == c2->initial_insn_length
@@ -28,7 +30,7 @@ index 832a991..4b6e8ea 100644
        && memcmp (c1->initial_instructions,
  		 c2->initial_instructions,
  		 c1->initial_insn_length) == 0)
-@@ -254,6 +255,7 @@ static hashval_t
+@@ -254,6 +255,7 @@
  cie_compute_hash (struct cie *c)
  {
    hashval_t h = 0;
@@ -36,7 +38,7 @@ index 832a991..4b6e8ea 100644
    h = iterative_hash_object (c->length, h);
    h = iterative_hash_object (c->version, h);
    h = iterative_hash (c->augmentation, strlen (c->augmentation) + 1, h);
-@@ -267,7 +269,10 @@ cie_compute_hash (struct cie *c)
+@@ -267,7 +269,10 @@
    h = iterative_hash_object (c->lsda_encoding, h);
    h = iterative_hash_object (c->fde_encoding, h);
    h = iterative_hash_object (c->initial_insn_length, h);
@@ -48,7 +50,7 @@ index 832a991..4b6e8ea 100644
    c->hash = h;
    return h;
  }
-@@ -762,11 +767,10 @@ _bfd_elf_parse_eh_frame (bfd *abfd, struct bfd_link_info *info,
+@@ -762,11 +767,10 @@
  	    cie->fde_encoding = DW_EH_PE_absptr;
  
  	  initial_insn_length = end - buf;
diff --git a/packages/binutils/2.24/0002-sh-conf.patch b/packages/binutils/2.24/0002-sh-conf.patch
new file mode 100644
index 00000000..40887ddd
--- /dev/null
+++ b/packages/binutils/2.24/0002-sh-conf.patch
@@ -0,0 +1,34 @@
+r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
+
+Likewise, binutils has no idea about any of these new targets either, so we 
+fix that up too.. now we're able to actually build a real toolchain for 
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
+inept targets than that one, really. Go look, I promise).
+
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -3793,7 +3793,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -1129,7 +1129,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
diff --git a/packages/binutils/2.27/300-001_ld_makefile_patch.patch b/packages/binutils/2.24/0003-001_ld_makefile_patch.patch
similarity index 76%
rename from packages/binutils/2.27/300-001_ld_makefile_patch.patch
rename to packages/binutils/2.24/0003-001_ld_makefile_patch.patch
index 2a1320cb..ab6a74f2 100644
--- a/packages/binutils/2.27/300-001_ld_makefile_patch.patch
+++ b/packages/binutils/2.24/0003-001_ld_makefile_patch.patch
@@ -1,8 +1,11 @@
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 9575f1f..84df0bf 100644
+---
+ ld/Makefile.am |    2 +-
+ ld/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
-@@ -54,7 +54,7 @@ endif
+@@ -54,7 +54,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
  # directives need to be different for native and cross linkers.
@@ -11,11 +14,9 @@ index 9575f1f..84df0bf 100644
  
  EMUL = @EMUL@
  EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 9f56ca1..272860f 100644
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+@@ -386,7 +386,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
  # directives need to be different for native and cross linkers.
diff --git a/packages/binutils/2.24/300-012_check_ldrunpath_length.patch b/packages/binutils/2.24/0004-012_check_ldrunpath_length.patch
similarity index 66%
rename from packages/binutils/2.24/300-012_check_ldrunpath_length.patch
rename to packages/binutils/2.24/0004-012_check_ldrunpath_length.patch
index b49cc041..ce28120c 100644
--- a/packages/binutils/2.24/300-012_check_ldrunpath_length.patch
+++ b/packages/binutils/2.24/0004-012_check_ldrunpath_length.patch
@@ -1,7 +1,10 @@
-diff -durN binutils-2.22.orig/ld/emultempl/elf32.em binutils-2.22/ld/emultempl/elf32.em
---- binutils-2.22.orig/ld/emultempl/elf32.em	2011-11-21 10:29:39.000000000 +0100
-+++ binutils-2.22/ld/emultempl/elf32.em	2011-12-14 19:52:12.880783238 +0100
-@@ -1273,6 +1273,8 @@
+---
+ ld/emultempl/elf32.em |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1267,6 +1267,8 @@
  	      && command_line.rpath == NULL)
  	    {
  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -10,7 +13,7 @@ diff -durN binutils-2.22.orig/ld/emultempl/elf32.em binutils-2.22/ld/emultempl/e
  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
  						      force))
  		break;
-@@ -1500,6 +1502,8 @@
+@@ -1518,6 +1520,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/packages/binutils/2.26.1/310-fix-gold-pthreads-typo.patch b/packages/binutils/2.24/0005-fix-gold-pthreads-typo.patch
similarity index 76%
rename from packages/binutils/2.26.1/310-fix-gold-pthreads-typo.patch
rename to packages/binutils/2.24/0005-fix-gold-pthreads-typo.patch
index f2e6ff25..40861f56 100644
--- a/packages/binutils/2.26.1/310-fix-gold-pthreads-typo.patch
+++ b/packages/binutils/2.24/0005-fix-gold-pthreads-typo.patch
@@ -1,5 +1,9 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2014-10-14 08:32:04.000000000 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:38:18.640819300 +0100
+---
+ gold/gold-threads.cc |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
 @@ -102,9 +102,9 @@
    if (err != 0)
      gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
diff --git a/packages/binutils/2.25.1/500-sysroot.patch b/packages/binutils/2.24/0006-sysroot.patch
similarity index 91%
rename from packages/binutils/2.25.1/500-sysroot.patch
rename to packages/binutils/2.24/0006-sysroot.patch
index e49c7953..13b52888 100644
--- a/packages/binutils/2.25.1/500-sysroot.patch
+++ b/packages/binutils/2.24/0006-sysroot.patch
@@ -5,9 +5,13 @@ Always try to prepend the sysroot prefix to absolute filenames first.
 http://bugs.gentoo.org/275666
 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
+---
+ ld/ldfile.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -308,18 +308,25 @@
+@@ -341,18 +341,25 @@
       directory first.  */
    if (! entry->flags.maybe_archive)
      {
diff --git a/packages/binutils/2.24/600-poison-system-directories.patch b/packages/binutils/2.24/0007-poison-system-directories.patch
similarity index 91%
rename from packages/binutils/2.24/600-poison-system-directories.patch
rename to packages/binutils/2.24/0007-poison-system-directories.patch
index 6a3bf6be..dcd8c5c1 100644
--- a/packages/binutils/2.24/600-poison-system-directories.patch
+++ b/packages/binutils/2.24/0007-poison-system-directories.patch
@@ -57,8 +57,18 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
-Index: b/ld/config.in
-===================================================================
+---
+ ld/config.in    |    3 +++
+ ld/configure    |   14 ++++++++++++++
+ ld/configure.in |   10 ++++++++++
+ ld/ld.h         |    8 ++++++++
+ ld/ld.texinfo   |   12 ++++++++++++
+ ld/ldfile.c     |   17 +++++++++++++++++
+ ld/ldlex.h      |    2 ++
+ ld/ldmain.c     |    2 ++
+ ld/lexsup.c     |   21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
 --- a/ld/config.in
 +++ b/ld/config.in
 @@ -11,6 +11,9 @@
@@ -71,8 +81,6 @@ Index: b/ld/config.in
  /* Additional extension a shared object might have. */
  #undef EXTRA_SHLIB_EXTENSION
  
-Index: b/ld/configure
-===================================================================
 --- a/ld/configure
 +++ b/ld/configure
 @@ -774,6 +774,7 @@
@@ -111,8 +119,6 @@ Index: b/ld/configure
  
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
-Index: b/ld/configure.in
-===================================================================
 --- a/ld/configure.in
 +++ b/ld/configure.in
 @@ -87,6 +87,16 @@
@@ -132,8 +138,6 @@ Index: b/ld/configure.in
  dnl Use --enable-gold to decide if this linker should be the default.
  dnl "install_as_default" is set to false if gold is the default linker.
  dnl "installed_linker" is the installed BFD linker name.
-Index: b/ld/ldfile.c
-===================================================================
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
 @@ -116,6 +116,23 @@
@@ -160,8 +164,6 @@ Index: b/ld/ldfile.c
  }
  
  /* Try to open a BFD for a lang_input_statement.  */
-Index: b/ld/ld.h
-===================================================================
 --- a/ld/ld.h
 +++ b/ld/ld.h
 @@ -180,6 +180,14 @@
@@ -179,8 +181,6 @@ Index: b/ld/ld.h
    /* Big or little endian as set on command line.  */
    enum endian_enum endian;
  
-Index: b/ld/ldmain.c
-===================================================================
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
 @@ -266,6 +266,8 @@
@@ -192,8 +192,6 @@ Index: b/ld/ldmain.c
  
    /* We initialize DEMANGLING based on the environment variable
       COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-Index: b/ld/ld.texinfo
-===================================================================
 --- a/ld/ld.texinfo
 +++ b/ld/ld.texinfo
 @@ -2175,6 +2175,18 @@
@@ -215,8 +213,6 @@ Index: b/ld/ld.texinfo
  @end table
  
  @c man end
-Index: b/ld/lexsup.c
-===================================================================
 --- a/ld/lexsup.c
 +++ b/ld/lexsup.c
 @@ -507,6 +507,14 @@
@@ -264,8 +260,6 @@ Index: b/ld/lexsup.c
    while (ingroup)
      {
        lang_leave_group ();
-Index: b/ld/ldlex.h
-===================================================================
 --- a/ld/ldlex.h
 +++ b/ld/ldlex.h
 @@ -138,6 +138,8 @@
diff --git a/packages/binutils/2.24/700-Fix-library-paths-on-PowerPC.patch b/packages/binutils/2.24/0008-Fix-library-paths-on-PowerPC.patch
similarity index 87%
rename from packages/binutils/2.24/700-Fix-library-paths-on-PowerPC.patch
rename to packages/binutils/2.24/0008-Fix-library-paths-on-PowerPC.patch
index cea92f3d..887e93a5 100644
--- a/packages/binutils/2.24/700-Fix-library-paths-on-PowerPC.patch
+++ b/packages/binutils/2.24/0008-Fix-library-paths-on-PowerPC.patch
@@ -13,14 +13,12 @@ depend on whether it is built on LE or BE machine.
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ld/emulparams/elf32ppccommon.sh | 10 +++++-----
+ ld/emulparams/elf32ppccommon.sh |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
-index 1f54ef8..d00cf68 100644
 --- a/ld/emulparams/elf32ppccommon.sh
 +++ b/ld/emulparams/elf32ppccommon.sh
-@@ -44,11 +44,11 @@ fi
+@@ -46,11 +46,11 @@
  
  # Look for 64 bit target libraries in /lib64, /usr/lib64 etc., first.
  # Similarly, look for 32 bit libraries in /lib32, /usr/lib32 etc.
@@ -37,6 +35,3 @@ index 1f54ef8..d00cf68 100644
    *:*64lppc*) LIBPATH_SUFFIX=64le ;;
    *:*32lppc*) LIBPATH_SUFFIX=32le ;;
    *:*64*) LIBPATH_SUFFIX=64 ;;
--- 
-2.9.3
-
diff --git a/packages/binutils/2.24/900-xtensa-trampolines.patch b/packages/binutils/2.24/0009-xtensa-trampolines.patch
similarity index 91%
rename from packages/binutils/2.24/900-xtensa-trampolines.patch
rename to packages/binutils/2.24/0009-xtensa-trampolines.patch
index b5b934fc..c5bfb016 100644
--- a/packages/binutils/2.24/900-xtensa-trampolines.patch
+++ b/packages/binutils/2.24/0009-xtensa-trampolines.patch
@@ -35,22 +35,20 @@ Subject: [PATCH] Add support to the Xtensa target for creating trampolines for
 Backported from: a82c7d9030b67a6a76a5403d0e1641f9e42141ac
 Changes to Changelog files are dropped.
 
- gas/config/tc-xtensa.c                | 558 +++++++++++++++++++++++++++++++++-
- gas/config/tc-xtensa.h                |   5 +
- gas/frags.c                           |  15 +
- gas/frags.h                           |   3 +
- gas/testsuite/gas/xtensa/all.exp      |   1 +
- gas/testsuite/gas/xtensa/trampoline.d |  26 ++
- gas/testsuite/gas/xtensa/trampoline.s |  21 ++
- 11 files changed, 753 insertions(+), 2 deletions(-)
+ gas/config/tc-xtensa.c                |  558 +++++++++++++++++++++++++++++++++-
+ gas/config/tc-xtensa.h                |    5 
+ gas/frags.c                           |   15 
+ gas/frags.h                           |    3 
+ gas/testsuite/gas/xtensa/all.exp      |    1 
+ gas/testsuite/gas/xtensa/trampoline.d |   26 +
+ gas/testsuite/gas/xtensa/trampoline.s |   21 +
+ 7 files changed, 627 insertions(+), 2 deletions(-)
  create mode 100644 gas/testsuite/gas/xtensa/trampoline.d
  create mode 100644 gas/testsuite/gas/xtensa/trampoline.s
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index fe8ec0f..ea23c96 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -468,6 +468,12 @@ static void xtensa_set_frag_assembly_state (fragS *);
+@@ -469,6 +469,12 @@
  static void finish_vinsn (vliw_insn *);
  static bfd_boolean emit_single_op (TInsn *);
  static int total_frag_text_expansion (fragS *);
@@ -63,7 +61,7 @@ index fe8ec0f..ea23c96 100644
  
  /* Alignment Functions.  */
  
-@@ -520,6 +526,7 @@ static void tinsn_from_chars (TInsn *, char *, int);
+@@ -521,6 +527,7 @@
  static void tinsn_immed_from_frag (TInsn *, fragS *, int);
  static int get_num_stack_text_bytes (IStack *);
  static int get_num_stack_literal_bytes (IStack *);
@@ -71,7 +69,7 @@ index fe8ec0f..ea23c96 100644
  
  /* vliw_insn functions.  */
  
-@@ -687,7 +694,10 @@ enum
+@@ -688,7 +695,10 @@
    option_prefer_l32r,
    option_prefer_const16,
  
@@ -83,7 +81,7 @@ index fe8ec0f..ea23c96 100644
  };
  
  const char *md_shortopts = "";
-@@ -760,6 +770,9 @@ struct option md_longopts[] =
+@@ -761,6 +771,9 @@
  
    { "target-hardware", required_argument, NULL, option_target_hardware },
  
@@ -93,7 +91,7 @@ index fe8ec0f..ea23c96 100644
    { NULL, no_argument, NULL, 0 }
  };
  
-@@ -940,6 +953,14 @@ md_parse_option (int c, char *arg)
+@@ -941,6 +954,14 @@
        directive_state[directive_transform] = FALSE;
        return 1;
  
@@ -108,7 +106,7 @@ index fe8ec0f..ea23c96 100644
      default:
        return 0;
      }
-@@ -963,7 +984,9 @@ Xtensa options:\n\
+@@ -964,7 +985,9 @@
                            flix bundles\n\
    --no-allow-flix         neither allow hand-written nor generate\n\
                            flix bundles\n\
@@ -119,7 +117,7 @@ index fe8ec0f..ea23c96 100644
  }
  
  
-@@ -5568,6 +5591,8 @@ md_assemble (char *str)
+@@ -5569,6 +5592,8 @@
  
    /* We've just emitted a new instruction so clear the list of labels.  */
    xtensa_clear_insn_labels ();
@@ -128,7 +126,7 @@ index fe8ec0f..ea23c96 100644
  }
  
  
-@@ -6372,6 +6397,8 @@ finish_vinsn (vliw_insn *vinsn)
+@@ -6373,6 +6398,8 @@
    xg_assemble_vliw_tokens (vinsn);
  
    xg_clear_vinsn (vinsn);
@@ -137,7 +135,7 @@ index fe8ec0f..ea23c96 100644
  }
  
  
-@@ -7140,6 +7167,7 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
+@@ -7141,6 +7168,7 @@
  		    RELAX_UNREACHABLE,
  		    frag_now->fr_symbol, frag_now->fr_offset, NULL);
  	  xtensa_set_frag_assembly_state (frag_now);
@@ -145,7 +143,7 @@ index fe8ec0f..ea23c96 100644
  	}
        else if (is_branch && do_align_targets ())
  	{
-@@ -7222,9 +7250,164 @@ xtensa_end (void)
+@@ -7223,9 +7251,164 @@
    xtensa_sanity_check ();
  
    xtensa_add_config_info ();
@@ -310,7 +308,7 @@ index fe8ec0f..ea23c96 100644
  static void
  xtensa_cleanup_align_frags (void)
  {
-@@ -8708,6 +8891,149 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -8709,6 +8892,149 @@
  	new_stretch += relax_frag_for_align (fragP, stretch);
        break;
  
@@ -460,7 +458,7 @@ index fe8ec0f..ea23c96 100644
      default:
        as_bad (_("bad relaxation state"));
      }
-@@ -9146,6 +9472,200 @@ bytes_to_stretch (fragS *this_frag,
+@@ -9147,6 +9473,200 @@
  }
  
  
@@ -661,7 +659,7 @@ index fe8ec0f..ea23c96 100644
  static long
  relax_frag_immed (segT segP,
  		  fragS *fragP,
-@@ -9284,6 +9804,37 @@ relax_frag_immed (segT segP,
+@@ -9285,6 +9805,37 @@
    if (negatable_branch && istack.ninsn > 1)
      update_next_frag_state (fragP);
  
@@ -699,7 +697,7 @@ index fe8ec0f..ea23c96 100644
    return this_text_diff;
  }
  
-@@ -9404,6 +9955,9 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT sec, fragS *fragp)
+@@ -9405,6 +9956,9 @@
        else
  	as_bad (_("invalid relaxation fragment result"));
        break;
@@ -709,11 +707,9 @@ index fe8ec0f..ea23c96 100644
      }
  
    fragp->fr_var = 0;
-diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
-index 0bf1240..4672bc6 100644
 --- a/gas/config/tc-xtensa.h
 +++ b/gas/config/tc-xtensa.h
-@@ -180,6 +180,11 @@ enum xtensa_relax_statesE
+@@ -181,6 +181,11 @@
       prevent the linker from changing the size of any frag between the
       section start and the org frag.  */
  
@@ -725,11 +721,9 @@ index 0bf1240..4672bc6 100644
    RELAX_NONE
  };
  
-diff --git a/gas/frags.c b/gas/frags.c
-index 5f68480..e14099d 100644
 --- a/gas/frags.c
 +++ b/gas/frags.c
-@@ -24,6 +24,20 @@
+@@ -26,6 +26,20 @@
  
  extern fragS zero_address_frag;
  extern fragS predefined_address_frag;
@@ -750,7 +744,7 @@ index 5f68480..e14099d 100644
  
  /* Initialization for frag routines.  */
  
-@@ -70,6 +84,7 @@ frag_alloc (struct obstack *ob)
+@@ -72,6 +86,7 @@
    ptr = (fragS *) obstack_alloc (ob, SIZEOF_STRUCT_FRAG);
    obstack_alignment_mask (ob) = oalign;
    memset (ptr, 0, SIZEOF_STRUCT_FRAG);
@@ -758,11 +752,9 @@ index 5f68480..e14099d 100644
    return ptr;
  }
  
-diff --git a/gas/frags.h b/gas/frags.h
-index 319898f..2f9e1b5 100644
 --- a/gas/frags.h
 +++ b/gas/frags.h
-@@ -155,4 +155,7 @@ char *frag_var (relax_stateT type,
+@@ -157,4 +157,7 @@
  
  bfd_boolean frag_offset_fixed_p (const fragS *, const fragS *, offsetT *);
  
@@ -770,11 +762,9 @@ index 319898f..2f9e1b5 100644
 +void clear_frag_count (void);
 +
  #endif /* FRAGS_H */
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 2b2c294..3683b78 100644
 --- a/gas/testsuite/gas/xtensa/all.exp
 +++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -98,6 +98,7 @@ if [istarget xtensa*-*-*] then {
+@@ -99,6 +99,7 @@
      run_dump_test "pcrel"
      run_dump_test "weak-call"
      run_dump_test "jlong"
@@ -782,9 +772,6 @@ index 2b2c294..3683b78 100644
  }
  
  if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-new file mode 100644
-index 0000000..b4f65dc
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/trampoline.d
 @@ -0,0 +1,26 @@
@@ -814,9 +801,6 @@ index 0000000..b4f65dc
 +.*33462:.*j.0x49407
 +#...
 +.*49407:.*j.0x49407
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-new file mode 100644
-index 0000000..259a3bb
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/trampoline.s
 @@ -0,0 +1,21 @@
@@ -841,6 +825,3 @@ index 0000000..259a3bb
 +	.endr
 +3:
 +	j	3b
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.23.2/901-xtensa-gas-first-frag-alignment.patch b/packages/binutils/2.24/0010-xtensa-gas-first-frag-alignment.patch
similarity index 88%
rename from packages/binutils/2.23.2/901-xtensa-gas-first-frag-alignment.patch
rename to packages/binutils/2.24/0010-xtensa-gas-first-frag-alignment.patch
index e1c2d85a..88e6990a 100644
--- a/packages/binutils/2.23.2/901-xtensa-gas-first-frag-alignment.patch
+++ b/packages/binutils/2.24/0010-xtensa-gas-first-frag-alignment.patch
@@ -31,14 +31,12 @@ gas/
 Backported from: a35d5e823fdfe8a6e7e05ca8e3fb8bb5697335b1
 Changes to Changelog files and tests are dropped.
 
- gas/config/tc-xtensa.c                      | 1 -
+ gas/config/tc-xtensa.c |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index ea23c96..58ace38 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -5609,7 +5609,6 @@ xtensa_handle_align (fragS *fragP)
+@@ -5610,7 +5610,6 @@
        && ! fragP->tc_frag_data.is_literal
        && (fragP->fr_type == rs_align
  	  || fragP->fr_type == rs_align_code)
@@ -46,6 +44,3 @@ index ea23c96..58ace38 100644
        && fragP->fr_offset > 0
        && now_seg != bss_section)
      {
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/902-xtensa-gas-ld-diff-relocation-signed.patch b/packages/binutils/2.24/0011-xtensa-gas-ld-diff-relocation-signed.patch
similarity index 84%
rename from packages/binutils/2.24/902-xtensa-gas-ld-diff-relocation-signed.patch
rename to packages/binutils/2.24/0011-xtensa-gas-ld-diff-relocation-signed.patch
index ba24f4e4..b4f903df 100644
--- a/packages/binutils/2.24/902-xtensa-gas-ld-diff-relocation-signed.patch
+++ b/packages/binutils/2.24/0011-xtensa-gas-ld-diff-relocation-signed.patch
@@ -22,15 +22,13 @@ gas/
 Backported from: 1058c7532d0b012ac329219264ddad59049fb6e6
 Changes to Changelog files and tests are dropped.
 
- bfd/elf32-xtensa.c                       | 32 ++++++++++++-----------
- gas/config/tc-xtensa.c                   |  3 +++
+ bfd/elf32-xtensa.c     |   32 +++++++++++++++++---------------
+ gas/config/tc-xtensa.c |    3 +++
  2 files changed, 20 insertions(+), 15 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index edb04b4..8818d67 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -222,11 +222,11 @@ static reloc_howto_type elf_howto_table[] =
+@@ -223,11 +223,11 @@
  	 FALSE, 0, 0, FALSE),
  
    /* Relocations for supporting difference of symbols.  */
@@ -45,7 +43,7 @@ index edb04b4..8818d67 100644
  	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF32", FALSE, 0, 0xffffffff, FALSE),
  
    /* General immediate operand relocations.  */
-@@ -9013,7 +9013,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9012,7 +9012,8 @@
  		  || r_type == R_XTENSA_DIFF16
  		  || r_type == R_XTENSA_DIFF32)
  		{
@@ -55,7 +53,7 @@ index edb04b4..8818d67 100644
  
  		  if (bfd_get_section_limit (abfd, sec) < old_source_offset)
  		    {
-@@ -9027,15 +9028,15 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9026,15 +9027,15 @@
  		    {
  		    case R_XTENSA_DIFF8:
  		      diff_value =
@@ -74,7 +72,7 @@ index edb04b4..8818d67 100644
  		      break;
  		    }
  
-@@ -9047,24 +9048,25 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9046,24 +9047,25 @@
  		  switch (r_type)
  		    {
  		    case R_XTENSA_DIFF8:
@@ -108,11 +106,9 @@ index edb04b4..8818d67 100644
  		    {
  		      (*link_info->callbacks->reloc_dangerous)
  			(link_info, _("overflow after relaxation"),
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 58ace38..7547c0a0 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -5867,12 +5867,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
+@@ -5868,12 +5868,15 @@
  	    {
  	    case BFD_RELOC_8:
  	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
@@ -128,6 +124,3 @@ index 58ace38..7547c0a0 100644
  	      break;
  	    default:
  	      break;
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.23.2/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch b/packages/binutils/2.24/0012-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
similarity index 88%
rename from packages/binutils/2.23.2/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
rename to packages/binutils/2.24/0012-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
index 6a0846ef..57cd0bf7 100644
--- a/packages/binutils/2.23.2/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
+++ b/packages/binutils/2.24/0012-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
@@ -26,14 +26,12 @@ ld/
 Backported from: e7d17e71cdc10a2e81e454ce3b9637f1b2a587f2
 Changes to ld/ChangeLog file are dropped.
 
- ld/emultempl/xtensaelf.em | 2 +-
+ ld/emultempl/xtensaelf.em |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em
-index 151eea4..948d18d 100644
 --- a/ld/emultempl/xtensaelf.em
 +++ b/ld/emultempl/xtensaelf.em
-@@ -1310,7 +1310,7 @@ is_inconsistent_linkonce_section (asection *sec)
+@@ -1311,7 +1311,7 @@
       for Tensilica's XCC compiler.  */
    name = sec_name + linkonce_len;
    if (CONST_STRNEQ (name, "prop."))
@@ -42,6 +40,3 @@ index 151eea4..948d18d 100644
    else if (name[1] == '.'
  	   && (name[0] == 'p' || name[0] == 'e' || name[0] == 'h'))
      name += 2;
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch b/packages/binutils/2.24/0013-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
similarity index 92%
rename from packages/binutils/2.24/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
rename to packages/binutils/2.24/0013-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
index e4c600e5..c31d01c8 100644
--- a/packages/binutils/2.24/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
+++ b/packages/binutils/2.24/0013-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
@@ -19,14 +19,12 @@ bfd/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- bfd/elf32-xtensa.c | 41 +++++++++++++++++++++++++++++++++++++----
+ bfd/elf32-xtensa.c |   41 +++++++++++++++++++++++++++++++++++++----
  1 file changed, 37 insertions(+), 4 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 09862e3..e32496a 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -7124,10 +7124,43 @@ is_resolvable_asm_expansion (bfd *abfd,
+@@ -7123,10 +7123,43 @@
  	  || is_reloc_sym_weak (abfd, irel)))
      return FALSE;
  
@@ -74,6 +72,3 @@ index 09862e3..e32496a 100644
  
    *is_reachable_p = pcrel_reloc_fits (direct_call_opcode, 0,
  				      self_address, dest_address);
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch b/packages/binutils/2.24/0014-Fix-trampolines-search-code-for-conditional-branches.patch
similarity index 76%
rename from packages/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch
rename to packages/binutils/2.24/0014-Fix-trampolines-search-code-for-conditional-branches.patch
index 8aeb0642..a4e7b5cc 100644
--- a/packages/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch
+++ b/packages/binutils/2.24/0014-Fix-trampolines-search-code-for-conditional-branches.patch
@@ -28,16 +28,14 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: d92b6eece424f0ad35d96fdd85bf207295e8c4c3
 Changes to ChangeLogs are dropped.
 
- gas/config/tc-xtensa.c                | 8 ++++----
- gas/testsuite/gas/xtensa/trampoline.d | 9 +++++++++
- gas/testsuite/gas/xtensa/trampoline.s | 7 +++++++
+ gas/config/tc-xtensa.c                |    8 ++++----
+ gas/testsuite/gas/xtensa/trampoline.d |    9 +++++++++
+ gas/testsuite/gas/xtensa/trampoline.s |    7 +++++++
  3 files changed, 20 insertions(+), 4 deletions(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d11b0c7..f23ccf8 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -9514,11 +9514,11 @@ search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only)
+@@ -9515,11 +9515,11 @@
  	      if (next_addr == 0 || addr - next_addr > J_RANGE)
  		break;
  	    }
@@ -53,8 +51,6 @@ index d11b0c7..f23ccf8 100644
      }
    for ( ; tf; tf = tf->next)
      {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-index b4f65dc..5ae32a6 100644
 --- a/gas/testsuite/gas/xtensa/trampoline.d
 +++ b/gas/testsuite/gas/xtensa/trampoline.d
 @@ -24,3 +24,12 @@
@@ -70,8 +66,6 @@ index b4f65dc..5ae32a6 100644
 +#...
 +.*927f5:.*j.0x927f5
 +#...
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-index 259a3bb..4465786 100644
 --- a/gas/testsuite/gas/xtensa/trampoline.s
 +++ b/gas/testsuite/gas/xtensa/trampoline.s
 @@ -19,3 +19,10 @@
@@ -85,6 +79,3 @@ index 259a3bb..4465786 100644
 +	.endr
 +4:
 +	j	4b
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch b/packages/binutils/2.24/0015-xtensa-optimize-check_section_ebb_pcrels_fit.patch
similarity index 94%
rename from packages/binutils/2.24/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
rename to packages/binutils/2.24/0015-xtensa-optimize-check_section_ebb_pcrels_fit.patch
index 8a211004..e4af6100 100644
--- a/packages/binutils/2.24/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
+++ b/packages/binutils/2.24/0015-xtensa-optimize-check_section_ebb_pcrels_fit.patch
@@ -76,14 +76,12 @@ bfd/
 Backported from: b2b326d246f839ee218192ac88da2384d929a072
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- bfd/elf32-xtensa.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++++----
+ bfd/elf32-xtensa.c |  321 +++++++++++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 298 insertions(+), 23 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 0b6f584..872370b 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -6619,8 +6619,10 @@ static bfd_boolean compute_text_actions
+@@ -6614,8 +6614,10 @@
    (bfd *, asection *, struct bfd_link_info *);
  static bfd_boolean compute_ebb_proposed_actions (ebb_constraint *);
  static bfd_boolean compute_ebb_actions (ebb_constraint *);
@@ -95,7 +93,7 @@ index 0b6f584..872370b 100644
     const xtensa_opcode *);
  static bfd_boolean check_section_ebb_reduces (const ebb_constraint *);
  static void text_action_add_proposed
-@@ -7219,6 +7221,221 @@ build_reloc_opcodes (bfd *abfd,
+@@ -7214,6 +7216,221 @@
    return reloc_opcodes;
  }
  
@@ -317,7 +315,7 @@ index 0b6f584..872370b 100644
  
  /* The compute_text_actions function will build a list of potential
     transformation actions for code in the extended basic block of each
-@@ -7245,6 +7462,7 @@ compute_text_actions (bfd *abfd,
+@@ -7240,6 +7457,7 @@
    property_table_entry *prop_table = 0;
    int ptblsize = 0;
    bfd_size_type sec_size;
@@ -325,7 +323,7 @@ index 0b6f584..872370b 100644
  
    relax_info = get_xtensa_relax_info (sec);
    BFD_ASSERT (relax_info);
-@@ -7277,6 +7495,12 @@ compute_text_actions (bfd *abfd,
+@@ -7272,6 +7490,12 @@
        goto error_return;
      }
  
@@ -338,7 +336,7 @@ index 0b6f584..872370b 100644
    for (i = 0; i < sec->reloc_count; i++)
      {
        Elf_Internal_Rela *irel = &internal_relocs[i];
-@@ -7340,17 +7564,13 @@ compute_text_actions (bfd *abfd,
+@@ -7335,17 +7559,13 @@
        ebb->start_reloc_idx = i;
        ebb->end_reloc_idx = i;
  
@@ -359,7 +357,7 @@ index 0b6f584..872370b 100644
  	  || !check_section_ebb_reduces (&ebb_table))
  	{
  	  /* If anything goes wrong or we get unlucky and something does
-@@ -7372,6 +7592,8 @@ compute_text_actions (bfd *abfd,
+@@ -7367,6 +7587,8 @@
        free_ebb_constraint (&ebb_table);
      }
  
@@ -368,7 +366,7 @@ index 0b6f584..872370b 100644
  #if DEBUG
    if (relax_info->action_list.head)
      print_action_list (stderr, &relax_info->action_list);
-@@ -7974,14 +8196,17 @@ check_section_ebb_pcrels_fit (bfd *abfd,
+@@ -7969,14 +8191,17 @@
  			      asection *sec,
  			      bfd_byte *contents,
  			      Elf_Internal_Rela *internal_relocs,
@@ -386,7 +384,7 @@ index 0b6f584..872370b 100644
  
    relax_info = get_xtensa_relax_info (sec);
  
-@@ -7992,7 +8217,40 @@ check_section_ebb_pcrels_fit (bfd *abfd,
+@@ -7987,7 +8212,40 @@
  	 can still be used.  */
      }
  
@@ -428,7 +426,7 @@ index 0b6f584..872370b 100644
      {
        r_reloc r_rel;
        bfd_vma orig_self_offset, orig_target_offset;
-@@ -8001,7 +8259,15 @@ check_section_ebb_pcrels_fit (bfd *abfd,
+@@ -7996,7 +8254,15 @@
        reloc_howto_type *howto;
        int self_removed_bytes, target_removed_bytes;
  
@@ -445,7 +443,7 @@ index 0b6f584..872370b 100644
        r_type = ELF32_R_TYPE (irel->r_info);
  
        howto = &elf_howto_table[r_type];
-@@ -8067,21 +8333,30 @@ check_section_ebb_pcrels_fit (bfd *abfd,
+@@ -8062,21 +8328,30 @@
  	  xtensa_opcode opcode;
  	  int opnum;
  
@@ -488,7 +486,7 @@ index 0b6f584..872370b 100644
  	    }
  
  	  if (!pcrel_reloc_fits (opcode, opnum, self_offset, target_offset))
-@@ -8778,7 +9053,7 @@ move_shared_literal (asection *sec,
+@@ -8773,7 +9048,7 @@
    /* Check all of the PC-relative relocations to make sure they still fit.  */
    relocs_fit = check_section_ebb_pcrels_fit (target_sec->owner, target_sec,
  					     target_sec_cache->contents,
@@ -497,6 +495,3 @@ index 0b6f584..872370b 100644
  					     &ebb_table, NULL);
  
    if (!relocs_fit)
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch b/packages/binutils/2.24/0016-xtensa-optimize-removed_by_actions.patch
similarity index 89%
rename from packages/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch
rename to packages/binutils/2.24/0016-xtensa-optimize-removed_by_actions.patch
index 9df80653..2ce6a19d 100644
--- a/packages/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch
+++ b/packages/binutils/2.24/0016-xtensa-optimize-removed_by_actions.patch
@@ -50,14 +50,12 @@ bfd/
 Backported from: 071aa5c98a31c966f5fbfc573fcee61350fd1936
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- bfd/elf32-xtensa.c | 181 +++++++++++++++++++++++++++++++++++++++++++++--------
+ bfd/elf32-xtensa.c |  181 +++++++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 156 insertions(+), 25 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 872370b..21b2871 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -5420,11 +5420,28 @@ struct text_action_struct
+@@ -5415,11 +5415,28 @@
    text_action *next;
  };
  
@@ -86,7 +84,7 @@ index 872370b..21b2871 100644
  };
  
  
-@@ -5636,6 +5653,101 @@ action_list_count (text_action_list *action_list)
+@@ -5631,6 +5648,101 @@
    return count;
  }
  
@@ -188,7 +186,7 @@ index 872370b..21b2871 100644
  
  /* The find_insn_action routine will only find non-fill actions.  */
  
-@@ -5909,6 +6021,9 @@ init_xtensa_relax_info (asection *sec)
+@@ -5904,6 +6016,9 @@
  
    relax_info->action_list.head = NULL;
  
@@ -198,7 +196,7 @@ index 872370b..21b2871 100644
    relax_info->fix_list = NULL;
    relax_info->fix_array = NULL;
    relax_info->fix_array_count = 0;
-@@ -9218,7 +9333,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9213,7 +9328,7 @@
  		  if (elf_hash_table (link_info)->dynamic_sections_created)
  		    shrink_dynamic_reloc_sections (link_info, abfd, sec, irel);
  		  irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
@@ -207,7 +205,7 @@ index 872370b..21b2871 100644
  		    (&relax_info->action_list, irel->r_offset);
  		  continue;
  		}
-@@ -9255,7 +9370,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9250,7 +9365,7 @@
  		    }
  		}
  
@@ -216,7 +214,7 @@ index 872370b..21b2871 100644
  		(&relax_info->action_list, irel->r_offset);
  	      irel->r_offset = source_offset;
  	    }
-@@ -9352,7 +9467,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9347,7 +9462,7 @@
  		      break;
  		    }
  
@@ -225,7 +223,7 @@ index 872370b..21b2871 100644
  		    (&target_relax_info->action_list,
  		     r_rel.target_offset + diff_value);
  		  diff_value = new_end_offset - new_reloc.target_offset;
-@@ -9750,7 +9865,6 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
+@@ -9745,7 +9860,6 @@
    xtensa_relax_info *relax_info;
    removed_literal *removed;
    bfd_vma target_offset, base_offset;
@@ -233,7 +231,7 @@ index 872370b..21b2871 100644
  
    *new_rel = *orig_rel;
  
-@@ -9803,19 +9917,26 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
+@@ -9798,19 +9912,26 @@
       offset.  */
  
    base_offset = r_reloc_get_target_offset (new_rel) - new_rel->rela.r_addend;
@@ -265,7 +263,7 @@ index 872370b..21b2871 100644
        new_rel->target_offset = target_offset - tgt_removed;
        new_rel->rela.r_addend += addend_removed;
      }
-@@ -10138,9 +10259,10 @@ relax_property_section (bfd *abfd,
+@@ -10133,9 +10254,10 @@
  	      bfd_vma old_offset = val.r_rel.target_offset;
  	      bfd_vma new_offset;
  	      long old_size, new_size;
@@ -279,7 +277,7 @@ index 872370b..21b2871 100644
  
  	      /* Assert that we are not out of bounds.  */
  	      old_size = bfd_get_32 (abfd, size_p);
-@@ -10164,9 +10286,10 @@ relax_property_section (bfd *abfd,
+@@ -10159,9 +10281,10 @@
  
  		      /* Recompute the new_offset, but this time don't
  			 include any fill inserted by relaxation.  */
@@ -293,7 +291,7 @@ index 872370b..21b2871 100644
  
  		      /* If it is not unreachable and we have not yet
  			 seen an unreachable at this address, place it
-@@ -10182,8 +10305,12 @@ relax_property_section (bfd *abfd,
+@@ -10177,8 +10300,12 @@
  		    }
  		}
  	      else
@@ -308,7 +306,7 @@ index 872370b..21b2871 100644
  
  	      if (new_size != old_size)
  		{
-@@ -10441,14 +10568,16 @@ relax_section_symbols (bfd *abfd, asection *sec)
+@@ -10436,14 +10563,16 @@
  
        if (isym->st_shndx == sec_shndx)
  	{
@@ -329,7 +327,7 @@ index 872370b..21b2871 100644
  	}
      }
  
-@@ -10466,15 +10595,17 @@ relax_section_symbols (bfd *abfd, asection *sec)
+@@ -10461,15 +10590,17 @@
  	   || sym_hash->root.type == bfd_link_hash_defweak)
  	  && sym_hash->root.u.def.section == sec)
  	{
@@ -351,6 +349,3 @@ index 872370b..21b2871 100644
  	}
      }
  
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/908-xtensa-optimize-find_removed_literal.patch b/packages/binutils/2.24/0017-xtensa-optimize-find_removed_literal.patch
similarity index 89%
rename from packages/binutils/2.24/908-xtensa-optimize-find_removed_literal.patch
rename to packages/binutils/2.24/0017-xtensa-optimize-find_removed_literal.patch
index 96d526fe..3b64fd8b 100644
--- a/packages/binutils/2.24/908-xtensa-optimize-find_removed_literal.patch
+++ b/packages/binutils/2.24/0017-xtensa-optimize-find_removed_literal.patch
@@ -38,14 +38,12 @@ bfd/
 Backported from: 3439c466273378021821473d3fc84990e089ae34
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- bfd/elf32-xtensa.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++-----
+ bfd/elf32-xtensa.c |   64 ++++++++++++++++++++++++++++++++++++++++++++++++-----
  1 file changed, 58 insertions(+), 6 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 21b2871..51733ad 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -5832,6 +5832,7 @@ print_action_list (FILE *fp, text_action_list *action_list)
+@@ -5827,6 +5827,7 @@
     by the "from" offset field.  */
  
  typedef struct removed_literal_struct removed_literal;
@@ -53,7 +51,7 @@ index 21b2871..51733ad 100644
  typedef struct removed_literal_list_struct removed_literal_list;
  
  struct removed_literal_struct
-@@ -5841,10 +5842,19 @@ struct removed_literal_struct
+@@ -5836,10 +5837,19 @@
    removed_literal *next;
  };
  
@@ -73,7 +71,7 @@ index 21b2871..51733ad 100644
  };
  
  
-@@ -5893,6 +5903,39 @@ add_removed_literal (removed_literal_list *removed_list,
+@@ -5888,6 +5898,39 @@
      }
  }
  
@@ -113,7 +111,7 @@ index 21b2871..51733ad 100644
  
  /* Check if the list of removed literals contains an entry for the
     given address.  Return the entry if found.  */
-@@ -5900,12 +5943,21 @@ add_removed_literal (removed_literal_list *removed_list,
+@@ -5895,12 +5938,21 @@
  static removed_literal *
  find_removed_literal (removed_literal_list *removed_list, bfd_vma addr)
  {
@@ -141,6 +139,3 @@ index 21b2871..51733ad 100644
  }
  
  
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch b/packages/binutils/2.24/0018-xtensa-replace-action-list-with-splay-tree.patch
similarity index 91%
rename from packages/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch
rename to packages/binutils/2.24/0018-xtensa-replace-action-list-with-splay-tree.patch
index 3090cc21..dd7ff8f9 100644
--- a/packages/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch
+++ b/packages/binutils/2.24/0018-xtensa-replace-action-list-with-splay-tree.patch
@@ -73,14 +73,12 @@ bfd/
 Backported from: 4c2af04fe8b4452bf51d2debf1bb467fafcd0f08
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- bfd/elf32-xtensa.c | 488 +++++++++++++++++++++++++++++++----------------------
+ bfd/elf32-xtensa.c |  488 ++++++++++++++++++++++++++++++-----------------------
  1 file changed, 282 insertions(+), 206 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 51733ad..53af1c6 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -28,6 +28,7 @@
+@@ -29,6 +29,7 @@
  #include "libbfd.h"
  #include "elf-bfd.h"
  #include "elf/xtensa.h"
@@ -88,7 +86,7 @@ index 51733ad..53af1c6 100644
  #include "xtensa-isa.h"
  #include "xtensa-config.h"
  
-@@ -5416,8 +5417,6 @@ struct text_action_struct
+@@ -5411,8 +5412,6 @@
    bfd_vma virtual_offset;  /* Zero except for adding literals.  */
    int removed_bytes;
    literal_value value;	/* Only valid when adding literals.  */
@@ -97,7 +95,7 @@ index 51733ad..53af1c6 100644
  };
  
  struct removal_by_action_entry_struct
-@@ -5440,7 +5439,8 @@ typedef struct removal_by_action_map_struct removal_by_action_map;
+@@ -5435,7 +5434,8 @@
  /* List of all of the actions taken on a text section.  */
  struct text_action_list_struct
  {
@@ -107,7 +105,7 @@ index 51733ad..53af1c6 100644
    removal_by_action_map map;
  };
  
-@@ -5448,20 +5448,18 @@ struct text_action_list_struct
+@@ -5443,20 +5443,18 @@
  static text_action *
  find_fill_action (text_action_list *l, asection *sec, bfd_vma offset)
  {
@@ -135,7 +133,7 @@ index 51733ad..53af1c6 100644
    return NULL;
  }
  
-@@ -5509,6 +5507,49 @@ adjust_fill_action (text_action *ta, int fill_diff)
+@@ -5504,6 +5502,49 @@
  }
  
  
@@ -185,7 +183,7 @@ index 51733ad..53af1c6 100644
  /* Add a modification action to the text.  For the case of adding or
     removing space, modify any current fill and assume that
     "unreachable_space" bytes can be freely contracted.  Note that a
-@@ -5521,8 +5562,8 @@ text_action_add (text_action_list *l,
+@@ -5516,8 +5557,8 @@
  		 bfd_vma offset,
  		 int removed)
  {
@@ -195,7 +193,7 @@ index 51733ad..53af1c6 100644
  
    /* It is not necessary to fill at the end of a section.  */
    if (action == ta_fill && sec->size == offset)
-@@ -5532,34 +5573,30 @@ text_action_add (text_action_list *l,
+@@ -5527,34 +5568,30 @@
    if (action == ta_fill && removed == 0)
      return;
  
@@ -243,7 +241,7 @@ index 51733ad..53af1c6 100644
  }
  
  
-@@ -5570,7 +5607,6 @@ text_action_add_literal (text_action_list *l,
+@@ -5565,7 +5602,6 @@
  			 const literal_value *value,
  			 int removed)
  {
@@ -251,7 +249,7 @@ index 51733ad..53af1c6 100644
    text_action *ta;
    asection *sec = r_reloc_get_section (loc);
    bfd_vma offset = loc->target_offset;
-@@ -5578,14 +5614,6 @@ text_action_add_literal (text_action_list *l,
+@@ -5573,14 +5609,6 @@
  
    BFD_ASSERT (action == ta_add_literal);
  
@@ -266,7 +264,7 @@ index 51733ad..53af1c6 100644
    /* Create a new record and fill it up.  */
    ta = (text_action *) bfd_zmalloc (sizeof (text_action));
    ta->action = action;
-@@ -5594,8 +5622,10 @@ text_action_add_literal (text_action_list *l,
+@@ -5589,8 +5617,10 @@
    ta->virtual_offset = virtual_offset;
    ta->value = *value;
    ta->removed_bytes = removed;
@@ -279,7 +277,7 @@ index 51733ad..53af1c6 100644
  }
  
  
-@@ -5606,7 +5636,8 @@ text_action_add_literal (text_action_list *l,
+@@ -5601,7 +5631,8 @@
     so that each search may begin where the previous one left off.  */
  
  static int
@@ -289,7 +287,7 @@ index 51733ad..53af1c6 100644
  		    bfd_vma offset,
  		    bfd_boolean before_fill)
  {
-@@ -5614,6 +5645,13 @@ removed_by_actions (text_action **p_start_action,
+@@ -5609,6 +5640,13 @@
    int removed = 0;
  
    r = *p_start_action;
@@ -303,7 +301,7 @@ index 51733ad..53af1c6 100644
    while (r)
      {
        if (r->offset > offset)
-@@ -5625,7 +5663,7 @@ removed_by_actions (text_action **p_start_action,
+@@ -5620,7 +5658,7 @@
  
        removed += r->removed_bytes;
  
@@ -312,7 +310,7 @@ index 51733ad..53af1c6 100644
      }
  
    *p_start_action = r;
-@@ -5636,68 +5674,74 @@ removed_by_actions (text_action **p_start_action,
+@@ -5631,68 +5669,74 @@
  static bfd_vma
  offset_with_removed_text (text_action_list *action_list, bfd_vma offset)
  {
@@ -429,7 +427,7 @@ index 51733ad..53af1c6 100644
  }
  
  static int
-@@ -5754,28 +5798,26 @@ offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset)
+@@ -5749,28 +5793,26 @@
  static text_action *
  find_insn_action (text_action_list *action_list, bfd_vma offset)
  {
@@ -477,16 +475,42 @@ index 51733ad..53af1c6 100644
      }
    return NULL;
  }
-@@ -5784,40 +5826,50 @@ find_insn_action (text_action_list *action_list, bfd_vma offset)
+@@ -5779,40 +5821,50 @@
  #if DEBUG
  
  static void
 -print_action_list (FILE *fp, text_action_list *action_list)
 +print_action (FILE *fp, text_action *r)
-+{
+ {
+-  text_action *r;
+-
+-  fprintf (fp, "Text Action\n");
+-  for (r = action_list->head; r != NULL; r = r->next)
 +  const char *t = "unknown";
 +  switch (r->action)
-+    {
+     {
+-      const char *t = "unknown";
+-      switch (r->action)
+-	{
+-	case ta_remove_insn:
+-	  t = "remove_insn"; break;
+-	case ta_remove_longcall:
+-	  t = "remove_longcall"; break;
+-	case ta_convert_longcall:
+-	  t = "convert_longcall"; break;
+-	case ta_narrow_insn:
+-	  t = "narrow_insn"; break;
+-	case ta_widen_insn:
+-	  t = "widen_insn"; break;
+-	case ta_fill:
+-	  t = "fill"; break;
+-	case ta_none:
+-	  t = "none"; break;
+-	case ta_remove_literal:
+-	  t = "remove_literal"; break;
+-	case ta_add_literal:
+-	  t = "add_literal"; break;
+-	}
 +    case ta_remove_insn:
 +      t = "remove_insn"; break;
 +    case ta_remove_longcall:
@@ -511,46 +535,20 @@ index 51733ad..53af1c6 100644
 +	   r->sec->owner->filename,
 +	   r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
 +}
-+
-+static int
-+print_action_list_fn (splay_tree_node node, void *p)
- {
--  text_action *r;
-+  text_action *r = (text_action *)node->value;
- 
--  fprintf (fp, "Text Action\n");
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      const char *t = "unknown";
--      switch (r->action)
--	{
--	case ta_remove_insn:
--	  t = "remove_insn"; break;
--	case ta_remove_longcall:
--	  t = "remove_longcall"; break;
--	case ta_convert_longcall:
--	  t = "convert_longcall"; break;
--	case ta_narrow_insn:
--	  t = "narrow_insn"; break;
--	case ta_widen_insn:
--	  t = "widen_insn"; break;
--	case ta_fill:
--	  t = "fill"; break;
--	case ta_none:
--	  t = "none"; break;
--	case ta_remove_literal:
--	  t = "remove_literal"; break;
--	case ta_add_literal:
--	  t = "add_literal"; break;
--	}
-+  print_action (p, r);
-+  return 0;
-+}
  
 -      fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
 -	       r->sec->owner->filename,
 -	       r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
 -    }
++static int
++print_action_list_fn (splay_tree_node node, void *p)
++{
++  text_action *r = (text_action *)node->value;
++
++  print_action (p, r);
++  return 0;
++}
++
 +static void
 +print_action_list (FILE *fp, text_action_list *action_list)
 +{
@@ -559,7 +557,7 @@ index 51733ad..53af1c6 100644
  }
  
  #endif /* DEBUG */
-@@ -6071,8 +6123,8 @@ init_xtensa_relax_info (asection *sec)
+@@ -6066,8 +6118,8 @@
    relax_info->removed_list.head = NULL;
    relax_info->removed_list.tail = NULL;
  
@@ -570,7 +568,7 @@ index 51733ad..53af1c6 100644
    relax_info->action_list.map.n_entries = 0;
    relax_info->action_list.map.entry = NULL;
  
-@@ -7762,7 +7814,7 @@ compute_text_actions (bfd *abfd,
+@@ -7757,7 +7809,7 @@
    free_reloc_range_list (&relevant_relocs);
  
  #if DEBUG
@@ -579,7 +577,7 @@ index 51733ad..53af1c6 100644
      print_action_list (stderr, &relax_info->action_list);
  #endif
  
-@@ -8263,6 +8315,54 @@ xlate_offset_with_removed_text (const xlate_map_t *map,
+@@ -8258,6 +8310,54 @@
    return e->new_address - e->orig_address + offset;
  }
  
@@ -634,7 +632,7 @@ index 51733ad..53af1c6 100644
  
  /* Build a binary searchable offset translation map from a section's
     action list.  */
-@@ -8270,75 +8370,40 @@ xlate_offset_with_removed_text (const xlate_map_t *map,
+@@ -8265,75 +8365,40 @@
  static xlate_map_t *
  build_xlate_map (asection *sec, xtensa_relax_info *relax_info)
  {
@@ -729,7 +727,7 @@ index 51733ad..53af1c6 100644
  }
  
  
-@@ -9302,6 +9367,16 @@ move_shared_literal (asection *sec,
+@@ -9297,6 +9362,16 @@
  
  /* Second relaxation pass.  */
  
@@ -746,7 +744,7 @@ index 51733ad..53af1c6 100644
  /* Modify all of the relocations to point to the right spot, and if this
     is a relaxable section, delete the unwanted literals and fix the
     section size.  */
-@@ -9334,7 +9409,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9329,7 +9404,7 @@
  
    internal_relocs = retrieve_internal_relocs (abfd, sec,
  					      link_info->keep_memory);
@@ -755,7 +753,7 @@ index 51733ad..53af1c6 100644
      return TRUE;
  
    contents = retrieve_contents (abfd, sec, link_info->keep_memory);
-@@ -9412,6 +9487,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9407,6 +9482,12 @@
  			}
  		      /* Update the action so that the code that moves
  			 the contents will do the right thing.  */
@@ -768,7 +766,7 @@ index 51733ad..53af1c6 100644
  		      if (action->action == ta_remove_longcall)
  			action->action = ta_remove_insn;
  		      else
-@@ -9584,13 +9665,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9579,13 +9660,12 @@
  
    if ((relax_info->is_relaxable_literal_section
         || relax_info->is_relaxable_asm_section)
@@ -783,7 +781,7 @@ index 51733ad..53af1c6 100644
        bfd_size_type final_size, copy_size, orig_insn_size;
        bfd_byte *scratch = NULL;
        bfd_byte *dup_contents = NULL;
-@@ -9601,15 +9681,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9596,15 +9676,12 @@
        bfd_vma orig_dot_vo = 0; /* Virtual offset from orig_dot.  */
        bfd_vma dup_dot = 0;
  
@@ -802,7 +800,7 @@ index 51733ad..53af1c6 100644
        scratch = (bfd_byte *) bfd_zmalloc (final_size);
        dup_contents = (bfd_byte *) bfd_zmalloc (final_size);
  
-@@ -9618,8 +9695,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9613,8 +9690,8 @@
        print_action_list (stderr, &relax_info->action_list);
  #endif
  
@@ -813,7 +811,7 @@ index 51733ad..53af1c6 100644
  	{
  	  virtual_action = FALSE;
  	  if (action->offset > orig_dot)
-@@ -9748,7 +9825,6 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9743,7 +9820,6 @@
  	      break;
  	    }
  
@@ -821,6 +819,3 @@ index 51733ad..53af1c6 100644
  	  BFD_ASSERT (dup_dot <= final_size);
  	  BFD_ASSERT (orig_dot <= orig_size);
  	}
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/910-xtensa-optimize-trampolines-relaxation.patch b/packages/binutils/2.24/0019-xtensa-optimize-trampolines-relaxation.patch
similarity index 94%
rename from packages/binutils/2.24/910-xtensa-optimize-trampolines-relaxation.patch
rename to packages/binutils/2.24/0019-xtensa-optimize-trampolines-relaxation.patch
index 043ff4df..4967b61e 100644
--- a/packages/binutils/2.24/910-xtensa-optimize-trampolines-relaxation.patch
+++ b/packages/binutils/2.24/0019-xtensa-optimize-trampolines-relaxation.patch
@@ -64,14 +64,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: b76f99d702c3501ac320396ea06bc7f9237173c3
 Changes to ChangeLog are dropped.
 
- gas/config/tc-xtensa.c | 220 +++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 194 insertions(+), 26 deletions(-)
+ gas/config/tc-xtensa.c |  220 ++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 193 insertions(+), 27 deletions(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 3e85b69..31c0b6b 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -8785,6 +8785,154 @@ static long relax_frag_for_align (fragS *, long);
+@@ -8786,6 +8786,154 @@
  static long relax_frag_immed
    (segT, fragS *, long, int, xtensa_format, int, int *, bfd_boolean);
  
@@ -226,7 +224,7 @@ index 3e85b69..31c0b6b 100644
  
  /* Return the number of bytes added to this fragment, given that the
     input has been stretched already by "stretch".  */
-@@ -8896,35 +9044,42 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -8897,35 +9045,42 @@
      case RELAX_TRAMPOLINE:
        if (fragP->tc_frag_data.relax_seen)
          {
@@ -280,21 +278,21 @@ index 3e85b69..31c0b6b 100644
 +	      trampaddr = fragP->fr_address + fragP->fr_fix;
 +
 +	      if (addr + J_RANGE < trampaddr)
++		continue;
++	      if (addr > trampaddr + J_RANGE)
++		break;
++	      if (abs (delta) < J_RANGE)
  		continue;
 -              target = S_GET_VALUE (s);
 -              addr = fixP->fx_frag->fr_address;
 -              delta = target - addr + stretch;
-+	      if (addr > trampaddr + J_RANGE)
-+		break;
-+	      if (abs (delta) < J_RANGE)
-+		continue;
 +
 +	      slot = fixP->tc_fix_data.slot;
 +
                if (delta > J_RANGE  || delta < -1 * J_RANGE)
                  { /* Found an out-of-range jump; scan the list of trampolines for the best match.  */
  		  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-@@ -8978,14 +9133,13 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -8979,14 +9134,13 @@
  		    }
  		  if (tf->fragP == fragP)
  		    {
@@ -310,7 +308,7 @@ index 3e85b69..31c0b6b 100644
  
  			  new_stretch += init_trampoline_frag (tf);
  			  offset = fragP->fr_fix; /* Where to assemble the j insn.  */
-@@ -9009,10 +9163,20 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -9010,10 +9164,20 @@
  			  newfixP->tc_fix_data.X_add_symbol = lsym;
  			  newfixP->tc_fix_data.X_add_number = offset;
  			  newfixP->tc_fix_data.slot = slot;
@@ -331,7 +329,7 @@ index 3e85b69..31c0b6b 100644
  			  /* Adjust the jump around this trampoline (if present).  */
  			  if (tf->fixP != NULL)
  			    {
-@@ -9027,6 +9191,8 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -9028,6 +9192,8 @@
  			      fragP->fr_subtype = 0;
  			      /* Remove from the trampoline_list.  */
  			      prev->next = tf->next;
@@ -340,6 +338,3 @@ index 3e85b69..31c0b6b 100644
  			      break;
  			    }
  			}
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch b/packages/binutils/2.24/0020-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
similarity index 90%
rename from packages/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
rename to packages/binutils/2.24/0020-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
index 9ad6b3be..63fc41d8 100644
--- a/packages/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
+++ b/packages/binutils/2.24/0020-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
@@ -29,14 +29,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: e6c9a083ec5ae7a45bd71682b26aae1939849388
 Changes to ChangeLog are dropped.
 
- bfd/elf32-xtensa.c | 6 +++++-
+ bfd/elf32-xtensa.c |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 53af1c6..2523670 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -1360,10 +1360,14 @@ elf_xtensa_gc_sweep_hook (bfd *abfd,
+@@ -1357,10 +1357,14 @@
  	{
  	  if (is_plt)
  	    {
@@ -52,6 +50,3 @@ index 53af1c6..2523670 100644
  	    {
  	      if (h->got.refcount > 0)
  		h->got.refcount--;
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch b/packages/binutils/2.24/0021-xtensa-fix-gas-segfault-with-text-section-literals.patch
similarity index 89%
rename from packages/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
rename to packages/binutils/2.24/0021-xtensa-fix-gas-segfault-with-text-section-literals.patch
index 4a3de2c8..b1849874 100644
--- a/packages/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
+++ b/packages/binutils/2.24/0021-xtensa-fix-gas-segfault-with-text-section-literals.patch
@@ -21,14 +21,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: 4de0562a4c69fef4952aa7e19d7bda359f02e8b4
 Changes to ChangeLog are dropped.
 
- gas/config/tc-xtensa.c | 10 +++++++++-
+ gas/config/tc-xtensa.c |   10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 31c0b6b..18307c1 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -10808,13 +10808,21 @@ xtensa_move_literals (void)
+@@ -10809,13 +10809,21 @@
        frchain_to = NULL;
        frag_splice = &(frchain_from->frch_root);
  
@@ -51,6 +49,3 @@ index 31c0b6b..18307c1 100644
        gas_assert (search_frag->tc_frag_data.literal_frag->fr_subtype
  	      == RELAX_LITERAL_POOL_BEGIN);
        xtensa_switch_section_emit_state (&state, segment->seg, 0);
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/913-xtensa-add-auto-litpools-option.patch b/packages/binutils/2.24/0022-xtensa-add-auto-litpools-option.patch
similarity index 91%
rename from packages/binutils/2.24/913-xtensa-add-auto-litpools-option.patch
rename to packages/binutils/2.24/0022-xtensa-add-auto-litpools-option.patch
index f0199e1e..269e9f2f 100644
--- a/packages/binutils/2.24/913-xtensa-add-auto-litpools-option.patch
+++ b/packages/binutils/2.24/0022-xtensa-add-auto-litpools-option.patch
@@ -55,20 +55,18 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: b46824bd49648c575372e6d9bc6a6defeabd6ed5
 Changes to ChangeLogs and documentation are dropped.
 
- gas/config/tc-xtensa.c                   | 432 ++++++++++++++++++++++++++++++-
- gas/config/tc-xtensa.h                   |   1 +
- gas/testsuite/gas/xtensa/all.exp         |   1 +
- gas/testsuite/gas/xtensa/auto-litpools.d |  12 +
- gas/testsuite/gas/xtensa/auto-litpools.s |  13 +
+ gas/config/tc-xtensa.c                   |  432 ++++++++++++++++++++++++++++++-
+ gas/config/tc-xtensa.h                   |    1 
+ gas/testsuite/gas/xtensa/all.exp         |    1 
+ gas/testsuite/gas/xtensa/auto-litpools.d |   12 
+ gas/testsuite/gas/xtensa/auto-litpools.s |   13 
  5 files changed, 454 insertions(+), 5 deletions(-)
  create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.d
  create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.s
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 7311a05..b8b1e7d 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -440,6 +440,29 @@ bfd_boolean directive_state[] =
+@@ -441,6 +441,29 @@
  #endif
  };
  
@@ -98,7 +96,7 @@ index 7311a05..b8b1e7d 100644
  
  /* Directive functions.  */
  
-@@ -474,6 +497,9 @@ static void xtensa_create_trampoline_frag (bfd_boolean);
+@@ -475,6 +498,9 @@
  static void xtensa_maybe_create_trampoline_frag (void);
  struct trampoline_frag;
  static int init_trampoline_frag (struct trampoline_frag *);
@@ -108,7 +106,7 @@ index 7311a05..b8b1e7d 100644
  
  /* Alignment Functions.  */
  
-@@ -698,6 +724,10 @@ enum
+@@ -699,6 +725,10 @@
  
    option_trampolines,
    option_no_trampolines,
@@ -119,7 +117,7 @@ index 7311a05..b8b1e7d 100644
  };
  
  const char *md_shortopts = "";
-@@ -773,6 +803,10 @@ struct option md_longopts[] =
+@@ -774,6 +804,10 @@
    { "trampolines", no_argument, NULL, option_trampolines },
    { "no-trampolines", no_argument, NULL, option_no_trampolines },
  
@@ -130,7 +128,7 @@ index 7311a05..b8b1e7d 100644
    { NULL, no_argument, NULL, 0 }
  };
  
-@@ -961,6 +995,34 @@ md_parse_option (int c, char *arg)
+@@ -962,6 +996,34 @@
        use_trampolines = FALSE;
        return 1;
  
@@ -165,7 +163,7 @@ index 7311a05..b8b1e7d 100644
      default:
        return 0;
      }
-@@ -986,7 +1048,12 @@ Xtensa options:\n\
+@@ -987,7 +1049,12 @@
                            flix bundles\n\
    --rename-section old=new Rename section 'old' to 'new'\n\
    --[no-]trampolines      [Do not] generate trampolines (jumps to jumps)\n\
@@ -179,7 +177,7 @@ index 7311a05..b8b1e7d 100644
  }
  
  
-@@ -4728,6 +4795,8 @@ xtensa_mark_literal_pool_location (void)
+@@ -4729,6 +4796,8 @@
    pool_location = frag_now;
    frag_now->tc_frag_data.lit_frchain = frchain_now;
    frag_now->tc_frag_data.literal_frag = frag_now;
@@ -188,7 +186,7 @@ index 7311a05..b8b1e7d 100644
    frag_variant (rs_machine_dependent, 0, 0,
  		RELAX_LITERAL_POOL_BEGIN, NULL, 0, NULL);
    xtensa_set_frag_assembly_state (frag_now);
-@@ -4832,6 +4901,31 @@ get_expanded_loop_offset (xtensa_opcode opcode)
+@@ -4833,6 +4902,31 @@
  static fragS *
  get_literal_pool_location (segT seg)
  {
@@ -220,7 +218,7 @@ index 7311a05..b8b1e7d 100644
    return seg_info (seg)->tc_segment_info_data.literal_pool_loc;
  }
  
-@@ -7098,6 +7192,11 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
+@@ -7099,6 +7193,11 @@
        frag_now->tc_frag_data.slot_symbols[slot] = tinsn->symbol;
        frag_now->tc_frag_data.slot_offsets[slot] = tinsn->offset;
        frag_now->tc_frag_data.literal_frags[slot] = tinsn->literal_frag;
@@ -232,7 +230,7 @@ index 7311a05..b8b1e7d 100644
        if (tinsn->literal_space != 0)
  	xg_assemble_literal_space (tinsn->literal_space, slot);
        frag_now->tc_frag_data.free_reg[slot] = tinsn->extra_arg;
-@@ -7170,6 +7269,8 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
+@@ -7171,6 +7270,8 @@
  		    frag_now->fr_symbol, frag_now->fr_offset, NULL);
  	  xtensa_set_frag_assembly_state (frag_now);
  	  xtensa_maybe_create_trampoline_frag ();
@@ -241,7 +239,7 @@ index 7311a05..b8b1e7d 100644
  	}
        else if (is_branch && do_align_targets ())
  	{
-@@ -7314,11 +7415,18 @@ xtensa_check_frag_count (void)
+@@ -7315,11 +7416,18 @@
        clear_frag_count ();
        unreachable_count = 0;
      }
@@ -260,7 +258,7 @@ index 7311a05..b8b1e7d 100644
  #define TRAMPOLINE_FRAG_SIZE 3000
  
  static void
-@@ -7410,6 +7518,135 @@ dump_trampolines (void)
+@@ -7411,6 +7519,135 @@
      }
  }
  
@@ -396,7 +394,7 @@ index 7311a05..b8b1e7d 100644
  static void
  xtensa_cleanup_align_frags (void)
  {
-@@ -9029,7 +9266,41 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -9030,7 +9267,41 @@
        break;
  
      case RELAX_LITERAL_POOL_BEGIN:
@@ -438,7 +436,7 @@ index 7311a05..b8b1e7d 100644
      case RELAX_MAYBE_UNREACHABLE:
      case RELAX_MAYBE_DESIRE_ALIGN:
        /* No relaxation required.  */
-@@ -10789,12 +11060,115 @@ xtensa_move_literals (void)
+@@ -10790,12 +11061,115 @@
    segT dest_seg;
    fixS *fix, *next_fix, **fix_splice;
    sym_list *lit;
@@ -554,7 +552,7 @@ index 7311a05..b8b1e7d 100644
    for (segment = literal_head->next; segment; segment = segment->next)
      {
        /* Keep the literals for .init and .fini in separate sections.  */
-@@ -10839,9 +11213,6 @@ xtensa_move_literals (void)
+@@ -10840,9 +11214,6 @@
        while (search_frag != frag_now)
  	{
  	  next_frag = search_frag->fr_next;
@@ -564,7 +562,7 @@ index 7311a05..b8b1e7d 100644
  	  if (search_frag->tc_frag_data.literal_frag)
  	    {
  	      literal_pool = search_frag->tc_frag_data.literal_frag;
-@@ -10849,8 +11220,56 @@ xtensa_move_literals (void)
+@@ -10850,8 +11221,56 @@
  	      frchain_to = literal_pool->tc_frag_data.lit_frchain;
  	      gas_assert (frchain_to);
  	    }
@@ -621,7 +619,7 @@ index 7311a05..b8b1e7d 100644
  
  	  *frag_splice = next_frag;
  	  search_frag->fr_next = insert_after->fr_next;
-@@ -11014,7 +11433,10 @@ xtensa_switch_to_non_abs_literal_fragment (emit_state *result)
+@@ -11015,7 +11434,10 @@
        && !recursive
        && !is_init && ! is_fini)
      {
@@ -633,11 +631,9 @@ index 7311a05..b8b1e7d 100644
  
        /* When we mark a literal pool location, we want to put a frag in
  	 the literal pool that points to it.  But to do that, we want to
-diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
-index b2e43fa..290d902 100644
 --- a/gas/config/tc-xtensa.h
 +++ b/gas/config/tc-xtensa.h
-@@ -124,6 +124,7 @@ enum xtensa_relax_statesE
+@@ -125,6 +125,7 @@
  
    RELAX_LITERAL_POOL_BEGIN,
    RELAX_LITERAL_POOL_END,
@@ -645,20 +641,16 @@ index b2e43fa..290d902 100644
    /* Technically these are not relaxations at all but mark a location
       to store literals later.  Note that fr_var stores the frchain for
       BEGIN frags and fr_var stores now_seg for END frags.  */
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index d197ec8..db39629 100644
 --- a/gas/testsuite/gas/xtensa/all.exp
 +++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -100,5 +100,6 @@ if [istarget xtensa*-*-*] then {
+@@ -100,6 +100,7 @@
+     run_dump_test "weak-call"
      run_dump_test "jlong"
      run_dump_test "trampoline"
 +    run_dump_test "auto-litpools"
  }
  
  if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/auto-litpools.d b/gas/testsuite/gas/xtensa/auto-litpools.d
-new file mode 100644
-index 0000000..4d1a690
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/auto-litpools.d
 @@ -0,0 +1,12 @@
@@ -674,9 +666,6 @@ index 0000000..4d1a690
 +#...
 +.*40750:.*l32r.a2, 3e43c .*
 +#...
-diff --git a/gas/testsuite/gas/xtensa/auto-litpools.s b/gas/testsuite/gas/xtensa/auto-litpools.s
-new file mode 100644
-index 0000000..9a5b26b
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/auto-litpools.s
 @@ -0,0 +1,13 @@
@@ -693,6 +682,3 @@ index 0000000..9a5b26b
 +	.endr
 +	l32r	a2, .L1
 +	ret
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.23.2/914-xtensa-fix-signedness-of-gas-relocations.patch b/packages/binutils/2.24/0023-xtensa-fix-signedness-of-gas-relocations.patch
similarity index 85%
rename from packages/binutils/2.23.2/914-xtensa-fix-signedness-of-gas-relocations.patch
rename to packages/binutils/2.24/0023-xtensa-fix-signedness-of-gas-relocations.patch
index 2955e114..1d89655e 100644
--- a/packages/binutils/2.23.2/914-xtensa-fix-signedness-of-gas-relocations.patch
+++ b/packages/binutils/2.24/0023-xtensa-fix-signedness-of-gas-relocations.patch
@@ -16,14 +16,12 @@ gas/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gas/config/tc-xtensa.c           |  6 +++---
+ gas/config/tc-xtensa.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index a119871..36a06cc 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
+@@ -5962,15 +5962,15 @@
  	    {
  	    case BFD_RELOC_8:
  	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
@@ -42,6 +40,3 @@ index a119871..36a06cc 100644
  	      break;
  	    default:
  	      break;
--- 
-2.1.4
-
diff --git a/packages/binutils/2.24/915-xtensa-fix-.init-.fini-literals-moving.patch b/packages/binutils/2.24/0024-xtensa-fix-.init-.fini-literals-moving.patch
similarity index 90%
rename from packages/binutils/2.24/915-xtensa-fix-.init-.fini-literals-moving.patch
rename to packages/binutils/2.24/0024-xtensa-fix-.init-.fini-literals-moving.patch
index 656373f0..cd8a72c0 100644
--- a/packages/binutils/2.24/915-xtensa-fix-.init-.fini-literals-moving.patch
+++ b/packages/binutils/2.24/0024-xtensa-fix-.init-.fini-literals-moving.patch
@@ -32,14 +32,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: 4111950f363221c4641dc2f33bea61cc94f34906
 
- gas/config/tc-xtensa.c                        | 12 ++++++++++--
+ gas/config/tc-xtensa.c |   12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 36a06cc..5773634 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -11061,6 +11061,10 @@ xtensa_move_literals (void)
+@@ -11062,6 +11062,10 @@
    fixS *fix, *next_fix, **fix_splice;
    sym_list *lit;
    struct litpool_seg *lps;
@@ -50,7 +48,7 @@ index 36a06cc..5773634 100644
  
    mark_literal_frags (literal_head->next);
  
-@@ -11171,9 +11175,13 @@ xtensa_move_literals (void)
+@@ -11172,9 +11176,13 @@
  
    for (segment = literal_head->next; segment; segment = segment->next)
      {
@@ -66,6 +64,3 @@ index 36a06cc..5773634 100644
  	continue;
  
        frchain_from = seg_info (segment->seg)->frchainP;
--- 
-2.1.4
-
diff --git a/packages/binutils/2.24/120-sh-conf.patch b/packages/binutils/2.24/120-sh-conf.patch
deleted file mode 100644
index d5913e84..00000000
--- a/packages/binutils/2.24/120-sh-conf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
-
-Likewise, binutils has no idea about any of these new targets either, so we 
-fix that up too.. now we're able to actually build a real toolchain for 
-sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
-inept targets than that one, really. Go look, I promise).
-
-diff -durN binutils-2.22.orig/configure binutils-2.22/configure
---- binutils-2.22.orig/configure	2011-08-14 14:28:15.000000000 +0200
-+++ binutils-2.22/configure	2011-12-14 19:49:40.284777434 +0100
-@@ -3570,7 +3570,7 @@
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
-diff -durN binutils-2.22.orig/configure.ac binutils-2.22/configure.ac
---- binutils-2.22.orig/configure.ac	2011-11-21 12:58:27.000000000 +0100
-+++ binutils-2.22/configure.ac	2011-12-14 19:49:40.316777436 +0100
-@@ -1006,7 +1006,7 @@
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
diff --git a/packages/binutils/2.24/300-001_ld_makefile_patch.patch b/packages/binutils/2.24/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 4b5888a3..00000000
--- a/packages/binutils/2.24/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN binutils-2.22.orig/ld/Makefile.am binutils-2.22/ld/Makefile.am
---- binutils-2.22.orig/ld/Makefile.am	2011-07-22 22:22:37.000000000 +0200
-+++ binutils-2.22/ld/Makefile.am	2011-12-14 19:50:25.760779164 +0100
-@@ -37,7 +37,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -durN binutils-2.22.orig/ld/Makefile.in binutils-2.22/ld/Makefile.in
---- binutils-2.22.orig/ld/Makefile.in	2011-07-22 22:22:37.000000000 +0200
-+++ binutils-2.22/ld/Makefile.in	2011-12-14 19:50:25.784779163 +0100
-@@ -366,7 +366,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/packages/binutils/2.28.1/120-sh-conf.patch b/packages/binutils/2.25.1/0000-sh-conf.patch
similarity index 77%
rename from packages/binutils/2.28.1/120-sh-conf.patch
rename to packages/binutils/2.25.1/0000-sh-conf.patch
index c12a0230..88024bff 100644
--- a/packages/binutils/2.28.1/120-sh-conf.patch
+++ b/packages/binutils/2.25.1/0000-sh-conf.patch
@@ -5,11 +5,14 @@ fix that up too.. now we're able to actually build a real toolchain for
 sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
 inept targets than that one, really. Go look, I promise).
 
-diff --git a/configure b/configure
-index 87677bc..2d916f1 100755
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/configure
 +++ b/configure
-@@ -3812,7 +3812,7 @@ case "${target}" in
+@@ -3812,7 +3812,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
@@ -18,11 +21,9 @@ index 87677bc..2d916f1 100755
      case "${target}" in
        sh*-*-elf)
           ;;
-diff --git a/configure.ac b/configure.ac
-index 8fe0eca..b10a99f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1140,7 +1140,7 @@ case "${target}" in
+@@ -1140,7 +1140,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
diff --git a/packages/binutils/2.28.1/300-001_ld_makefile_patch.patch b/packages/binutils/2.25.1/0001-001_ld_makefile_patch.patch
similarity index 76%
rename from packages/binutils/2.28.1/300-001_ld_makefile_patch.patch
rename to packages/binutils/2.25.1/0001-001_ld_makefile_patch.patch
index 2a1320cb..c47d7d1e 100644
--- a/packages/binutils/2.28.1/300-001_ld_makefile_patch.patch
+++ b/packages/binutils/2.25.1/0001-001_ld_makefile_patch.patch
@@ -1,8 +1,11 @@
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 9575f1f..84df0bf 100644
+---
+ ld/Makefile.am |    2 +-
+ ld/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
-@@ -54,7 +54,7 @@ endif
+@@ -54,7 +54,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
  # directives need to be different for native and cross linkers.
@@ -11,11 +14,9 @@ index 9575f1f..84df0bf 100644
  
  EMUL = @EMUL@
  EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 9f56ca1..272860f 100644
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+@@ -388,7 +388,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
  # directives need to be different for native and cross linkers.
diff --git a/packages/binutils/2.25.1/300-012_check_ldrunpath_length.patch b/packages/binutils/2.25.1/0002-012_check_ldrunpath_length.patch
similarity index 76%
rename from packages/binutils/2.25.1/300-012_check_ldrunpath_length.patch
rename to packages/binutils/2.25.1/0002-012_check_ldrunpath_length.patch
index f1f31af9..712eb19b 100644
--- a/packages/binutils/2.25.1/300-012_check_ldrunpath_length.patch
+++ b/packages/binutils/2.25.1/0002-012_check_ldrunpath_length.patch
@@ -1,8 +1,10 @@
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 137446f..bb8391a 100644
+---
+ ld/emultempl/elf32.em |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/ld/emultempl/elf32.em
 +++ b/ld/emultempl/elf32.em
-@@ -1195,6 +1195,8 @@ fragment <<EOF
+@@ -1198,6 +1198,8 @@
  	      && command_line.rpath == NULL)
  	    {
  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -11,7 +13,7 @@ index 137446f..bb8391a 100644
  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
  						      force))
  		break;
-@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+@@ -1461,6 +1463,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/packages/binutils/2.25.1/310-fix-gold-pthreads-typo.patch b/packages/binutils/2.25.1/0003-fix-gold-pthreads-typo.patch
similarity index 76%
rename from packages/binutils/2.25.1/310-fix-gold-pthreads-typo.patch
rename to packages/binutils/2.25.1/0003-fix-gold-pthreads-typo.patch
index f2e6ff25..40861f56 100644
--- a/packages/binutils/2.25.1/310-fix-gold-pthreads-typo.patch
+++ b/packages/binutils/2.25.1/0003-fix-gold-pthreads-typo.patch
@@ -1,5 +1,9 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2014-10-14 08:32:04.000000000 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:38:18.640819300 +0100
+---
+ gold/gold-threads.cc |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
 @@ -102,9 +102,9 @@
    if (err != 0)
      gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
diff --git a/packages/binutils/2.25.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.25.1/0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
similarity index 72%
rename from packages/binutils/2.25.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
rename to packages/binutils/2.25.1/0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
index f9a8af67..c0867980 100644
--- a/packages/binutils/2.25.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ b/packages/binutils/2.25.1/0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
@@ -1,5 +1,9 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2015-10-20 22:39:36.371169400 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:39:38.182772700 +0100
+---
+ gold/gold-threads.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
 @@ -101,7 +101,7 @@
    int err = pthread_mutexattr_init(&attr);
    if (err != 0)
diff --git a/packages/binutils/2.25.1/0005-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.25.1/0005-Dont-link-to-libfl-as-its-unnecessary.patch
new file mode 100644
index 00000000..bf7906d1
--- /dev/null
+++ b/packages/binutils/2.25.1/0005-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -0,0 +1,105 @@
+---
+ binutils/configure    |    3 +++
+ binutils/configure.ac |    3 +++
+ gas/configure         |    3 +++
+ gas/configure.ac      |    3 +++
+ ld/configure          |    3 +++
+ ld/configure.ac       |    3 +++
+ 6 files changed, 18 insertions(+)
+
+--- a/binutils/configure
++++ b/binutils/configure
+@@ -12067,6 +12067,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -12227,6 +12228,8 @@
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
+ # If we haven't got the data from the intl directory,
+--- a/binutils/configure.ac
++++ b/binutils/configure.ac
+@@ -87,7 +87,10 @@
+ fi
+ 
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
+ ZW_GNU_GETTEXT_SISTER_DIR
+--- a/gas/configure
++++ b/gas/configure
+@@ -12795,6 +12795,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -12955,6 +12956,8 @@
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="fr tr es rw id ru fi ja"
+ # If we haven't got the data from the intl directory,
+--- a/gas/configure.ac
++++ b/gas/configure.ac
+@@ -717,7 +717,10 @@
+ AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
+ 
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="fr tr es rw id ru fi ja"
+ ZW_GNU_GETTEXT_SISTER_DIR
+--- a/ld/configure
++++ b/ld/configure
+@@ -16071,6 +16071,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -16231,6 +16232,8 @@
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -173,7 +173,10 @@
+ AC_EXEEXT
+ 
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ AM_MAINTAINER_MODE
+ AM_CONDITIONAL(GENINSRC_NEVER, false)
diff --git a/packages/binutils/2.25.1/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.25.1/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch
new file mode 100644
index 00000000..73cfde8b
--- /dev/null
+++ b/packages/binutils/2.25.1/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch
@@ -0,0 +1,15 @@
+---
+ gold/binary.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gold/binary.cc
++++ b/gold/binary.cc
+@@ -23,7 +23,7 @@
+ #include "gold.h"
+ 
+ #include <cerrno>
+-#include <cstring>
++#include <string>
+ #include "safe-ctype.h"
+ 
+ #include "elfcpp.h"
diff --git a/packages/binutils/2.26.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.25.1/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
similarity index 70%
rename from packages/binutils/2.26.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
rename to packages/binutils/2.25.1/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
index 6168b31e..d40f95d3 100644
--- a/packages/binutils/2.26.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ b/packages/binutils/2.25.1/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
@@ -9,15 +9,13 @@ Subject: [PATCH] Fix darwin build
 
 Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
 ---
- binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
- binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
+ bfd/peXXigen.c       |   22 ++++++++++++++++++++++
+ gold/gold-threads.cc |   15 ++++++++++++---
  2 files changed, 34 insertions(+), 3 deletions(-)
 
-diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
-index 13e39e4..7a98306 100644
---- binutils-2.25.orig/bfd/peXXigen.c
-+++ binutils-2.25/bfd/peXXigen.c
-@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
+--- a/bfd/peXXigen.c
++++ b/bfd/peXXigen.c
+@@ -3570,6 +3570,28 @@
  }
  #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
  
@@ -46,11 +44,9 @@ index 13e39e4..7a98306 100644
  /* Perform a comparison of two entries.  */
  static signed int
  rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
-diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
-index ff5a8ac..45140e0 100644
---- binutils-2.25.orig/gold/gold-threads.cc
-+++ binutils-2.25/gold/gold-threads.cc
-@@ -284,9 +284,18 @@ Condvar::~Condvar()
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
+@@ -284,9 +284,18 @@
  class Once_initialize
  {
   public:
@@ -72,6 +68,3 @@ index ff5a8ac..45140e0 100644
  
    // Return a pointer to the pthread_once_t variable.
    pthread_once_t*
--- 
-2.1.3
-
diff --git a/packages/binutils/2.25.1/400-arm-rotate_left-fix.patch b/packages/binutils/2.25.1/0008-arm-rotate_left-fix.patch
similarity index 69%
rename from packages/binutils/2.25.1/400-arm-rotate_left-fix.patch
rename to packages/binutils/2.25.1/0008-arm-rotate_left-fix.patch
index 41495970..0a40611c 100644
--- a/packages/binutils/2.25.1/400-arm-rotate_left-fix.patch
+++ b/packages/binutils/2.25.1/0008-arm-rotate_left-fix.patch
@@ -5,14 +5,12 @@ Subject: [PATCH] * config/tc-arm.c (rotate_left): Avoid undefined behaviour
  when N = 0.
 
 ---
- gas/config/tc-arm.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletion(-)
+ gas/config/tc-arm.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
-index 5077f87..9100fb2 100644
 --- a/gas/config/tc-arm.c
 +++ b/gas/config/tc-arm.c
-@@ -7251,7 +7251,7 @@ parse_operands (char *str, const unsigned int *pattern, bfd_boolean thumb)
+@@ -7261,7 +7261,7 @@
  
  /* Functions for operand encoding.  ARM, then Thumb.  */
  
@@ -21,6 +19,3 @@ index 5077f87..9100fb2 100644
  
  /* If VAL can be encoded in the immediate field of an ARM instruction,
     return the encoded form.  Otherwise, return FAIL.  */
--- 
-1.9.4
-
diff --git a/packages/binutils/2.26.1/500-sysroot.patch b/packages/binutils/2.25.1/0009-sysroot.patch
similarity index 91%
rename from packages/binutils/2.26.1/500-sysroot.patch
rename to packages/binutils/2.25.1/0009-sysroot.patch
index e49c7953..9377e4e9 100644
--- a/packages/binutils/2.26.1/500-sysroot.patch
+++ b/packages/binutils/2.25.1/0009-sysroot.patch
@@ -5,9 +5,13 @@ Always try to prepend the sysroot prefix to absolute filenames first.
 http://bugs.gentoo.org/275666
 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
+---
+ ld/ldfile.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -308,18 +308,25 @@
+@@ -339,18 +339,25 @@
       directory first.  */
    if (! entry->flags.maybe_archive)
      {
diff --git a/packages/binutils/2.25.1/600-poison-system-directories.patch b/packages/binutils/2.25.1/0010-poison-system-directories.patch
similarity index 86%
rename from packages/binutils/2.25.1/600-poison-system-directories.patch
rename to packages/binutils/2.25.1/0010-poison-system-directories.patch
index ec3622bc..e3affcdc 100644
--- a/packages/binutils/2.25.1/600-poison-system-directories.patch
+++ b/packages/binutils/2.25.1/0010-poison-system-directories.patch
@@ -59,9 +59,20 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
-diff -Nura a/ld/config.in b/ld/config.in
---- a/ld/config.in	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/config.in	2014-12-24 08:07:28.997918918 -0300
+---
+ ld/config.in    |    3 +++
+ ld/configure    |   14 ++++++++++++++
+ ld/configure.ac |   10 ++++++++++
+ ld/ld.h         |    8 ++++++++
+ ld/ld.texinfo   |   12 ++++++++++++
+ ld/ldfile.c     |   17 +++++++++++++++++
+ ld/ldlex.h      |    2 ++
+ ld/ldmain.c     |    2 ++
+ ld/lexsup.c     |   21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
+--- a/ld/config.in
++++ b/ld/config.in
 @@ -11,6 +11,9 @@
     language is requested. */
  #undef ENABLE_NLS
@@ -72,9 +83,8 @@ diff -Nura a/ld/config.in b/ld/config.in
  /* Additional extension a shared object might have. */
  #undef EXTRA_SHLIB_EXTENSION
  
-diff -Nura a/ld/configure b/ld/configure
---- a/ld/configure	2014-12-23 11:22:07.000000000 -0300
-+++ b/ld/configure	2014-12-24 08:07:29.002919088 -0300
+--- a/ld/configure
++++ b/ld/configure
 @@ -783,6 +783,7 @@
  enable_targets
  enable_64_bit_bfd
@@ -111,9 +121,8 @@ diff -Nura a/ld/configure b/ld/configure
  
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
-diff -Nura a/ld/configure.ac b/ld/configure.ac
---- a/ld/configure.ac	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/configure.ac	2014-12-24 08:07:29.002919088 -0300
+--- a/ld/configure.ac
++++ b/ld/configure.ac
 @@ -94,6 +94,16 @@
  AC_SUBST(TARGET_SYSTEM_ROOT)
  AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
@@ -131,9 +140,8 @@ diff -Nura a/ld/configure.ac b/ld/configure.ac
  dnl Use --enable-gold to decide if this linker should be the default.
  dnl "install_as_default" is set to false if gold is the default linker.
  dnl "installed_linker" is the installed BFD linker name.
-diff -Nura a/ld/ldfile.c b/ld/ldfile.c
---- a/ld/ldfile.c	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/ldfile.c	2014-12-24 08:07:29.002919088 -0300
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
 @@ -114,6 +114,23 @@
      new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
    else
@@ -158,9 +166,8 @@ diff -Nura a/ld/ldfile.c b/ld/ldfile.c
  }
  
  /* Try to open a BFD for a lang_input_statement.  */
-diff -Nura a/ld/ld.h b/ld/ld.h
---- a/ld/ld.h	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/ld.h	2014-12-24 08:07:29.003919122 -0300
+--- a/ld/ld.h
++++ b/ld/ld.h
 @@ -161,6 +161,14 @@
    /* If TRUE we'll just print the default output on stdout.  */
    bfd_boolean print_output_format;
@@ -176,9 +183,8 @@ diff -Nura a/ld/ld.h b/ld/ld.h
    /* Big or little endian as set on command line.  */
    enum endian_enum endian;
  
-diff -Nura a/ld/ldlex.h b/ld/ldlex.h
---- a/ld/ldlex.h	2014-11-04 06:54:41.000000000 -0300
-+++ b/ld/ldlex.h	2014-12-24 08:09:47.477644294 -0300
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
 @@ -140,6 +140,8 @@
    OPTION_IGNORE_UNRESOLVED_SYMBOL,
    OPTION_PUSH_STATE,
@@ -188,9 +194,8 @@ diff -Nura a/ld/ldlex.h b/ld/ldlex.h
  };
  
  /* The initial parser states.  */
-diff -Nura a/ld/ldmain.c b/ld/ldmain.c
---- a/ld/ldmain.c	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/ldmain.c	2014-12-24 08:07:29.003919122 -0300
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
 @@ -266,6 +266,8 @@
    command_line.warn_mismatch = TRUE;
    command_line.warn_search_mismatch = TRUE;
@@ -200,9 +205,8 @@ diff -Nura a/ld/ldmain.c b/ld/ldmain.c
  
    /* We initialize DEMANGLING based on the environment variable
       COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff -Nura a/ld/ld.texinfo b/ld/ld.texinfo
---- a/ld/ld.texinfo	2014-12-23 05:47:10.000000000 -0300
-+++ b/ld/ld.texinfo	2014-12-24 08:07:29.005919191 -0300
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
 @@ -2212,6 +2212,18 @@
  
  Passing @code{none} for @var{style} disables the setting from any
@@ -222,9 +226,8 @@ diff -Nura a/ld/ld.texinfo b/ld/ld.texinfo
  @end table
  
  @c man end
-diff -Nura a/ld/lexsup.c b/ld/lexsup.c
---- a/ld/lexsup.c	2014-11-04 06:54:41.000000000 -0300
-+++ b/ld/lexsup.c	2014-12-24 08:48:50.136583414 -0300
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
 @@ -513,6 +513,14 @@
    { {"pop-state", no_argument, NULL, OPTION_POP_STATE},
      '\0', NULL, N_("Pop state of flags governing input file handling"),
diff --git a/packages/binutils/2.26.1/700-Fix-library-paths-on-PowerPC.patch b/packages/binutils/2.25.1/0011-Fix-library-paths-on-PowerPC.patch
similarity index 87%
rename from packages/binutils/2.26.1/700-Fix-library-paths-on-PowerPC.patch
rename to packages/binutils/2.25.1/0011-Fix-library-paths-on-PowerPC.patch
index cea92f3d..4bcc748b 100644
--- a/packages/binutils/2.26.1/700-Fix-library-paths-on-PowerPC.patch
+++ b/packages/binutils/2.25.1/0011-Fix-library-paths-on-PowerPC.patch
@@ -13,14 +13,12 @@ depend on whether it is built on LE or BE machine.
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ld/emulparams/elf32ppccommon.sh | 10 +++++-----
+ ld/emulparams/elf32ppccommon.sh |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
-index 1f54ef8..d00cf68 100644
 --- a/ld/emulparams/elf32ppccommon.sh
 +++ b/ld/emulparams/elf32ppccommon.sh
-@@ -44,11 +44,11 @@ fi
+@@ -44,11 +44,11 @@
  
  # Look for 64 bit target libraries in /lib64, /usr/lib64 etc., first.
  # Similarly, look for 32 bit libraries in /lib32, /usr/lib32 etc.
@@ -37,6 +35,3 @@ index 1f54ef8..d00cf68 100644
    *:*64lppc*) LIBPATH_SUFFIX=64le ;;
    *:*32lppc*) LIBPATH_SUFFIX=32le ;;
    *:*64*) LIBPATH_SUFFIX=64 ;;
--- 
-2.9.3
-
diff --git a/packages/binutils/2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch b/packages/binutils/2.25.1/0012-Fix-trampolines-search-code-for-conditional-branches.patch
similarity index 76%
rename from packages/binutils/2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch
rename to packages/binutils/2.25.1/0012-Fix-trampolines-search-code-for-conditional-branches.patch
index 8aeb0642..ec96a36b 100644
--- a/packages/binutils/2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch
+++ b/packages/binutils/2.25.1/0012-Fix-trampolines-search-code-for-conditional-branches.patch
@@ -28,16 +28,14 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: d92b6eece424f0ad35d96fdd85bf207295e8c4c3
 Changes to ChangeLogs are dropped.
 
- gas/config/tc-xtensa.c                | 8 ++++----
- gas/testsuite/gas/xtensa/trampoline.d | 9 +++++++++
- gas/testsuite/gas/xtensa/trampoline.s | 7 +++++++
+ gas/config/tc-xtensa.c                |    8 ++++----
+ gas/testsuite/gas/xtensa/trampoline.d |    9 +++++++++
+ gas/testsuite/gas/xtensa/trampoline.s |    7 +++++++
  3 files changed, 20 insertions(+), 4 deletions(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d11b0c7..f23ccf8 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -9514,11 +9514,11 @@ search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only)
+@@ -9514,11 +9514,11 @@
  	      if (next_addr == 0 || addr - next_addr > J_RANGE)
  		break;
  	    }
@@ -53,8 +51,6 @@ index d11b0c7..f23ccf8 100644
      }
    for ( ; tf; tf = tf->next)
      {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-index b4f65dc..5ae32a6 100644
 --- a/gas/testsuite/gas/xtensa/trampoline.d
 +++ b/gas/testsuite/gas/xtensa/trampoline.d
 @@ -24,3 +24,12 @@
@@ -70,8 +66,6 @@ index b4f65dc..5ae32a6 100644
 +#...
 +.*927f5:.*j.0x927f5
 +#...
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-index 259a3bb..4465786 100644
 --- a/gas/testsuite/gas/xtensa/trampoline.s
 +++ b/gas/testsuite/gas/xtensa/trampoline.s
 @@ -19,3 +19,10 @@
@@ -85,6 +79,3 @@ index 259a3bb..4465786 100644
 +	.endr
 +4:
 +	j	4b
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch b/packages/binutils/2.25.1/0013-xtensa-optimize-check_section_ebb_pcrels_fit.patch
similarity index 94%
rename from packages/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
rename to packages/binutils/2.25.1/0013-xtensa-optimize-check_section_ebb_pcrels_fit.patch
index 8a211004..19435b55 100644
--- a/packages/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
+++ b/packages/binutils/2.25.1/0013-xtensa-optimize-check_section_ebb_pcrels_fit.patch
@@ -76,14 +76,12 @@ bfd/
 Backported from: b2b326d246f839ee218192ac88da2384d929a072
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- bfd/elf32-xtensa.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++++----
+ bfd/elf32-xtensa.c |  321 +++++++++++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 298 insertions(+), 23 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 0b6f584..872370b 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -6619,8 +6619,10 @@ static bfd_boolean compute_text_actions
+@@ -6619,8 +6619,10 @@
    (bfd *, asection *, struct bfd_link_info *);
  static bfd_boolean compute_ebb_proposed_actions (ebb_constraint *);
  static bfd_boolean compute_ebb_actions (ebb_constraint *);
@@ -95,7 +93,7 @@ index 0b6f584..872370b 100644
     const xtensa_opcode *);
  static bfd_boolean check_section_ebb_reduces (const ebb_constraint *);
  static void text_action_add_proposed
-@@ -7219,6 +7221,221 @@ build_reloc_opcodes (bfd *abfd,
+@@ -7219,6 +7221,221 @@
    return reloc_opcodes;
  }
  
@@ -317,7 +315,7 @@ index 0b6f584..872370b 100644
  
  /* The compute_text_actions function will build a list of potential
     transformation actions for code in the extended basic block of each
-@@ -7245,6 +7462,7 @@ compute_text_actions (bfd *abfd,
+@@ -7245,6 +7462,7 @@
    property_table_entry *prop_table = 0;
    int ptblsize = 0;
    bfd_size_type sec_size;
@@ -325,7 +323,7 @@ index 0b6f584..872370b 100644
  
    relax_info = get_xtensa_relax_info (sec);
    BFD_ASSERT (relax_info);
-@@ -7277,6 +7495,12 @@ compute_text_actions (bfd *abfd,
+@@ -7277,6 +7495,12 @@
        goto error_return;
      }
  
@@ -338,7 +336,7 @@ index 0b6f584..872370b 100644
    for (i = 0; i < sec->reloc_count; i++)
      {
        Elf_Internal_Rela *irel = &internal_relocs[i];
-@@ -7340,17 +7564,13 @@ compute_text_actions (bfd *abfd,
+@@ -7340,17 +7564,13 @@
        ebb->start_reloc_idx = i;
        ebb->end_reloc_idx = i;
  
@@ -359,7 +357,7 @@ index 0b6f584..872370b 100644
  	  || !check_section_ebb_reduces (&ebb_table))
  	{
  	  /* If anything goes wrong or we get unlucky and something does
-@@ -7372,6 +7592,8 @@ compute_text_actions (bfd *abfd,
+@@ -7372,6 +7592,8 @@
        free_ebb_constraint (&ebb_table);
      }
  
@@ -368,7 +366,7 @@ index 0b6f584..872370b 100644
  #if DEBUG
    if (relax_info->action_list.head)
      print_action_list (stderr, &relax_info->action_list);
-@@ -7974,14 +8196,17 @@ check_section_ebb_pcrels_fit (bfd *abfd,
+@@ -7974,14 +8196,17 @@
  			      asection *sec,
  			      bfd_byte *contents,
  			      Elf_Internal_Rela *internal_relocs,
@@ -386,7 +384,7 @@ index 0b6f584..872370b 100644
  
    relax_info = get_xtensa_relax_info (sec);
  
-@@ -7992,7 +8217,40 @@ check_section_ebb_pcrels_fit (bfd *abfd,
+@@ -7992,7 +8217,40 @@
  	 can still be used.  */
      }
  
@@ -428,7 +426,7 @@ index 0b6f584..872370b 100644
      {
        r_reloc r_rel;
        bfd_vma orig_self_offset, orig_target_offset;
-@@ -8001,7 +8259,15 @@ check_section_ebb_pcrels_fit (bfd *abfd,
+@@ -8001,7 +8259,15 @@
        reloc_howto_type *howto;
        int self_removed_bytes, target_removed_bytes;
  
@@ -445,7 +443,7 @@ index 0b6f584..872370b 100644
        r_type = ELF32_R_TYPE (irel->r_info);
  
        howto = &elf_howto_table[r_type];
-@@ -8067,21 +8333,30 @@ check_section_ebb_pcrels_fit (bfd *abfd,
+@@ -8067,21 +8333,30 @@
  	  xtensa_opcode opcode;
  	  int opnum;
  
@@ -488,7 +486,7 @@ index 0b6f584..872370b 100644
  	    }
  
  	  if (!pcrel_reloc_fits (opcode, opnum, self_offset, target_offset))
-@@ -8778,7 +9053,7 @@ move_shared_literal (asection *sec,
+@@ -8778,7 +9053,7 @@
    /* Check all of the PC-relative relocations to make sure they still fit.  */
    relocs_fit = check_section_ebb_pcrels_fit (target_sec->owner, target_sec,
  					     target_sec_cache->contents,
@@ -497,6 +495,3 @@ index 0b6f584..872370b 100644
  					     &ebb_table, NULL);
  
    if (!relocs_fit)
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/907-xtensa-optimize-removed_by_actions.patch b/packages/binutils/2.25.1/0014-xtensa-optimize-removed_by_actions.patch
similarity index 89%
rename from packages/binutils/2.24/907-xtensa-optimize-removed_by_actions.patch
rename to packages/binutils/2.25.1/0014-xtensa-optimize-removed_by_actions.patch
index 9df80653..0a0f4c50 100644
--- a/packages/binutils/2.24/907-xtensa-optimize-removed_by_actions.patch
+++ b/packages/binutils/2.25.1/0014-xtensa-optimize-removed_by_actions.patch
@@ -50,14 +50,12 @@ bfd/
 Backported from: 071aa5c98a31c966f5fbfc573fcee61350fd1936
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- bfd/elf32-xtensa.c | 181 +++++++++++++++++++++++++++++++++++++++++++++--------
+ bfd/elf32-xtensa.c |  181 +++++++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 156 insertions(+), 25 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 872370b..21b2871 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -5420,11 +5420,28 @@ struct text_action_struct
+@@ -5420,11 +5420,28 @@
    text_action *next;
  };
  
@@ -86,7 +84,7 @@ index 872370b..21b2871 100644
  };
  
  
-@@ -5636,6 +5653,101 @@ action_list_count (text_action_list *action_list)
+@@ -5636,6 +5653,101 @@
    return count;
  }
  
@@ -188,7 +186,7 @@ index 872370b..21b2871 100644
  
  /* The find_insn_action routine will only find non-fill actions.  */
  
-@@ -5909,6 +6021,9 @@ init_xtensa_relax_info (asection *sec)
+@@ -5909,6 +6021,9 @@
  
    relax_info->action_list.head = NULL;
  
@@ -198,7 +196,7 @@ index 872370b..21b2871 100644
    relax_info->fix_list = NULL;
    relax_info->fix_array = NULL;
    relax_info->fix_array_count = 0;
-@@ -9218,7 +9333,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9218,7 +9333,7 @@
  		  if (elf_hash_table (link_info)->dynamic_sections_created)
  		    shrink_dynamic_reloc_sections (link_info, abfd, sec, irel);
  		  irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
@@ -207,7 +205,7 @@ index 872370b..21b2871 100644
  		    (&relax_info->action_list, irel->r_offset);
  		  continue;
  		}
-@@ -9255,7 +9370,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9255,7 +9370,7 @@
  		    }
  		}
  
@@ -216,7 +214,7 @@ index 872370b..21b2871 100644
  		(&relax_info->action_list, irel->r_offset);
  	      irel->r_offset = source_offset;
  	    }
-@@ -9352,7 +9467,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9352,7 +9467,7 @@
  		      break;
  		    }
  
@@ -225,7 +223,7 @@ index 872370b..21b2871 100644
  		    (&target_relax_info->action_list,
  		     r_rel.target_offset + diff_value);
  		  diff_value = new_end_offset - new_reloc.target_offset;
-@@ -9750,7 +9865,6 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
+@@ -9750,7 +9865,6 @@
    xtensa_relax_info *relax_info;
    removed_literal *removed;
    bfd_vma target_offset, base_offset;
@@ -233,7 +231,7 @@ index 872370b..21b2871 100644
  
    *new_rel = *orig_rel;
  
-@@ -9803,19 +9917,26 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
+@@ -9803,19 +9917,26 @@
       offset.  */
  
    base_offset = r_reloc_get_target_offset (new_rel) - new_rel->rela.r_addend;
@@ -265,7 +263,7 @@ index 872370b..21b2871 100644
        new_rel->target_offset = target_offset - tgt_removed;
        new_rel->rela.r_addend += addend_removed;
      }
-@@ -10138,9 +10259,10 @@ relax_property_section (bfd *abfd,
+@@ -10138,9 +10259,10 @@
  	      bfd_vma old_offset = val.r_rel.target_offset;
  	      bfd_vma new_offset;
  	      long old_size, new_size;
@@ -279,7 +277,7 @@ index 872370b..21b2871 100644
  
  	      /* Assert that we are not out of bounds.  */
  	      old_size = bfd_get_32 (abfd, size_p);
-@@ -10164,9 +10286,10 @@ relax_property_section (bfd *abfd,
+@@ -10164,9 +10286,10 @@
  
  		      /* Recompute the new_offset, but this time don't
  			 include any fill inserted by relaxation.  */
@@ -293,7 +291,7 @@ index 872370b..21b2871 100644
  
  		      /* If it is not unreachable and we have not yet
  			 seen an unreachable at this address, place it
-@@ -10182,8 +10305,12 @@ relax_property_section (bfd *abfd,
+@@ -10182,8 +10305,12 @@
  		    }
  		}
  	      else
@@ -308,7 +306,7 @@ index 872370b..21b2871 100644
  
  	      if (new_size != old_size)
  		{
-@@ -10441,14 +10568,16 @@ relax_section_symbols (bfd *abfd, asection *sec)
+@@ -10441,14 +10568,16 @@
  
        if (isym->st_shndx == sec_shndx)
  	{
@@ -329,7 +327,7 @@ index 872370b..21b2871 100644
  	}
      }
  
-@@ -10466,15 +10595,17 @@ relax_section_symbols (bfd *abfd, asection *sec)
+@@ -10466,15 +10595,17 @@
  	   || sym_hash->root.type == bfd_link_hash_defweak)
  	  && sym_hash->root.u.def.section == sec)
  	{
@@ -351,6 +349,3 @@ index 872370b..21b2871 100644
  	}
      }
  
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch b/packages/binutils/2.25.1/0015-xtensa-optimize-find_removed_literal.patch
similarity index 89%
rename from packages/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch
rename to packages/binutils/2.25.1/0015-xtensa-optimize-find_removed_literal.patch
index 96d526fe..e7346583 100644
--- a/packages/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch
+++ b/packages/binutils/2.25.1/0015-xtensa-optimize-find_removed_literal.patch
@@ -38,14 +38,12 @@ bfd/
 Backported from: 3439c466273378021821473d3fc84990e089ae34
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- bfd/elf32-xtensa.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++-----
+ bfd/elf32-xtensa.c |   64 ++++++++++++++++++++++++++++++++++++++++++++++++-----
  1 file changed, 58 insertions(+), 6 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 21b2871..51733ad 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -5832,6 +5832,7 @@ print_action_list (FILE *fp, text_action_list *action_list)
+@@ -5832,6 +5832,7 @@
     by the "from" offset field.  */
  
  typedef struct removed_literal_struct removed_literal;
@@ -53,7 +51,7 @@ index 21b2871..51733ad 100644
  typedef struct removed_literal_list_struct removed_literal_list;
  
  struct removed_literal_struct
-@@ -5841,10 +5842,19 @@ struct removed_literal_struct
+@@ -5841,10 +5842,19 @@
    removed_literal *next;
  };
  
@@ -73,7 +71,7 @@ index 21b2871..51733ad 100644
  };
  
  
-@@ -5893,6 +5903,39 @@ add_removed_literal (removed_literal_list *removed_list,
+@@ -5893,6 +5903,39 @@
      }
  }
  
@@ -113,7 +111,7 @@ index 21b2871..51733ad 100644
  
  /* Check if the list of removed literals contains an entry for the
     given address.  Return the entry if found.  */
-@@ -5900,12 +5943,21 @@ add_removed_literal (removed_literal_list *removed_list,
+@@ -5900,12 +5943,21 @@
  static removed_literal *
  find_removed_literal (removed_literal_list *removed_list, bfd_vma addr)
  {
@@ -141,6 +139,3 @@ index 21b2871..51733ad 100644
  }
  
  
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.24/909-xtensa-replace-action-list-with-splay-tree.patch b/packages/binutils/2.25.1/0016-xtensa-replace-action-list-with-splay-tree.patch
similarity index 91%
rename from packages/binutils/2.24/909-xtensa-replace-action-list-with-splay-tree.patch
rename to packages/binutils/2.25.1/0016-xtensa-replace-action-list-with-splay-tree.patch
index 3090cc21..669c8b03 100644
--- a/packages/binutils/2.24/909-xtensa-replace-action-list-with-splay-tree.patch
+++ b/packages/binutils/2.25.1/0016-xtensa-replace-action-list-with-splay-tree.patch
@@ -73,11 +73,9 @@ bfd/
 Backported from: 4c2af04fe8b4452bf51d2debf1bb467fafcd0f08
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- bfd/elf32-xtensa.c | 488 +++++++++++++++++++++++++++++++----------------------
+ bfd/elf32-xtensa.c |  488 ++++++++++++++++++++++++++++++-----------------------
  1 file changed, 282 insertions(+), 206 deletions(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 51733ad..53af1c6 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
 @@ -28,6 +28,7 @@
@@ -88,7 +86,7 @@ index 51733ad..53af1c6 100644
  #include "xtensa-isa.h"
  #include "xtensa-config.h"
  
-@@ -5416,8 +5417,6 @@ struct text_action_struct
+@@ -5416,8 +5417,6 @@
    bfd_vma virtual_offset;  /* Zero except for adding literals.  */
    int removed_bytes;
    literal_value value;	/* Only valid when adding literals.  */
@@ -97,7 +95,7 @@ index 51733ad..53af1c6 100644
  };
  
  struct removal_by_action_entry_struct
-@@ -5440,7 +5439,8 @@ typedef struct removal_by_action_map_struct removal_by_action_map;
+@@ -5440,7 +5439,8 @@
  /* List of all of the actions taken on a text section.  */
  struct text_action_list_struct
  {
@@ -107,7 +105,7 @@ index 51733ad..53af1c6 100644
    removal_by_action_map map;
  };
  
-@@ -5448,20 +5448,18 @@ struct text_action_list_struct
+@@ -5448,20 +5448,18 @@
  static text_action *
  find_fill_action (text_action_list *l, asection *sec, bfd_vma offset)
  {
@@ -135,7 +133,7 @@ index 51733ad..53af1c6 100644
    return NULL;
  }
  
-@@ -5509,6 +5507,49 @@ adjust_fill_action (text_action *ta, int fill_diff)
+@@ -5509,6 +5507,49 @@
  }
  
  
@@ -185,7 +183,7 @@ index 51733ad..53af1c6 100644
  /* Add a modification action to the text.  For the case of adding or
     removing space, modify any current fill and assume that
     "unreachable_space" bytes can be freely contracted.  Note that a
-@@ -5521,8 +5562,8 @@ text_action_add (text_action_list *l,
+@@ -5521,8 +5562,8 @@
  		 bfd_vma offset,
  		 int removed)
  {
@@ -195,7 +193,7 @@ index 51733ad..53af1c6 100644
  
    /* It is not necessary to fill at the end of a section.  */
    if (action == ta_fill && sec->size == offset)
-@@ -5532,34 +5573,30 @@ text_action_add (text_action_list *l,
+@@ -5532,34 +5573,30 @@
    if (action == ta_fill && removed == 0)
      return;
  
@@ -243,7 +241,7 @@ index 51733ad..53af1c6 100644
  }
  
  
-@@ -5570,7 +5607,6 @@ text_action_add_literal (text_action_list *l,
+@@ -5570,7 +5607,6 @@
  			 const literal_value *value,
  			 int removed)
  {
@@ -251,7 +249,7 @@ index 51733ad..53af1c6 100644
    text_action *ta;
    asection *sec = r_reloc_get_section (loc);
    bfd_vma offset = loc->target_offset;
-@@ -5578,14 +5614,6 @@ text_action_add_literal (text_action_list *l,
+@@ -5578,14 +5614,6 @@
  
    BFD_ASSERT (action == ta_add_literal);
  
@@ -266,7 +264,7 @@ index 51733ad..53af1c6 100644
    /* Create a new record and fill it up.  */
    ta = (text_action *) bfd_zmalloc (sizeof (text_action));
    ta->action = action;
-@@ -5594,8 +5622,10 @@ text_action_add_literal (text_action_list *l,
+@@ -5594,8 +5622,10 @@
    ta->virtual_offset = virtual_offset;
    ta->value = *value;
    ta->removed_bytes = removed;
@@ -279,7 +277,7 @@ index 51733ad..53af1c6 100644
  }
  
  
-@@ -5606,7 +5636,8 @@ text_action_add_literal (text_action_list *l,
+@@ -5606,7 +5636,8 @@
     so that each search may begin where the previous one left off.  */
  
  static int
@@ -289,7 +287,7 @@ index 51733ad..53af1c6 100644
  		    bfd_vma offset,
  		    bfd_boolean before_fill)
  {
-@@ -5614,6 +5645,13 @@ removed_by_actions (text_action **p_start_action,
+@@ -5614,6 +5645,13 @@
    int removed = 0;
  
    r = *p_start_action;
@@ -303,7 +301,7 @@ index 51733ad..53af1c6 100644
    while (r)
      {
        if (r->offset > offset)
-@@ -5625,7 +5663,7 @@ removed_by_actions (text_action **p_start_action,
+@@ -5625,7 +5663,7 @@
  
        removed += r->removed_bytes;
  
@@ -312,7 +310,7 @@ index 51733ad..53af1c6 100644
      }
  
    *p_start_action = r;
-@@ -5636,68 +5674,74 @@ removed_by_actions (text_action **p_start_action,
+@@ -5636,68 +5674,74 @@
  static bfd_vma
  offset_with_removed_text (text_action_list *action_list, bfd_vma offset)
  {
@@ -429,7 +427,7 @@ index 51733ad..53af1c6 100644
  }
  
  static int
-@@ -5754,28 +5798,26 @@ offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset)
+@@ -5754,28 +5798,26 @@
  static text_action *
  find_insn_action (text_action_list *action_list, bfd_vma offset)
  {
@@ -477,16 +475,42 @@ index 51733ad..53af1c6 100644
      }
    return NULL;
  }
-@@ -5784,40 +5826,50 @@ find_insn_action (text_action_list *action_list, bfd_vma offset)
+@@ -5784,40 +5826,50 @@
  #if DEBUG
  
  static void
 -print_action_list (FILE *fp, text_action_list *action_list)
 +print_action (FILE *fp, text_action *r)
-+{
+ {
+-  text_action *r;
+-
+-  fprintf (fp, "Text Action\n");
+-  for (r = action_list->head; r != NULL; r = r->next)
 +  const char *t = "unknown";
 +  switch (r->action)
-+    {
+     {
+-      const char *t = "unknown";
+-      switch (r->action)
+-	{
+-	case ta_remove_insn:
+-	  t = "remove_insn"; break;
+-	case ta_remove_longcall:
+-	  t = "remove_longcall"; break;
+-	case ta_convert_longcall:
+-	  t = "convert_longcall"; break;
+-	case ta_narrow_insn:
+-	  t = "narrow_insn"; break;
+-	case ta_widen_insn:
+-	  t = "widen_insn"; break;
+-	case ta_fill:
+-	  t = "fill"; break;
+-	case ta_none:
+-	  t = "none"; break;
+-	case ta_remove_literal:
+-	  t = "remove_literal"; break;
+-	case ta_add_literal:
+-	  t = "add_literal"; break;
+-	}
 +    case ta_remove_insn:
 +      t = "remove_insn"; break;
 +    case ta_remove_longcall:
@@ -511,46 +535,20 @@ index 51733ad..53af1c6 100644
 +	   r->sec->owner->filename,
 +	   r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
 +}
-+
-+static int
-+print_action_list_fn (splay_tree_node node, void *p)
- {
--  text_action *r;
-+  text_action *r = (text_action *)node->value;
- 
--  fprintf (fp, "Text Action\n");
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      const char *t = "unknown";
--      switch (r->action)
--	{
--	case ta_remove_insn:
--	  t = "remove_insn"; break;
--	case ta_remove_longcall:
--	  t = "remove_longcall"; break;
--	case ta_convert_longcall:
--	  t = "convert_longcall"; break;
--	case ta_narrow_insn:
--	  t = "narrow_insn"; break;
--	case ta_widen_insn:
--	  t = "widen_insn"; break;
--	case ta_fill:
--	  t = "fill"; break;
--	case ta_none:
--	  t = "none"; break;
--	case ta_remove_literal:
--	  t = "remove_literal"; break;
--	case ta_add_literal:
--	  t = "add_literal"; break;
--	}
-+  print_action (p, r);
-+  return 0;
-+}
  
 -      fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
 -	       r->sec->owner->filename,
 -	       r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
 -    }
++static int
++print_action_list_fn (splay_tree_node node, void *p)
++{
++  text_action *r = (text_action *)node->value;
++
++  print_action (p, r);
++  return 0;
++}
++
 +static void
 +print_action_list (FILE *fp, text_action_list *action_list)
 +{
@@ -559,7 +557,7 @@ index 51733ad..53af1c6 100644
  }
  
  #endif /* DEBUG */
-@@ -6071,8 +6123,8 @@ init_xtensa_relax_info (asection *sec)
+@@ -6071,8 +6123,8 @@
    relax_info->removed_list.head = NULL;
    relax_info->removed_list.tail = NULL;
  
@@ -570,7 +568,7 @@ index 51733ad..53af1c6 100644
    relax_info->action_list.map.n_entries = 0;
    relax_info->action_list.map.entry = NULL;
  
-@@ -7762,7 +7814,7 @@ compute_text_actions (bfd *abfd,
+@@ -7762,7 +7814,7 @@
    free_reloc_range_list (&relevant_relocs);
  
  #if DEBUG
@@ -579,7 +577,7 @@ index 51733ad..53af1c6 100644
      print_action_list (stderr, &relax_info->action_list);
  #endif
  
-@@ -8263,6 +8315,54 @@ xlate_offset_with_removed_text (const xlate_map_t *map,
+@@ -8263,6 +8315,54 @@
    return e->new_address - e->orig_address + offset;
  }
  
@@ -634,7 +632,7 @@ index 51733ad..53af1c6 100644
  
  /* Build a binary searchable offset translation map from a section's
     action list.  */
-@@ -8270,75 +8370,40 @@ xlate_offset_with_removed_text (const xlate_map_t *map,
+@@ -8270,75 +8370,40 @@
  static xlate_map_t *
  build_xlate_map (asection *sec, xtensa_relax_info *relax_info)
  {
@@ -729,7 +727,7 @@ index 51733ad..53af1c6 100644
  }
  
  
-@@ -9302,6 +9367,16 @@ move_shared_literal (asection *sec,
+@@ -9302,6 +9367,16 @@
  
  /* Second relaxation pass.  */
  
@@ -746,7 +744,7 @@ index 51733ad..53af1c6 100644
  /* Modify all of the relocations to point to the right spot, and if this
     is a relaxable section, delete the unwanted literals and fix the
     section size.  */
-@@ -9334,7 +9409,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9334,7 +9409,7 @@
  
    internal_relocs = retrieve_internal_relocs (abfd, sec,
  					      link_info->keep_memory);
@@ -755,7 +753,7 @@ index 51733ad..53af1c6 100644
      return TRUE;
  
    contents = retrieve_contents (abfd, sec, link_info->keep_memory);
-@@ -9412,6 +9487,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9412,6 +9487,12 @@
  			}
  		      /* Update the action so that the code that moves
  			 the contents will do the right thing.  */
@@ -768,7 +766,7 @@ index 51733ad..53af1c6 100644
  		      if (action->action == ta_remove_longcall)
  			action->action = ta_remove_insn;
  		      else
-@@ -9584,13 +9665,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9584,13 +9665,12 @@
  
    if ((relax_info->is_relaxable_literal_section
         || relax_info->is_relaxable_asm_section)
@@ -783,7 +781,7 @@ index 51733ad..53af1c6 100644
        bfd_size_type final_size, copy_size, orig_insn_size;
        bfd_byte *scratch = NULL;
        bfd_byte *dup_contents = NULL;
-@@ -9601,15 +9681,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9601,15 +9681,12 @@
        bfd_vma orig_dot_vo = 0; /* Virtual offset from orig_dot.  */
        bfd_vma dup_dot = 0;
  
@@ -802,7 +800,7 @@ index 51733ad..53af1c6 100644
        scratch = (bfd_byte *) bfd_zmalloc (final_size);
        dup_contents = (bfd_byte *) bfd_zmalloc (final_size);
  
-@@ -9618,8 +9695,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9618,8 +9695,8 @@
        print_action_list (stderr, &relax_info->action_list);
  #endif
  
@@ -813,7 +811,7 @@ index 51733ad..53af1c6 100644
  	{
  	  virtual_action = FALSE;
  	  if (action->offset > orig_dot)
-@@ -9748,7 +9825,6 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+@@ -9748,7 +9825,6 @@
  	      break;
  	    }
  
@@ -821,6 +819,3 @@ index 51733ad..53af1c6 100644
  	  BFD_ASSERT (dup_dot <= final_size);
  	  BFD_ASSERT (orig_dot <= orig_size);
  	}
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch b/packages/binutils/2.25.1/0017-xtensa-optimize-trampolines-relaxation.patch
similarity index 94%
rename from packages/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch
rename to packages/binutils/2.25.1/0017-xtensa-optimize-trampolines-relaxation.patch
index 043ff4df..3c11e3d9 100644
--- a/packages/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch
+++ b/packages/binutils/2.25.1/0017-xtensa-optimize-trampolines-relaxation.patch
@@ -64,14 +64,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: b76f99d702c3501ac320396ea06bc7f9237173c3
 Changes to ChangeLog are dropped.
 
- gas/config/tc-xtensa.c | 220 +++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 194 insertions(+), 26 deletions(-)
+ gas/config/tc-xtensa.c |  220 ++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 193 insertions(+), 27 deletions(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 3e85b69..31c0b6b 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -8785,6 +8785,154 @@ static long relax_frag_for_align (fragS *, long);
+@@ -8785,6 +8785,154 @@
  static long relax_frag_immed
    (segT, fragS *, long, int, xtensa_format, int, int *, bfd_boolean);
  
@@ -226,7 +224,7 @@ index 3e85b69..31c0b6b 100644
  
  /* Return the number of bytes added to this fragment, given that the
     input has been stretched already by "stretch".  */
-@@ -8896,35 +9044,42 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -8896,35 +9044,42 @@
      case RELAX_TRAMPOLINE:
        if (fragP->tc_frag_data.relax_seen)
          {
@@ -280,21 +278,21 @@ index 3e85b69..31c0b6b 100644
 +	      trampaddr = fragP->fr_address + fragP->fr_fix;
 +
 +	      if (addr + J_RANGE < trampaddr)
++		continue;
++	      if (addr > trampaddr + J_RANGE)
++		break;
++	      if (abs (delta) < J_RANGE)
  		continue;
 -              target = S_GET_VALUE (s);
 -              addr = fixP->fx_frag->fr_address;
 -              delta = target - addr + stretch;
-+	      if (addr > trampaddr + J_RANGE)
-+		break;
-+	      if (abs (delta) < J_RANGE)
-+		continue;
 +
 +	      slot = fixP->tc_fix_data.slot;
 +
                if (delta > J_RANGE  || delta < -1 * J_RANGE)
                  { /* Found an out-of-range jump; scan the list of trampolines for the best match.  */
  		  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-@@ -8978,14 +9133,13 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -8978,14 +9133,13 @@
  		    }
  		  if (tf->fragP == fragP)
  		    {
@@ -310,7 +308,7 @@ index 3e85b69..31c0b6b 100644
  
  			  new_stretch += init_trampoline_frag (tf);
  			  offset = fragP->fr_fix; /* Where to assemble the j insn.  */
-@@ -9009,10 +9163,20 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -9009,10 +9163,20 @@
  			  newfixP->tc_fix_data.X_add_symbol = lsym;
  			  newfixP->tc_fix_data.X_add_number = offset;
  			  newfixP->tc_fix_data.slot = slot;
@@ -331,7 +329,7 @@ index 3e85b69..31c0b6b 100644
  			  /* Adjust the jump around this trampoline (if present).  */
  			  if (tf->fixP != NULL)
  			    {
-@@ -9027,6 +9191,8 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -9027,6 +9191,8 @@
  			      fragP->fr_subtype = 0;
  			      /* Remove from the trampoline_list.  */
  			      prev->next = tf->next;
@@ -340,6 +338,3 @@ index 3e85b69..31c0b6b 100644
  			      break;
  			    }
  			}
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.23.2/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch b/packages/binutils/2.25.1/0018-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
similarity index 90%
rename from packages/binutils/2.23.2/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
rename to packages/binutils/2.25.1/0018-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
index 9ad6b3be..3e8490a5 100644
--- a/packages/binutils/2.23.2/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
+++ b/packages/binutils/2.25.1/0018-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
@@ -29,14 +29,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: e6c9a083ec5ae7a45bd71682b26aae1939849388
 Changes to ChangeLog are dropped.
 
- bfd/elf32-xtensa.c | 6 +++++-
+ bfd/elf32-xtensa.c |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 53af1c6..2523670 100644
 --- a/bfd/elf32-xtensa.c
 +++ b/bfd/elf32-xtensa.c
-@@ -1360,10 +1360,14 @@ elf_xtensa_gc_sweep_hook (bfd *abfd,
+@@ -1360,10 +1360,14 @@
  	{
  	  if (is_plt)
  	    {
@@ -52,6 +50,3 @@ index 53af1c6..2523670 100644
  	    {
  	      if (h->got.refcount > 0)
  		h->got.refcount--;
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.23.2/912-xtensa-fix-gas-segfault-with-text-section-literals.patch b/packages/binutils/2.25.1/0019-xtensa-fix-gas-segfault-with-text-section-literals.patch
similarity index 89%
rename from packages/binutils/2.23.2/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
rename to packages/binutils/2.25.1/0019-xtensa-fix-gas-segfault-with-text-section-literals.patch
index 4a3de2c8..b1874cb0 100644
--- a/packages/binutils/2.23.2/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
+++ b/packages/binutils/2.25.1/0019-xtensa-fix-gas-segfault-with-text-section-literals.patch
@@ -21,14 +21,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: 4de0562a4c69fef4952aa7e19d7bda359f02e8b4
 Changes to ChangeLog are dropped.
 
- gas/config/tc-xtensa.c | 10 +++++++++-
+ gas/config/tc-xtensa.c |   10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 31c0b6b..18307c1 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -10808,13 +10808,21 @@ xtensa_move_literals (void)
+@@ -10808,13 +10808,21 @@
        frchain_to = NULL;
        frag_splice = &(frchain_from->frch_root);
  
@@ -51,6 +49,3 @@ index 31c0b6b..18307c1 100644
        gas_assert (search_frag->tc_frag_data.literal_frag->fr_subtype
  	      == RELAX_LITERAL_POOL_BEGIN);
        xtensa_switch_section_emit_state (&state, segment->seg, 0);
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch b/packages/binutils/2.25.1/0020-xtensa-add-auto-litpools-option.patch
similarity index 91%
rename from packages/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch
rename to packages/binutils/2.25.1/0020-xtensa-add-auto-litpools-option.patch
index 3ed9af12..9ed61eac 100644
--- a/packages/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch
+++ b/packages/binutils/2.25.1/0020-xtensa-add-auto-litpools-option.patch
@@ -55,20 +55,18 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: b46824bd49648c575372e6d9bc6a6defeabd6ed5
 Changes to ChangeLogs and documentation are dropped.
 
- gas/config/tc-xtensa.c                   | 432 ++++++++++++++++++++++++++++++-
- gas/config/tc-xtensa.h                   |   1 +
- gas/testsuite/gas/xtensa/all.exp         |   1 +
- gas/testsuite/gas/xtensa/auto-litpools.d |  12 +
- gas/testsuite/gas/xtensa/auto-litpools.s |  13 +
+ gas/config/tc-xtensa.c                   |  432 ++++++++++++++++++++++++++++++-
+ gas/config/tc-xtensa.h                   |    1 
+ gas/testsuite/gas/xtensa/all.exp         |    1 
+ gas/testsuite/gas/xtensa/auto-litpools.d |   12 
+ gas/testsuite/gas/xtensa/auto-litpools.s |   13 
  5 files changed, 454 insertions(+), 5 deletions(-)
  create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.d
  create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.s
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 7311a05..b8b1e7d 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -440,6 +440,29 @@ bfd_boolean directive_state[] =
+@@ -440,6 +440,29 @@
  #endif
  };
  
@@ -98,7 +96,7 @@ index 7311a05..b8b1e7d 100644
  
  /* Directive functions.  */
  
-@@ -474,6 +497,9 @@ static void xtensa_create_trampoline_frag (bfd_boolean);
+@@ -474,6 +497,9 @@
  static void xtensa_maybe_create_trampoline_frag (void);
  struct trampoline_frag;
  static int init_trampoline_frag (struct trampoline_frag *);
@@ -108,7 +106,7 @@ index 7311a05..b8b1e7d 100644
  
  /* Alignment Functions.  */
  
-@@ -698,6 +724,10 @@ enum
+@@ -698,6 +724,10 @@
  
    option_trampolines,
    option_no_trampolines,
@@ -119,7 +117,7 @@ index 7311a05..b8b1e7d 100644
  };
  
  const char *md_shortopts = "";
-@@ -773,6 +803,10 @@ struct option md_longopts[] =
+@@ -773,6 +803,10 @@
    { "trampolines", no_argument, NULL, option_trampolines },
    { "no-trampolines", no_argument, NULL, option_no_trampolines },
  
@@ -130,7 +128,7 @@ index 7311a05..b8b1e7d 100644
    { NULL, no_argument, NULL, 0 }
  };
  
-@@ -961,6 +995,34 @@ md_parse_option (int c, char *arg)
+@@ -961,6 +995,34 @@
        use_trampolines = FALSE;
        return 1;
  
@@ -165,7 +163,7 @@ index 7311a05..b8b1e7d 100644
      default:
        return 0;
      }
-@@ -986,7 +1048,12 @@ Xtensa options:\n\
+@@ -986,7 +1048,12 @@
                            flix bundles\n\
    --rename-section old=new Rename section 'old' to 'new'\n\
    --[no-]trampolines      [Do not] generate trampolines (jumps to jumps)\n\
@@ -179,7 +177,7 @@ index 7311a05..b8b1e7d 100644
  }
  
  
-@@ -4728,6 +4795,8 @@ xtensa_mark_literal_pool_location (void)
+@@ -4728,6 +4795,8 @@
    pool_location = frag_now;
    frag_now->tc_frag_data.lit_frchain = frchain_now;
    frag_now->tc_frag_data.literal_frag = frag_now;
@@ -188,7 +186,7 @@ index 7311a05..b8b1e7d 100644
    frag_variant (rs_machine_dependent, 0, 0,
  		RELAX_LITERAL_POOL_BEGIN, NULL, 0, NULL);
    xtensa_set_frag_assembly_state (frag_now);
-@@ -4832,6 +4901,31 @@ get_expanded_loop_offset (xtensa_opcode opcode)
+@@ -4832,6 +4901,31 @@
  static fragS *
  get_literal_pool_location (segT seg)
  {
@@ -220,7 +218,7 @@ index 7311a05..b8b1e7d 100644
    return seg_info (seg)->tc_segment_info_data.literal_pool_loc;
  }
  
-@@ -7098,6 +7192,11 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
+@@ -7098,6 +7192,11 @@
        frag_now->tc_frag_data.slot_symbols[slot] = tinsn->symbol;
        frag_now->tc_frag_data.slot_offsets[slot] = tinsn->offset;
        frag_now->tc_frag_data.literal_frags[slot] = tinsn->literal_frag;
@@ -232,7 +230,7 @@ index 7311a05..b8b1e7d 100644
        if (tinsn->literal_space != 0)
  	xg_assemble_literal_space (tinsn->literal_space, slot);
        frag_now->tc_frag_data.free_reg[slot] = tinsn->extra_arg;
-@@ -7170,6 +7269,8 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
+@@ -7170,6 +7269,8 @@
  		    frag_now->fr_symbol, frag_now->fr_offset, NULL);
  	  xtensa_set_frag_assembly_state (frag_now);
  	  xtensa_maybe_create_trampoline_frag ();
@@ -241,7 +239,7 @@ index 7311a05..b8b1e7d 100644
  	}
        else if (is_branch && do_align_targets ())
  	{
-@@ -7314,11 +7415,18 @@ xtensa_check_frag_count (void)
+@@ -7314,11 +7415,18 @@
        clear_frag_count ();
        unreachable_count = 0;
      }
@@ -260,7 +258,7 @@ index 7311a05..b8b1e7d 100644
  #define TRAMPOLINE_FRAG_SIZE 3000
  
  static void
-@@ -7410,6 +7518,135 @@ dump_trampolines (void)
+@@ -7410,6 +7518,135 @@
      }
  }
  
@@ -396,7 +394,7 @@ index 7311a05..b8b1e7d 100644
  static void
  xtensa_cleanup_align_frags (void)
  {
-@@ -9029,7 +9266,41 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
+@@ -9029,7 +9266,41 @@
        break;
  
      case RELAX_LITERAL_POOL_BEGIN:
@@ -438,7 +436,7 @@ index 7311a05..b8b1e7d 100644
      case RELAX_MAYBE_UNREACHABLE:
      case RELAX_MAYBE_DESIRE_ALIGN:
        /* No relaxation required.  */
-@@ -10789,12 +11060,115 @@ xtensa_move_literals (void)
+@@ -10789,12 +11060,115 @@
    segT dest_seg;
    fixS *fix, *next_fix, **fix_splice;
    sym_list *lit;
@@ -554,7 +552,7 @@ index 7311a05..b8b1e7d 100644
    for (segment = literal_head->next; segment; segment = segment->next)
      {
        /* Keep the literals for .init and .fini in separate sections.  */
-@@ -10839,9 +11213,6 @@ xtensa_move_literals (void)
+@@ -10839,9 +11213,6 @@
        while (search_frag != frag_now)
  	{
  	  next_frag = search_frag->fr_next;
@@ -564,7 +562,7 @@ index 7311a05..b8b1e7d 100644
  	  if (search_frag->tc_frag_data.literal_frag)
  	    {
  	      literal_pool = search_frag->tc_frag_data.literal_frag;
-@@ -10849,8 +11220,56 @@ xtensa_move_literals (void)
+@@ -10849,8 +11220,56 @@
  	      frchain_to = literal_pool->tc_frag_data.lit_frchain;
  	      gas_assert (frchain_to);
  	    }
@@ -621,7 +619,7 @@ index 7311a05..b8b1e7d 100644
  
  	  *frag_splice = next_frag;
  	  search_frag->fr_next = insert_after->fr_next;
-@@ -11014,7 +11433,10 @@ xtensa_switch_to_non_abs_literal_fragment (emit_state *result)
+@@ -11014,7 +11433,10 @@
        && !recursive
        && !is_init && ! is_fini)
      {
@@ -633,11 +631,9 @@ index 7311a05..b8b1e7d 100644
  
        /* When we mark a literal pool location, we want to put a frag in
  	 the literal pool that points to it.  But to do that, we want to
-diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
-index b2e43fa..290d902 100644
 --- a/gas/config/tc-xtensa.h
 +++ b/gas/config/tc-xtensa.h
-@@ -124,6 +124,7 @@ enum xtensa_relax_statesE
+@@ -124,6 +124,7 @@
  
    RELAX_LITERAL_POOL_BEGIN,
    RELAX_LITERAL_POOL_END,
@@ -645,11 +641,9 @@ index b2e43fa..290d902 100644
    /* Technically these are not relaxations at all but mark a location
       to store literals later.  Note that fr_var stores the frchain for
       BEGIN frags and fr_var stores now_seg for END frags.  */
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index d197ec8..db39629 100644
 --- a/gas/testsuite/gas/xtensa/all.exp
 +++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -100,6 +100,7 @@ if [istarget xtensa*-*-*] then {
+@@ -100,6 +100,7 @@
      run_dump_test "jlong"
      run_dump_test "trampoline"
      run_dump_test "first_frag_align"
@@ -657,9 +651,6 @@ index d197ec8..db39629 100644
  }
  
  if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/auto-litpools.d b/gas/testsuite/gas/xtensa/auto-litpools.d
-new file mode 100644
-index 0000000..4d1a690
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/auto-litpools.d
 @@ -0,0 +1,12 @@
@@ -675,9 +666,6 @@ index 0000000..4d1a690
 +#...
 +.*40750:.*l32r.a2, 3e43c .*
 +#...
-diff --git a/gas/testsuite/gas/xtensa/auto-litpools.s b/gas/testsuite/gas/xtensa/auto-litpools.s
-new file mode 100644
-index 0000000..9a5b26b
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/auto-litpools.s
 @@ -0,0 +1,13 @@
@@ -694,6 +682,3 @@ index 0000000..9a5b26b
 +	.endr
 +	l32r	a2, .L1
 +	ret
--- 
-1.8.1.4
-
diff --git a/packages/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch b/packages/binutils/2.25.1/0021-xtensa-fix-signedness-of-gas-relocations.patch
similarity index 74%
rename from packages/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch
rename to packages/binutils/2.25.1/0021-xtensa-fix-signedness-of-gas-relocations.patch
index 66d4e603..77b4af39 100644
--- a/packages/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch
+++ b/packages/binutils/2.25.1/0021-xtensa-fix-signedness-of-gas-relocations.patch
@@ -21,19 +21,17 @@ gas/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gas/config/tc-xtensa.c           |  6 +++---
- gas/testsuite/gas/xtensa/all.exp |  1 +
- gas/testsuite/gas/xtensa/loc.d   | 10 ++++++++++
- gas/testsuite/gas/xtensa/loc.s   |  7 +++++++
+ gas/config/tc-xtensa.c           |    6 +++---
+ gas/testsuite/gas/xtensa/all.exp |    1 +
+ gas/testsuite/gas/xtensa/loc.d   |   10 ++++++++++
+ gas/testsuite/gas/xtensa/loc.s   |    7 +++++++
  4 files changed, 21 insertions(+), 3 deletions(-)
  create mode 100644 gas/testsuite/gas/xtensa/loc.d
  create mode 100644 gas/testsuite/gas/xtensa/loc.s
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index a119871..36a06cc 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
+@@ -5961,15 +5961,15 @@
  	    {
  	    case BFD_RELOC_8:
  	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
@@ -52,11 +50,9 @@ index a119871..36a06cc 100644
  	      break;
  	    default:
  	      break;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 31b725b..7ff7bd7 100644
 --- a/gas/testsuite/gas/xtensa/all.exp
 +++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -101,6 +101,7 @@ if [istarget xtensa*-*-*] then {
+@@ -101,6 +101,7 @@
      run_dump_test "trampoline"
      run_dump_test "first_frag_align"
      run_dump_test "auto-litpools"
@@ -64,9 +60,6 @@ index 31b725b..7ff7bd7 100644
  }
  
  if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d
-new file mode 100644
-index 0000000..71983cc
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/loc.d
 @@ -0,0 +1,10 @@
@@ -80,9 +73,6 @@ index 0000000..71983cc
 +#...
 +.*R_XTENSA_DIFF16.*\.text\+0x00009c42
 +#...
-diff --git a/gas/testsuite/gas/xtensa/loc.s b/gas/testsuite/gas/xtensa/loc.s
-new file mode 100644
-index 0000000..029e14e
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/loc.s
 @@ -0,0 +1,7 @@
@@ -93,6 +83,3 @@ index 0000000..029e14e
 +	.space 40000
 +	.loc 1 5
 +	nop
--- 
-2.1.4
-
diff --git a/packages/binutils/2.26.1/915-xtensa-fix-.init-.fini-literals-moving.patch b/packages/binutils/2.25.1/0022-xtensa-fix-.init-.fini-literals-moving.patch
similarity index 82%
rename from packages/binutils/2.26.1/915-xtensa-fix-.init-.fini-literals-moving.patch
rename to packages/binutils/2.25.1/0022-xtensa-fix-.init-.fini-literals-moving.patch
index ead3e42b..0b2b3faa 100644
--- a/packages/binutils/2.26.1/915-xtensa-fix-.init-.fini-literals-moving.patch
+++ b/packages/binutils/2.25.1/0022-xtensa-fix-.init-.fini-literals-moving.patch
@@ -38,19 +38,17 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: 4111950f363221c4641dc2f33bea61cc94f34906
 
- gas/config/tc-xtensa.c                        | 12 ++++++++++--
- gas/testsuite/gas/xtensa/all.exp              |  1 +
- gas/testsuite/gas/xtensa/init-fini-literals.d | 24 ++++++++++++++++++++++++
- gas/testsuite/gas/xtensa/init-fini-literals.s | 19 +++++++++++++++++++
+ gas/config/tc-xtensa.c                        |   12 ++++++++++--
+ gas/testsuite/gas/xtensa/all.exp              |    1 +
+ gas/testsuite/gas/xtensa/init-fini-literals.d |   24 ++++++++++++++++++++++++
+ gas/testsuite/gas/xtensa/init-fini-literals.s |   19 +++++++++++++++++++
  4 files changed, 54 insertions(+), 2 deletions(-)
  create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.d
  create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.s
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 36a06cc..5773634 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -11061,6 +11061,10 @@ xtensa_move_literals (void)
+@@ -11061,6 +11061,10 @@
    fixS *fix, *next_fix, **fix_splice;
    sym_list *lit;
    struct litpool_seg *lps;
@@ -61,7 +59,7 @@ index 36a06cc..5773634 100644
  
    mark_literal_frags (literal_head->next);
  
-@@ -11171,9 +11175,13 @@ xtensa_move_literals (void)
+@@ -11171,9 +11175,13 @@
  
    for (segment = literal_head->next; segment; segment = segment->next)
      {
@@ -77,11 +75,9 @@ index 36a06cc..5773634 100644
  	continue;
  
        frchain_from = seg_info (segment->seg)->frchainP;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 7ff7bd7..6b67320 100644
 --- a/gas/testsuite/gas/xtensa/all.exp
 +++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -102,6 +102,7 @@ if [istarget xtensa*-*-*] then {
+@@ -102,6 +102,7 @@
      run_dump_test "first_frag_align"
      run_dump_test "auto-litpools"
      run_dump_test "loc"
@@ -89,9 +85,6 @@ index 7ff7bd7..6b67320 100644
  }
  
  if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.d b/gas/testsuite/gas/xtensa/init-fini-literals.d
-new file mode 100644
-index 0000000..19ed121
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/init-fini-literals.d
 @@ -0,0 +1,24 @@
@@ -119,9 +112,6 @@ index 0000000..19ed121
 +.* R_XTENSA_SLOT0_OP  \.fini\.literal
 +.* R_XTENSA_SLOT0_OP  \.fini\.literal\+0x00000004
 +#...
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.s b/gas/testsuite/gas/xtensa/init-fini-literals.s
-new file mode 100644
-index 0000000..7c9ec17
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/init-fini-literals.s
 @@ -0,0 +1,19 @@
@@ -144,6 +134,3 @@ index 0000000..7c9ec17
 +
 +	l32r	a2, .LC2
 +	l32r	a2, .LC3
--- 
-2.1.4
-
diff --git a/packages/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
deleted file mode 100644
index af4032a5..00000000
--- a/packages/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -urN binutils-2.25.1.orig/binutils/configure binutils-2.25.1/binutils/configure
---- binutils-2.25.1.orig/binutils/configure	2015-10-25 13:18:46.249052806 +0000
-+++ binutils-2.25.1/binutils/configure	2015-10-25 13:39:21.339034801 +0000
-@@ -12067,6 +12067,7 @@
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12227,6 +12228,8 @@
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
- # If we haven't got the data from the intl directory,
-diff -urN binutils-2.25.1.orig/binutils/configure.ac binutils-2.25.1/binutils/configure.ac
---- binutils-2.25.1.orig/binutils/configure.ac	2015-10-25 13:18:46.249052806 +0000
-+++ binutils-2.25.1/binutils/configure.ac	2015-10-25 13:38:52.969035216 +0000
-@@ -87,7 +87,10 @@
- fi
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
- ZW_GNU_GETTEXT_SISTER_DIR
-diff -urN binutils-2.25.1.orig/gas/configure binutils-2.25.1/gas/configure
---- binutils-2.25.1.orig/gas/configure	2015-10-25 13:18:46.389052803 +0000
-+++ binutils-2.25.1/gas/configure	2015-10-25 15:16:55.988949456 +0000
-@@ -12795,6 +12795,7 @@
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12955,6 +12956,8 @@
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="fr tr es rw id ru fi ja"
- # If we haven't got the data from the intl directory,
-diff -urN binutils-2.25.1.orig/gas/configure.ac binutils-2.25.1/gas/configure.ac
---- binutils-2.25.1.orig/gas/configure.ac	2015-10-25 15:15:06.000000000 +0000
-+++ binutils-2.25.1/gas/configure.ac	2015-10-25 14:45:32.000000000 +0000
-@@ -717,7 +717,10 @@
- AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="fr tr es rw id ru fi ja"
- ZW_GNU_GETTEXT_SISTER_DIR
-diff -urN binutils-2.25.1.orig/ld/configure binutils-2.25.1/ld/configure
---- binutils-2.25.1.orig/ld/configure	2015-10-25 13:18:47.399052788 +0000
-+++ binutils-2.25.1/ld/configure	2015-10-25 15:17:06.472282637 +0000
-@@ -16071,6 +16071,7 @@
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -16231,6 +16232,8 @@
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-diff -urN binutils-2.25.1.orig/ld/configure.ac binutils-2.25.1/ld/configure.ac
---- binutils-2.25.1.orig/ld/configure.ac	2015-10-25 13:18:47.415719456 +0000
-+++ binutils-2.25.1/ld/configure.ac	2015-10-25 15:14:43.000000000 +0000
-@@ -173,7 +173,10 @@
- AC_EXEEXT
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- AM_MAINTAINER_MODE
- AM_CONDITIONAL(GENINSRC_NEVER, false)
diff --git a/packages/binutils/2.25.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.25.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
deleted file mode 100644
index 33441cc6..00000000
--- a/packages/binutils/2.25.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- binutils-2.25.orig/gold/binary.cc	2015-06-09 10:48:32.000000000 +0100
-+++ binutils-2.25/gold/binary.cc	2015-06-09 10:49:23.000000000 +0100
-@@ -23,7 +23,7 @@
- #include "gold.h"
- 
- #include <cerrno>
--#include <cstring>
-+#include <string>
- #include "safe-ctype.h"
- 
- #include "elfcpp.h"
diff --git a/packages/binutils/2.27/120-sh-conf.patch b/packages/binutils/2.26.1/0000-sh-conf.patch
similarity index 77%
rename from packages/binutils/2.27/120-sh-conf.patch
rename to packages/binutils/2.26.1/0000-sh-conf.patch
index c12a0230..a41d630d 100644
--- a/packages/binutils/2.27/120-sh-conf.patch
+++ b/packages/binutils/2.26.1/0000-sh-conf.patch
@@ -5,11 +5,14 @@ fix that up too.. now we're able to actually build a real toolchain for
 sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
 inept targets than that one, really. Go look, I promise).
 
-diff --git a/configure b/configure
-index 87677bc..2d916f1 100755
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/configure
 +++ b/configure
-@@ -3812,7 +3812,7 @@ case "${target}" in
+@@ -3939,7 +3939,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
@@ -18,11 +21,9 @@ index 87677bc..2d916f1 100755
      case "${target}" in
        sh*-*-elf)
           ;;
-diff --git a/configure.ac b/configure.ac
-index 8fe0eca..b10a99f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1140,7 +1140,7 @@ case "${target}" in
+@@ -1276,7 +1276,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
diff --git a/packages/binutils/2.25.1/300-001_ld_makefile_patch.patch b/packages/binutils/2.26.1/0001-001_ld_makefile_patch.patch
similarity index 76%
rename from packages/binutils/2.25.1/300-001_ld_makefile_patch.patch
rename to packages/binutils/2.26.1/0001-001_ld_makefile_patch.patch
index 2a1320cb..d2e1cd9e 100644
--- a/packages/binutils/2.25.1/300-001_ld_makefile_patch.patch
+++ b/packages/binutils/2.26.1/0001-001_ld_makefile_patch.patch
@@ -1,8 +1,11 @@
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 9575f1f..84df0bf 100644
+---
+ ld/Makefile.am |    2 +-
+ ld/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
-@@ -54,7 +54,7 @@ endif
+@@ -57,7 +57,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
  # directives need to be different for native and cross linkers.
@@ -11,11 +14,9 @@ index 9575f1f..84df0bf 100644
  
  EMUL = @EMUL@
  EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 9f56ca1..272860f 100644
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+@@ -413,7 +413,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
  # directives need to be different for native and cross linkers.
diff --git a/packages/binutils/2.26.1/300-012_check_ldrunpath_length.patch b/packages/binutils/2.26.1/0002-012_check_ldrunpath_length.patch
similarity index 76%
rename from packages/binutils/2.26.1/300-012_check_ldrunpath_length.patch
rename to packages/binutils/2.26.1/0002-012_check_ldrunpath_length.patch
index f1f31af9..e3d65084 100644
--- a/packages/binutils/2.26.1/300-012_check_ldrunpath_length.patch
+++ b/packages/binutils/2.26.1/0002-012_check_ldrunpath_length.patch
@@ -1,8 +1,10 @@
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 137446f..bb8391a 100644
+---
+ ld/emultempl/elf32.em |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/ld/emultempl/elf32.em
 +++ b/ld/emultempl/elf32.em
-@@ -1195,6 +1195,8 @@ fragment <<EOF
+@@ -1242,6 +1242,8 @@
  	      && command_line.rpath == NULL)
  	    {
  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -11,7 +13,7 @@ index 137446f..bb8391a 100644
  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
  						      force))
  		break;
-@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+@@ -1523,6 +1525,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/packages/binutils/2.23.2/310-fix-gold-pthreads-typo.patch b/packages/binutils/2.26.1/0003-fix-gold-pthreads-typo.patch
similarity index 76%
rename from packages/binutils/2.23.2/310-fix-gold-pthreads-typo.patch
rename to packages/binutils/2.26.1/0003-fix-gold-pthreads-typo.patch
index f2e6ff25..40861f56 100644
--- a/packages/binutils/2.23.2/310-fix-gold-pthreads-typo.patch
+++ b/packages/binutils/2.26.1/0003-fix-gold-pthreads-typo.patch
@@ -1,5 +1,9 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2014-10-14 08:32:04.000000000 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:38:18.640819300 +0100
+---
+ gold/gold-threads.cc |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
 @@ -102,9 +102,9 @@
    if (err != 0)
      gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
diff --git a/packages/binutils/2.26.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.26.1/0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
similarity index 72%
rename from packages/binutils/2.26.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
rename to packages/binutils/2.26.1/0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
index f9a8af67..c0867980 100644
--- a/packages/binutils/2.26.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ b/packages/binutils/2.26.1/0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
@@ -1,5 +1,9 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2015-10-20 22:39:36.371169400 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:39:38.182772700 +0100
+---
+ gold/gold-threads.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
 @@ -101,7 +101,7 @@
    int err = pthread_mutexattr_init(&attr);
    if (err != 0)
diff --git a/packages/binutils/2.26.1/330-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.26.1/0005-Dont-link-to-libfl-as-its-unnecessary.patch
similarity index 70%
rename from packages/binutils/2.26.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
rename to packages/binutils/2.26.1/0005-Dont-link-to-libfl-as-its-unnecessary.patch
index 334ee3e8..afe9bc59 100644
--- a/packages/binutils/2.26.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
+++ b/packages/binutils/2.26.1/0005-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -1,8 +1,15 @@
-diff --git a/binutils/configure b/binutils/configure
-index 6e1f21e..78bf4ae 100755
+---
+ binutils/configure    |    3 +++
+ binutils/configure.ac |    3 +++
+ gas/configure         |    3 +++
+ gas/configure.ac      |    3 +++
+ ld/configure          |    3 +++
+ ld/configure.ac       |    3 +++
+ 6 files changed, 18 insertions(+)
+
 --- a/binutils/configure
 +++ b/binutils/configure
-@@ -12069,6 +12069,7 @@ fi
+@@ -12069,6 +12069,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -10,7 +17,7 @@ index 6e1f21e..78bf4ae 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12230,6 +12231,8 @@ esac
+@@ -12230,6 +12231,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -19,11 +26,9 @@ index 6e1f21e..78bf4ae 100755
  
  ALL_LINGUAS="bg ca da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
  # If we haven't got the data from the intl directory,
-diff --git a/binutils/configure.ac b/binutils/configure.ac
-index defe781..8fd236a 100644
 --- a/binutils/configure.ac
 +++ b/binutils/configure.ac
-@@ -87,7 +87,10 @@ if test -z "$host" ; then
+@@ -87,7 +87,10 @@
  fi
  
  AC_PROG_YACC
@@ -34,11 +39,9 @@ index defe781..8fd236a 100644
  
  ALL_LINGUAS="bg ca da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
  ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/gas/configure b/gas/configure
-index f959e95..9bb4043 100755
 --- a/gas/configure
 +++ b/gas/configure
-@@ -12819,6 +12819,7 @@ fi
+@@ -12853,6 +12853,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -46,7 +49,7 @@ index f959e95..9bb4043 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12980,6 +12981,8 @@ esac
+@@ -13014,6 +13015,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -55,11 +58,9 @@ index f959e95..9bb4043 100755
  
  ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
  # If we haven't got the data from the intl directory,
-diff --git a/gas/configure.ac b/gas/configure.ac
-index 07f825d..c552b7e 100644
 --- a/gas/configure.ac
 +++ b/gas/configure.ac
-@@ -734,7 +734,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${target_vendor}", [Target vendor.])
+@@ -763,7 +763,10 @@
  AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
  
  AC_PROG_YACC
@@ -70,11 +71,9 @@ index 07f825d..c552b7e 100644
  
  ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
  ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/ld/configure b/ld/configure
-index a446283..1a6bf81 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -16087,6 +16087,7 @@ fi
+@@ -16087,6 +16087,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -82,7 +81,7 @@ index a446283..1a6bf81 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -16248,6 +16249,8 @@ esac
+@@ -16248,6 +16249,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -91,11 +90,9 @@ index a446283..1a6bf81 100755
  
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..45eec53 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -186,7 +186,10 @@ AM_PO_SUBDIRS
+@@ -186,7 +186,10 @@
  AC_EXEEXT
  
  AC_PROG_YACC
diff --git a/packages/binutils/2.29.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.26.1/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch
similarity index 70%
rename from packages/binutils/2.29.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
rename to packages/binutils/2.26.1/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch
index e4f235b1..fbc40418 100644
--- a/packages/binutils/2.29.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ b/packages/binutils/2.26.1/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch
@@ -1,5 +1,7 @@
-diff --git a/gold/binary.cc b/gold/binary.cc
-index 52df81a..03a8f20 100644
+---
+ gold/binary.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gold/binary.cc
 +++ b/gold/binary.cc
 @@ -23,7 +23,7 @@
diff --git a/packages/binutils/2.27/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.26.1/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
similarity index 70%
rename from packages/binutils/2.27/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
rename to packages/binutils/2.26.1/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
index 6168b31e..bfb22585 100644
--- a/packages/binutils/2.27/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ b/packages/binutils/2.26.1/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
@@ -9,15 +9,13 @@ Subject: [PATCH] Fix darwin build
 
 Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
 ---
- binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
- binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
+ bfd/peXXigen.c       |   22 ++++++++++++++++++++++
+ gold/gold-threads.cc |   15 ++++++++++++---
  2 files changed, 34 insertions(+), 3 deletions(-)
 
-diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
-index 13e39e4..7a98306 100644
---- binutils-2.25.orig/bfd/peXXigen.c
-+++ binutils-2.25/bfd/peXXigen.c
-@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
+--- a/bfd/peXXigen.c
++++ b/bfd/peXXigen.c
+@@ -3578,6 +3578,28 @@
  }
  #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
  
@@ -46,11 +44,9 @@ index 13e39e4..7a98306 100644
  /* Perform a comparison of two entries.  */
  static signed int
  rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
-diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
-index ff5a8ac..45140e0 100644
---- binutils-2.25.orig/gold/gold-threads.cc
-+++ binutils-2.25/gold/gold-threads.cc
-@@ -284,9 +284,18 @@ Condvar::~Condvar()
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
+@@ -284,9 +284,18 @@
  class Once_initialize
  {
   public:
@@ -72,6 +68,3 @@ index ff5a8ac..45140e0 100644
  
    // Return a pointer to the pthread_once_t variable.
    pthread_once_t*
--- 
-2.1.3
-
diff --git a/packages/binutils/2.24/500-sysroot.patch b/packages/binutils/2.26.1/0008-sysroot.patch
similarity index 91%
rename from packages/binutils/2.24/500-sysroot.patch
rename to packages/binutils/2.26.1/0008-sysroot.patch
index e49c7953..636234b3 100644
--- a/packages/binutils/2.24/500-sysroot.patch
+++ b/packages/binutils/2.26.1/0008-sysroot.patch
@@ -5,9 +5,13 @@ Always try to prepend the sysroot prefix to absolute filenames first.
 http://bugs.gentoo.org/275666
 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
+---
+ ld/ldfile.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -308,18 +308,25 @@
+@@ -335,18 +335,25 @@
       directory first.  */
    if (! entry->flags.maybe_archive)
      {
diff --git a/packages/binutils/2.26.1/600-poison-system-directories.patch b/packages/binutils/2.26.1/0009-poison-system-directories.patch
similarity index 86%
rename from packages/binutils/2.26.1/600-poison-system-directories.patch
rename to packages/binutils/2.26.1/0009-poison-system-directories.patch
index aa04082c..ad59414d 100644
--- a/packages/binutils/2.26.1/600-poison-system-directories.patch
+++ b/packages/binutils/2.26.1/0009-poison-system-directories.patch
@@ -59,8 +59,18 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
-diff --git a/ld/config.in b/ld/config.in
-index 276fb77..35c58eb 100644
+---
+ ld/config.in    |    3 +++
+ ld/configure    |   14 ++++++++++++++
+ ld/configure.ac |   10 ++++++++++
+ ld/ld.h         |    8 ++++++++
+ ld/ld.texinfo   |   12 ++++++++++++
+ ld/ldfile.c     |   17 +++++++++++++++++
+ ld/ldlex.h      |    2 ++
+ ld/ldmain.c     |    2 ++
+ ld/lexsup.c     |   21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
 --- a/ld/config.in
 +++ b/ld/config.in
 @@ -14,6 +14,9 @@
@@ -73,11 +83,9 @@ index 276fb77..35c58eb 100644
  /* Additional extension a shared object might have. */
  #undef EXTRA_SHLIB_EXTENSION
  
-diff --git a/ld/configure b/ld/configure
-index a446283..d1f9504 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -786,6 +786,7 @@ with_lib_path
+@@ -786,6 +786,7 @@
  enable_targets
  enable_64_bit_bfd
  with_sysroot
@@ -85,7 +93,7 @@ index a446283..d1f9504 100755
  enable_gold
  enable_got
  enable_compressed_debug_sections
-@@ -1442,6 +1443,8 @@ Optional Features:
+@@ -1442,6 +1443,8 @@
    --disable-largefile     omit support for large files
    --enable-targets        alternative target configurations
    --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
@@ -94,7 +102,7 @@ index a446283..d1f9504 100755
    --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
    --enable-got=<type>     GOT handling scheme (target, single, negative,
                            multigot)
-@@ -15491,7 +15494,18 @@ else
+@@ -15491,7 +15494,18 @@
  fi
  
  
@@ -113,11 +121,9 @@ index a446283..d1f9504 100755
  
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..2cd8443 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+@@ -95,6 +95,16 @@
  AC_SUBST(TARGET_SYSTEM_ROOT)
  AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
  
@@ -134,11 +140,9 @@ index 188172d..2cd8443 100644
  dnl Use --enable-gold to decide if this linker should be the default.
  dnl "install_as_default" is set to false if gold is the default linker.
  dnl "installed_linker" is the installed BFD linker name.
-diff --git a/ld/ld.h b/ld/ld.h
-index d84ec4e..3476b26 100644
 --- a/ld/ld.h
 +++ b/ld/ld.h
-@@ -164,6 +164,14 @@ typedef struct {
+@@ -164,6 +164,14 @@
    /* If set, display the target memory usage (per memory region).  */
    bfd_boolean print_memory_usage;
  
@@ -153,11 +157,9 @@ index d84ec4e..3476b26 100644
    /* Big or little endian as set on command line.  */
    enum endian_enum endian;
  
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index 1dd7492..fb1438e 100644
 --- a/ld/ld.texinfo
 +++ b/ld/ld.texinfo
-@@ -2332,6 +2332,18 @@ string identifying the original linked file does not change.
+@@ -2338,6 +2338,18 @@
  
  Passing @code{none} for @var{style} disables the setting from any
  @code{--build-id} options earlier on the command line.
@@ -176,11 +178,9 @@ index 1dd7492..fb1438e 100644
  @end table
  
  @c man end
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 96f9ecc..af231c0 100644
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+@@ -114,6 +114,23 @@
      new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
    else
      new_dirs->name = xstrdup (name);
@@ -204,11 +204,9 @@ index 96f9ecc..af231c0 100644
  }
  
  /* Try to open a BFD for a lang_input_statement.  */
-diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 6f11e7b..0ca3110 100644
 --- a/ld/ldlex.h
 +++ b/ld/ldlex.h
-@@ -144,6 +144,8 @@ enum option_values
+@@ -144,6 +144,8 @@
    OPTION_PRINT_MEMORY_USAGE,
    OPTION_REQUIRE_DEFINED_SYMBOL,
    OPTION_ORPHAN_HANDLING,
@@ -217,11 +215,9 @@ index 6f11e7b..0ca3110 100644
  };
  
  /* The initial parser states.  */
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index bb0b9cc..a23c56c 100644
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
-@@ -257,6 +257,8 @@ main (int argc, char **argv)
+@@ -257,6 +257,8 @@
    command_line.warn_mismatch = TRUE;
    command_line.warn_search_mismatch = TRUE;
    command_line.check_section_addresses = -1;
@@ -230,11 +226,9 @@ index bb0b9cc..a23c56c 100644
  
    /* We initialize DEMANGLING based on the environment variable
       COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 4cad209..be7d584 100644
 --- a/ld/lexsup.c
 +++ b/ld/lexsup.c
-@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
+@@ -530,6 +530,14 @@
    { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
      '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
      TWO_DASHES },
@@ -249,7 +243,7 @@ index 4cad209..be7d584 100644
  };
  
  #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
+@@ -542,6 +550,7 @@
    int ingroup = 0;
    char *default_dirlist = NULL;
    char *shortopts;
@@ -257,7 +251,7 @@ index 4cad209..be7d584 100644
    struct option *longopts;
    struct option *really_longopts;
    int last_optind;
-@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
+@@ -1516,6 +1525,14 @@
            }
            break;
  
@@ -272,7 +266,7 @@ index 4cad209..be7d584 100644
  	case OPTION_PUSH_STATE:
  	  input_flags.pushed = xmemdup (&input_flags,
  					sizeof (input_flags),
-@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
+@@ -1559,6 +1576,10 @@
        command_line.soname = NULL;
      }
  
diff --git a/packages/binutils/2.27/700-Fix-library-paths-on-PowerPC.patch b/packages/binutils/2.26.1/0010-Fix-library-paths-on-PowerPC.patch
similarity index 87%
rename from packages/binutils/2.27/700-Fix-library-paths-on-PowerPC.patch
rename to packages/binutils/2.26.1/0010-Fix-library-paths-on-PowerPC.patch
index cea92f3d..4bcc748b 100644
--- a/packages/binutils/2.27/700-Fix-library-paths-on-PowerPC.patch
+++ b/packages/binutils/2.26.1/0010-Fix-library-paths-on-PowerPC.patch
@@ -13,14 +13,12 @@ depend on whether it is built on LE or BE machine.
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ld/emulparams/elf32ppccommon.sh | 10 +++++-----
+ ld/emulparams/elf32ppccommon.sh |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
-index 1f54ef8..d00cf68 100644
 --- a/ld/emulparams/elf32ppccommon.sh
 +++ b/ld/emulparams/elf32ppccommon.sh
-@@ -44,11 +44,11 @@ fi
+@@ -44,11 +44,11 @@
  
  # Look for 64 bit target libraries in /lib64, /usr/lib64 etc., first.
  # Similarly, look for 32 bit libraries in /lib32, /usr/lib32 etc.
@@ -37,6 +35,3 @@ index 1f54ef8..d00cf68 100644
    *:*64lppc*) LIBPATH_SUFFIX=64le ;;
    *:*32lppc*) LIBPATH_SUFFIX=32le ;;
    *:*64*) LIBPATH_SUFFIX=64 ;;
--- 
-2.9.3
-
diff --git a/packages/binutils/2.26.1/914-xtensa-fix-signedness-of-gas-relocations.patch b/packages/binutils/2.26.1/0011-xtensa-fix-signedness-of-gas-relocations.patch
similarity index 74%
rename from packages/binutils/2.26.1/914-xtensa-fix-signedness-of-gas-relocations.patch
rename to packages/binutils/2.26.1/0011-xtensa-fix-signedness-of-gas-relocations.patch
index 66d4e603..77b4af39 100644
--- a/packages/binutils/2.26.1/914-xtensa-fix-signedness-of-gas-relocations.patch
+++ b/packages/binutils/2.26.1/0011-xtensa-fix-signedness-of-gas-relocations.patch
@@ -21,19 +21,17 @@ gas/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gas/config/tc-xtensa.c           |  6 +++---
- gas/testsuite/gas/xtensa/all.exp |  1 +
- gas/testsuite/gas/xtensa/loc.d   | 10 ++++++++++
- gas/testsuite/gas/xtensa/loc.s   |  7 +++++++
+ gas/config/tc-xtensa.c           |    6 +++---
+ gas/testsuite/gas/xtensa/all.exp |    1 +
+ gas/testsuite/gas/xtensa/loc.d   |   10 ++++++++++
+ gas/testsuite/gas/xtensa/loc.s   |    7 +++++++
  4 files changed, 21 insertions(+), 3 deletions(-)
  create mode 100644 gas/testsuite/gas/xtensa/loc.d
  create mode 100644 gas/testsuite/gas/xtensa/loc.s
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index a119871..36a06cc 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
+@@ -5961,15 +5961,15 @@
  	    {
  	    case BFD_RELOC_8:
  	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
@@ -52,11 +50,9 @@ index a119871..36a06cc 100644
  	      break;
  	    default:
  	      break;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 31b725b..7ff7bd7 100644
 --- a/gas/testsuite/gas/xtensa/all.exp
 +++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -101,6 +101,7 @@ if [istarget xtensa*-*-*] then {
+@@ -101,6 +101,7 @@
      run_dump_test "trampoline"
      run_dump_test "first_frag_align"
      run_dump_test "auto-litpools"
@@ -64,9 +60,6 @@ index 31b725b..7ff7bd7 100644
  }
  
  if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d
-new file mode 100644
-index 0000000..71983cc
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/loc.d
 @@ -0,0 +1,10 @@
@@ -80,9 +73,6 @@ index 0000000..71983cc
 +#...
 +.*R_XTENSA_DIFF16.*\.text\+0x00009c42
 +#...
-diff --git a/gas/testsuite/gas/xtensa/loc.s b/gas/testsuite/gas/xtensa/loc.s
-new file mode 100644
-index 0000000..029e14e
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/loc.s
 @@ -0,0 +1,7 @@
@@ -93,6 +83,3 @@ index 0000000..029e14e
 +	.space 40000
 +	.loc 1 5
 +	nop
--- 
-2.1.4
-
diff --git a/packages/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch b/packages/binutils/2.26.1/0012-xtensa-fix-.init-.fini-literals-moving.patch
similarity index 82%
rename from packages/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch
rename to packages/binutils/2.26.1/0012-xtensa-fix-.init-.fini-literals-moving.patch
index ead3e42b..0b2b3faa 100644
--- a/packages/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch
+++ b/packages/binutils/2.26.1/0012-xtensa-fix-.init-.fini-literals-moving.patch
@@ -38,19 +38,17 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: 4111950f363221c4641dc2f33bea61cc94f34906
 
- gas/config/tc-xtensa.c                        | 12 ++++++++++--
- gas/testsuite/gas/xtensa/all.exp              |  1 +
- gas/testsuite/gas/xtensa/init-fini-literals.d | 24 ++++++++++++++++++++++++
- gas/testsuite/gas/xtensa/init-fini-literals.s | 19 +++++++++++++++++++
+ gas/config/tc-xtensa.c                        |   12 ++++++++++--
+ gas/testsuite/gas/xtensa/all.exp              |    1 +
+ gas/testsuite/gas/xtensa/init-fini-literals.d |   24 ++++++++++++++++++++++++
+ gas/testsuite/gas/xtensa/init-fini-literals.s |   19 +++++++++++++++++++
  4 files changed, 54 insertions(+), 2 deletions(-)
  create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.d
  create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.s
 
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 36a06cc..5773634 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -11061,6 +11061,10 @@ xtensa_move_literals (void)
+@@ -11061,6 +11061,10 @@
    fixS *fix, *next_fix, **fix_splice;
    sym_list *lit;
    struct litpool_seg *lps;
@@ -61,7 +59,7 @@ index 36a06cc..5773634 100644
  
    mark_literal_frags (literal_head->next);
  
-@@ -11171,9 +11175,13 @@ xtensa_move_literals (void)
+@@ -11171,9 +11175,13 @@
  
    for (segment = literal_head->next; segment; segment = segment->next)
      {
@@ -77,11 +75,9 @@ index 36a06cc..5773634 100644
  	continue;
  
        frchain_from = seg_info (segment->seg)->frchainP;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 7ff7bd7..6b67320 100644
 --- a/gas/testsuite/gas/xtensa/all.exp
 +++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -102,6 +102,7 @@ if [istarget xtensa*-*-*] then {
+@@ -102,6 +102,7 @@
      run_dump_test "first_frag_align"
      run_dump_test "auto-litpools"
      run_dump_test "loc"
@@ -89,9 +85,6 @@ index 7ff7bd7..6b67320 100644
  }
  
  if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.d b/gas/testsuite/gas/xtensa/init-fini-literals.d
-new file mode 100644
-index 0000000..19ed121
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/init-fini-literals.d
 @@ -0,0 +1,24 @@
@@ -119,9 +112,6 @@ index 0000000..19ed121
 +.* R_XTENSA_SLOT0_OP  \.fini\.literal
 +.* R_XTENSA_SLOT0_OP  \.fini\.literal\+0x00000004
 +#...
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.s b/gas/testsuite/gas/xtensa/init-fini-literals.s
-new file mode 100644
-index 0000000..7c9ec17
 --- /dev/null
 +++ b/gas/testsuite/gas/xtensa/init-fini-literals.s
 @@ -0,0 +1,19 @@
@@ -144,6 +134,3 @@ index 0000000..7c9ec17
 +
 +	l32r	a2, .LC2
 +	l32r	a2, .LC3
--- 
-2.1.4
-
diff --git a/packages/binutils/2.27/100-missing-break.patch b/packages/binutils/2.27/0000-missing-break.patch
similarity index 71%
rename from packages/binutils/2.27/100-missing-break.patch
rename to packages/binutils/2.27/0000-missing-break.patch
index 6f9d67cc..3f9230d5 100644
--- a/packages/binutils/2.27/100-missing-break.patch
+++ b/packages/binutils/2.27/0000-missing-break.patch
@@ -9,15 +9,12 @@ missing break.
 	PR 20531
 	* elf32-ppc.c (_bfd_elf_ppc_set_arch): Add missing "break".
 ---
- bfd/ChangeLog   | 5 +++++
- bfd/elf32-ppc.c | 1 +
- 2 files changed, 6 insertions(+)
+ bfd/elf32-ppc.c |    1 +
+ 1 file changed, 1 insertion(+)
 
-diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
-index 92299bc..1dd6d78 100644
 --- a/bfd/elf32-ppc.c
 +++ b/bfd/elf32-ppc.c
-@@ -2246,6 +2246,7 @@ _bfd_elf_ppc_set_arch (bfd *abfd)
+@@ -2246,6 +2246,7 @@
  		case PPC_APUINFO_BRLOCK:
  		  if (mach != bfd_mach_ppc_vle)
  		    mach = bfd_mach_ppc_e500;
@@ -25,6 +22,3 @@ index 92299bc..1dd6d78 100644
  
  		case PPC_APUINFO_VLE:
  		  mach = bfd_mach_ppc_vle;
--- 
-2.9.3
-
diff --git a/packages/binutils/2.26.1/120-sh-conf.patch b/packages/binutils/2.27/0001-sh-conf.patch
similarity index 77%
rename from packages/binutils/2.26.1/120-sh-conf.patch
rename to packages/binutils/2.27/0001-sh-conf.patch
index c12a0230..63a3543c 100644
--- a/packages/binutils/2.26.1/120-sh-conf.patch
+++ b/packages/binutils/2.27/0001-sh-conf.patch
@@ -5,11 +5,14 @@ fix that up too.. now we're able to actually build a real toolchain for
 sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
 inept targets than that one, really. Go look, I promise).
 
-diff --git a/configure b/configure
-index 87677bc..2d916f1 100755
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/configure
 +++ b/configure
-@@ -3812,7 +3812,7 @@ case "${target}" in
+@@ -3946,7 +3946,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
@@ -18,11 +21,9 @@ index 87677bc..2d916f1 100755
      case "${target}" in
        sh*-*-elf)
           ;;
-diff --git a/configure.ac b/configure.ac
-index 8fe0eca..b10a99f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1140,7 +1140,7 @@ case "${target}" in
+@@ -1282,7 +1282,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
diff --git a/packages/binutils/2.27/0002-001_ld_makefile_patch.patch b/packages/binutils/2.27/0002-001_ld_makefile_patch.patch
new file mode 100644
index 00000000..79c47193
--- /dev/null
+++ b/packages/binutils/2.27/0002-001_ld_makefile_patch.patch
@@ -0,0 +1,27 @@
+---
+ ld/Makefile.am |    2 +-
+ ld/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -57,7 +57,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -451,7 +451,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/packages/binutils/2.27/300-012_check_ldrunpath_length.patch b/packages/binutils/2.27/0003-012_check_ldrunpath_length.patch
similarity index 76%
rename from packages/binutils/2.27/300-012_check_ldrunpath_length.patch
rename to packages/binutils/2.27/0003-012_check_ldrunpath_length.patch
index f1f31af9..74333510 100644
--- a/packages/binutils/2.27/300-012_check_ldrunpath_length.patch
+++ b/packages/binutils/2.27/0003-012_check_ldrunpath_length.patch
@@ -1,8 +1,10 @@
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 137446f..bb8391a 100644
+---
+ ld/emultempl/elf32.em |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/ld/emultempl/elf32.em
 +++ b/ld/emultempl/elf32.em
-@@ -1195,6 +1195,8 @@ fragment <<EOF
+@@ -1244,6 +1244,8 @@
  	      && command_line.rpath == NULL)
  	    {
  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -11,7 +13,7 @@ index 137446f..bb8391a 100644
  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
  						      force))
  		break;
-@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+@@ -1525,6 +1527,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/packages/binutils/2.29.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.27/0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
similarity index 72%
rename from packages/binutils/2.29.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
rename to packages/binutils/2.27/0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
index 2956385a..99dee969 100644
--- a/packages/binutils/2.29.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ b/packages/binutils/2.27/0004-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
@@ -1,5 +1,9 @@
---- binutils-2.27/gold/gold-threads.cc.orig	2016-12-26 16:44:23.691075600 +1100
-+++ binutils-2.27/gold/gold-threads.cc	2016-12-26 16:46:21.071855200 +1100
+---
+ gold/gold-threads.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
 @@ -101,7 +101,7 @@
    int err = pthread_mutexattr_init(&attr);
    if (err != 0)
diff --git a/packages/binutils/2.27/330-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.27/0005-Dont-link-to-libfl-as-its-unnecessary.patch
similarity index 73%
rename from packages/binutils/2.27/330-Dont-link-to-libfl-as-its-unnecessary.patch
rename to packages/binutils/2.27/0005-Dont-link-to-libfl-as-its-unnecessary.patch
index c52af050..ada911fb 100644
--- a/packages/binutils/2.27/330-Dont-link-to-libfl-as-its-unnecessary.patch
+++ b/packages/binutils/2.27/0005-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -1,5 +1,12 @@
-diff --git a/binutils/configure b/binutils/configure
-index 6e1f21e..78bf4ae 100755
+---
+ binutils/configure    |    3 +++
+ binutils/configure.ac |    3 +++
+ gas/configure         |    3 +++
+ gas/configure.ac      |    3 +++
+ ld/configure          |    3 +++
+ ld/configure.ac       |    3 +++
+ 6 files changed, 18 insertions(+)
+
 --- a/binutils/configure
 +++ b/binutils/configure
 @@ -12106,6 +12106,7 @@
@@ -19,8 +26,6 @@ index 6e1f21e..78bf4ae 100755
  
  ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
  # If we haven't got the data from the intl directory,
-diff --git a/binutils/configure.ac b/binutils/configure.ac
-index defe781..8fd236a 100644
 --- a/binutils/configure.ac
 +++ b/binutils/configure.ac
 @@ -87,7 +87,10 @@
@@ -34,11 +39,9 @@ index defe781..8fd236a 100644
  
  ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
  ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/gas/configure b/gas/configure
-index f959e95..9bb4043 100755
 --- a/gas/configure
 +++ b/gas/configure
-@@ -12819,6 +12819,7 @@ fi
+@@ -12927,6 +12927,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -46,7 +49,7 @@ index f959e95..9bb4043 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12980,6 +12981,8 @@ esac
+@@ -13088,6 +13089,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -55,11 +58,9 @@ index f959e95..9bb4043 100755
  
  ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
  # If we haven't got the data from the intl directory,
-diff --git a/gas/configure.ac b/gas/configure.ac
-index 07f825d..c552b7e 100644
 --- a/gas/configure.ac
 +++ b/gas/configure.ac
-@@ -734,7 +734,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${target_vendor}", [Target vendor.])
+@@ -793,7 +793,10 @@
  AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
  
  AC_PROG_YACC
@@ -70,11 +71,9 @@ index 07f825d..c552b7e 100644
  
  ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
  ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/ld/configure b/ld/configure
-index a446283..1a6bf81 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -16087,6 +16087,7 @@ fi
+@@ -16138,6 +16138,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -82,7 +81,7 @@ index a446283..1a6bf81 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -16248,6 +16249,8 @@ esac
+@@ -16299,6 +16300,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -91,11 +90,9 @@ index a446283..1a6bf81 100755
  
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..45eec53 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -186,7 +186,10 @@ AM_PO_SUBDIRS
+@@ -197,7 +197,10 @@
  AC_EXEEXT
  
  AC_PROG_YACC
diff --git a/packages/binutils/2.26.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.27/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch
similarity index 70%
rename from packages/binutils/2.26.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
rename to packages/binutils/2.27/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch
index e4f235b1..fbc40418 100644
--- a/packages/binutils/2.26.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ b/packages/binutils/2.27/0006-Darwin-gold-binary-cc-include-string-not-cstring.patch
@@ -1,5 +1,7 @@
-diff --git a/gold/binary.cc b/gold/binary.cc
-index 52df81a..03a8f20 100644
+---
+ gold/binary.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gold/binary.cc
 +++ b/gold/binary.cc
 @@ -23,7 +23,7 @@
diff --git a/packages/binutils/2.25.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.27/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
similarity index 70%
rename from packages/binutils/2.25.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
rename to packages/binutils/2.27/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
index 6168b31e..ab83bccb 100644
--- a/packages/binutils/2.25.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ b/packages/binutils/2.27/0007-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
@@ -9,15 +9,13 @@ Subject: [PATCH] Fix darwin build
 
 Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
 ---
- binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
- binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
+ bfd/peXXigen.c       |   22 ++++++++++++++++++++++
+ gold/gold-threads.cc |   15 ++++++++++++---
  2 files changed, 34 insertions(+), 3 deletions(-)
 
-diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
-index 13e39e4..7a98306 100644
---- binutils-2.25.orig/bfd/peXXigen.c
-+++ binutils-2.25/bfd/peXXigen.c
-@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
+--- a/bfd/peXXigen.c
++++ b/bfd/peXXigen.c
+@@ -3582,6 +3582,28 @@
  }
  #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
  
@@ -46,11 +44,9 @@ index 13e39e4..7a98306 100644
  /* Perform a comparison of two entries.  */
  static signed int
  rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
-diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
-index ff5a8ac..45140e0 100644
---- binutils-2.25.orig/gold/gold-threads.cc
-+++ binutils-2.25/gold/gold-threads.cc
-@@ -284,9 +284,18 @@ Condvar::~Condvar()
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
+@@ -284,9 +284,18 @@
  class Once_initialize
  {
   public:
@@ -72,6 +68,3 @@ index ff5a8ac..45140e0 100644
  
    // Return a pointer to the pthread_once_t variable.
    pthread_once_t*
--- 
-2.1.3
-
diff --git a/packages/binutils/2.27/500-sysroot.patch b/packages/binutils/2.27/0008-sysroot.patch
similarity index 93%
rename from packages/binutils/2.27/500-sysroot.patch
rename to packages/binutils/2.27/0008-sysroot.patch
index 4cb9bc79..22d2cb5e 100644
--- a/packages/binutils/2.27/500-sysroot.patch
+++ b/packages/binutils/2.27/0008-sysroot.patch
@@ -5,6 +5,10 @@ Always try to prepend the sysroot prefix to absolute filenames first.
 http://bugs.gentoo.org/275666
 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
+---
+ ld/ldfile.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
 @@ -336,18 +336,25 @@
diff --git a/packages/binutils/2.27/600-poison-system-directories.patch b/packages/binutils/2.27/0009-poison-system-directories.patch
similarity index 86%
rename from packages/binutils/2.27/600-poison-system-directories.patch
rename to packages/binutils/2.27/0009-poison-system-directories.patch
index ff235e3d..027377e7 100644
--- a/packages/binutils/2.27/600-poison-system-directories.patch
+++ b/packages/binutils/2.27/0009-poison-system-directories.patch
@@ -59,8 +59,18 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
-diff --git a/ld/config.in b/ld/config.in
-index 276fb77..35c58eb 100644
+---
+ ld/config.in    |    3 +++
+ ld/configure    |   14 ++++++++++++++
+ ld/configure.ac |   10 ++++++++++
+ ld/ld.h         |    8 ++++++++
+ ld/ld.texinfo   |   12 ++++++++++++
+ ld/ldfile.c     |   17 +++++++++++++++++
+ ld/ldlex.h      |    2 ++
+ ld/ldmain.c     |    2 ++
+ ld/lexsup.c     |   21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
 --- a/ld/config.in
 +++ b/ld/config.in
 @@ -17,6 +17,9 @@
@@ -73,11 +83,9 @@ index 276fb77..35c58eb 100644
  /* Additional extension a shared object might have. */
  #undef EXTRA_SHLIB_EXTENSION
  
-diff --git a/ld/configure b/ld/configure
-index a446283..d1f9504 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -788,6 +788,7 @@ with_lib_path
+@@ -788,6 +788,7 @@
  enable_targets
  enable_64_bit_bfd
  with_sysroot
@@ -85,7 +93,7 @@ index a446283..d1f9504 100755
  enable_gold
  enable_got
  enable_compressed_debug_sections
-@@ -1445,6 +1446,8 @@ Optional Features:
+@@ -1445,6 +1446,8 @@
    --disable-largefile     omit support for large files
    --enable-targets        alternative target configurations
    --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
@@ -94,7 +102,7 @@ index a446283..d1f9504 100755
    --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
    --enable-got=<type>     GOT handling scheme (target, single, negative,
                            multigot)
-@@ -15498,7 +15501,18 @@ else
+@@ -15498,7 +15501,18 @@
  fi
  
  
@@ -113,11 +121,9 @@ index a446283..d1f9504 100755
  
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..2cd8443 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+@@ -95,6 +95,16 @@
  AC_SUBST(TARGET_SYSTEM_ROOT)
  AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
  
@@ -134,11 +140,9 @@ index 188172d..2cd8443 100644
  dnl Use --enable-gold to decide if this linker should be the default.
  dnl "install_as_default" is set to false if gold is the default linker.
  dnl "installed_linker" is the installed BFD linker name.
-diff --git a/ld/ld.h b/ld/ld.h
-index d84ec4e..3476b26 100644
 --- a/ld/ld.h
 +++ b/ld/ld.h
-@@ -169,6 +169,14 @@ typedef struct {
+@@ -169,6 +169,14 @@
    /* If set, display the target memory usage (per memory region).  */
    bfd_boolean print_memory_usage;
  
@@ -153,11 +157,9 @@ index d84ec4e..3476b26 100644
    /* Big or little endian as set on command line.  */
    enum endian_enum endian;
  
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index 1dd7492..fb1438e 100644
 --- a/ld/ld.texinfo
 +++ b/ld/ld.texinfo
-@@ -2357,6 +2357,18 @@ string identifying the original linked file does not change.
+@@ -2357,6 +2357,18 @@
  
  Passing @code{none} for @var{style} disables the setting from any
  @code{--build-id} options earlier on the command line.
@@ -176,11 +178,9 @@ index 1dd7492..fb1438e 100644
  @end table
  
  @c man end
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 96f9ecc..af231c0 100644
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+@@ -114,6 +114,23 @@
      new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
    else
      new_dirs->name = xstrdup (name);
@@ -204,11 +204,9 @@ index 96f9ecc..af231c0 100644
  }
  
  /* Try to open a BFD for a lang_input_statement.  */
-diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 6f11e7b..0ca3110 100644
 --- a/ld/ldlex.h
 +++ b/ld/ldlex.h
-@@ -144,6 +144,8 @@ enum option_values
+@@ -144,6 +144,8 @@
    OPTION_PRINT_MEMORY_USAGE,
    OPTION_REQUIRE_DEFINED_SYMBOL,
    OPTION_ORPHAN_HANDLING,
@@ -217,11 +215,9 @@ index 6f11e7b..0ca3110 100644
  };
  
  /* The initial parser states.  */
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index bb0b9cc..a23c56c 100644
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
-@@ -257,6 +257,8 @@ main (int argc, char **argv)
+@@ -257,6 +257,8 @@
    command_line.warn_mismatch = TRUE;
    command_line.warn_search_mismatch = TRUE;
    command_line.check_section_addresses = -1;
@@ -230,11 +226,9 @@ index bb0b9cc..a23c56c 100644
  
    /* We initialize DEMANGLING based on the environment variable
       COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 4cad209..be7d584 100644
 --- a/ld/lexsup.c
 +++ b/ld/lexsup.c
-@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
+@@ -530,6 +530,14 @@
    { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
      '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
      TWO_DASHES },
@@ -249,7 +243,7 @@ index 4cad209..be7d584 100644
  };
  
  #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
+@@ -542,6 +550,7 @@
    int ingroup = 0;
    char *default_dirlist = NULL;
    char *shortopts;
@@ -257,7 +251,7 @@ index 4cad209..be7d584 100644
    struct option *longopts;
    struct option *really_longopts;
    int last_optind;
-@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
+@@ -1516,6 +1525,14 @@
            }
            break;
  
@@ -272,7 +266,7 @@ index 4cad209..be7d584 100644
  	case OPTION_PUSH_STATE:
  	  input_flags.pushed = xmemdup (&input_flags,
  					sizeof (input_flags),
-@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
+@@ -1559,6 +1576,10 @@
        command_line.soname = NULL;
      }
  
diff --git a/packages/binutils/2.25.1/700-Fix-library-paths-on-PowerPC.patch b/packages/binutils/2.27/0010-Fix-library-paths-on-PowerPC.patch
similarity index 87%
rename from packages/binutils/2.25.1/700-Fix-library-paths-on-PowerPC.patch
rename to packages/binutils/2.27/0010-Fix-library-paths-on-PowerPC.patch
index cea92f3d..4bcc748b 100644
--- a/packages/binutils/2.25.1/700-Fix-library-paths-on-PowerPC.patch
+++ b/packages/binutils/2.27/0010-Fix-library-paths-on-PowerPC.patch
@@ -13,14 +13,12 @@ depend on whether it is built on LE or BE machine.
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ld/emulparams/elf32ppccommon.sh | 10 +++++-----
+ ld/emulparams/elf32ppccommon.sh |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
-index 1f54ef8..d00cf68 100644
 --- a/ld/emulparams/elf32ppccommon.sh
 +++ b/ld/emulparams/elf32ppccommon.sh
-@@ -44,11 +44,11 @@ fi
+@@ -44,11 +44,11 @@
  
  # Look for 64 bit target libraries in /lib64, /usr/lib64 etc., first.
  # Similarly, look for 32 bit libraries in /lib32, /usr/lib32 etc.
@@ -37,6 +35,3 @@ index 1f54ef8..d00cf68 100644
    *:*64lppc*) LIBPATH_SUFFIX=64le ;;
    *:*32lppc*) LIBPATH_SUFFIX=32le ;;
    *:*64*) LIBPATH_SUFFIX=64 ;;
--- 
-2.9.3
-
diff --git a/packages/binutils/2.27/999-xtensa-reverse-shift-count.patch b/packages/binutils/2.27/0011-xtensa-reverse-shift-count.patch
similarity index 72%
rename from packages/binutils/2.27/999-xtensa-reverse-shift-count.patch
rename to packages/binutils/2.27/0011-xtensa-reverse-shift-count.patch
index f8bb9c19..1fc8652b 100644
--- a/packages/binutils/2.27/999-xtensa-reverse-shift-count.patch
+++ b/packages/binutils/2.27/0011-xtensa-reverse-shift-count.patch
@@ -10,16 +10,13 @@ gas/ChangeLog:
 	* config/tc-xtensa.c (xg_reverse_shift_count): Pass cnt_arg instead of
 	cnt_argp to concat.
 ---
- gas/ChangeLog          | 5 +++++
- gas/config/tc-xtensa.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
+ gas/config/tc-xtensa.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 [[ ChangeLog skipped, fails to apply on 2.27 ]]
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d062044..ca261ae 100644
 --- a/gas/config/tc-xtensa.c
 +++ b/gas/config/tc-xtensa.c
-@@ -2228,7 +2228,7 @@ xg_reverse_shift_count (char **cnt_argp)
+@@ -2228,7 +2228,7 @@
    cnt_arg = *cnt_argp;
  
    /* replace the argument with "31-(argument)" */
@@ -28,6 +25,3 @@ index d062044..ca261ae 100644
  
    free (cnt_arg);
    *cnt_argp = new_arg;
--- 
-2.9.3
-
diff --git a/packages/binutils/2.25.1/120-sh-conf.patch b/packages/binutils/2.28.1/0000-sh-conf.patch
similarity index 77%
rename from packages/binutils/2.25.1/120-sh-conf.patch
rename to packages/binutils/2.28.1/0000-sh-conf.patch
index c12a0230..67e7c7af 100644
--- a/packages/binutils/2.25.1/120-sh-conf.patch
+++ b/packages/binutils/2.28.1/0000-sh-conf.patch
@@ -5,11 +5,14 @@ fix that up too.. now we're able to actually build a real toolchain for
 sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
 inept targets than that one, really. Go look, I promise).
 
-diff --git a/configure b/configure
-index 87677bc..2d916f1 100755
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/configure
 +++ b/configure
-@@ -3812,7 +3812,7 @@ case "${target}" in
+@@ -3943,7 +3943,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
@@ -18,11 +21,9 @@ index 87677bc..2d916f1 100755
      case "${target}" in
        sh*-*-elf)
           ;;
-diff --git a/configure.ac b/configure.ac
-index 8fe0eca..b10a99f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1140,7 +1140,7 @@ case "${target}" in
+@@ -1279,7 +1279,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
diff --git a/packages/binutils/2.28.1/0001-001_ld_makefile_patch.patch b/packages/binutils/2.28.1/0001-001_ld_makefile_patch.patch
new file mode 100644
index 00000000..36940def
--- /dev/null
+++ b/packages/binutils/2.28.1/0001-001_ld_makefile_patch.patch
@@ -0,0 +1,27 @@
+---
+ ld/Makefile.am |    2 +-
+ ld/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -57,7 +57,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -452,7 +452,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch b/packages/binutils/2.28.1/0002-012_check_ldrunpath_length.patch
similarity index 76%
rename from packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch
rename to packages/binutils/2.28.1/0002-012_check_ldrunpath_length.patch
index f1f31af9..78f05ae6 100644
--- a/packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch
+++ b/packages/binutils/2.28.1/0002-012_check_ldrunpath_length.patch
@@ -1,8 +1,10 @@
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 137446f..bb8391a 100644
+---
+ ld/emultempl/elf32.em |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/ld/emultempl/elf32.em
 +++ b/ld/emultempl/elf32.em
-@@ -1195,6 +1195,8 @@ fragment <<EOF
+@@ -1411,6 +1411,8 @@
  	      && command_line.rpath == NULL)
  	    {
  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -11,7 +13,7 @@ index 137446f..bb8391a 100644
  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
  						      force))
  		break;
-@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+@@ -1692,6 +1694,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/packages/binutils/2.27/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.28.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
similarity index 72%
rename from packages/binutils/2.27/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
rename to packages/binutils/2.28.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
index 2956385a..99dee969 100644
--- a/packages/binutils/2.27/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ b/packages/binutils/2.28.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
@@ -1,5 +1,9 @@
---- binutils-2.27/gold/gold-threads.cc.orig	2016-12-26 16:44:23.691075600 +1100
-+++ binutils-2.27/gold/gold-threads.cc	2016-12-26 16:46:21.071855200 +1100
+---
+ gold/gold-threads.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
 @@ -101,7 +101,7 @@
    int err = pthread_mutexattr_init(&attr);
    if (err != 0)
diff --git a/packages/binutils/2.28.1/330-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.28.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
similarity index 71%
rename from packages/binutils/2.28.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
rename to packages/binutils/2.28.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
index c52af050..c687f748 100644
--- a/packages/binutils/2.28.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
+++ b/packages/binutils/2.28.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -1,8 +1,15 @@
-diff --git a/binutils/configure b/binutils/configure
-index 6e1f21e..78bf4ae 100755
+---
+ binutils/configure    |    3 +++
+ binutils/configure.ac |    3 +++
+ gas/configure         |    3 +++
+ gas/configure.ac      |    3 +++
+ ld/configure          |    3 +++
+ ld/configure.ac       |    3 +++
+ 6 files changed, 18 insertions(+)
+
 --- a/binutils/configure
 +++ b/binutils/configure
-@@ -12106,6 +12106,7 @@
+@@ -12150,6 +12150,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -10,7 +17,7 @@ index 6e1f21e..78bf4ae 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12267,6 +12268,8 @@
+@@ -12311,6 +12312,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -19,8 +26,6 @@ index 6e1f21e..78bf4ae 100755
  
  ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
  # If we haven't got the data from the intl directory,
-diff --git a/binutils/configure.ac b/binutils/configure.ac
-index defe781..8fd236a 100644
 --- a/binutils/configure.ac
 +++ b/binutils/configure.ac
 @@ -87,7 +87,10 @@
@@ -34,11 +39,9 @@ index defe781..8fd236a 100644
  
  ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
  ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/gas/configure b/gas/configure
-index f959e95..9bb4043 100755
 --- a/gas/configure
 +++ b/gas/configure
-@@ -12819,6 +12819,7 @@ fi
+@@ -13002,6 +13002,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -46,7 +49,7 @@ index f959e95..9bb4043 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12980,6 +12981,8 @@ esac
+@@ -13163,6 +13164,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -55,11 +58,9 @@ index f959e95..9bb4043 100755
  
  ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
  # If we haven't got the data from the intl directory,
-diff --git a/gas/configure.ac b/gas/configure.ac
-index 07f825d..c552b7e 100644
 --- a/gas/configure.ac
 +++ b/gas/configure.ac
-@@ -734,7 +734,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${target_vendor}", [Target vendor.])
+@@ -794,7 +794,10 @@
  AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
  
  AC_PROG_YACC
@@ -70,11 +71,9 @@ index 07f825d..c552b7e 100644
  
  ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
  ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/ld/configure b/ld/configure
-index a446283..1a6bf81 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -16087,6 +16087,7 @@ fi
+@@ -16182,6 +16182,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -82,7 +81,7 @@ index a446283..1a6bf81 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -16248,6 +16249,8 @@ esac
+@@ -16343,6 +16344,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -91,11 +90,9 @@ index a446283..1a6bf81 100755
  
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..45eec53 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -186,7 +186,10 @@ AM_PO_SUBDIRS
+@@ -197,7 +197,10 @@
  AC_EXEEXT
  
  AC_PROG_YACC
diff --git a/packages/binutils/2.27/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.28.1/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch
similarity index 70%
rename from packages/binutils/2.27/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
rename to packages/binutils/2.28.1/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch
index e4f235b1..fbc40418 100644
--- a/packages/binutils/2.27/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ b/packages/binutils/2.28.1/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch
@@ -1,5 +1,7 @@
-diff --git a/gold/binary.cc b/gold/binary.cc
-index 52df81a..03a8f20 100644
+---
+ gold/binary.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gold/binary.cc
 +++ b/gold/binary.cc
 @@ -23,7 +23,7 @@
diff --git a/packages/binutils/2.28.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.28.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
similarity index 70%
rename from packages/binutils/2.28.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
rename to packages/binutils/2.28.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
index 6168b31e..4192e1dd 100644
--- a/packages/binutils/2.28.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ b/packages/binutils/2.28.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
@@ -9,15 +9,13 @@ Subject: [PATCH] Fix darwin build
 
 Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
 ---
- binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
- binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
+ bfd/peXXigen.c       |   22 ++++++++++++++++++++++
+ gold/gold-threads.cc |   15 ++++++++++++---
  2 files changed, 34 insertions(+), 3 deletions(-)
 
-diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
-index 13e39e4..7a98306 100644
---- binutils-2.25.orig/bfd/peXXigen.c
-+++ binutils-2.25/bfd/peXXigen.c
-@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
+--- a/bfd/peXXigen.c
++++ b/bfd/peXXigen.c
+@@ -3604,6 +3604,28 @@
  }
  #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
  
@@ -46,11 +44,9 @@ index 13e39e4..7a98306 100644
  /* Perform a comparison of two entries.  */
  static signed int
  rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
-diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
-index ff5a8ac..45140e0 100644
---- binutils-2.25.orig/gold/gold-threads.cc
-+++ binutils-2.25/gold/gold-threads.cc
-@@ -284,9 +284,18 @@ Condvar::~Condvar()
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
+@@ -284,9 +284,18 @@
  class Once_initialize
  {
   public:
@@ -72,6 +68,3 @@ index ff5a8ac..45140e0 100644
  
    // Return a pointer to the pthread_once_t variable.
    pthread_once_t*
--- 
-2.1.3
-
diff --git a/packages/binutils/2.28.1/500-sysroot.patch b/packages/binutils/2.28.1/0007-sysroot.patch
similarity index 93%
rename from packages/binutils/2.28.1/500-sysroot.patch
rename to packages/binutils/2.28.1/0007-sysroot.patch
index 4cb9bc79..22d2cb5e 100644
--- a/packages/binutils/2.28.1/500-sysroot.patch
+++ b/packages/binutils/2.28.1/0007-sysroot.patch
@@ -5,6 +5,10 @@ Always try to prepend the sysroot prefix to absolute filenames first.
 http://bugs.gentoo.org/275666
 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
+---
+ ld/ldfile.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
 @@ -336,18 +336,25 @@
diff --git a/packages/binutils/2.28.1/600-poison-system-directories.patch b/packages/binutils/2.28.1/0008-poison-system-directories.patch
similarity index 86%
rename from packages/binutils/2.28.1/600-poison-system-directories.patch
rename to packages/binutils/2.28.1/0008-poison-system-directories.patch
index ff235e3d..4348162e 100644
--- a/packages/binutils/2.28.1/600-poison-system-directories.patch
+++ b/packages/binutils/2.28.1/0008-poison-system-directories.patch
@@ -59,8 +59,18 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
-diff --git a/ld/config.in b/ld/config.in
-index 276fb77..35c58eb 100644
+---
+ ld/config.in    |    3 +++
+ ld/configure    |   14 ++++++++++++++
+ ld/configure.ac |   10 ++++++++++
+ ld/ld.h         |    8 ++++++++
+ ld/ld.texinfo   |   12 ++++++++++++
+ ld/ldfile.c     |   17 +++++++++++++++++
+ ld/ldlex.h      |    2 ++
+ ld/ldmain.c     |    2 ++
+ ld/lexsup.c     |   21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
 --- a/ld/config.in
 +++ b/ld/config.in
 @@ -17,6 +17,9 @@
@@ -73,11 +83,9 @@ index 276fb77..35c58eb 100644
  /* Additional extension a shared object might have. */
  #undef EXTRA_SHLIB_EXTENSION
  
-diff --git a/ld/configure b/ld/configure
-index a446283..d1f9504 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -788,6 +788,7 @@ with_lib_path
+@@ -789,6 +789,7 @@
  enable_targets
  enable_64_bit_bfd
  with_sysroot
@@ -85,7 +93,7 @@ index a446283..d1f9504 100755
  enable_gold
  enable_got
  enable_compressed_debug_sections
-@@ -1445,6 +1446,8 @@ Optional Features:
+@@ -1446,6 +1447,8 @@
    --disable-largefile     omit support for large files
    --enable-targets        alternative target configurations
    --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
@@ -94,7 +102,7 @@ index a446283..d1f9504 100755
    --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
    --enable-got=<type>     GOT handling scheme (target, single, negative,
                            multigot)
-@@ -15498,7 +15501,18 @@ else
+@@ -15499,7 +15502,18 @@
  fi
  
  
@@ -113,11 +121,9 @@ index a446283..d1f9504 100755
  
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..2cd8443 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+@@ -95,6 +95,16 @@
  AC_SUBST(TARGET_SYSTEM_ROOT)
  AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
  
@@ -134,11 +140,9 @@ index 188172d..2cd8443 100644
  dnl Use --enable-gold to decide if this linker should be the default.
  dnl "install_as_default" is set to false if gold is the default linker.
  dnl "installed_linker" is the installed BFD linker name.
-diff --git a/ld/ld.h b/ld/ld.h
-index d84ec4e..3476b26 100644
 --- a/ld/ld.h
 +++ b/ld/ld.h
-@@ -169,6 +169,14 @@ typedef struct {
+@@ -172,6 +172,14 @@
    /* If set, display the target memory usage (per memory region).  */
    bfd_boolean print_memory_usage;
  
@@ -153,11 +157,9 @@ index d84ec4e..3476b26 100644
    /* Big or little endian as set on command line.  */
    enum endian_enum endian;
  
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index 1dd7492..fb1438e 100644
 --- a/ld/ld.texinfo
 +++ b/ld/ld.texinfo
-@@ -2357,6 +2357,18 @@ string identifying the original linked file does not change.
+@@ -2401,6 +2401,18 @@
  
  Passing @code{none} for @var{style} disables the setting from any
  @code{--build-id} options earlier on the command line.
@@ -176,11 +178,9 @@ index 1dd7492..fb1438e 100644
  @end table
  
  @c man end
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 96f9ecc..af231c0 100644
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+@@ -114,6 +114,23 @@
      new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
    else
      new_dirs->name = xstrdup (name);
@@ -204,11 +204,9 @@ index 96f9ecc..af231c0 100644
  }
  
  /* Try to open a BFD for a lang_input_statement.  */
-diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 6f11e7b..0ca3110 100644
 --- a/ld/ldlex.h
 +++ b/ld/ldlex.h
-@@ -144,6 +144,8 @@ enum option_values
+@@ -146,6 +146,8 @@
    OPTION_PRINT_MEMORY_USAGE,
    OPTION_REQUIRE_DEFINED_SYMBOL,
    OPTION_ORPHAN_HANDLING,
@@ -217,11 +215,9 @@ index 6f11e7b..0ca3110 100644
  };
  
  /* The initial parser states.  */
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index bb0b9cc..a23c56c 100644
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
-@@ -257,6 +257,8 @@ main (int argc, char **argv)
+@@ -270,6 +270,8 @@
    command_line.warn_mismatch = TRUE;
    command_line.warn_search_mismatch = TRUE;
    command_line.check_section_addresses = -1;
@@ -230,11 +226,9 @@ index bb0b9cc..a23c56c 100644
  
    /* We initialize DEMANGLING based on the environment variable
       COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 4cad209..be7d584 100644
 --- a/ld/lexsup.c
 +++ b/ld/lexsup.c
-@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
+@@ -535,6 +535,14 @@
    { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
      '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
      TWO_DASHES },
@@ -249,7 +243,7 @@ index 4cad209..be7d584 100644
  };
  
  #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
+@@ -547,6 +555,7 @@
    int ingroup = 0;
    char *default_dirlist = NULL;
    char *shortopts;
@@ -257,7 +251,7 @@ index 4cad209..be7d584 100644
    struct option *longopts;
    struct option *really_longopts;
    int last_optind;
-@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
+@@ -1528,6 +1537,14 @@
            }
            break;
  
@@ -272,7 +266,7 @@ index 4cad209..be7d584 100644
  	case OPTION_PUSH_STATE:
  	  input_flags.pushed = xmemdup (&input_flags,
  					sizeof (input_flags),
-@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
+@@ -1571,6 +1588,10 @@
        command_line.soname = NULL;
      }
  
diff --git a/packages/binutils/2.29.1/120-sh-conf.patch b/packages/binutils/2.29.1/0000-sh-conf.patch
similarity index 76%
rename from packages/binutils/2.29.1/120-sh-conf.patch
rename to packages/binutils/2.29.1/0000-sh-conf.patch
index 65fbcb0f..fd814d2e 100644
--- a/packages/binutils/2.29.1/120-sh-conf.patch
+++ b/packages/binutils/2.29.1/0000-sh-conf.patch
@@ -5,11 +5,14 @@ fix that up too.. now we're able to actually build a real toolchain for
 sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
 inept targets than that one, really. Go look, I promise).
 
-diff --git a/configure b/configure
-index 87677bc..2d916f1 100755
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/configure
 +++ b/configure
-@@ -3812,7 +3812,7 @@ case "${target}" in
+@@ -3844,7 +3844,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
@@ -18,11 +21,9 @@ index 87677bc..2d916f1 100755
      case "${target}" in
        sh*-*-elf)
           ;;
-diff --git a/configure.ac b/configure.ac
-index 8fe0eca..b10a99f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1140,7 +1140,7 @@ case "${target}" in
+@@ -1178,7 +1178,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
diff --git a/packages/binutils/2.29.1/0001-001_ld_makefile_patch.patch b/packages/binutils/2.29.1/0001-001_ld_makefile_patch.patch
new file mode 100644
index 00000000..46236530
--- /dev/null
+++ b/packages/binutils/2.29.1/0001-001_ld_makefile_patch.patch
@@ -0,0 +1,27 @@
+---
+ ld/Makefile.am |    2 +-
+ ld/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -57,7 +57,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -446,7 +446,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/packages/binutils/2.29.1/300-012_check_ldrunpath_length.patch b/packages/binutils/2.29.1/0002-012_check_ldrunpath_length.patch
similarity index 75%
rename from packages/binutils/2.29.1/300-012_check_ldrunpath_length.patch
rename to packages/binutils/2.29.1/0002-012_check_ldrunpath_length.patch
index c1d5a978..9bdc4135 100644
--- a/packages/binutils/2.29.1/300-012_check_ldrunpath_length.patch
+++ b/packages/binutils/2.29.1/0002-012_check_ldrunpath_length.patch
@@ -1,8 +1,10 @@
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 137446f..bb8391a 100644
+---
+ ld/emultempl/elf32.em |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/ld/emultempl/elf32.em
 +++ b/ld/emultempl/elf32.em
-@@ -1195,6 +1195,8 @@ fragment <<EOF
+@@ -1463,6 +1463,8 @@
  	      && command_line.rpath == NULL)
  	    {
  	      path = (const char *) getenv ("LD_RUN_PATH");
@@ -11,7 +13,7 @@ index 137446f..bb8391a 100644
  	      if (path
  		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
  		break;
-@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+@@ -1740,6 +1742,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/packages/binutils/2.28.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.29.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
similarity index 72%
rename from packages/binutils/2.28.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
rename to packages/binutils/2.29.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
index 2956385a..99dee969 100644
--- a/packages/binutils/2.28.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ b/packages/binutils/2.29.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
@@ -1,5 +1,9 @@
---- binutils-2.27/gold/gold-threads.cc.orig	2016-12-26 16:44:23.691075600 +1100
-+++ binutils-2.27/gold/gold-threads.cc	2016-12-26 16:46:21.071855200 +1100
+---
+ gold/gold-threads.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
 @@ -101,7 +101,7 @@
    int err = pthread_mutexattr_init(&attr);
    if (err != 0)
diff --git a/packages/binutils/2.29.1/330-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.29.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
similarity index 72%
rename from packages/binutils/2.29.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
rename to packages/binutils/2.29.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
index 4eaa7002..cb7af68f 100644
--- a/packages/binutils/2.29.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
+++ b/packages/binutils/2.29.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -1,8 +1,15 @@
-diff --git a/binutils/configure b/binutils/configure
-index 6e1f21e..78bf4ae 100755
+---
+ binutils/configure    |    3 +++
+ binutils/configure.ac |    3 +++
+ gas/configure         |    3 +++
+ gas/configure.ac      |    3 +++
+ ld/configure          |    3 +++
+ ld/configure.ac       |    3 +++
+ 6 files changed, 18 insertions(+)
+
 --- a/binutils/configure
 +++ b/binutils/configure
-@@ -12106,6 +12106,7 @@
+@@ -12150,6 +12150,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -10,7 +17,7 @@ index 6e1f21e..78bf4ae 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12267,6 +12268,8 @@
+@@ -12311,6 +12312,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -19,8 +26,6 @@ index 6e1f21e..78bf4ae 100755
  
  ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
  # If we haven't got the data from the intl directory,
-diff --git a/binutils/configure.ac b/binutils/configure.ac
-index defe781..8fd236a 100644
 --- a/binutils/configure.ac
 +++ b/binutils/configure.ac
 @@ -87,7 +87,10 @@
@@ -34,11 +39,9 @@ index defe781..8fd236a 100644
  
  ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
  ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/gas/configure b/gas/configure
-index f959e95..9bb4043 100755
 --- a/gas/configure
 +++ b/gas/configure
-@@ -12819,6 +12819,7 @@ fi
+@@ -13002,6 +13002,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -46,7 +49,7 @@ index f959e95..9bb4043 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12980,6 +12981,8 @@ esac
+@@ -13163,6 +13164,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -55,11 +58,9 @@ index f959e95..9bb4043 100755
  
  ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN sv"
  # If we haven't got the data from the intl directory,
-diff --git a/gas/configure.ac b/gas/configure.ac
-index 07f825d..c552b7e 100644
 --- a/gas/configure.ac
 +++ b/gas/configure.ac
-@@ -734,7 +734,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${target_vendor}", [Target vendor.])
+@@ -794,7 +794,10 @@
  AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
  
  AC_PROG_YACC
@@ -70,11 +71,9 @@ index 07f825d..c552b7e 100644
  
  ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN sv"
  ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/ld/configure b/ld/configure
-index a446283..1a6bf81 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -16087,6 +16087,7 @@ fi
+@@ -16191,6 +16191,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -82,7 +81,7 @@ index a446283..1a6bf81 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -16248,6 +16249,8 @@ esac
+@@ -16352,6 +16353,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -91,11 +90,9 @@ index a446283..1a6bf81 100755
  
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..45eec53 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -186,7 +186,10 @@ AM_PO_SUBDIRS
+@@ -208,7 +208,10 @@
  AC_EXEEXT
  
  AC_PROG_YACC
diff --git a/packages/binutils/2.28.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.29.1/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch
similarity index 70%
rename from packages/binutils/2.28.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
rename to packages/binutils/2.29.1/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch
index e4f235b1..fbc40418 100644
--- a/packages/binutils/2.28.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ b/packages/binutils/2.29.1/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch
@@ -1,5 +1,7 @@
-diff --git a/gold/binary.cc b/gold/binary.cc
-index 52df81a..03a8f20 100644
+---
+ gold/binary.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gold/binary.cc
 +++ b/gold/binary.cc
 @@ -23,7 +23,7 @@
diff --git a/packages/binutils/2.29.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.29.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
new file mode 100644
index 00000000..f4dc91ac
--- /dev/null
+++ b/packages/binutils/2.29.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
@@ -0,0 +1,70 @@
+From c39479f4ab4d372b518957871e1f205a03e7c3d6 Mon Sep 17 00:00:00 2001
+From: Andrew Hsieh <andrewhsieh@google.com>
+Date: Wed, 18 Mar 2015 10:57:24 +0800
+Subject: [PATCH] Fix darwin build
+
+1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4
+   doesn't support ended initializer list
+2. wcsncasecmp doesn't exist in MacSDK10.6.x
+
+Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
+---
+ bfd/peXXigen.c       |   22 ++++++++++++++++++++++
+ gold/gold-threads.cc |   15 ++++++++++++---
+ 2 files changed, 34 insertions(+), 3 deletions(-)
+
+--- a/bfd/peXXigen.c
++++ b/bfd/peXXigen.c
+@@ -3609,6 +3609,28 @@
+ }
+ #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
+ 
++#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L
++/* wcsncasecmp isn't always defined in Mac SDK */
++static int
++wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
++{
++  wchar_t c1, c2;
++
++  if (n == 0)
++    return (0);
++  for (; *s1; s1++, s2++)
++  {
++    c1 = towlower(*s1);
++    c2 = towlower(*s2);
++    if (c1 != c2)
++      return ((int)c1 - c2);
++    if (--n == 0)
++      return (0);
++  }
++  return (-*s2);
++}
++#endif
++
+ /* Perform a comparison of two entries.  */
+ static signed int
+ rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
+@@ -284,9 +284,18 @@
+ class Once_initialize
+ {
+  public:
+-  Once_initialize()
+-    : once_(PTHREAD_ONCE_INIT)
+-  { }
++   Once_initialize()
++#if !defined(__APPLE__)
++     : once_(PTHREAD_ONCE_INIT)
++   { }
++#else
++// In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 doesn't support
++// extended initializer list as above */
++   {
++     pthread_once_t once_2 = PTHREAD_ONCE_INIT;
++     once_ = once_2; 
++   }
++#endif
+ 
+   // Return a pointer to the pthread_once_t variable.
+   pthread_once_t*
diff --git a/packages/binutils/2.29.1/500-sysroot.patch b/packages/binutils/2.29.1/0007-sysroot.patch
similarity index 91%
rename from packages/binutils/2.29.1/500-sysroot.patch
rename to packages/binutils/2.29.1/0007-sysroot.patch
index 4cb9bc79..ba7940a4 100644
--- a/packages/binutils/2.29.1/500-sysroot.patch
+++ b/packages/binutils/2.29.1/0007-sysroot.patch
@@ -5,9 +5,13 @@ Always try to prepend the sysroot prefix to absolute filenames first.
 http://bugs.gentoo.org/275666
 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
+---
+ ld/ldfile.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -336,18 +336,25 @@
+@@ -338,18 +338,25 @@
       directory first.  */
    if (!entry->flags.maybe_archive)
      {
diff --git a/packages/binutils/2.29.1/600-poison-system-directories.patch b/packages/binutils/2.29.1/0008-poison-system-directories.patch
similarity index 85%
rename from packages/binutils/2.29.1/600-poison-system-directories.patch
rename to packages/binutils/2.29.1/0008-poison-system-directories.patch
index a0a4a30d..242b8ba2 100644
--- a/packages/binutils/2.29.1/600-poison-system-directories.patch
+++ b/packages/binutils/2.29.1/0008-poison-system-directories.patch
@@ -59,11 +59,21 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
-diff --git a/ld/config.in b/ld/config.in
-index 276fb77..35c58eb 100644
+---
+ ld/config.in    |    3 +++
+ ld/configure    |   14 ++++++++++++++
+ ld/configure.ac |   10 ++++++++++
+ ld/ld.h         |    8 ++++++++
+ ld/ld.texinfo   |   12 ++++++++++++
+ ld/ldfile.c     |   17 +++++++++++++++++
+ ld/ldlex.h      |    2 ++
+ ld/ldmain.c     |    2 ++
+ ld/lexsup.c     |   21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
 --- a/ld/config.in
 +++ b/ld/config.in
-@@ -17,6 +17,9 @@
+@@ -21,6 +21,9 @@
     language is requested. */
  #undef ENABLE_NLS
  
@@ -73,11 +83,9 @@ index 276fb77..35c58eb 100644
  /* Additional extension a shared object might have. */
  #undef EXTRA_SHLIB_EXTENSION
  
-diff --git a/ld/configure b/ld/configure
-index a446283..d1f9504 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -788,6 +788,7 @@ with_lib_path
+@@ -785,6 +785,7 @@
  enable_targets
  enable_64_bit_bfd
  with_sysroot
@@ -85,7 +93,7 @@ index a446283..d1f9504 100755
  enable_gold
  enable_got
  enable_compressed_debug_sections
-@@ -1445,6 +1446,8 @@ Optional Features:
+@@ -1443,6 +1444,8 @@
    --disable-largefile     omit support for large files
    --enable-targets        alternative target configurations
    --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
@@ -94,7 +102,7 @@ index a446283..d1f9504 100755
    --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
    --enable-got=<type>     GOT handling scheme (target, single, negative,
                            multigot)
-@@ -15498,7 +15501,18 @@ else
+@@ -15497,7 +15500,18 @@
  fi
  
  
@@ -113,11 +121,9 @@ index a446283..d1f9504 100755
  
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..2cd8443 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+@@ -95,6 +95,16 @@
  AC_SUBST(TARGET_SYSTEM_ROOT)
  AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
  
@@ -134,11 +140,9 @@ index 188172d..2cd8443 100644
  dnl Use --enable-gold to decide if this linker should be the default.
  dnl "install_as_default" is set to false if gold is the default linker.
  dnl "installed_linker" is the installed BFD linker name.
-diff --git a/ld/ld.h b/ld/ld.h
-index d84ec4e..3476b26 100644
 --- a/ld/ld.h
 +++ b/ld/ld.h
-@@ -169,6 +169,14 @@ typedef struct {
+@@ -172,6 +172,14 @@
    /* If set, display the target memory usage (per memory region).  */
    bfd_boolean print_memory_usage;
  
@@ -153,11 +157,9 @@ index d84ec4e..3476b26 100644
    /* Should we force section groups to be resolved?  Controlled with
       --force-group-allocation on the command line or FORCE_GROUP_ALLOCATION
       in the linker script.  */
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index 1dd7492..fb1438e 100644
 --- a/ld/ld.texinfo
 +++ b/ld/ld.texinfo
-@@ -2357,6 +2357,18 @@ string identifying the original linked file does not change.
+@@ -2480,6 +2480,18 @@
  
  Passing @code{none} for @var{style} disables the setting from any
  @code{--build-id} options earlier on the command line.
@@ -176,12 +178,10 @@ index 1dd7492..fb1438e 100644
  @end table
  
  @c man end
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 96f9ecc..af231c0 100644
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
+@@ -116,6 +116,23 @@
+     new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
    else
      new_dirs->name = xstrdup (name);
 +
@@ -204,11 +204,9 @@ index 96f9ecc..af231c0 100644
  }
  
  /* Try to open a BFD for a lang_input_statement.  */
-diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 6f11e7b..0ca3110 100644
 --- a/ld/ldlex.h
 +++ b/ld/ldlex.h
-@@ -144,6 +144,8 @@ enum option_values
+@@ -147,6 +147,8 @@
    OPTION_REQUIRE_DEFINED_SYMBOL,
    OPTION_ORPHAN_HANDLING,
    OPTION_FORCE_GROUP_ALLOCATION,
@@ -217,11 +215,9 @@ index 6f11e7b..0ca3110 100644
  };
  
  /* The initial parser states.  */
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index bb0b9cc..a23c56c 100644
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
-@@ -257,6 +257,8 @@ main (int argc, char **argv)
+@@ -270,6 +270,8 @@
    command_line.warn_mismatch = TRUE;
    command_line.warn_search_mismatch = TRUE;
    command_line.check_section_addresses = -1;
@@ -230,11 +226,9 @@ index bb0b9cc..a23c56c 100644
  
    /* We initialize DEMANGLING based on the environment variable
       COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 4cad209..be7d584 100644
 --- a/ld/lexsup.c
 +++ b/ld/lexsup.c
-@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
+@@ -538,6 +538,14 @@
    { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
      '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
      TWO_DASHES },
@@ -249,7 +243,7 @@ index 4cad209..be7d584 100644
  };
  
  #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
+@@ -550,6 +558,7 @@
    int ingroup = 0;
    char *default_dirlist = NULL;
    char *shortopts;
@@ -257,7 +251,7 @@ index 4cad209..be7d584 100644
    struct option *longopts;
    struct option *really_longopts;
    int last_optind;
-@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
+@@ -1534,6 +1543,14 @@
            }
            break;
  
@@ -272,7 +266,7 @@ index 4cad209..be7d584 100644
  	case OPTION_PUSH_STATE:
  	  input_flags.pushed = xmemdup (&input_flags,
  					sizeof (input_flags),
-@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
+@@ -1577,6 +1594,10 @@
        command_line.soname = NULL;
      }
  
diff --git a/packages/binutils/2.29.1/300-001_ld_makefile_patch.patch b/packages/binutils/2.29.1/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 2a1320cb..00000000
--- a/packages/binutils/2.29.1/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 9575f1f..84df0bf 100644
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -54,7 +54,7 @@ endif
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 9f56ca1..272860f 100644
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/packages/binutils/2.29.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.29.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
deleted file mode 100644
index 6168b31e..00000000
--- a/packages/binutils/2.29.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c39479f4ab4d372b518957871e1f205a03e7c3d6 Mon Sep 17 00:00:00 2001
-From: Andrew Hsieh <andrewhsieh@google.com>
-Date: Wed, 18 Mar 2015 10:57:24 +0800
-Subject: [PATCH] Fix darwin build
-
-1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4
-   doesn't support ended initializer list
-2. wcsncasecmp doesn't exist in MacSDK10.6.x
-
-Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
----
- binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
- binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
-diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
-index 13e39e4..7a98306 100644
---- binutils-2.25.orig/bfd/peXXigen.c
-+++ binutils-2.25/bfd/peXXigen.c
-@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
- }
- #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
- 
-+#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L
-+/* wcsncasecmp isn't always defined in Mac SDK */
-+static int
-+wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-+{
-+  wchar_t c1, c2;
-+
-+  if (n == 0)
-+    return (0);
-+  for (; *s1; s1++, s2++)
-+  {
-+    c1 = towlower(*s1);
-+    c2 = towlower(*s2);
-+    if (c1 != c2)
-+      return ((int)c1 - c2);
-+    if (--n == 0)
-+      return (0);
-+  }
-+  return (-*s2);
-+}
-+#endif
-+
- /* Perform a comparison of two entries.  */
- static signed int
- rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
-diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
-index ff5a8ac..45140e0 100644
---- binutils-2.25.orig/gold/gold-threads.cc
-+++ binutils-2.25/gold/gold-threads.cc
-@@ -284,9 +284,18 @@ Condvar::~Condvar()
- class Once_initialize
- {
-  public:
--  Once_initialize()
--    : once_(PTHREAD_ONCE_INIT)
--  { }
-+   Once_initialize()
-+#if !defined(__APPLE__)
-+     : once_(PTHREAD_ONCE_INIT)
-+   { }
-+#else
-+// In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 doesn't support
-+// extended initializer list as above */
-+   {
-+     pthread_once_t once_2 = PTHREAD_ONCE_INIT;
-+     once_ = once_2; 
-+   }
-+#endif
- 
-   // Return a pointer to the pthread_once_t variable.
-   pthread_once_t*
--- 
-2.1.3
-
diff --git a/packages/duma/2_5_15/100-cross-compile.patch b/packages/duma/2_5_15/0000-cross-compile.patch
similarity index 77%
rename from packages/duma/2_5_15/100-cross-compile.patch
rename to packages/duma/2_5_15/0000-cross-compile.patch
index cc951605..6978eba6 100644
--- a/packages/duma/2_5_15/100-cross-compile.patch
+++ b/packages/duma/2_5_15/0000-cross-compile.patch
@@ -1,6 +1,9 @@
-diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
---- duma_2_5_15.orig/GNUmakefile	2008-08-03 21:22:38.000000000 +0200
-+++ duma_2_5_15/GNUmakefile	2009-06-19 15:32:23.000000000 +0200
+---
+ GNUmakefile |    8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+--- a/GNUmakefile
++++ b/GNUmakefile
 @@ -93,10 +93,6 @@
  # also define 'WIN32'
  
diff --git a/packages/duma/2_5_15/110-separate_cpp.patch b/packages/duma/2_5_15/0001-separate_cpp.patch
similarity index 75%
rename from packages/duma/2_5_15/110-separate_cpp.patch
rename to packages/duma/2_5_15/0001-separate_cpp.patch
index 4bbccc72..bd6c6ee2 100644
--- a/packages/duma/2_5_15/110-separate_cpp.patch
+++ b/packages/duma/2_5_15/0001-separate_cpp.patch
@@ -1,6 +1,9 @@
-diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
---- duma_2_5_15.orig/GNUmakefile	2009-06-19 16:41:53.000000000 +0200
-+++ duma_2_5_15/GNUmakefile	2009-06-19 16:43:53.000000000 +0200
+---
+ GNUmakefile |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/GNUmakefile
++++ b/GNUmakefile
 @@ -289,9 +289,13 @@
  	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
  	createconf.c
diff --git a/packages/duma/2_5_15/200-cpp11-new-operator.patch b/packages/duma/2_5_15/0002-cpp11-new-operator.patch
similarity index 92%
rename from packages/duma/2_5_15/200-cpp11-new-operator.patch
rename to packages/duma/2_5_15/0002-cpp11-new-operator.patch
index 900333ea..4504cd75 100644
--- a/packages/duma/2_5_15/200-cpp11-new-operator.patch
+++ b/packages/duma/2_5_15/0002-cpp11-new-operator.patch
@@ -1,8 +1,11 @@
-diff --git a/dumapp.cpp b/dumapp.cpp
-index dbddf66..b5e9ba3 100644
+---
+ dumapp.cpp |   12 ++++--------
+ dumapp.h   |   13 +++++++++----
+ 2 files changed, 13 insertions(+), 12 deletions(-)
+
 --- a/dumapp.cpp
 +++ b/dumapp.cpp
-@@ -189,8 +189,7 @@ void * duma_new_operator(DUMA_SIZE_T userSize, enum _DUMA_Allocator allocator, b
+@@ -189,8 +189,7 @@
   * Single object form, no debug information
   * (11) = (a) ; ASW
   */
@@ -12,7 +15,7 @@ index dbddf66..b5e9ba3 100644
  {
    return duma_new_operator(size, EFA_NEW_ELEM, true  DUMA_PARAMS_UK);
  }
-@@ -253,8 +252,7 @@ throw()
+@@ -253,8 +252,7 @@
   * Array object form, no debug information
   * (21) = (a) ; AAW
   */
@@ -22,7 +25,7 @@ index dbddf66..b5e9ba3 100644
  {
    return duma_new_operator(size, EFA_NEW_ARRAY, true  DUMA_PARAMS_UK);
  }
-@@ -320,8 +318,7 @@ throw()
+@@ -320,8 +318,7 @@
   * Single object form with debug information
   * (31) = (a) ; ASW 
   */
@@ -32,7 +35,7 @@ index dbddf66..b5e9ba3 100644
  {
    return duma_new_operator(size, EFA_NEW_ELEM, true  DUMA_PARAMS_FILELINE);
  }
-@@ -373,8 +370,7 @@ throw()
+@@ -373,8 +370,7 @@
   * Array object form with debug information
   * (41) = (a) ; AAW 
   */
@@ -42,8 +45,6 @@ index dbddf66..b5e9ba3 100644
  {
    return duma_new_operator(size, EFA_NEW_ARRAY, true  DUMA_PARAMS_FILELINE);
  }
-diff --git a/dumapp.h b/dumapp.h
-index fc40d9a..7175359 100644
 --- a/dumapp.h
 +++ b/dumapp.h
 @@ -64,6 +64,11 @@
diff --git a/packages/gcc/4.8.5/001_gcc_bug_62231.patch b/packages/gcc-linaro/4.8-2015.06/0000-gcc_bug_62231.patch
similarity index 88%
rename from packages/gcc/4.8.5/001_gcc_bug_62231.patch
rename to packages/gcc-linaro/4.8-2015.06/0000-gcc_bug_62231.patch
index e7c9cf97..603e1c25 100644
--- a/packages/gcc/4.8.5/001_gcc_bug_62231.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0000-gcc_bug_62231.patch
@@ -4,9 +4,14 @@ https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02625.html
 
 Linked from bug62231 comment 4 there
 
-diff -durN a/gcc/defaults.h b/gcc/defaults.h
---- a/gcc/defaults.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/defaults.h	2014-12-15 13:26:13.498904465 -0800
+---
+ gcc/defaults.h      |    5 +++
+ gcc/dwarf2cfi.c     |   76 +++++++++++++++++++++++++++++++++++-----------------
+ libgcc/unwind-dw2.c |    4 --
+ 3 files changed, 57 insertions(+), 28 deletions(-)
+
+--- a/gcc/defaults.h
++++ b/gcc/defaults.h
 @@ -438,6 +438,11 @@
  #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
  #endif
@@ -19,9 +24,8 @@ diff -durN a/gcc/defaults.h b/gcc/defaults.h
  /* Map register numbers held in the call frame info that gcc has
     collected using DWARF_FRAME_REGNUM to those that should be output in
     .debug_frame and .eh_frame.  */
-diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
---- a/gcc/dwarf2cfi.c	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/dwarf2cfi.c	2014-12-15 13:50:24.554883694 -0800
+--- a/gcc/dwarf2cfi.c
++++ b/gcc/dwarf2cfi.c
 @@ -225,7 +225,44 @@
    emit_move_insn (adjust_address (mem, mode, offset), GEN_INT (size));
  }
@@ -74,7 +78,9 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
      {
 -      unsigned int dnum = DWARF_FRAME_REGNUM (i);
 -      unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
--
++      enum machine_mode save_mode = reg_raw_mode[i];
++      rtx span;
+ 
 -      if (rnum < DWARF_FRAME_REGISTERS)
 -	{
 -	  HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode);
@@ -92,9 +98,7 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
 -	  size = GET_MODE_SIZE (save_mode);
 -	  if (offset < 0)
 -	    continue;
-+      enum machine_mode save_mode = reg_raw_mode[i];
-+      rtx span;
- 
+-
 -	  emit_move_insn (adjust_address (mem, mode, offset),
 -			  gen_int_mode (size, mode));
 -	}
@@ -113,9 +117,8 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
      }
  
    if (!wrote_return_column)
-diff -durN a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
---- a/libgcc/unwind-dw2.c	2013-05-31 16:21:46.000000000 -0700
-+++ b/libgcc/unwind-dw2.c	2014-12-15 13:26:13.570904866 -0800
+--- a/libgcc/unwind-dw2.c
++++ b/libgcc/unwind-dw2.c
 @@ -55,10 +55,6 @@
  #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS
  #endif
diff --git a/packages/gcc-linaro/4.9-2017.01/002-gcc_bug_62231.patch b/packages/gcc-linaro/4.8-2015.06/0001-gcc_bug_62231.patch
similarity index 64%
rename from packages/gcc-linaro/4.9-2017.01/002-gcc_bug_62231.patch
rename to packages/gcc-linaro/4.8-2015.06/0001-gcc_bug_62231.patch
index b970ebc8..0fed72dd 100644
--- a/packages/gcc-linaro/4.9-2017.01/002-gcc_bug_62231.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0001-gcc_bug_62231.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/ml/gcc-patches/2014-10/msg02605.html
 
 Linked from bug62231 comment 4 there
 
-diff -durN a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
---- a/gcc/config/rs6000/rs6000.c	2014-12-08 17:29:04.000000000 -0800
-+++ b/gcc/config/rs6000/rs6000.c	2014-12-15 14:44:46.568801843 -0800
-@@ -1673,7 +1673,7 @@
+---
+ gcc/config/rs6000/rs6000.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -1677,7 +1677,7 @@
       SCmode so as to pass the value correctly in a pair of
       registers.  */
    else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode
diff --git a/packages/gcc-linaro/4.8-2015.06/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/4.8-2015.06/0002-libtool-leave-framework-alone.patch
similarity index 73%
rename from packages/gcc-linaro/4.8-2015.06/1000-libtool-leave-framework-alone.patch
rename to packages/gcc-linaro/4.8-2015.06/0002-libtool-leave-framework-alone.patch
index 525592e6..e67e0e88 100644
--- a/packages/gcc-linaro/4.8-2015.06/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0002-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-4.9.4/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-4.9.4/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
 @@ -36,6 +36,11 @@
  for arg
  do
diff --git a/packages/gcc-linaro/7.1-2017.08/100-uclibc-conf.patch b/packages/gcc-linaro/4.8-2015.06/0003-uclibc-conf.patch
similarity index 82%
rename from packages/gcc-linaro/7.1-2017.08/100-uclibc-conf.patch
rename to packages/gcc-linaro/4.8-2015.06/0003-uclibc-conf.patch
index 73d1f0d3..aef750af 100644
--- a/packages/gcc-linaro/7.1-2017.08/100-uclibc-conf.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0003-uclibc-conf.patch
@@ -1,5 +1,7 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/contrib/regression/objs-gcc.sh
 +++ b/contrib/regression/objs-gcc.sh
 @@ -106,6 +106,10 @@
diff --git a/packages/gcc/4.8.5/111-pr65730.patch b/packages/gcc-linaro/4.8-2015.06/0004-pr65730.patch
similarity index 82%
rename from packages/gcc/4.8.5/111-pr65730.patch
rename to packages/gcc-linaro/4.8-2015.06/0004-pr65730.patch
index f195e308..3cea1a11 100644
--- a/packages/gcc/4.8.5/111-pr65730.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0004-pr65730.patch
@@ -13,14 +13,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
 Changes to ChangeLog are dropped.
 
- gcc/config/xtensa/xtensa.c | 5 +++--
+ gcc/config/xtensa/xtensa.c |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..7296e36 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1461,8 +1461,9 @@ init_alignment_context (struct alignment_context *ac, rtx mem)
+@@ -1423,8 +1423,9 @@
    if (ac->shift != NULL_RTX)
      {
        /* Shift is the byte count, but we need the bitcount.  */
@@ -32,6 +30,3 @@ index eb039ba..7296e36 100644
  				       NULL_RTX, 1, OPTAB_DIRECT);
        ac->modemask = expand_simple_binop (SImode, ASHIFT,
  					  GEN_INT (GET_MODE_MASK (mode)),
--- 
-1.8.1.4
-
diff --git a/packages/gcc/4.9.4/130-pr43538.patch b/packages/gcc-linaro/4.8-2015.06/0005-pr43538.patch
similarity index 85%
rename from packages/gcc/4.9.4/130-pr43538.patch
rename to packages/gcc-linaro/4.8-2015.06/0005-pr43538.patch
index 19e57bb0..c2a20462 100644
--- a/packages/gcc/4.9.4/130-pr43538.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0005-pr43538.patch
@@ -10,16 +10,11 @@ Subject: [PATCH] 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- config/mt-gnu    | 2 +-
+ config/mt-gnu |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
 --- a/config/mt-gnu
 +++ b/config/mt-gnu
 @@ -1 +1 @@
 -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
 +CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
--- 
-2.1.4
-
diff --git a/packages/gcc/4.8.5/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch b/packages/gcc-linaro/4.8-2015.06/0006-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
similarity index 87%
rename from packages/gcc/4.8.5/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
rename to packages/gcc-linaro/4.8-2015.06/0006-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
index 1c49fb0a..d8666619 100644
--- a/packages/gcc/4.8.5/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0006-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
@@ -10,11 +10,9 @@ Subject: [PATCH] 2014-11-17  Bob Dunlop  <bob.dunlop@xyzzy.org.uk>
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217739 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- config/mt-ospace | 4 ++--
+ config/mt-ospace |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/config/mt-ospace b/config/mt-ospace
-index 7f09104..ce29ff4 100644
 --- a/config/mt-ospace
 +++ b/config/mt-ospace
 @@ -1,3 +1,3 @@
@@ -23,6 +21,3 @@ index 7f09104..ce29ff4 100644
 - CXXFLAGS_FOR_TARGET = -g -Os
 + CFLAGS_FOR_TARGET += -g -Os
 + CXXFLAGS_FOR_TARGET += -g -Os
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/132-build_gcc-5_with_gcc-6.patch b/packages/gcc-linaro/4.8-2015.06/0007-build_gcc-5_with_gcc-6.patch
similarity index 81%
rename from packages/gcc-linaro/4.8-2015.06/132-build_gcc-5_with_gcc-6.patch
rename to packages/gcc-linaro/4.8-2015.06/0007-build_gcc-5_with_gcc-6.patch
index ac1d8461..b49d7dab 100644
--- a/packages/gcc-linaro/4.8-2015.06/132-build_gcc-5_with_gcc-6.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0007-build_gcc-5_with_gcc-6.patch
@@ -15,16 +15,22 @@ Subject: [PATCH 1/1] 2016-02-25  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
 
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@233720 138bc75d-0d04-0410-961f-82ee72b054a4
-diff -urpN a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
---- a/gcc/cp/cfns.gperf	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/cfns.gperf	2016-12-05 13:55:20.331616274 -0800
+---
+ gcc/cp/Make-lang.in |    2 +-
+ gcc/cp/cfns.gperf   |   10 ++--------
+ gcc/cp/cfns.h       |   41 ++++++++++++++---------------------------
+ gcc/cp/except.c     |    3 ++-
+ 4 files changed, 19 insertions(+), 37 deletions(-)
+
+--- a/gcc/cp/cfns.gperf
++++ b/gcc/cp/cfns.gperf
 @@ -1,3 +1,5 @@
 +%language=C++
 +%define class-name libc_name
  %{
  /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
  
-@@ -16,14 +18,6 @@ for more details.
+@@ -16,14 +18,6 @@
  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/>.  */
@@ -39,9 +45,8 @@ diff -urpN a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
  %}
  %%
  # The standard C library functions, for feeding to gperf; the result is used
-diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
---- a/gcc/cp/cfns.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/cfns.h	2016-12-05 13:55:20.331616274 -0800
+--- a/gcc/cp/cfns.h
++++ b/gcc/cp/cfns.h
 @@ -1,5 +1,5 @@
 -/* ANSI-C code produced by gperf version 3.0.3 */
 -/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf  */
@@ -59,7 +64,7 @@ diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
  
  /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
  
-@@ -47,25 +47,18 @@ for more details.
+@@ -47,25 +47,18 @@
  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/>.  */
@@ -95,7 +100,7 @@ diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
  {
    static const unsigned short asso_values[] =
      {
-@@ -122,14 +115,8 @@ hash (register const char *str, register
+@@ -122,14 +115,8 @@
    return hval + asso_values[(unsigned char)str[len - 1]];
  }
  
@@ -111,10 +116,9 @@ diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
  {
    enum
      {
-diff -urpN a/gcc/cp/except.c b/gcc/cp/except.c
---- a/gcc/cp/except.c	2013-10-25 06:49:48.000000000 -0700
-+++ b/gcc/cp/except.c	2016-12-05 13:55:20.331616274 -0800
-@@ -1025,7 +1025,8 @@ nothrow_libfn_p (const_tree fn)
+--- a/gcc/cp/except.c
++++ b/gcc/cp/except.c
+@@ -1025,7 +1025,8 @@
       unless the system headers are playing rename tricks, and if
       they are, we don't want to be confused by them.  */
    id = DECL_NAME (fn);
@@ -124,10 +128,9 @@ diff -urpN a/gcc/cp/except.c b/gcc/cp/except.c
  }
  
  /* Returns nonzero if an exception of type FROM will be caught by a
-diff -urpN a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
---- a/gcc/cp/Make-lang.in	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/Make-lang.in	2016-12-05 13:55:20.331616274 -0800
-@@ -115,7 +115,7 @@ else
+--- a/gcc/cp/Make-lang.in
++++ b/gcc/cp/Make-lang.in
+@@ -115,7 +115,7 @@
  # deleting the $(srcdir)/cp/cfns.h file.
  $(srcdir)/cp/cfns.h:
  endif
diff --git a/packages/gcc-linaro/5.4-2017.05/301-missing-execinfo_h.patch b/packages/gcc-linaro/4.8-2015.06/0008-missing-execinfo_h.patch
similarity index 79%
rename from packages/gcc-linaro/5.4-2017.05/301-missing-execinfo_h.patch
rename to packages/gcc-linaro/4.8-2015.06/0008-missing-execinfo_h.patch
index 2d0e7baa..c90222a1 100644
--- a/packages/gcc-linaro/5.4-2017.05/301-missing-execinfo_h.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0008-missing-execinfo_h.patch
@@ -1,5 +1,7 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
+---
+ boehm-gc/include/gc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/boehm-gc/include/gc.h
 +++ b/boehm-gc/include/gc.h
 @@ -503,7 +503,7 @@
diff --git a/packages/gcc-linaro/4.8-2015.06/305-libmudflap-susv3-legacy.patch b/packages/gcc-linaro/4.8-2015.06/0009-libmudflap-susv3-legacy.patch
similarity index 81%
rename from packages/gcc-linaro/4.8-2015.06/305-libmudflap-susv3-legacy.patch
rename to packages/gcc-linaro/4.8-2015.06/0009-libmudflap-susv3-legacy.patch
index 35d5f502..c63f9116 100644
--- a/packages/gcc-linaro/4.8-2015.06/305-libmudflap-susv3-legacy.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0009-libmudflap-susv3-legacy.patch
@@ -1,7 +1,9 @@
-Index: gcc-4.8.0/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.8.0.orig/libmudflap/mf-hooks2.c	2013-02-03 18:48:05.000000000 +0100
-+++ gcc-4.8.0/libmudflap/mf-hooks2.c	2013-03-23 17:39:43.000000000 +0100
+---
+ libmudflap/mf-hooks2.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/libmudflap/mf-hooks2.c
++++ b/libmudflap/mf-hooks2.c
 @@ -424,7 +424,7 @@
  {
    TRACE ("%s\n", __PRETTY_FUNCTION__);
diff --git a/packages/gcc-linaro/4.9-2017.01/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc-linaro/4.8-2015.06/0010-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
similarity index 77%
rename from packages/gcc-linaro/4.9-2017.01/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
rename to packages/gcc-linaro/4.8-2015.06/0010-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index c3bab158..f29c5a21 100644
--- a/packages/gcc-linaro/4.9-2017.01/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0010-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,7 +1,11 @@
-diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc/configure
---- gcc-4.9.4.orig/gcc/configure	2016-05-22 01:53:32.000000000 -0700
-+++ gcc-4.9.4/gcc/configure	2017-02-11 16:54:52.879474293 -0800
-@@ -28058,6 +28058,9 @@ fi
+---
+ gcc/configure    |   22 +++++++++++++++-------
+ gcc/configure.ac |   18 +++++++++++++-----
+ 2 files changed, 28 insertions(+), 12 deletions(-)
+
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -27366,6 +27366,9 @@
  
  
  pluginlibs=
@@ -11,7 +15,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc
  
  case "${host}" in
    *-*-darwin*)
-@@ -28069,6 +28072,11 @@ case "${host}" in
+@@ -27377,6 +27380,11 @@
        export_sym_check=
      fi
    ;;
@@ -23,7 +27,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -28181,23 +28189,23 @@ fi
+@@ -27489,23 +27497,23 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -54,10 +58,9 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc
    ;
    return 0;
  }
-diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure.ac gcc-4.9.4/gcc/configure.ac
---- gcc-4.9.4.orig/gcc/configure.ac	2016-05-22 01:53:32.000000000 -0700
-+++ gcc-4.9.4/gcc/configure.ac	2017-02-11 16:49:59.820965424 -0800
-@@ -5583,6 +5583,9 @@ enable_plugin=$enableval,
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -5244,6 +5244,9 @@
  enable_plugin=yes; default_plugin=yes)
  
  pluginlibs=
@@ -67,7 +70,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure.ac gcc-4.9.4/
  
  case "${host}" in
    *-*-darwin*)
-@@ -5594,6 +5597,11 @@ case "${host}" in
+@@ -5255,6 +5258,11 @@
        export_sym_check=
      fi
    ;;
@@ -79,7 +82,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure.ac gcc-4.9.4/
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -5645,17 +5653,17 @@ if test x"$enable_plugin" = x"yes"; then
+@@ -5306,17 +5314,17 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc-linaro/4.8-2015.06/0011-arm-softfloat-libgcc.patch b/packages/gcc-linaro/4.8-2015.06/0011-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..7b0265a9
--- /dev/null
+++ b/packages/gcc-linaro/4.8-2015.06/0011-arm-softfloat-libgcc.patch
@@ -0,0 +1,31 @@
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -55,7 +55,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
+@@ -1,6 +1,11 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
diff --git a/packages/gcc-linaro/4.8-2015.06/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/4.8-2015.06/0012-arm_unbreak_armv4t.patch
similarity index 83%
rename from packages/gcc-linaro/4.8-2015.06/830-arm_unbreak_armv4t.patch
rename to packages/gcc-linaro/4.8-2015.06/0012-arm_unbreak_armv4t.patch
index 37f8f2a5..7c374453 100644
--- a/packages/gcc-linaro/4.8-2015.06/830-arm_unbreak_armv4t.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0012-arm_unbreak_armv4t.patch
@@ -1,5 +1,9 @@
 http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
 
+---
+ gcc/config/arm/linux-eabi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -45,7 +45,7 @@
diff --git a/packages/gcc/4.8.5/841-PR57717-E500v2.patch b/packages/gcc-linaro/4.8-2015.06/0013-PR57717-E500v2.patch
similarity index 71%
rename from packages/gcc/4.8.5/841-PR57717-E500v2.patch
rename to packages/gcc-linaro/4.8-2015.06/0013-PR57717-E500v2.patch
index a011e241..079a0f23 100644
--- a/packages/gcc/4.8.5/841-PR57717-E500v2.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0013-PR57717-E500v2.patch
@@ -7,10 +7,13 @@ Signed-off-by: Julian Brown <Julian_Brown@mentor.com>
 fix for PR57717 (PowerPC E500v2)
 http://gcc.gnu.org/ml/gcc-patches/2013-08/msg00668.html
 
-diff -Nura gcc-4.8.3/gcc/config/rs6000/rs6000.c gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c
---- gcc-4.8.3/gcc/config/rs6000/rs6000.c	2014-05-04 23:18:35.000000000 -0300
-+++ gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c	2014-05-22 15:20:12.554270919 -0300
-@@ -7343,9 +7343,7 @@
+---
+ gcc/config/rs6000/rs6000.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -7479,9 +7479,7 @@
        && GET_CODE (XEXP (x, 1)) == CONST_INT
        && reg_offset_p
        && !SPE_VECTOR_MODE (mode)
diff --git a/packages/gcc/4.8.5/842-PR60155.patch b/packages/gcc-linaro/4.8-2015.06/0014-PR60155.patch
similarity index 90%
rename from packages/gcc/4.8.5/842-PR60155.patch
rename to packages/gcc-linaro/4.8-2015.06/0014-PR60155.patch
index 7bc2122f..f9603c82 100644
--- a/packages/gcc/4.8.5/842-PR60155.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0014-PR60155.patch
@@ -3,9 +3,13 @@ Upstream status: in trunk.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
---- trunk/gcc/gcse.c	2014/02/12 14:50:06	207726
-+++ trunk/gcc/gcse.c	2014/04/04 22:25:51	209134
-@@ -2502,6 +2502,65 @@
+---
+ gcc/gcse.c |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 64 insertions(+), 7 deletions(-)
+
+--- a/gcc/gcse.c
++++ b/gcc/gcse.c
+@@ -2479,6 +2479,65 @@
        }
  }
  
@@ -71,7 +75,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  /* Emit move from SRC to DEST noting the equivalence with expression computed
     in INSN.  */
  
-@@ -2509,7 +2568,8 @@
+@@ -2486,7 +2545,8 @@
  gcse_emit_move_after (rtx dest, rtx src, rtx insn)
  {
    rtx new_rtx;
@@ -81,7 +85,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
    rtx note;
    rtx eqv = NULL_RTX;
  
-@@ -3369,13 +3429,12 @@
+@@ -3345,13 +3405,12 @@
  	      FOR_EACH_VEC_ELT (occrs_to_hoist, j, occr)
  		{
  		  rtx insn;
@@ -97,7 +101,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  
  		  /* Create a pseudo-reg to store the result of reaching
  		     expressions into.  Get the mode for the new pseudo
-@@ -3456,10 +3515,8 @@
+@@ -3432,10 +3491,8 @@
  {
    rtx reg;
    enum reg_class pressure_class;
diff --git a/packages/gcc-linaro/4.8-2015.06/843-aarch64-vmlaq_lane_s32-typo.patch b/packages/gcc-linaro/4.8-2015.06/0015-aarch64-vmlaq_lane_s32-typo.patch
similarity index 88%
rename from packages/gcc-linaro/4.8-2015.06/843-aarch64-vmlaq_lane_s32-typo.patch
rename to packages/gcc-linaro/4.8-2015.06/0015-aarch64-vmlaq_lane_s32-typo.patch
index afa650c8..d9ecb51f 100644
--- a/packages/gcc-linaro/4.8-2015.06/843-aarch64-vmlaq_lane_s32-typo.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0015-aarch64-vmlaq_lane_s32-typo.patch
@@ -9,11 +9,13 @@ Change-Id: I4e35a764d369d378808dab29beefe34d1f93249b
 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 
-diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h
-index 73c7e7d..92b0119 100644
+---
+ gcc/config/aarch64/arm_neon.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/aarch64/arm_neon.h
 +++ b/gcc/config/aarch64/arm_neon.h
-@@ -9984,7 +9984,7 @@
+@@ -8303,7 +8303,7 @@
  #define vmlaq_lane_s32(a, b, c, d)                                      \
    __extension__                                                         \
      ({                                                                  \
diff --git a/packages/gcc-linaro/4.8-2015.06/850-libstdcxx-uclibc-c99.patch b/packages/gcc-linaro/4.8-2015.06/0016-libstdcxx-uclibc-c99.patch
similarity index 76%
rename from packages/gcc-linaro/4.8-2015.06/850-libstdcxx-uclibc-c99.patch
rename to packages/gcc-linaro/4.8-2015.06/0016-libstdcxx-uclibc-c99.patch
index 792976fd..21df8cf3 100644
--- a/packages/gcc-linaro/4.8-2015.06/850-libstdcxx-uclibc-c99.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0016-libstdcxx-uclibc-c99.patch
@@ -15,8 +15,28 @@ that uClibc defines the __UCLIBC__ definition.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
+---
+ libstdc++-v3/config/locale/generic/c_locale.h     |    2 +-
+ libstdc++-v3/config/locale/gnu/c_locale.h         |    2 +-
+ libstdc++-v3/include/bits/basic_string.h          |    2 +-
+ libstdc++-v3/include/bits/locale_facets.tcc       |    2 +-
+ libstdc++-v3/include/bits/locale_facets_nonio.tcc |    2 +-
+ libstdc++-v3/include/c_compatibility/math.h       |    2 +-
+ libstdc++-v3/include/c_compatibility/wchar.h      |    2 +-
+ libstdc++-v3/include/c_global/cstdio              |    2 +-
+ libstdc++-v3/include/c_global/cstdlib             |    2 +-
+ libstdc++-v3/include/c_global/cwchar              |    4 ++--
+ libstdc++-v3/include/c_std/cstdio                 |    2 +-
+ libstdc++-v3/include/c_std/cstdlib                |    2 +-
+ libstdc++-v3/include/c_std/cwchar                 |    2 +-
+ libstdc++-v3/include/ext/vstring.h                |    2 +-
+ libstdc++-v3/include/tr1/cstdio                   |    2 +-
+ libstdc++-v3/include/tr1/cstdlib                  |    2 +-
+ libstdc++-v3/include/tr1/cwchar                   |    2 +-
+ libstdc++-v3/include/tr1/stdlib.h                 |    2 +-
+ libstdc++-v3/src/c++11/debug.cc                   |    2 +-
+ 19 files changed, 20 insertions(+), 20 deletions(-)
+
 --- a/libstdc++-v3/config/locale/generic/c_locale.h
 +++ b/libstdc++-v3/config/locale/generic/c_locale.h
 @@ -70,7 +70,7 @@
@@ -28,8 +48,6 @@ Index: b/libstdc++-v3/config/locale/generic/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
 --- a/libstdc++-v3/config/locale/gnu/c_locale.h
 +++ b/libstdc++-v3/config/locale/gnu/c_locale.h
 @@ -88,7 +88,7 @@
@@ -41,8 +59,6 @@ Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
 --- a/libstdc++-v3/include/bits/basic_string.h
 +++ b/libstdc++-v3/include/bits/basic_string.h
 @@ -2809,7 +2809,7 @@
@@ -54,8 +70,6 @@ Index: b/libstdc++-v3/include/bits/basic_string.h
       && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
  
  #include <ext/string_conversions.h>
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets.tcc
 @@ -987,7 +987,7 @@
@@ -67,8 +81,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets.tcc
  	// First try a buffer perhaps big enough (most probably sufficient
  	// for non-ios_base::fixed outputs)
  	int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 @@ -572,7 +572,7 @@
@@ -80,8 +92,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
        // First try a buffer perhaps big enough.
        int __cs_size = 64;
        char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/math.h
 +++ b/libstdc++-v3/include/c_compatibility/math.h
 @@ -56,7 +56,7 @@
@@ -93,8 +103,6 @@ Index: b/libstdc++-v3/include/c_compatibility/math.h
  using std::fpclassify;
  using std::isfinite;
  using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/wchar.h
 +++ b/libstdc++-v3/include/c_compatibility/wchar.h
 @@ -103,7 +103,7 @@
@@ -106,8 +114,6 @@ Index: b/libstdc++-v3/include/c_compatibility/wchar.h
  using std::wcstold;
  using std::wcstoll;
  using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdlib
 +++ b/libstdc++-v3/include/c_global/cstdlib
 @@ -182,7 +182,7 @@
@@ -119,8 +125,6 @@ Index: b/libstdc++-v3/include/c_global/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_global/cwchar
 +++ b/libstdc++-v3/include/c_global/cwchar
 @@ -232,7 +232,7 @@
@@ -141,8 +145,6 @@ Index: b/libstdc++-v3/include/c_global/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdio
 +++ b/libstdc++-v3/include/c_std/cstdio
 @@ -139,7 +139,7 @@
@@ -154,8 +156,6 @@ Index: b/libstdc++-v3/include/c_std/cstdio
  
  #undef snprintf
  #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdlib
 +++ b/libstdc++-v3/include/c_std/cstdlib
 @@ -180,7 +180,7 @@
@@ -167,8 +167,6 @@ Index: b/libstdc++-v3/include/c_std/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_std/cwchar
 +++ b/libstdc++-v3/include/c_std/cwchar
 @@ -228,7 +228,7 @@
@@ -180,8 +178,6 @@ Index: b/libstdc++-v3/include/c_std/cwchar
  
  #undef wcstold
  #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
 --- a/libstdc++-v3/include/ext/vstring.h
 +++ b/libstdc++-v3/include/ext/vstring.h
 @@ -2571,7 +2571,7 @@
@@ -193,8 +189,6 @@ Index: b/libstdc++-v3/include/ext/vstring.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdio
 +++ b/libstdc++-v3/include/tr1/cstdio
 @@ -33,7 +33,7 @@
@@ -206,8 +200,6 @@ Index: b/libstdc++-v3/include/tr1/cstdio
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdlib
 +++ b/libstdc++-v3/include/tr1/cstdlib
 @@ -35,7 +35,7 @@
@@ -219,8 +211,6 @@ Index: b/libstdc++-v3/include/tr1/cstdlib
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
 --- a/libstdc++-v3/include/tr1/cwchar
 +++ b/libstdc++-v3/include/tr1/cwchar
 @@ -52,7 +52,7 @@
@@ -232,8 +222,6 @@ Index: b/libstdc++-v3/include/tr1/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
 --- a/libstdc++-v3/include/tr1/stdlib.h
 +++ b/libstdc++-v3/include/tr1/stdlib.h
 @@ -33,7 +33,7 @@
@@ -245,8 +233,6 @@ Index: b/libstdc++-v3/include/tr1/stdlib.h
  
  using std::tr1::atoll;
  using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
 --- a/libstdc++-v3/src/c++11/debug.cc
 +++ b/libstdc++-v3/src/c++11/debug.cc
 @@ -787,7 +787,7 @@
@@ -258,8 +244,6 @@ Index: b/libstdc++-v3/src/c++11/debug.cc
        std::snprintf(__buf, __n, __fmt, __s);
  #else
        std::sprintf(__buf, __fmt, __s);
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdio
 +++ b/libstdc++-v3/include/c_global/cstdio
 @@ -139,7 +139,7 @@
diff --git a/packages/gcc/4.8.5/851-PR-other-56780.patch b/packages/gcc-linaro/4.8-2015.06/0017-PR-other-56780.patch
similarity index 89%
rename from packages/gcc/4.8.5/851-PR-other-56780.patch
rename to packages/gcc-linaro/4.8-2015.06/0017-PR-other-56780.patch
index feb43392..e393ec36 100644
--- a/packages/gcc/4.8.5/851-PR-other-56780.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0017-PR-other-56780.patch
@@ -28,16 +28,14 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-8
   Remove the ChangeLog]
 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
 ---
- libiberty/Makefile.in  | 24 ++++++++++-----------
- libiberty/configure    | 57 +++++++++++++++++++++++++++-----------------------
- libiberty/configure.ac | 47 ++++++++++++++++++++++-------------------
+ libiberty/Makefile.in  |   24 ++++++++++----------
+ libiberty/configure    |   57 ++++++++++++++++++++++++++-----------------------
+ libiberty/configure.ac |   47 +++++++++++++++++++++-------------------
  3 files changed, 68 insertions(+), 60 deletions(-)
 
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index f6a3ebd..75ff82d 100644
 --- a/libiberty/Makefile.in
 +++ b/libiberty/Makefile.in
-@@ -355,19 +355,19 @@ install-strip: install
+@@ -355,19 +355,19 @@
  # since it will be passed the multilib flags.
  MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
  install_to_libdir: all
@@ -69,11 +67,9 @@ index f6a3ebd..75ff82d 100644
  	fi
  	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
  
-diff --git a/libiberty/configure b/libiberty/configure
-index 5367027..4feb95a 100755
 --- a/libiberty/configure
 +++ b/libiberty/configure
-@@ -675,8 +675,8 @@ with_cross_host
+@@ -675,8 +675,8 @@
  with_newlib
  enable_maintainer_mode
  enable_multilib
@@ -83,7 +79,7 @@ index 5367027..4feb95a 100755
  '
        ac_precious_vars='build_alias
  host_alias
-@@ -1303,8 +1303,8 @@ Optional Features:
+@@ -1303,8 +1303,8 @@
                            enable make rules and dependencies not useful
                            (and sometimes confusing) to the casual installer
    --enable-multilib       build many library versions (default)
@@ -93,7 +89,7 @@ index 5367027..4feb95a 100755
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \
+@@ -2784,6 +2784,35 @@
     cross_compiling=maybe
  fi
  
@@ -129,7 +125,7 @@ index 5367027..4feb95a 100755
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -5476,7 +5505,6 @@ fi
+@@ -5476,7 +5505,6 @@
  
  setobjs=
  CHECK=
@@ -137,7 +133,7 @@ index 5367027..4feb95a 100755
  if test -n "${with_target_subdir}"; then
  
    # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -5759,29 +5787,6 @@ _ACEOF
+@@ -5759,29 +5787,6 @@
  
    esac
  
@@ -167,11 +163,9 @@ index 5367027..4feb95a 100755
  else
  
     # Not a target library, so we set things up to run the test suite.
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index c763894..f17e6b6 100644
 --- a/libiberty/configure.ac
 +++ b/libiberty/configure.ac
-@@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \
+@@ -128,6 +128,31 @@
     cross_compiling=maybe
  fi
  
@@ -203,7 +197,7 @@ index c763894..f17e6b6 100644
  GCC_NO_EXECUTABLES
  AC_PROG_CC
  AC_SYS_LARGEFILE
-@@ -380,7 +405,6 @@ fi
+@@ -380,7 +405,6 @@
  
  setobjs=
  CHECK=
@@ -211,7 +205,7 @@ index c763894..f17e6b6 100644
  if test -n "${with_target_subdir}"; then
  
    # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -492,27 +516,6 @@ if test -n "${with_target_subdir}"; then
+@@ -492,27 +516,6 @@
  
    esac
  
@@ -239,6 +233,3 @@ index c763894..f17e6b6 100644
  else
  
     # Not a target library, so we set things up to run the test suite.
--- 
-1.9.3
-
diff --git a/packages/gcc-linaro/4.8-2015.06/0018-xtensa-add-mauto-litpools-option.patch b/packages/gcc-linaro/4.8-2015.06/0018-xtensa-add-mauto-litpools-option.patch
new file mode 100644
index 00000000..6a22717c
--- /dev/null
+++ b/packages/gcc-linaro/4.8-2015.06/0018-xtensa-add-mauto-litpools-option.patch
@@ -0,0 +1,273 @@
+From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Thu, 6 Aug 2015 01:16:02 +0300
+Subject: [PATCH] xtensa: add -mauto-litpools option
+
+With support from assembler this option allows compiling huge functions,
+where single literal pool at the beginning of a function may not be
+reachable by L32R instructions at its end.
+
+Currently assembler --auto-litpools option cannot deal with literals
+used from multiple locations separated by more than 256 KBytes of code.
+Don't turn constants into literals, instead use MOVI instruction to load
+them into registers and let the assembler turn them into literals as
+necessary.
+
+2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
+gcc/
+	* config/xtensa/constraints.md (define_constraint "Y"): New
+	constraint.
+	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
+	* config/xtensa/linux.h (ASM_SPEC): Likewise.
+	* config/xtensa/predicates.md (move_operand): Match constants
+	and symbols in the presence of TARGET_AUTO_LITPOOLS.
+	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
+	immediate references to TLS data.
+	(xtensa_emit_move_sequence): Don't force constants to memory in
+	the presence of TARGET_AUTO_LITPOOLS.
+	(print_operand): Add 'y' format, same as default, but capable of
+	printing SF mode constants as well.
+	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
+	(movsf_internal): Add movi pattern that loads literal.
+	(movsf, movdf): Don't force constants to memory in the presence
+	of TARGET_AUTO_LITPOOLS.
+	(movdf_internal): Add 'Y' constraint.
+	* config/xtensa/xtensa.opt (mauto-litpools): New option.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+---
+Backported from: r226828
+Changes to ChangeLogs and documentation are dropped.
+
+ gcc/config/xtensa/constraints.md |    5 +++++
+ gcc/config/xtensa/elf.h          |    4 +++-
+ gcc/config/xtensa/linux.h        |    4 +++-
+ gcc/config/xtensa/predicates.md  |    3 ++-
+ gcc/config/xtensa/xtensa.c       |   19 ++++++++++++++++++-
+ gcc/config/xtensa/xtensa.md      |   35 +++++++++++++++++++----------------
+ gcc/config/xtensa/xtensa.opt     |    4 ++++
+ 7 files changed, 54 insertions(+), 20 deletions(-)
+
+--- a/gcc/config/xtensa/constraints.md
++++ b/gcc/config/xtensa/constraints.md
+@@ -111,6 +111,11 @@
+  (and (match_code "const_int")
+       (match_test "xtensa_mask_immediate (ival)")))
+ 
++(define_constraint "Y"
++ "A constant that can be used in relaxed MOVI instructions."
++ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
++      (match_test "TARGET_AUTO_LITPOOLS")))
++
+ ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
+ ;; causes reload to force some constants into the constant pool, but since
+ ;; the Xtensa constant pool can only be accessed with L32R instructions, it
+--- a/gcc/config/xtensa/elf.h
++++ b/gcc/config/xtensa/elf.h
+@@ -48,7 +48,9 @@
+   %{mtarget-align:--target-align} \
+   %{mno-target-align:--no-target-align} \
+   %{mlongcalls:--longcalls} \
+-  %{mno-longcalls:--no-longcalls}"
++  %{mno-longcalls:--no-longcalls} \
++  %{mauto-litpools:--auto-litpools} \
++  %{mno-auto-litpools:--no-auto-litpools}"
+ 
+ #undef LIB_SPEC
+ #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
+--- a/gcc/config/xtensa/linux.h
++++ b/gcc/config/xtensa/linux.h
+@@ -42,7 +42,9 @@
+   %{mtarget-align:--target-align} \
+   %{mno-target-align:--no-target-align} \
+   %{mlongcalls:--longcalls} \
+-  %{mno-longcalls:--no-longcalls}"
++  %{mno-longcalls:--no-longcalls} \
++  %{mauto-litpools:--auto-litpools} \
++  %{mno-auto-litpools:--no-auto-litpools}"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ 
+--- a/gcc/config/xtensa/predicates.md
++++ b/gcc/config/xtensa/predicates.md
+@@ -142,7 +142,8 @@
+ 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
+ 			    && xtensa_simm12b (INTVAL (op))"))
+ 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
+-	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
++	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
++			    && CONSTANT_P (op)
+ 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
+ 
+ ;; Accept the floating point constant 1 in the appropriate mode.
+--- a/gcc/config/xtensa/xtensa.c
++++ b/gcc/config/xtensa/xtensa.c
+@@ -464,6 +464,9 @@
+     {
+       int dst_regnum = xt_true_regnum (operands[0]);
+ 
++      if (xtensa_tls_referenced_p (operands[1]))
++	return FALSE;
++
+       /* The stack pointer can only be assigned with a MOVSP opcode.  */
+       if (dst_regnum == STACK_POINTER_REGNUM)
+ 	return (mode == SImode
+@@ -1031,7 +1034,7 @@
+ 	  return 1;
+ 	}
+ 
+-      if (! TARGET_CONST16)
++      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
+ 	{
+ 	  src = force_const_mem (SImode, src);
+ 	  operands[1] = src;
+@@ -2415,6 +2418,20 @@
+ 	}
+       break;
+ 
++    case 'y':
++      if (GET_CODE (x) == CONST_DOUBLE &&
++	  GET_MODE (x) == SFmode)
++	{
++	  REAL_VALUE_TYPE r;
++	  long l;
++	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
++	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
++	  fprintf (file, "0x%08lx", l);
++	  break;
++	}
++
++      /* fall through */
++
+     default:
+       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
+ 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
+--- a/gcc/config/xtensa/xtensa.md
++++ b/gcc/config/xtensa/xtensa.md
+@@ -799,8 +799,8 @@
+ })
+ 
+ (define_insn "movsi_internal"
+-  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
+-	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
++  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
++	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
+   "xtensa_valid_move (SImode, operands)"
+   "@
+    movi.n\t%0, %x1
+@@ -812,15 +812,16 @@
+    mov\t%0, %1
+    movsp\t%0, %1
+    movi\t%0, %x1
++   movi\t%0, %1
+    const16\t%0, %t1\;const16\t%0, %b1
+    %v1l32r\t%0, %1
+    %v1l32i\t%0, %1
+    %v0s32i\t%1, %0
+    rsr\t%0, ACCLO
+    wsr\t%1, ACCLO"
+-  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
++  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
+    (set_attr "mode"	"SI")
+-   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
++   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
+ 
+ ;; 16-bit Integer moves
+ 
+@@ -834,21 +835,22 @@
+ })
+ 
+ (define_insn "movhi_internal"
+-  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
+-	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
++  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
++	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
+   "xtensa_valid_move (HImode, operands)"
+   "@
+    movi.n\t%0, %x1
+    mov.n\t%0, %1
+    mov\t%0, %1
+    movi\t%0, %x1
++   movi\t%0, %1
+    %v1l16ui\t%0, %1
+    %v0s16i\t%1, %0
+    rsr\t%0, ACCLO
+    wsr\t%1, ACCLO"
+-  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
++  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
+    (set_attr "mode"	"HI")
+-   (set_attr "length"	"2,2,3,3,3,3,3,3")])
++   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
+ 
+ ;; 8-bit Integer moves
+ 
+@@ -919,7 +921,7 @@
+ 	(match_operand:SF 1 "general_operand" ""))]
+   ""
+ {
+-  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
++  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
+     operands[1] = force_const_mem (SFmode, operands[1]);
+ 
+   if ((!register_operand (operands[0], SFmode)
+@@ -934,8 +936,8 @@
+ })
+ 
+ (define_insn "movsf_internal"
+-  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
+-	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
++  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
++	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
+   "((register_operand (operands[0], SFmode)
+      || register_operand (operands[1], SFmode))
+     && !(FP_REG_P (xt_true_regnum (operands[0]))
+@@ -950,13 +952,14 @@
+    mov\t%0, %1
+    wfr\t%0, %1
+    rfr\t%0, %1
++   movi\t%0, %y1
+    const16\t%0, %t1\;const16\t%0, %b1
+    %v1l32r\t%0, %1
+    %v1l32i\t%0, %1
+    %v0s32i\t%1, %0"
+-  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
++  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
+    (set_attr "mode"	"SF")
+-   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
++   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
+ 
+ (define_insn "*lsiu"
+   [(set (match_operand:SF 0 "register_operand" "=f")
+@@ -997,7 +1000,7 @@
+ 	(match_operand:DF 1 "general_operand" ""))]
+   ""
+ {
+-  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
++  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
+     operands[1] = force_const_mem (DFmode, operands[1]);
+ 
+   if (!register_operand (operands[0], DFmode)
+@@ -1008,8 +1011,8 @@
+ })
+ 
+ (define_insn_and_split "movdf_internal"
+-  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
+-	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
++  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
++	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
+   "register_operand (operands[0], DFmode)
+    || register_operand (operands[1], DFmode)"
+   "#"
+--- a/gcc/config/xtensa/xtensa.opt
++++ b/gcc/config/xtensa/xtensa.opt
+@@ -38,6 +38,10 @@
+ Target
+ Intersperse literal pools with code in the text section
+ 
++mauto-litpools
++Target Report Mask(AUTO_LITPOOLS)
++Relax literals in assembler and place them automatically in the text section
++
+ mserialize-volatile
+ Target Report Mask(SERIALIZE_VOLATILE)
+ -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
diff --git a/packages/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch b/packages/gcc-linaro/4.8-2015.06/0019-xtensa-reimplement-register-spilling.patch
similarity index 84%
rename from packages/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch
rename to packages/gcc-linaro/4.8-2015.06/0019-xtensa-reimplement-register-spilling.patch
index abc7a08e..776914d1 100644
--- a/packages/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0019-xtensa-reimplement-register-spilling.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226962
 
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
+ libgcc/config/xtensa/lib2funcs.S |   30 +++++++++++++++++++++++-------
  1 file changed, 23 insertions(+), 7 deletions(-)
 
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
 --- a/libgcc/config/xtensa/lib2funcs.S
 +++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,10 +33,29 @@
  	.global	__xtensa_libgcc_window_spill
  	.type	__xtensa_libgcc_window_spill,@function
  __xtensa_libgcc_window_spill:
@@ -59,7 +57,7 @@ index 3ac8c1d..2e678af 100644
  	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
  
  
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
+@@ -58,10 +77,7 @@
  	entry	sp, 32
  
  	/* Flush registers.  */
@@ -71,6 +69,3 @@ index 3ac8c1d..2e678af 100644
  
  	/* Because the save area for a0-a3 is stored one frame below
  	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/packages/gcc-linaro/4.8-2015.06/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
similarity index 79%
rename from packages/gcc-linaro/4.9-2017.01/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
rename to packages/gcc-linaro/4.8-2015.06/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
index f23a5c07..ef753c1a 100644
--- a/packages/gcc-linaro/4.9-2017.01/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
@@ -15,19 +15,14 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226963
 
- libgcc/config/xtensa/t-xtensa | 2 +-
+ libgcc/config/xtensa/t-xtensa |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
 --- a/libgcc/config/xtensa/t-xtensa
 +++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
+@@ -13,4 +13,4 @@
  LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
  
  LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
 -   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
 +   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/packages/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch b/packages/gcc-linaro/4.8-2015.06/0021-xtensa-fix-_Unwind_GetCFA.patch
similarity index 81%
rename from packages/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch
rename to packages/gcc-linaro/4.8-2015.06/0021-xtensa-fix-_Unwind_GetCFA.patch
index dc405132..0fbaeec3 100644
--- a/packages/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0021-xtensa-fix-_Unwind_GetCFA.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226964
 
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
+ libgcc/config/xtensa/unwind-dw2-xtensa.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
 --- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
 +++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
+@@ -130,7 +130,7 @@
  _Unwind_Word
  _Unwind_GetCFA (struct _Unwind_Context *context)
  {
@@ -35,6 +33,3 @@ index 35f7797..ef6b900 100644
  }
  
  /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/874-gcc-xtensa-fix-fprintf-format-specifiers.patch b/packages/gcc-linaro/4.8-2015.06/0022-gcc-xtensa-fix-fprintf-format-specifiers.patch
similarity index 83%
rename from packages/gcc-linaro/4.8-2015.06/874-gcc-xtensa-fix-fprintf-format-specifiers.patch
rename to packages/gcc-linaro/4.8-2015.06/0022-gcc-xtensa-fix-fprintf-format-specifiers.patch
index 6013fef7..52d0ee56 100644
--- a/packages/gcc-linaro/4.8-2015.06/874-gcc-xtensa-fix-fprintf-format-specifiers.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0022-gcc-xtensa-fix-fprintf-format-specifiers.patch
@@ -17,14 +17,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 10 +++++-----
+ gcc/config/xtensa/xtensa.c |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index dbc5bd3..466adb5 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1772,7 +1772,7 @@ xtensa_emit_call (int callop, rtx *operands)
+@@ -1773,7 +1773,7 @@
    rtx tgt = operands[callop];
  
    if (GET_CODE (tgt) == CONST_INT)
@@ -33,7 +31,7 @@ index dbc5bd3..466adb5 100644
    else if (register_operand (tgt, VOIDmode))
      sprintf (result, "callx8\t%%%d", callop);
    else
-@@ -2347,14 +2347,14 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2348,14 +2348,14 @@
  
      case 'L':
        if (GET_CODE (x) == CONST_INT)
@@ -50,7 +48,7 @@ index dbc5bd3..466adb5 100644
        else
  	output_operand_lossage ("invalid %%R value");
        break;
-@@ -2368,7 +2368,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2369,7 +2369,7 @@
  
      case 'd':
        if (GET_CODE (x) == CONST_INT)
@@ -59,7 +57,7 @@ index dbc5bd3..466adb5 100644
        else
  	output_operand_lossage ("invalid %%d value");
        break;
-@@ -2437,7 +2437,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2438,7 +2438,7 @@
        else if (GET_CODE (x) == MEM)
  	output_address (XEXP (x, 0));
        else if (GET_CODE (x) == CONST_INT)
@@ -68,6 +66,3 @@ index dbc5bd3..466adb5 100644
        else
  	output_addr_const (file, x);
      }
--- 
-2.1.4
-
diff --git a/packages/gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch b/packages/gcc-linaro/4.8-2015.06/0023-xtensa-fix-PR-target-82181.patch
similarity index 76%
rename from packages/gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch
rename to packages/gcc-linaro/4.8-2015.06/0023-xtensa-fix-PR-target-82181.patch
index 0a011a6b..7476071a 100644
--- a/packages/gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0023-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 466adb5103ca..3ba2965ecf5e 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -599,6 +599,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode)
+@@ -599,6 +599,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 466adb5103ca..3ba2965ecf5e 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc/4.8.5/900-musl-support.patch b/packages/gcc-linaro/4.8-2015.06/0024-musl-support.patch
similarity index 88%
rename from packages/gcc/4.8.5/900-musl-support.patch
rename to packages/gcc-linaro/4.8-2015.06/0024-musl-support.patch
index 6743a88b..8e36bfbd 100644
--- a/packages/gcc/4.8.5/900-musl-support.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0024-musl-support.patch
@@ -22,8 +22,32 @@ https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version:
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 [Gustavo: Update for gcc 4.8.3]
 
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
+---
+ fixincludes/mkfixinc.sh            |    3 -
+ gcc/config.gcc                     |    9 ++-
+ gcc/config/aarch64/aarch64-linux.h |    5 +
+ gcc/config/arm/linux-eabi.h        |   17 +++++
+ gcc/config/i386/linux.h            |    2 
+ gcc/config/i386/linux64.h          |    7 ++
+ gcc/config/linux.h                 |  111 ++++++++++++++++++++++++++++++++-----
+ gcc/config/linux.opt               |    4 +
+ gcc/config/microblaze/linux.h      |   18 +++++-
+ gcc/config/mips/linux.h            |    8 ++
+ gcc/config/mips/linux64.h          |    2 
+ gcc/config/rs6000/linux64.h        |   14 +++-
+ gcc/config/rs6000/secureplt.h      |    1 
+ gcc/config/rs6000/sysv4.h          |   16 ++++-
+ gcc/config/sh/linux.h              |    8 ++
+ gcc/configure                      |    3 +
+ gcc/configure.ac                   |    3 +
+ gcc/ginclude/stddef.h              |    3 +
+ libgcc/unwind-dw2-fde-dip.c        |    7 ++
+ libgomp/config/posix/time.c        |    2 
+ libitm/config/arm/hwcap.cc         |    4 +
+ libitm/config/linux/x86/tls.h      |    8 ++
+ libstdc++-v3/configure.host        |   10 +++
+ 23 files changed, 238 insertions(+), 27 deletions(-)
+
 --- a/fixincludes/mkfixinc.sh
 +++ b/fixincludes/mkfixinc.sh
 @@ -19,7 +19,8 @@
@@ -36,8 +60,6 @@ Index: b/fixincludes/mkfixinc.sh
  	#  IF there is no include fixing,
  	#  THEN create a no-op fixer and exit
  	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,12 @@
@@ -53,8 +75,6 @@ Index: b/gcc/config/aarch64/aarch64-linux.h
  
  #define CPP_SPEC "%{pthread:-D_REENTRANT}"
  
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -77,6 +77,23 @@
@@ -81,8 +101,6 @@ Index: b/gcc/config/arm/linux-eabi.h
  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
     use the GNU/Linux version, not the generic BPABI version.  */
  #undef  LINK_SPEC
-Index: b/gcc/config/i386/linux64.h
-===================================================================
 --- a/gcc/config/i386/linux64.h
 +++ b/gcc/config/i386/linux64.h
 @@ -30,3 +30,10 @@
@@ -96,8 +114,6 @@ Index: b/gcc/config/i386/linux64.h
 +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
 +#undef MUSL_DYNAMIC_LINKERX32
 +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-Index: b/gcc/config/i386/linux.h
-===================================================================
 --- a/gcc/config/i386/linux.h
 +++ b/gcc/config/i386/linux.h
 @@ -21,3 +21,5 @@
@@ -106,8 +122,6 @@ Index: b/gcc/config/i386/linux.h
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
 +#undef MUSL_DYNAMIC_LINKER
 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/linux.h
-===================================================================
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
 @@ -32,10 +32,12 @@
@@ -266,8 +280,6 @@ Index: b/gcc/config/linux.h
 +    { 0, 0, 0, 0, 0, 0 }				\
 +  }
 +#endif
-Index: b/gcc/config/linux.opt
-===================================================================
 --- a/gcc/config/linux.opt
 +++ b/gcc/config/linux.opt
 @@ -30,3 +30,7 @@
@@ -278,11 +290,9 @@ Index: b/gcc/config/linux.opt
 +mmusl
 +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
 +Use musl C library
-Index: b/gcc/config/microblaze/linux.h
-===================================================================
 --- a/gcc/config/microblaze/linux.h
 +++ b/gcc/config/microblaze/linux.h
-@@ -25,7 +25,23 @@
+@@ -28,7 +28,23 @@
  #undef TLS_NEEDS_GOT
  #define TLS_NEEDS_GOT 1
  
@@ -307,8 +317,6 @@ Index: b/gcc/config/microblaze/linux.h
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
    { "dynamic_linker", DYNAMIC_LINKER }
-Index: b/gcc/config/mips/linux64.h
-===================================================================
 --- a/gcc/config/mips/linux64.h
 +++ b/gcc/config/mips/linux64.h
 @@ -29,4 +29,4 @@
@@ -317,8 +325,6 @@ Index: b/gcc/config/mips/linux64.h
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
 -			 BIONIC_DYNAMIC_LINKERN32)
 +			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER)
-Index: b/gcc/config/mips/linux.h
-===================================================================
 --- a/gcc/config/mips/linux.h
 +++ b/gcc/config/mips/linux.h
 @@ -18,3 +18,11 @@
@@ -333,11 +339,9 @@ Index: b/gcc/config/mips/linux.h
 +#endif
 +#undef MUSL_DYNAMIC_LINKER
 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
-@@ -374,17 +374,23 @@
+@@ -370,17 +370,23 @@
  #endif
  #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
  #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
@@ -365,8 +369,6 @@ Index: b/gcc/config/rs6000/linux64.h
  
  #undef  DEFAULT_ASM_ENDIAN
  #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-Index: b/gcc/config/rs6000/secureplt.h
-===================================================================
 --- a/gcc/config/rs6000/secureplt.h
 +++ b/gcc/config/rs6000/secureplt.h
 @@ -18,3 +18,4 @@
@@ -374,8 +376,6 @@ Index: b/gcc/config/rs6000/secureplt.h
  
  #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
 +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
 @@ -537,6 +537,9 @@
@@ -428,8 +428,6 @@ Index: b/gcc/config/rs6000/sysv4.h
    { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
    { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
    { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-Index: b/gcc/config/sh/linux.h
-===================================================================
 --- a/gcc/config/sh/linux.h
 +++ b/gcc/config/sh/linux.h
 @@ -43,7 +43,15 @@
@@ -448,11 +446,9 @@ Index: b/gcc/config/sh/linux.h
  
  #undef SUBTARGET_LINK_EMUL_SUFFIX
  #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-Index: b/gcc/config.gcc
-===================================================================
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -550,7 +550,7 @@
+@@ -559,7 +559,7 @@
  esac
  
  # Common C libraries.
@@ -461,7 +457,7 @@ Index: b/gcc/config.gcc
  
  # Common parts for widely ported systems.
  case ${target} in
-@@ -653,6 +653,9 @@
+@@ -662,6 +662,9 @@
      *-*-*uclibc*)
        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
        ;;
@@ -471,7 +467,7 @@ Index: b/gcc/config.gcc
      *)
        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
        ;;
-@@ -2135,6 +2138,10 @@
+@@ -2142,6 +2145,10 @@
  	    powerpc*-*-linux*paired*)
  		tm_file="${tm_file} rs6000/750cl.h" ;;
  	esac
@@ -482,11 +478,9 @@ Index: b/gcc/config.gcc
  	if test x${enable_secureplt} = xyes; then
  		tm_file="rs6000/secureplt.h ${tm_file}"
  	fi
-Index: b/gcc/configure
-===================================================================
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -26936,6 +26940,9 @@
+@@ -26969,6 +26969,9 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -496,11 +490,9 @@ Index: b/gcc/configure
  esac
  
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4848,6 +4852,9 @@
+@@ -4875,6 +4875,9 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -510,8 +502,6 @@ Index: b/gcc/configure.ac
  esac
  GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/ginclude/stddef.h
-===================================================================
 --- a/gcc/ginclude/stddef.h
 +++ b/gcc/ginclude/stddef.h
 @@ -181,6 +181,7 @@
@@ -538,8 +528,6 @@ Index: b/gcc/ginclude/stddef.h
  #endif /* __size_t */
  #endif /* _SIZET_ */
  #endif /* _GCC_SIZE_T */
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
 @@ -75,6 +75,13 @@
@@ -556,8 +544,6 @@ Index: b/libgcc/unwind-dw2-fde-dip.c
  #if defined(USE_PT_GNU_EH_FRAME)
  
  #include <link.h>
-Index: b/libgomp/config/posix/time.c
-===================================================================
 --- a/libgomp/config/posix/time.c
 +++ b/libgomp/config/posix/time.c
 @@ -28,6 +28,8 @@
@@ -569,8 +555,6 @@ Index: b/libgomp/config/posix/time.c
  #include "libgomp.h"
  #include <unistd.h>
  #if TIME_WITH_SYS_TIME
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
 --- a/libitm/config/arm/hwcap.cc
 +++ b/libitm/config/arm/hwcap.cc
 @@ -40,7 +40,11 @@
@@ -585,8 +569,6 @@ Index: b/libitm/config/arm/hwcap.cc
  #include <elf.h>
  
  static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
 --- a/libitm/config/linux/x86/tls.h
 +++ b/libitm/config/linux/x86/tls.h
 @@ -25,16 +25,19 @@
@@ -618,11 +600,9 @@ Index: b/libitm/config/linux/x86/tls.h
 +#endif
  
  #endif // LIBITM_X86_TLS_H
-Index: b/libstdc++-v3/configure.host
-===================================================================
 --- a/libstdc++-v3/configure.host
 +++ b/libstdc++-v3/configure.host
-@@ -264,6 +264,13 @@
+@@ -263,6 +263,13 @@
      os_include_dir="os/bsd/freebsd"
      ;;
    gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
@@ -636,7 +616,7 @@ Index: b/libstdc++-v3/configure.host
      if [ "$uclibc" = "yes" ]; then
        os_include_dir="os/uclibc"
      elif [ "$bionic" = "yes" ]; then
-@@ -272,6 +279,9 @@
+@@ -271,6 +278,9 @@
        os_include_dir="os/gnu-linux"
      fi
      ;;
diff --git a/packages/gcc/4.8.5/950-cygwin64.patch b/packages/gcc-linaro/4.8-2015.06/0025-cygwin64.patch
similarity index 64%
rename from packages/gcc/4.8.5/950-cygwin64.patch
rename to packages/gcc-linaro/4.8-2015.06/0025-cygwin64.patch
index 67182eec..d39236a5 100644
--- a/packages/gcc/4.8.5/950-cygwin64.patch
+++ b/packages/gcc-linaro/4.8-2015.06/0025-cygwin64.patch
@@ -1,5 +1,9 @@
---- gcc-4.8.5/gcc/config.host.orig	2017-02-10 20:45:10.425515700 -0800
-+++ gcc-4.8.5/gcc/config.host	2017-02-10 20:47:33.935525500 -0800
+---
+ gcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config.host
++++ b/gcc/config.host
 @@ -214,7 +214,7 @@
          ;;
      esac
diff --git a/packages/gcc-linaro/4.8-2015.06/100-uclibc-conf.patch b/packages/gcc-linaro/4.8-2015.06/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a1..00000000
--- a/packages/gcc-linaro/4.8-2015.06/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/packages/gcc-linaro/4.8-2015.06/301-missing-execinfo_h.patch b/packages/gcc-linaro/4.8-2015.06/301-missing-execinfo_h.patch
deleted file mode 100644
index 00efda24..00000000
--- a/packages/gcc-linaro/4.8-2015.06/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/packages/gcc-linaro/4.8-2015.06/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/4.8-2015.06/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index c8cb377d..00000000
--- a/packages/gcc-linaro/4.8-2015.06/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: gcc-4.8.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.0/gcc/config/arm/linux-elf.h	2013-03-23 17:40:00.000000000 +0100
-@@ -55,7 +55,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: gcc-4.8.0/libgcc/config/arm/t-linux
-===================================================================
---- gcc-4.8.0.orig/libgcc/config/arm/t-linux	2012-03-22 16:14:46.000000000 +0100
-+++ gcc-4.8.0/libgcc/config/arm/t-linux	2013-03-23 17:40:54.000000000 +0100
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/packages/gcc-linaro/4.8-2015.06/870-xtensa-add-mauto-litpools-option.patch b/packages/gcc-linaro/4.8-2015.06/870-xtensa-add-mauto-litpools-option.patch
deleted file mode 100644
index aa1376c4..00000000
--- a/packages/gcc-linaro/4.8-2015.06/870-xtensa-add-mauto-litpools-option.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 6 Aug 2015 01:16:02 +0300
-Subject: [PATCH] xtensa: add -mauto-litpools option
-
-With support from assembler this option allows compiling huge functions,
-where single literal pool at the beginning of a function may not be
-reachable by L32R instructions at its end.
-
-Currently assembler --auto-litpools option cannot deal with literals
-used from multiple locations separated by more than 256 KBytes of code.
-Don't turn constants into literals, instead use MOVI instruction to load
-them into registers and let the assembler turn them into literals as
-necessary.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/constraints.md (define_constraint "Y"): New
-	constraint.
-	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
-	* config/xtensa/linux.h (ASM_SPEC): Likewise.
-	* config/xtensa/predicates.md (move_operand): Match constants
-	and symbols in the presence of TARGET_AUTO_LITPOOLS.
-	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
-	immediate references to TLS data.
-	(xtensa_emit_move_sequence): Don't force constants to memory in
-	the presence of TARGET_AUTO_LITPOOLS.
-	(print_operand): Add 'y' format, same as default, but capable of
-	printing SF mode constants as well.
-	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
-	(movsf_internal): Add movi pattern that loads literal.
-	(movsf, movdf): Don't force constants to memory in the presence
-	of TARGET_AUTO_LITPOOLS.
-	(movdf_internal): Add 'Y' constraint.
-	* config/xtensa/xtensa.opt (mauto-litpools): New option.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226828
-Changes to ChangeLogs and documentation are dropped.
-
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
- 7 files changed, 54 insertions(+), 20 deletions(-)
-
-diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md
-index 30f4c1f..773d4f9 100644
---- a/gcc/config/xtensa/constraints.md
-+++ b/gcc/config/xtensa/constraints.md
-@@ -111,6 +111,11 @@
-  (and (match_code "const_int")
-       (match_test "xtensa_mask_immediate (ival)")))
- 
-+(define_constraint "Y"
-+ "A constant that can be used in relaxed MOVI instructions."
-+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-+      (match_test "TARGET_AUTO_LITPOOLS")))
-+
- ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
- ;; causes reload to force some constants into the constant pool, but since
- ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
-index e59bede..12056f7 100644
---- a/gcc/config/xtensa/elf.h
-+++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #undef LIB_SPEC
- #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
-index 675aacf..5b0243a 100644
---- a/gcc/config/xtensa/linux.h
-+++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
-diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md
-index e02209e..d7dfa11 100644
---- a/gcc/config/xtensa/predicates.md
-+++ b/gcc/config/xtensa/predicates.md
-@@ -142,7 +142,8 @@
- 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
- 			    && xtensa_simm12b (INTVAL (op))"))
- 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
--	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
-+	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
-+			    && CONSTANT_P (op)
- 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
- 
- ;; Accept the floating point constant 1 in the appropriate mode.
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..206ff80 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands)
-     {
-       int dst_regnum = xt_true_regnum (operands[0]);
- 
-+      if (xtensa_tls_referenced_p (operands[1]))
-+	return FALSE;
-+
-       /* The stack pointer can only be assigned with a MOVSP opcode.  */
-       if (dst_regnum == STACK_POINTER_REGNUM)
- 	return !TARGET_WINDOWED_ABI
-@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode)
- 	  return 1;
- 	}
- 
--      if (! TARGET_CONST16)
-+      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
- 	{
- 	  src = force_const_mem (SImode, src);
- 	  operands[1] = src;
-@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter)
- 	}
-       break;
- 
-+    case 'y':
-+      if (GET_CODE (x) == CONST_DOUBLE &&
-+	  GET_MODE (x) == SFmode)
-+	{
-+	  REAL_VALUE_TYPE r;
-+	  long l;
-+	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-+	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
-+	  fprintf (file, "0x%08lx", l);
-+	  break;
-+	}
-+
-+      /* fall through */
-+
-     default:
-       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
- 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..0e673a3 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -761,8 +761,8 @@
- })
- 
- (define_insn "movsi_internal"
--  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
--	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
-+  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
-+	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
-   "xtensa_valid_move (SImode, operands)"
-   "@
-    movi.n\t%0, %x1
-@@ -774,15 +774,16 @@
-    mov\t%0, %1
-    movsp\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
-+  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
-    (set_attr "mode"	"SI")
--   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
- 
- ;; 16-bit Integer moves
- 
-@@ -796,21 +797,22 @@
- })
- 
- (define_insn "movhi_internal"
--  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
--	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
-+  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
-+	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
-   "xtensa_valid_move (HImode, operands)"
-   "@
-    movi.n\t%0, %x1
-    mov.n\t%0, %1
-    mov\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    %v1l16ui\t%0, %1
-    %v0s16i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
-+  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
-    (set_attr "mode"	"HI")
--   (set_attr "length"	"2,2,3,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
- 
- ;; 8-bit Integer moves
- 
-@@ -881,7 +883,7 @@
- 	(match_operand:SF 1 "general_operand" ""))]
-   ""
- {
--  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
-+  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
-     operands[1] = force_const_mem (SFmode, operands[1]);
- 
-   if ((!register_operand (operands[0], SFmode)
-@@ -896,8 +898,8 @@
- })
- 
- (define_insn "movsf_internal"
--  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
--	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
-+  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
-+	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
-   "((register_operand (operands[0], SFmode)
-      || register_operand (operands[1], SFmode))
-     && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -912,13 +914,14 @@
-    mov\t%0, %1
-    wfr\t%0, %1
-    rfr\t%0, %1
-+   movi\t%0, %y1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0"
--  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
-+  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
-    (set_attr "mode"	"SF")
--   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
-+   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
- 
- (define_insn "*lsiu"
-   [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -991,7 +994,7 @@
- 	(match_operand:DF 1 "general_operand" ""))]
-   ""
- {
--  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
-+  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
-     operands[1] = force_const_mem (DFmode, operands[1]);
- 
-   if (!register_operand (operands[0], DFmode)
-@@ -1002,8 +1005,8 @@
- })
- 
- (define_insn_and_split "movdf_internal"
--  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
--	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
-+  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
-+	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
-   "register_operand (operands[0], DFmode)
-    || register_operand (operands[1], DFmode)"
-   "#"
-diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
-index 2fd6cee..21c6e96 100644
---- a/gcc/config/xtensa/xtensa.opt
-+++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@ mtext-section-literals
- Target
- Intersperse literal pools with code in the text section
- 
-+mauto-litpools
-+Target Report Mask(AUTO_LITPOOLS)
-+Relax literals in assembler and place them automatically in the text section
-+
- mserialize-volatile
- Target Report Mask(SERIALIZE_VOLATILE)
- -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch b/packages/gcc-linaro/4.9-2017.01/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
similarity index 65%
rename from packages/gcc-linaro/5.4-2017.05/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
rename to packages/gcc-linaro/4.9-2017.01/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
index 1a6f7e5f..4629c90e 100644
--- a/packages/gcc-linaro/5.4-2017.05/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
@@ -32,23 +32,21 @@ build-many-glibcs.py.
 
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@249958 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
- libgcc/config/aarch64/linux-unwind.h | 2 +-
- libgcc/config/alpha/linux-unwind.h   | 2 +-
- libgcc/config/bfin/linux-unwind.h    | 2 +-
- libgcc/config/i386/linux-unwind.h    | 4 ++--
- libgcc/config/m68k/linux-unwind.h    | 2 +-
- libgcc/config/nios2/linux-unwind.h   | 2 +-
- libgcc/config/pa/linux-unwind.h      | 2 +-
- libgcc/config/sh/linux-unwind.h      | 2 +-
- libgcc/config/tilepro/linux-unwind.h | 2 +-
- libgcc/config/xtensa/linux-unwind.h  | 2 +-
+ libgcc/config/aarch64/linux-unwind.h |    2 +-
+ libgcc/config/alpha/linux-unwind.h   |    2 +-
+ libgcc/config/bfin/linux-unwind.h    |    2 +-
+ libgcc/config/i386/linux-unwind.h    |    4 ++--
+ libgcc/config/m68k/linux-unwind.h    |    2 +-
+ libgcc/config/nios2/linux-unwind.h   |    2 +-
+ libgcc/config/pa/linux-unwind.h      |    2 +-
+ libgcc/config/sh/linux-unwind.h      |    2 +-
+ libgcc/config/tilepro/linux-unwind.h |    2 +-
+ libgcc/config/xtensa/linux-unwind.h  |    2 +-
  10 files changed, 11 insertions(+), 11 deletions(-)
 
-diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
-index 86d17b1c798..909f68f7311 100644
 --- a/libgcc/config/aarch64/linux-unwind.h
 +++ b/libgcc/config/aarch64/linux-unwind.h
-@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
    struct rt_sigframe
    {
      siginfo_t info;
@@ -57,11 +55,9 @@ index 86d17b1c798..909f68f7311 100644
    };
  
    struct rt_sigframe *rt_;
-diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
-index d65474fec12..9a226b195b5 100644
 --- a/libgcc/config/alpha/linux-unwind.h
 +++ b/libgcc/config/alpha/linux-unwind.h
-@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+@@ -51,7 +51,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -70,11 +66,9 @@ index d65474fec12..9a226b195b5 100644
        } *rt_ = context->cfa;
        sc = &rt_->uc.uc_mcontext;
      }
-diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
-index 0c270e435c7..7fa95d2dc96 100644
 --- a/libgcc/config/bfin/linux-unwind.h
 +++ b/libgcc/config/bfin/linux-unwind.h
-@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
  	void *puc;
  	char retcode[8];
  	siginfo_t info;
@@ -83,11 +77,9 @@ index 0c270e435c7..7fa95d2dc96 100644
        } *rt_ = context->cfa;
  
        /* The void * cast is necessary to avoid an aliasing warning.
-diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
-index e54bf73b1fd..d35fc4566ce 100644
 --- a/libgcc/config/i386/linux-unwind.h
 +++ b/libgcc/config/i386/linux-unwind.h
-@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -58,7 +58,7 @@
    if (*(unsigned char *)(pc+0) == 0x48
        && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
      {
@@ -96,7 +88,7 @@ index e54bf73b1fd..d35fc4566ce 100644
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
           because it does not alias anything.  */
-@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+@@ -138,7 +138,7 @@
  	siginfo_t *pinfo;
  	void *puc;
  	siginfo_t info;
@@ -105,11 +97,9 @@ index e54bf73b1fd..d35fc4566ce 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
-index fb79a4d63cd..b2f5ea4cd7c 100644
 --- a/libgcc/config/m68k/linux-unwind.h
 +++ b/libgcc/config/m68k/linux-unwind.h
-@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,7 +33,7 @@
  /* <sys/ucontext.h> is unfortunately broken right now.  */
  struct uw_ucontext {
  	unsigned long	  uc_flags;
@@ -118,11 +108,9 @@ index fb79a4d63cd..b2f5ea4cd7c 100644
  	stack_t		  uc_stack;
  	mcontext_t	  uc_mcontext;
  	unsigned long	  uc_filler[80];
-diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
-index dff1c20076e..1d88afecb12 100644
 --- a/libgcc/config/nios2/linux-unwind.h
 +++ b/libgcc/config/nios2/linux-unwind.h
-@@ -38,7 +38,7 @@ struct nios2_mcontext {
+@@ -38,7 +38,7 @@
  
  struct nios2_ucontext {
    unsigned long uc_flags;
@@ -131,11 +119,9 @@ index dff1c20076e..1d88afecb12 100644
    stack_t uc_stack;
    struct nios2_mcontext uc_mcontext;
    sigset_t uc_sigmask;	/* mask last for extensibility */
-diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
-index 01494685ea4..91575356803 100644
 --- a/libgcc/config/pa/linux-unwind.h
 +++ b/libgcc/config/pa/linux-unwind.h
-@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+@@ -80,7 +80,7 @@
    struct sigcontext *sc;
    struct rt_sigframe {
      siginfo_t info;
@@ -144,11 +130,9 @@ index 01494685ea4..91575356803 100644
    } *frame;
  
    /* rt_sigreturn trampoline:
-diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
-index e63091f287c..67033f06b4b 100644
 --- a/libgcc/config/sh/linux-unwind.h
 +++ b/libgcc/config/sh/linux-unwind.h
-@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+@@ -180,7 +180,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -157,11 +141,9 @@ index e63091f287c..67033f06b4b 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
-index fd83ba7c275..e3c9ef0840d 100644
 --- a/libgcc/config/tilepro/linux-unwind.h
 +++ b/libgcc/config/tilepro/linux-unwind.h
-@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
+@@ -61,7 +61,7 @@
    struct rt_sigframe {
      unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
      siginfo_t info;
@@ -170,11 +152,9 @@ index fd83ba7c275..e3c9ef0840d 100644
    } *rt_;
  
    /* Return if this is not a signal handler.  */
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9daf738ff57..ff6b66373a9 100644
 --- a/libgcc/config/xtensa/linux-unwind.h
 +++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -64,7 +64,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -63,7 +63,7 @@
  
    struct rt_sigframe {
      siginfo_t info;
@@ -183,6 +163,3 @@ index 9daf738ff57..ff6b66373a9 100644
    } *rt_;
  
    /* movi a2, __NR_rt_sigreturn; syscall */
--- 
-2.14.1
-
diff --git a/packages/gcc/4.9.4/001-gcc_bug_62231.patch b/packages/gcc-linaro/4.9-2017.01/0001-gcc_bug_62231.patch
similarity index 85%
rename from packages/gcc/4.9.4/001-gcc_bug_62231.patch
rename to packages/gcc-linaro/4.9-2017.01/0001-gcc_bug_62231.patch
index e7c9cf97..3256f804 100644
--- a/packages/gcc/4.9.4/001-gcc_bug_62231.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0001-gcc_bug_62231.patch
@@ -4,9 +4,14 @@ https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02625.html
 
 Linked from bug62231 comment 4 there
 
-diff -durN a/gcc/defaults.h b/gcc/defaults.h
---- a/gcc/defaults.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/defaults.h	2014-12-15 13:26:13.498904465 -0800
+---
+ gcc/defaults.h      |    5 +++
+ gcc/dwarf2cfi.c     |   76 +++++++++++++++++++++++++++++++++++-----------------
+ libgcc/unwind-dw2.c |    4 --
+ 3 files changed, 57 insertions(+), 28 deletions(-)
+
+--- a/gcc/defaults.h
++++ b/gcc/defaults.h
 @@ -438,6 +438,11 @@
  #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
  #endif
@@ -19,11 +24,10 @@ diff -durN a/gcc/defaults.h b/gcc/defaults.h
  /* Map register numbers held in the call frame info that gcc has
     collected using DWARF_FRAME_REGNUM to those that should be output in
     .debug_frame and .eh_frame.  */
-diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
---- a/gcc/dwarf2cfi.c	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/dwarf2cfi.c	2014-12-15 13:50:24.554883694 -0800
-@@ -225,7 +225,44 @@
-   emit_move_insn (adjust_address (mem, mode, offset), GEN_INT (size));
+--- a/gcc/dwarf2cfi.c
++++ b/gcc/dwarf2cfi.c
+@@ -252,7 +252,44 @@
+ 		  gen_int_mode (size, mode));
  }
  
 -/* Generate code to initialize the register size table.  */
@@ -68,13 +72,15 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
  
  void
  expand_builtin_init_dwarf_reg_sizes (tree address)
-@@ -238,30 +275,21 @@
+@@ -265,30 +302,21 @@
  
    for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
      {
 -      unsigned int dnum = DWARF_FRAME_REGNUM (i);
 -      unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
--
++      enum machine_mode save_mode = reg_raw_mode[i];
++      rtx span;
+ 
 -      if (rnum < DWARF_FRAME_REGISTERS)
 -	{
 -	  HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode);
@@ -92,9 +98,7 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
 -	  size = GET_MODE_SIZE (save_mode);
 -	  if (offset < 0)
 -	    continue;
-+      enum machine_mode save_mode = reg_raw_mode[i];
-+      rtx span;
- 
+-
 -	  emit_move_insn (adjust_address (mem, mode, offset),
 -			  gen_int_mode (size, mode));
 -	}
@@ -113,9 +117,8 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
      }
  
    if (!wrote_return_column)
-diff -durN a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
---- a/libgcc/unwind-dw2.c	2013-05-31 16:21:46.000000000 -0700
-+++ b/libgcc/unwind-dw2.c	2014-12-15 13:26:13.570904866 -0800
+--- a/libgcc/unwind-dw2.c
++++ b/libgcc/unwind-dw2.c
 @@ -55,10 +55,6 @@
  #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS
  #endif
diff --git a/packages/gcc/4.8.5/002_gcc_bug_62231.patch b/packages/gcc-linaro/4.9-2017.01/0002-gcc_bug_62231.patch
similarity index 64%
rename from packages/gcc/4.8.5/002_gcc_bug_62231.patch
rename to packages/gcc-linaro/4.9-2017.01/0002-gcc_bug_62231.patch
index b970ebc8..953af509 100644
--- a/packages/gcc/4.8.5/002_gcc_bug_62231.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0002-gcc_bug_62231.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/ml/gcc-patches/2014-10/msg02605.html
 
 Linked from bug62231 comment 4 there
 
-diff -durN a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
---- a/gcc/config/rs6000/rs6000.c	2014-12-08 17:29:04.000000000 -0800
-+++ b/gcc/config/rs6000/rs6000.c	2014-12-15 14:44:46.568801843 -0800
-@@ -1673,7 +1673,7 @@
+---
+ gcc/config/rs6000/rs6000.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -1707,7 +1707,7 @@
       SCmode so as to pass the value correctly in a pair of
       registers.  */
    else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode
diff --git a/packages/gcc/4.8.5/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/4.9-2017.01/0003-libtool-leave-framework-alone.patch
similarity index 73%
rename from packages/gcc/4.8.5/1000-libtool-leave-framework-alone.patch
rename to packages/gcc-linaro/4.9-2017.01/0003-libtool-leave-framework-alone.patch
index 525592e6..e67e0e88 100644
--- a/packages/gcc/4.8.5/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0003-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-4.9.4/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-4.9.4/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
 @@ -36,6 +36,11 @@
  for arg
  do
diff --git a/packages/gcc-linaro/5.4-2017.05/100-uclibc-conf.patch b/packages/gcc-linaro/4.9-2017.01/0004-uclibc-conf.patch
similarity index 82%
rename from packages/gcc-linaro/5.4-2017.05/100-uclibc-conf.patch
rename to packages/gcc-linaro/4.9-2017.01/0004-uclibc-conf.patch
index 73d1f0d3..aef750af 100644
--- a/packages/gcc-linaro/5.4-2017.05/100-uclibc-conf.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0004-uclibc-conf.patch
@@ -1,5 +1,7 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/contrib/regression/objs-gcc.sh
 +++ b/contrib/regression/objs-gcc.sh
 @@ -106,6 +106,10 @@
diff --git a/packages/gcc/4.9.4/1100-msp430-string-literals.patch b/packages/gcc-linaro/4.9-2017.01/0005-msp430-string-literals.patch
similarity index 85%
rename from packages/gcc/4.9.4/1100-msp430-string-literals.patch
rename to packages/gcc-linaro/4.9-2017.01/0005-msp430-string-literals.patch
index 346842e8..c65911f7 100644
--- a/packages/gcc/4.9.4/1100-msp430-string-literals.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0005-msp430-string-literals.patch
@@ -12,11 +12,13 @@ Date:   Wed May 13 01:11:13 2015 +0000
     git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223106 138bc75d-0d04-0410-961f-82ee72b054a4
 
 [4.9 change: remove non-applicable parts of the patch]
-diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
-index bec168ca2ae..58d0efea1de 100644
+---
+ gcc/config/msp430/msp430.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/msp430/msp430.c
 +++ b/gcc/config/msp430/msp430.c
-@@ -2248,7 +2248,7 @@ static struct
+@@ -1629,7 +1629,7 @@
  }
    const_shift_helpers[] =
  {
diff --git a/packages/gcc/4.9.4/111-pr65730.patch b/packages/gcc-linaro/4.9-2017.01/0006-pr65730.patch
similarity index 89%
rename from packages/gcc/4.9.4/111-pr65730.patch
rename to packages/gcc-linaro/4.9-2017.01/0006-pr65730.patch
index 8a41fd2a..6bcab27e 100644
--- a/packages/gcc/4.9.4/111-pr65730.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0006-pr65730.patch
@@ -13,11 +13,9 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
 Changes to ChangeLog are dropped.
 
- gcc/config/xtensa/xtensa.c | 5 +++--
+ gcc/config/xtensa/xtensa.c |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
 @@ -1436,8 +1436,9 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/packages/gcc-linaro/4.9-2017.01/0007-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
similarity index 82%
rename from packages/gcc-linaro/4.9-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
rename to packages/gcc-linaro/4.9-2017.01/0007-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
index bb77c4b9..6c048479 100644
--- a/packages/gcc-linaro/4.9-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0007-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
@@ -8,14 +8,12 @@ Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
 
 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 ---
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ gcc/config.gcc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: b/gcc/config.gcc
-===================================================================
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -441,7 +441,7 @@
+@@ -442,7 +442,7 @@
  	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
  	need_64bit_hwint=yes
  	case x$with_cpu in
diff --git a/packages/gcc-linaro/4.8-2015.06/130-pr43538.patch b/packages/gcc-linaro/4.9-2017.01/0008-pr43538.patch
similarity index 85%
rename from packages/gcc-linaro/4.8-2015.06/130-pr43538.patch
rename to packages/gcc-linaro/4.9-2017.01/0008-pr43538.patch
index 19e57bb0..c2a20462 100644
--- a/packages/gcc-linaro/4.8-2015.06/130-pr43538.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0008-pr43538.patch
@@ -10,16 +10,11 @@ Subject: [PATCH] 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- config/mt-gnu    | 2 +-
+ config/mt-gnu |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
 --- a/config/mt-gnu
 +++ b/config/mt-gnu
 @@ -1 +1 @@
 -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
 +CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch b/packages/gcc-linaro/4.9-2017.01/0009-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
similarity index 87%
rename from packages/gcc-linaro/4.9-2017.01/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
rename to packages/gcc-linaro/4.9-2017.01/0009-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
index 1c49fb0a..d8666619 100644
--- a/packages/gcc-linaro/4.9-2017.01/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0009-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
@@ -10,11 +10,9 @@ Subject: [PATCH] 2014-11-17  Bob Dunlop  <bob.dunlop@xyzzy.org.uk>
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217739 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- config/mt-ospace | 4 ++--
+ config/mt-ospace |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/config/mt-ospace b/config/mt-ospace
-index 7f09104..ce29ff4 100644
 --- a/config/mt-ospace
 +++ b/config/mt-ospace
 @@ -1,3 +1,3 @@
@@ -23,6 +21,3 @@ index 7f09104..ce29ff4 100644
 - CXXFLAGS_FOR_TARGET = -g -Os
 + CFLAGS_FOR_TARGET += -g -Os
 + CXXFLAGS_FOR_TARGET += -g -Os
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch b/packages/gcc-linaro/4.9-2017.01/0010-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
similarity index 82%
rename from packages/gcc-linaro/4.9-2017.01/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
rename to packages/gcc-linaro/4.9-2017.01/0010-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
index 55f32288..28ced14a 100644
--- a/packages/gcc-linaro/4.9-2017.01/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0010-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
@@ -9,14 +9,12 @@ but this one file must be built with 32-bit off_t. More details in the code.
 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@220328 91177308-0d34-0410-b5e6-96231b3b80d8
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 8 ++++++++
+ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index bbc1108..fc09522 100644
 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
 +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -13,7 +13,15 @@
+@@ -13,6 +13,14 @@
  
  #include "sanitizer_platform.h"
  #if SANITIZER_LINUX || SANITIZER_MAC
@@ -31,7 +29,3 @@ index bbc1108..fc09522 100644
  
  #include "sanitizer_internal_defs.h"
  #include "sanitizer_platform_limits_posix.h"
- 
--- 
-2.1.4
-
diff --git a/packages/gcc/5.5.0/301-missing-execinfo_h.patch b/packages/gcc-linaro/4.9-2017.01/0011-missing-execinfo_h.patch
similarity index 79%
rename from packages/gcc/5.5.0/301-missing-execinfo_h.patch
rename to packages/gcc-linaro/4.9-2017.01/0011-missing-execinfo_h.patch
index 2d0e7baa..c90222a1 100644
--- a/packages/gcc/5.5.0/301-missing-execinfo_h.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0011-missing-execinfo_h.patch
@@ -1,5 +1,7 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
+---
+ boehm-gc/include/gc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/boehm-gc/include/gc.h
 +++ b/boehm-gc/include/gc.h
 @@ -503,7 +503,7 @@
diff --git a/packages/gcc/4.8.5/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc-linaro/4.9-2017.01/0012-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
similarity index 77%
rename from packages/gcc/4.8.5/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
rename to packages/gcc-linaro/4.9-2017.01/0012-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index 3cf66b25..0e7c80f1 100644
--- a/packages/gcc/4.8.5/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0012-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,7 +1,11 @@
-diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc/configure
---- gcc-4.8.5.orig/gcc/configure	2014-12-08 03:29:43.000000000 -0800
-+++ gcc-4.8.5/gcc/configure	2017-02-11 16:57:27.424807994 -0800
-@@ -27364,6 +27364,9 @@ fi
+---
+ gcc/configure    |   22 +++++++++++++++-------
+ gcc/configure.ac |   18 +++++++++++++-----
+ 2 files changed, 28 insertions(+), 12 deletions(-)
+
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -28059,6 +28059,9 @@
  
  
  pluginlibs=
@@ -11,7 +15,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc
  
  case "${host}" in
    *-*-darwin*)
-@@ -27375,6 +27378,11 @@ case "${host}" in
+@@ -28070,6 +28073,11 @@
        export_sym_check=
      fi
    ;;
@@ -23,7 +27,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -27487,23 +27495,23 @@ fi
+@@ -28182,23 +28190,23 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -54,10 +58,9 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc
    ;
    return 0;
  }
-diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/gcc/configure.ac
---- gcc-4.8.5.orig/gcc/configure.ac	2014-12-08 03:29:43.000000000 -0800
-+++ gcc-4.8.5/gcc/configure.ac	2017-02-11 16:57:27.424807994 -0800
-@@ -5243,6 +5243,9 @@ enable_plugin=$enableval,
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -5583,6 +5583,9 @@
  enable_plugin=yes; default_plugin=yes)
  
  pluginlibs=
@@ -67,7 +70,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/
  
  case "${host}" in
    *-*-darwin*)
-@@ -5254,6 +5257,11 @@ case "${host}" in
+@@ -5594,6 +5597,11 @@
        export_sym_check=
      fi
    ;;
@@ -79,7 +82,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -5305,17 +5313,17 @@ if test x"$enable_plugin" = x"yes"; then
+@@ -5645,17 +5653,17 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc-linaro/7.1-2017.08/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/4.9-2017.01/0013-arm-softfloat-libgcc.patch
similarity index 80%
rename from packages/gcc-linaro/7.1-2017.08/810-arm-softfloat-libgcc.patch
rename to packages/gcc-linaro/4.9-2017.01/0013-arm-softfloat-libgcc.patch
index 5efa7fd1..350857dd 100644
--- a/packages/gcc-linaro/7.1-2017.08/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0013-arm-softfloat-libgcc.patch
@@ -1,5 +1,8 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
 @@ -60,7 +60,7 @@
@@ -11,8 +14,6 @@ Index: b/gcc/config/arm/linux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-Index: b/libgcc/config/arm/t-linux
-===================================================================
 --- a/libgcc/config/arm/t-linux
 +++ b/libgcc/config/arm/t-linux
 @@ -1,6 +1,11 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/4.9-2017.01/0014-arm_unbreak_armv4t.patch
similarity index 83%
rename from packages/gcc-linaro/4.9-2017.01/830-arm_unbreak_armv4t.patch
rename to packages/gcc-linaro/4.9-2017.01/0014-arm_unbreak_armv4t.patch
index 37f8f2a5..7c374453 100644
--- a/packages/gcc-linaro/4.9-2017.01/830-arm_unbreak_armv4t.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0014-arm_unbreak_armv4t.patch
@@ -1,5 +1,9 @@
 http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
 
+---
+ gcc/config/arm/linux-eabi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -45,7 +45,7 @@
diff --git a/packages/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch b/packages/gcc-linaro/4.9-2017.01/0015-microblaze-enable-dwarf-eh-support.patch
similarity index 84%
rename from packages/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch
rename to packages/gcc-linaro/4.9-2017.01/0015-microblaze-enable-dwarf-eh-support.patch
index 03fc47f1..68b839a7 100644
--- a/packages/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0015-microblaze-enable-dwarf-eh-support.patch
@@ -26,15 +26,13 @@ Changelog
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 ---
- gcc/common/config/microblaze/microblaze-common.c |  3 ---
- gcc/config/microblaze/microblaze-protos.h        |  1 +
- gcc/config/microblaze/microblaze.c               | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h               | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md              | 11 +++++++++
+ gcc/common/config/microblaze/microblaze-common.c |    3 --
+ gcc/config/microblaze/microblaze-protos.h        |    1 
+ gcc/config/microblaze/microblaze.c               |   29 +++++++++++++++++++----
+ gcc/config/microblaze/microblaze.h               |   15 +++++++++++
+ gcc/config/microblaze/microblaze.md              |   11 ++++++++
  5 files changed, 52 insertions(+), 7 deletions(-)
 
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
 --- a/gcc/common/config/microblaze/microblaze-common.c
 +++ b/gcc/common/config/microblaze/microblaze-common.c
 @@ -37,7 +37,4 @@
@@ -45,8 +43,6 @@ Index: b/gcc/common/config/microblaze/microblaze-common.c
 -#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
 -
  struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze-protos.h
 +++ b/gcc/config/microblaze/microblaze-protos.h
 @@ -54,6 +54,7 @@
@@ -57,8 +53,6 @@ Index: b/gcc/config/microblaze/microblaze-protos.h
  #endif  /* RTX_CODE */
  
  /* Declare functions in microblaze-c.c.  */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
 --- a/gcc/config/microblaze/microblaze.c
 +++ b/gcc/config/microblaze/microblaze.c
 @@ -1906,6 +1906,11 @@
@@ -118,8 +112,6 @@ Index: b/gcc/config/microblaze/microblaze.c
  }
  
  /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze.h
 +++ b/gcc/config/microblaze/microblaze.h
 @@ -184,6 +184,21 @@
@@ -144,8 +136,6 @@ Index: b/gcc/config/microblaze/microblaze.h
  /* Use DWARF 2 debugging information by default.  */
  #define DWARF2_DEBUGGING_INFO
  #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
 --- a/gcc/config/microblaze/microblaze.md
 +++ b/gcc/config/microblaze/microblaze.md
 @@ -2261,4 +2261,15 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/850-libstdcxx-uclibc-c99.patch b/packages/gcc-linaro/4.9-2017.01/0016-libstdcxx-uclibc-c99.patch
similarity index 76%
rename from packages/gcc-linaro/4.9-2017.01/850-libstdcxx-uclibc-c99.patch
rename to packages/gcc-linaro/4.9-2017.01/0016-libstdcxx-uclibc-c99.patch
index 533d01fa..5a765de1 100644
--- a/packages/gcc-linaro/4.9-2017.01/850-libstdcxx-uclibc-c99.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0016-libstdcxx-uclibc-c99.patch
@@ -16,8 +16,28 @@ that uClibc defines the __UCLIBC__ definition.
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 [Gustavo: update for 4.9.3]
 
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
+---
+ libstdc++-v3/config/locale/generic/c_locale.h     |    2 +-
+ libstdc++-v3/config/locale/gnu/c_locale.h         |    2 +-
+ libstdc++-v3/include/bits/basic_string.h          |    2 +-
+ libstdc++-v3/include/bits/locale_facets.tcc       |    2 +-
+ libstdc++-v3/include/bits/locale_facets_nonio.tcc |    2 +-
+ libstdc++-v3/include/c_compatibility/math.h       |    2 +-
+ libstdc++-v3/include/c_compatibility/wchar.h      |    2 +-
+ libstdc++-v3/include/c_global/cstdio              |    2 +-
+ libstdc++-v3/include/c_global/cstdlib             |    2 +-
+ libstdc++-v3/include/c_global/cwchar              |    4 ++--
+ libstdc++-v3/include/c_std/cstdio                 |    2 +-
+ libstdc++-v3/include/c_std/cstdlib                |    2 +-
+ libstdc++-v3/include/c_std/cwchar                 |    2 +-
+ libstdc++-v3/include/ext/vstring.h                |    2 +-
+ libstdc++-v3/include/tr1/cstdio                   |    2 +-
+ libstdc++-v3/include/tr1/cstdlib                  |    2 +-
+ libstdc++-v3/include/tr1/cwchar                   |    2 +-
+ libstdc++-v3/include/tr1/stdlib.h                 |    2 +-
+ libstdc++-v3/src/c++11/debug.cc                   |    2 +-
+ 19 files changed, 20 insertions(+), 20 deletions(-)
+
 --- a/libstdc++-v3/config/locale/generic/c_locale.h
 +++ b/libstdc++-v3/config/locale/generic/c_locale.h
 @@ -70,7 +70,7 @@
@@ -29,8 +49,6 @@ Index: b/libstdc++-v3/config/locale/generic/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
 --- a/libstdc++-v3/config/locale/gnu/c_locale.h
 +++ b/libstdc++-v3/config/locale/gnu/c_locale.h
 @@ -88,7 +88,7 @@
@@ -42,8 +60,6 @@ Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
 --- a/libstdc++-v3/include/bits/basic_string.h
 +++ b/libstdc++-v3/include/bits/basic_string.h
 @@ -2843,7 +2843,7 @@
@@ -55,8 +71,6 @@ Index: b/libstdc++-v3/include/bits/basic_string.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 @@ -572,7 +572,7 @@
@@ -68,8 +82,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
        // First try a buffer perhaps big enough.
        int __cs_size = 64;
        char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets.tcc
 @@ -987,7 +987,7 @@
@@ -81,8 +93,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets.tcc
  	// First try a buffer perhaps big enough (most probably sufficient
  	// for non-ios_base::fixed outputs)
  	int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/math.h
 +++ b/libstdc++-v3/include/c_compatibility/math.h
 @@ -56,7 +56,7 @@
@@ -94,8 +104,6 @@ Index: b/libstdc++-v3/include/c_compatibility/math.h
  using std::fpclassify;
  using std::isfinite;
  using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/wchar.h
 +++ b/libstdc++-v3/include/c_compatibility/wchar.h
 @@ -103,7 +103,7 @@
@@ -107,8 +115,6 @@ Index: b/libstdc++-v3/include/c_compatibility/wchar.h
  using std::wcstold;
  using std::wcstoll;
  using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdio
 +++ b/libstdc++-v3/include/c_global/cstdio
 @@ -146,7 +146,7 @@
@@ -120,8 +126,6 @@ Index: b/libstdc++-v3/include/c_global/cstdio
  
  #undef snprintf
  #undef vfscanf
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdlib
 +++ b/libstdc++-v3/include/c_global/cstdlib
 @@ -182,7 +182,7 @@
@@ -133,8 +137,6 @@ Index: b/libstdc++-v3/include/c_global/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_global/cwchar
 +++ b/libstdc++-v3/include/c_global/cwchar
 @@ -232,7 +232,7 @@
@@ -155,8 +157,6 @@ Index: b/libstdc++-v3/include/c_global/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdio
 +++ b/libstdc++-v3/include/c_std/cstdio
 @@ -144,7 +144,7 @@
@@ -168,8 +168,6 @@ Index: b/libstdc++-v3/include/c_std/cstdio
  
  #undef snprintf
  #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdlib
 +++ b/libstdc++-v3/include/c_std/cstdlib
 @@ -180,7 +180,7 @@
@@ -181,8 +179,6 @@ Index: b/libstdc++-v3/include/c_std/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_std/cwchar
 +++ b/libstdc++-v3/include/c_std/cwchar
 @@ -228,7 +228,7 @@
@@ -194,8 +190,6 @@ Index: b/libstdc++-v3/include/c_std/cwchar
  
  #undef wcstold
  #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
 --- a/libstdc++-v3/include/ext/vstring.h
 +++ b/libstdc++-v3/include/ext/vstring.h
 @@ -2680,7 +2680,7 @@
@@ -207,8 +201,6 @@ Index: b/libstdc++-v3/include/ext/vstring.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdio
 +++ b/libstdc++-v3/include/tr1/cstdio
 @@ -33,7 +33,7 @@
@@ -220,8 +212,6 @@ Index: b/libstdc++-v3/include/tr1/cstdio
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdlib
 +++ b/libstdc++-v3/include/tr1/cstdlib
 @@ -35,7 +35,7 @@
@@ -233,8 +223,6 @@ Index: b/libstdc++-v3/include/tr1/cstdlib
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
 --- a/libstdc++-v3/include/tr1/cwchar
 +++ b/libstdc++-v3/include/tr1/cwchar
 @@ -52,7 +52,7 @@
@@ -246,8 +234,6 @@ Index: b/libstdc++-v3/include/tr1/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
 --- a/libstdc++-v3/include/tr1/stdlib.h
 +++ b/libstdc++-v3/include/tr1/stdlib.h
 @@ -33,7 +33,7 @@
@@ -259,8 +245,6 @@ Index: b/libstdc++-v3/include/tr1/stdlib.h
  
  using std::tr1::atoll;
  using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
 --- a/libstdc++-v3/src/c++11/debug.cc
 +++ b/libstdc++-v3/src/c++11/debug.cc
 @@ -788,7 +788,7 @@
diff --git a/packages/gcc-linaro/7.1-2017.08/860-cilk-wchar.patch b/packages/gcc-linaro/4.9-2017.01/0017-cilk-wchar.patch
similarity index 95%
rename from packages/gcc-linaro/7.1-2017.08/860-cilk-wchar.patch
rename to packages/gcc-linaro/4.9-2017.01/0017-cilk-wchar.patch
index 1d9916f5..300837f0 100644
--- a/packages/gcc-linaro/7.1-2017.08/860-cilk-wchar.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0017-cilk-wchar.patch
@@ -10,8 +10,6 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
 --- a/libcilkrts/include/cilk/reducer_min_max.h
 +++ b/libcilkrts/include/cilk/reducer_min_max.h
 @@ -3154,7 +3154,9 @@
diff --git a/packages/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch b/packages/gcc-linaro/4.9-2017.01/0018-xtensa-add-mauto-litpools-option.patch
similarity index 89%
rename from packages/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch
rename to packages/gcc-linaro/4.9-2017.01/0018-xtensa-add-mauto-litpools-option.patch
index 98c7b3f3..6cfa5215 100644
--- a/packages/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0018-xtensa-add-mauto-litpools-option.patch
@@ -39,17 +39,15 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: r226828
 Changes to ChangeLogs and documentation are dropped.
 
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
+ gcc/config/xtensa/constraints.md |    5 +++++
+ gcc/config/xtensa/elf.h          |    4 +++-
+ gcc/config/xtensa/linux.h        |    4 +++-
+ gcc/config/xtensa/predicates.md  |    3 ++-
+ gcc/config/xtensa/xtensa.c       |   19 ++++++++++++++++++-
+ gcc/config/xtensa/xtensa.md      |   35 +++++++++++++++++++----------------
+ gcc/config/xtensa/xtensa.opt     |    4 ++++
  7 files changed, 54 insertions(+), 20 deletions(-)
 
-Index: b/gcc/config/xtensa/constraints.md
-===================================================================
 --- a/gcc/config/xtensa/constraints.md
 +++ b/gcc/config/xtensa/constraints.md
 @@ -111,6 +111,11 @@
@@ -64,8 +62,6 @@ Index: b/gcc/config/xtensa/constraints.md
  ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
  ;; causes reload to force some constants into the constant pool, but since
  ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-Index: b/gcc/config/xtensa/elf.h
-===================================================================
 --- a/gcc/config/xtensa/elf.h
 +++ b/gcc/config/xtensa/elf.h
 @@ -48,7 +48,9 @@
@@ -79,8 +75,6 @@ Index: b/gcc/config/xtensa/elf.h
  
  #undef LIB_SPEC
  #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-Index: b/gcc/config/xtensa/linux.h
-===================================================================
 --- a/gcc/config/xtensa/linux.h
 +++ b/gcc/config/xtensa/linux.h
 @@ -42,7 +42,9 @@
@@ -94,8 +88,6 @@ Index: b/gcc/config/xtensa/linux.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
  
-Index: b/gcc/config/xtensa/predicates.md
-===================================================================
 --- a/gcc/config/xtensa/predicates.md
 +++ b/gcc/config/xtensa/predicates.md
 @@ -142,7 +142,8 @@
@@ -108,8 +100,6 @@ Index: b/gcc/config/xtensa/predicates.md
  			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
  
  ;; Accept the floating point constant 1 in the appropriate mode.
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
 @@ -477,6 +477,9 @@
@@ -152,8 +142,6 @@ Index: b/gcc/config/xtensa/xtensa.c
      default:
        if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
  	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-Index: b/gcc/config/xtensa/xtensa.md
-===================================================================
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -799,8 +799,8 @@
@@ -270,8 +258,6 @@ Index: b/gcc/config/xtensa/xtensa.md
    "register_operand (operands[0], DFmode)
     || register_operand (operands[1], DFmode)"
    "#"
-Index: b/gcc/config/xtensa/xtensa.opt
-===================================================================
 --- a/gcc/config/xtensa/xtensa.opt
 +++ b/gcc/config/xtensa/xtensa.opt
 @@ -38,6 +38,10 @@
diff --git a/packages/gcc-linaro/4.8-2015.06/871-xtensa-reimplement-register-spilling.patch b/packages/gcc-linaro/4.9-2017.01/0019-xtensa-reimplement-register-spilling.patch
similarity index 84%
rename from packages/gcc-linaro/4.8-2015.06/871-xtensa-reimplement-register-spilling.patch
rename to packages/gcc-linaro/4.9-2017.01/0019-xtensa-reimplement-register-spilling.patch
index abc7a08e..776914d1 100644
--- a/packages/gcc-linaro/4.8-2015.06/871-xtensa-reimplement-register-spilling.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0019-xtensa-reimplement-register-spilling.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226962
 
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
+ libgcc/config/xtensa/lib2funcs.S |   30 +++++++++++++++++++++++-------
  1 file changed, 23 insertions(+), 7 deletions(-)
 
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
 --- a/libgcc/config/xtensa/lib2funcs.S
 +++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,10 +33,29 @@
  	.global	__xtensa_libgcc_window_spill
  	.type	__xtensa_libgcc_window_spill,@function
  __xtensa_libgcc_window_spill:
@@ -59,7 +57,7 @@ index 3ac8c1d..2e678af 100644
  	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
  
  
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
+@@ -58,10 +77,7 @@
  	entry	sp, 32
  
  	/* Flush registers.  */
@@ -71,6 +69,3 @@ index 3ac8c1d..2e678af 100644
  
  	/* Because the save area for a0-a3 is stored one frame below
  	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/packages/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/packages/gcc-linaro/4.9-2017.01/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
similarity index 79%
rename from packages/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
rename to packages/gcc-linaro/4.9-2017.01/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
index f23a5c07..ef753c1a 100644
--- a/packages/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0020-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
@@ -15,19 +15,14 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226963
 
- libgcc/config/xtensa/t-xtensa | 2 +-
+ libgcc/config/xtensa/t-xtensa |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
 --- a/libgcc/config/xtensa/t-xtensa
 +++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
+@@ -13,4 +13,4 @@
  LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
  
  LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
 -   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
 +   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch b/packages/gcc-linaro/4.9-2017.01/0021-xtensa-fix-_Unwind_GetCFA.patch
similarity index 81%
rename from packages/gcc-linaro/4.9-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch
rename to packages/gcc-linaro/4.9-2017.01/0021-xtensa-fix-_Unwind_GetCFA.patch
index dc405132..0fbaeec3 100644
--- a/packages/gcc-linaro/4.9-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0021-xtensa-fix-_Unwind_GetCFA.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226964
 
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
+ libgcc/config/xtensa/unwind-dw2-xtensa.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
 --- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
 +++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
+@@ -130,7 +130,7 @@
  _Unwind_Word
  _Unwind_GetCFA (struct _Unwind_Context *context)
  {
@@ -35,6 +33,3 @@ index 35f7797..ef6b900 100644
  }
  
  /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/packages/gcc/4.9.4/874-xtensa-add-uclinux-support.patch b/packages/gcc-linaro/4.9-2017.01/0022-xtensa-add-uclinux-support.patch
similarity index 88%
rename from packages/gcc/4.9.4/874-xtensa-add-uclinux-support.patch
rename to packages/gcc-linaro/4.9-2017.01/0022-xtensa-add-uclinux-support.patch
index 881aec09..50bbaeb7 100644
--- a/packages/gcc/4.9.4/874-xtensa-add-uclinux-support.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0022-xtensa-add-uclinux-support.patch
@@ -16,19 +16,17 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r228450
 
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
+ gcc/config.gcc                |    5 +++
+ gcc/config/xtensa/uclinux.h   |   69 ++++++++++++++++++++++++++++++++++++++++++
+ gcc/config/xtensa/uclinux.opt |   32 +++++++++++++++++++
+ libgcc/config.host            |    5 +++
  4 files changed, 111 insertions(+)
  create mode 100644 gcc/config/xtensa/uclinux.h
  create mode 100644 gcc/config/xtensa/uclinux.opt
 
-Index: b/gcc/config.gcc
-===================================================================
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -2871,6 +2871,11 @@
+@@ -2872,6 +2872,11 @@
  	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
  	tmake_file="${tmake_file} xtensa/t-xtensa"
  	;;
@@ -40,8 +38,6 @@ Index: b/gcc/config.gcc
  am33_2.0-*-linux*)
  	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
  	gas=yes gnu_ld=yes
-Index: b/gcc/config/xtensa/uclinux.h
-===================================================================
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.h
 @@ -0,0 +1,69 @@
@@ -114,8 +110,6 @@ Index: b/gcc/config/xtensa/uclinux.h
 +
 +#undef DBX_REGISTER_NUMBER
 +
-Index: b/gcc/config/xtensa/uclinux.opt
-===================================================================
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.opt
 @@ -0,0 +1,32 @@
@@ -151,11 +145,9 @@ Index: b/gcc/config/xtensa/uclinux.opt
 +Driver JoinedOrMissing
 +
 +; This comment is to ensure we retain the blank line above.
-Index: b/libgcc/config.host
-===================================================================
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
-@@ -1213,6 +1213,11 @@
+@@ -1215,6 +1215,11 @@
  	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
  	md_unwind_header=xtensa/linux-unwind.h
  	;;
diff --git a/packages/gcc-linaro/4.9-2017.01/875-gcc-xtensa-fix-fprintf-format-specifiers.patch b/packages/gcc-linaro/4.9-2017.01/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
similarity index 83%
rename from packages/gcc-linaro/4.9-2017.01/875-gcc-xtensa-fix-fprintf-format-specifiers.patch
rename to packages/gcc-linaro/4.9-2017.01/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
index 052ffc3d..b8b6f740 100644
--- a/packages/gcc-linaro/4.9-2017.01/875-gcc-xtensa-fix-fprintf-format-specifiers.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
@@ -17,14 +17,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 10 +++++-----
+ gcc/config/xtensa/xtensa.c |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index d8c8298..3c00961 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1785,7 +1785,7 @@ xtensa_emit_call (int callop, rtx *operands)
+@@ -1786,7 +1786,7 @@
    rtx tgt = operands[callop];
  
    if (GET_CODE (tgt) == CONST_INT)
@@ -33,7 +31,7 @@ index d8c8298..3c00961 100644
    else if (register_operand (tgt, VOIDmode))
      sprintf (result, "callx8\t%%%d", callop);
    else
-@@ -2360,14 +2360,14 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2361,14 +2361,14 @@
  
      case 'L':
        if (GET_CODE (x) == CONST_INT)
@@ -50,7 +48,7 @@ index d8c8298..3c00961 100644
        else
  	output_operand_lossage ("invalid %%R value");
        break;
-@@ -2381,7 +2381,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2382,7 +2382,7 @@
  
      case 'd':
        if (GET_CODE (x) == CONST_INT)
@@ -59,7 +57,7 @@ index d8c8298..3c00961 100644
        else
  	output_operand_lossage ("invalid %%d value");
        break;
-@@ -2450,7 +2450,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2451,7 +2451,7 @@
        else if (GET_CODE (x) == MEM)
  	output_address (XEXP (x, 0));
        else if (GET_CODE (x) == CONST_INT)
@@ -68,6 +66,3 @@ index d8c8298..3c00961 100644
        else
  	output_addr_const (file, x);
      }
--- 
-2.1.4
-
diff --git a/packages/gcc/4.9.4/876-xtensa-fix-PR-target-82181.patch b/packages/gcc-linaro/4.9-2017.01/0024-xtensa-fix-PR-target-82181.patch
similarity index 76%
rename from packages/gcc/4.9.4/876-xtensa-fix-PR-target-82181.patch
rename to packages/gcc-linaro/4.9-2017.01/0024-xtensa-fix-PR-target-82181.patch
index a613bb38..fbdcf1ed 100644
--- a/packages/gcc/4.9.4/876-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0024-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 3c0096113775..3eb4db85b971 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -612,6 +612,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode)
+@@ -612,6 +612,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 3c0096113775..3eb4db85b971 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/880-nios2_legitimize_address.patch b/packages/gcc-linaro/4.9-2017.01/0025-nios2_legitimize_address.patch
similarity index 87%
rename from packages/gcc-linaro/4.9-2017.01/880-nios2_legitimize_address.patch
rename to packages/gcc-linaro/4.9-2017.01/0025-nios2_legitimize_address.patch
index 4623f295..5caeb207 100644
--- a/packages/gcc-linaro/4.9-2017.01/880-nios2_legitimize_address.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0025-nios2_legitimize_address.patch
@@ -19,14 +19,12 @@ http://autobuild.buildroot.net/results/901/90186d1fe134b804c0101554296b1235dc0cc
 [backported to 4.9.3]
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
 ---
- gcc/config/nios2/nios2.c | 4 ++--
+ gcc/config/nios2/nios2.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
-index 047b615..41dd6f9 100644
 --- a/gcc/config/nios2/nios2.c
 +++ b/gcc/config/nios2/nios2.c
-@@ -1786,15 +1786,15 @@ nios2_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
+@@ -1786,15 +1786,15 @@
  
       Which will be output as '%tls_le(var+48)(r23)' in assembly.  */
    if (GET_CODE (x) == PLUS
@@ -44,6 +42,3 @@ index 047b615..41dd6f9 100644
  	  unspec = copy_rtx (unspec);
  	  XVECEXP (unspec, 0, 0)
  	    = plus_constant (Pmode, XVECEXP (unspec, 0, 0), INTVAL (offset));
--- 
-2.5.0
-
diff --git a/packages/gcc-linaro/4.9-2017.01/890-fix-m68k-compile.patch b/packages/gcc-linaro/4.9-2017.01/0026-fix-m68k-compile.patch
similarity index 52%
rename from packages/gcc-linaro/4.9-2017.01/890-fix-m68k-compile.patch
rename to packages/gcc-linaro/4.9-2017.01/0026-fix-m68k-compile.patch
index 140977b3..9437f252 100644
--- a/packages/gcc-linaro/4.9-2017.01/890-fix-m68k-compile.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0026-fix-m68k-compile.patch
@@ -2,9 +2,12 @@ remove unused header, which breaks the toolchain building
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c gcc-4.9.3/libgcc/config/m68k/linux-atomic.c
---- gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c	2014-01-02 23:25:22.000000000 +0100
-+++ gcc-4.9.3/libgcc/config/m68k/linux-atomic.c	2016-03-18 22:24:40.000000000 +0100
+---
+ libgcc/config/m68k/linux-atomic.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/libgcc/config/m68k/linux-atomic.c
++++ b/libgcc/config/m68k/linux-atomic.c
 @@ -33,7 +33,6 @@
     using the kernel helper defined below.  There is no support for
     64-bit operations yet.  */
diff --git a/packages/gcc-linaro/5.4-2017.05/891-fix-m68k-uclinux.patch b/packages/gcc-linaro/4.9-2017.01/0027-fix-m68k-uclinux.patch
similarity index 66%
rename from packages/gcc-linaro/5.4-2017.05/891-fix-m68k-uclinux.patch
rename to packages/gcc-linaro/4.9-2017.01/0027-fix-m68k-uclinux.patch
index 4e186bd3..80f76d32 100644
--- a/packages/gcc-linaro/5.4-2017.05/891-fix-m68k-uclinux.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0027-fix-m68k-uclinux.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -752,7 +752,7 @@
  m68k*-*-openbsd*)
  	;;
  m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
diff --git a/packages/gcc-linaro/5.4-2017.05/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc-linaro/4.9-2017.01/0028-libgcc-disable-split-stack-nothreads.patch
similarity index 62%
rename from packages/gcc-linaro/5.4-2017.05/930-libgcc-disable-split-stack-nothreads.patch
rename to packages/gcc-linaro/4.9-2017.01/0028-libgcc-disable-split-stack-nothreads.patch
index 07f9a739..df91a9ff 100644
--- a/packages/gcc-linaro/5.4-2017.05/930-libgcc-disable-split-stack-nothreads.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0028-libgcc-disable-split-stack-nothreads.patch
@@ -2,9 +2,12 @@ disable split-stack for non-thread builds
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
 @@ -1,4 +1,6 @@
  # Makefile fragment to provide generic support for -fsplit-stack.
  # This should be used in config.host for any host which supports
diff --git a/packages/gcc-linaro/4.9-2017.01/940-uclinux-enable-threads.patch b/packages/gcc-linaro/4.9-2017.01/0029-uclinux-enable-threads.patch
similarity index 80%
rename from packages/gcc-linaro/4.9-2017.01/940-uclinux-enable-threads.patch
rename to packages/gcc-linaro/4.9-2017.01/0029-uclinux-enable-threads.patch
index 51081476..e427eb39 100644
--- a/packages/gcc-linaro/4.9-2017.01/940-uclinux-enable-threads.patch
+++ b/packages/gcc-linaro/4.9-2017.01/0029-uclinux-enable-threads.patch
@@ -4,11 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-Index: b/gcc/config.gcc
-===================================================================
+---
+ gcc/config.gcc |    3 +++
+ 1 file changed, 3 insertions(+)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -810,6 +810,9 @@
+@@ -808,6 +808,9 @@
  *-*-uclinux*)
    extra_options="$extra_options gnu-user.opt"
    use_gcc_stdint=wrap
diff --git a/packages/gcc-linaro/4.9-2017.01/100-uclibc-conf.patch b/packages/gcc-linaro/4.9-2017.01/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a1..00000000
--- a/packages/gcc-linaro/4.9-2017.01/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/packages/gcc-linaro/4.9-2017.01/301-missing-execinfo_h.patch b/packages/gcc-linaro/4.9-2017.01/301-missing-execinfo_h.patch
deleted file mode 100644
index 00efda24..00000000
--- a/packages/gcc-linaro/4.9-2017.01/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/packages/gcc-linaro/4.9-2017.01/860-cilk-wchar.patch b/packages/gcc-linaro/4.9-2017.01/860-cilk-wchar.patch
deleted file mode 100644
index 18374051..00000000
--- a/packages/gcc-linaro/4.9-2017.01/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- host-gcc-final-4.9.2.orig/libcilkrts/include/cilk/reducer_min_max.h
-+++ host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/packages/gcc/4.9.4/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch b/packages/gcc-linaro/5.4-2017.05/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
similarity index 65%
rename from packages/gcc/4.9.4/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
rename to packages/gcc-linaro/5.4-2017.05/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
index 1a6f7e5f..71625347 100644
--- a/packages/gcc/4.9.4/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
@@ -32,23 +32,21 @@ build-many-glibcs.py.
 
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@249958 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
- libgcc/config/aarch64/linux-unwind.h | 2 +-
- libgcc/config/alpha/linux-unwind.h   | 2 +-
- libgcc/config/bfin/linux-unwind.h    | 2 +-
- libgcc/config/i386/linux-unwind.h    | 4 ++--
- libgcc/config/m68k/linux-unwind.h    | 2 +-
- libgcc/config/nios2/linux-unwind.h   | 2 +-
- libgcc/config/pa/linux-unwind.h      | 2 +-
- libgcc/config/sh/linux-unwind.h      | 2 +-
- libgcc/config/tilepro/linux-unwind.h | 2 +-
- libgcc/config/xtensa/linux-unwind.h  | 2 +-
+ libgcc/config/aarch64/linux-unwind.h |    2 +-
+ libgcc/config/alpha/linux-unwind.h   |    2 +-
+ libgcc/config/bfin/linux-unwind.h    |    2 +-
+ libgcc/config/i386/linux-unwind.h    |    4 ++--
+ libgcc/config/m68k/linux-unwind.h    |    2 +-
+ libgcc/config/nios2/linux-unwind.h   |    2 +-
+ libgcc/config/pa/linux-unwind.h      |    2 +-
+ libgcc/config/sh/linux-unwind.h      |    2 +-
+ libgcc/config/tilepro/linux-unwind.h |    2 +-
+ libgcc/config/xtensa/linux-unwind.h  |    2 +-
  10 files changed, 11 insertions(+), 11 deletions(-)
 
-diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
-index 86d17b1c798..909f68f7311 100644
 --- a/libgcc/config/aarch64/linux-unwind.h
 +++ b/libgcc/config/aarch64/linux-unwind.h
-@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
    struct rt_sigframe
    {
      siginfo_t info;
@@ -57,11 +55,9 @@ index 86d17b1c798..909f68f7311 100644
    };
  
    struct rt_sigframe *rt_;
-diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
-index d65474fec12..9a226b195b5 100644
 --- a/libgcc/config/alpha/linux-unwind.h
 +++ b/libgcc/config/alpha/linux-unwind.h
-@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+@@ -51,7 +51,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -70,11 +66,9 @@ index d65474fec12..9a226b195b5 100644
        } *rt_ = context->cfa;
        sc = &rt_->uc.uc_mcontext;
      }
-diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
-index 0c270e435c7..7fa95d2dc96 100644
 --- a/libgcc/config/bfin/linux-unwind.h
 +++ b/libgcc/config/bfin/linux-unwind.h
-@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
  	void *puc;
  	char retcode[8];
  	siginfo_t info;
@@ -83,11 +77,9 @@ index 0c270e435c7..7fa95d2dc96 100644
        } *rt_ = context->cfa;
  
        /* The void * cast is necessary to avoid an aliasing warning.
-diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
-index e54bf73b1fd..d35fc4566ce 100644
 --- a/libgcc/config/i386/linux-unwind.h
 +++ b/libgcc/config/i386/linux-unwind.h
-@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -58,7 +58,7 @@
    if (*(unsigned char *)(pc+0) == 0x48
        && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
      {
@@ -96,7 +88,7 @@ index e54bf73b1fd..d35fc4566ce 100644
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
           because it does not alias anything.  */
-@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+@@ -138,7 +138,7 @@
  	siginfo_t *pinfo;
  	void *puc;
  	siginfo_t info;
@@ -105,11 +97,9 @@ index e54bf73b1fd..d35fc4566ce 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
-index fb79a4d63cd..b2f5ea4cd7c 100644
 --- a/libgcc/config/m68k/linux-unwind.h
 +++ b/libgcc/config/m68k/linux-unwind.h
-@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,7 +33,7 @@
  /* <sys/ucontext.h> is unfortunately broken right now.  */
  struct uw_ucontext {
  	unsigned long	  uc_flags;
@@ -118,11 +108,9 @@ index fb79a4d63cd..b2f5ea4cd7c 100644
  	stack_t		  uc_stack;
  	mcontext_t	  uc_mcontext;
  	unsigned long	  uc_filler[80];
-diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
-index dff1c20076e..1d88afecb12 100644
 --- a/libgcc/config/nios2/linux-unwind.h
 +++ b/libgcc/config/nios2/linux-unwind.h
-@@ -38,7 +38,7 @@ struct nios2_mcontext {
+@@ -38,7 +38,7 @@
  
  struct nios2_ucontext {
    unsigned long uc_flags;
@@ -131,11 +119,9 @@ index dff1c20076e..1d88afecb12 100644
    stack_t uc_stack;
    struct nios2_mcontext uc_mcontext;
    sigset_t uc_sigmask;	/* mask last for extensibility */
-diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
-index 01494685ea4..91575356803 100644
 --- a/libgcc/config/pa/linux-unwind.h
 +++ b/libgcc/config/pa/linux-unwind.h
-@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+@@ -80,7 +80,7 @@
    struct sigcontext *sc;
    struct rt_sigframe {
      siginfo_t info;
@@ -144,11 +130,9 @@ index 01494685ea4..91575356803 100644
    } *frame;
  
    /* rt_sigreturn trampoline:
-diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
-index e63091f287c..67033f06b4b 100644
 --- a/libgcc/config/sh/linux-unwind.h
 +++ b/libgcc/config/sh/linux-unwind.h
-@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+@@ -180,7 +180,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -157,11 +141,9 @@ index e63091f287c..67033f06b4b 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
-index fd83ba7c275..e3c9ef0840d 100644
 --- a/libgcc/config/tilepro/linux-unwind.h
 +++ b/libgcc/config/tilepro/linux-unwind.h
-@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
+@@ -61,7 +61,7 @@
    struct rt_sigframe {
      unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
      siginfo_t info;
@@ -170,11 +152,9 @@ index fd83ba7c275..e3c9ef0840d 100644
    } *rt_;
  
    /* Return if this is not a signal handler.  */
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9daf738ff57..ff6b66373a9 100644
 --- a/libgcc/config/xtensa/linux-unwind.h
 +++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -64,7 +64,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -64,7 +64,7 @@
  
    struct rt_sigframe {
      siginfo_t info;
@@ -183,6 +163,3 @@ index 9daf738ff57..ff6b66373a9 100644
    } *rt_;
  
    /* movi a2, __NR_rt_sigreturn; syscall */
--- 
-2.14.1
-
diff --git a/packages/gcc-linaro/7.1-2017.08/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/5.4-2017.05/0001-libtool-leave-framework-alone.patch
similarity index 74%
rename from packages/gcc-linaro/7.1-2017.08/1000-libtool-leave-framework-alone.patch
rename to packages/gcc-linaro/5.4-2017.05/0001-libtool-leave-framework-alone.patch
index bce09eb7..1a86e415 100644
--- a/packages/gcc-linaro/7.1-2017.08/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0001-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-6.2.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-6.2.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
 @@ -36,6 +36,11 @@
  for arg
  do
diff --git a/packages/gcc/5.5.0/100-uclibc-conf.patch b/packages/gcc-linaro/5.4-2017.05/0002-uclibc-conf.patch
similarity index 82%
rename from packages/gcc/5.5.0/100-uclibc-conf.patch
rename to packages/gcc-linaro/5.4-2017.05/0002-uclibc-conf.patch
index 73d1f0d3..aef750af 100644
--- a/packages/gcc/5.5.0/100-uclibc-conf.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0002-uclibc-conf.patch
@@ -1,5 +1,7 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/contrib/regression/objs-gcc.sh
 +++ b/contrib/regression/objs-gcc.sh
 @@ -106,6 +106,10 @@
diff --git a/packages/gcc/5.5.0/1100-msp430-string-literals.patch b/packages/gcc-linaro/5.4-2017.05/0003-msp430-string-literals.patch
similarity index 79%
rename from packages/gcc/5.5.0/1100-msp430-string-literals.patch
rename to packages/gcc-linaro/5.4-2017.05/0003-msp430-string-literals.patch
index 819d6d22..24f421f9 100644
--- a/packages/gcc/5.5.0/1100-msp430-string-literals.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0003-msp430-string-literals.patch
@@ -11,11 +11,15 @@ Date:   Wed May 13 01:11:13 2015 +0000
     
     git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223106 138bc75d-0d04-0410-961f-82ee72b054a4
 
-diff --git a/gcc/ada/sigtramp-vxworks.c b/gcc/ada/sigtramp-vxworks.c
-index 2119296dc1d..c697626a03e 100644
+---
+ gcc/ada/sigtramp-vxworks.c |    6 +++---
+ gcc/config/mmix/mmix.c     |    6 +++---
+ gcc/config/msp430/msp430.c |    2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
 --- a/gcc/ada/sigtramp-vxworks.c
 +++ b/gcc/ada/sigtramp-vxworks.c
-@@ -342,16 +342,16 @@ CR("") \
+@@ -342,16 +342,16 @@
  TCR("# Allocate frame and save the non-volatile") \
  TCR("# registers we're going to modify") \
  TCR("mov	ip, sp") \
@@ -35,11 +39,9 @@ index 2119296dc1d..c697626a03e 100644
  
  #else
  Not_implemented;
-diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
-index 6e991207dbc..e0699854e25 100644
 --- a/gcc/config/mmix/mmix.c
 +++ b/gcc/config/mmix/mmix.c
-@@ -2520,7 +2520,7 @@ mmix_output_shiftvalue_op_from_str (FILE *stream,
+@@ -2521,7 +2521,7 @@
    if (! mmix_shiftable_wyde_value (value))
      {
        char s[sizeof ("0xffffffffffffffff")];
@@ -48,7 +50,7 @@ index 6e991207dbc..e0699854e25 100644
        internal_error ("MMIX Internal: %s is not a shiftable int", s);
      }
  
-@@ -2562,7 +2562,7 @@ mmix_output_octa (FILE *stream, int64_t value, int do_begin_end)
+@@ -2563,7 +2563,7 @@
      fprintf (stream, "#" HOST_WIDE_INT_PRINT_HEX_PURE,
  	     (HOST_WIDE_INT) value);
    else /* Need to avoid the hex output; there's no ...WIDEST...HEX_PURE.  */
@@ -57,7 +59,7 @@ index 6e991207dbc..e0699854e25 100644
  
    if (do_begin_end)
      fprintf (stream, "\n");
-@@ -2579,7 +2579,7 @@ mmix_output_shifted_value (FILE *stream, int64_t value)
+@@ -2580,7 +2580,7 @@
    if (! mmix_shiftable_wyde_value (value))
      {
        char s[16+2+1];
@@ -66,11 +68,9 @@ index 6e991207dbc..e0699854e25 100644
        internal_error ("MMIX Internal: %s is not a shiftable int", s);
      }
  
-diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
-index bec168ca2ae..58d0efea1de 100644
 --- a/gcc/config/msp430/msp430.c
 +++ b/gcc/config/msp430/msp430.c
-@@ -2248,7 +2248,7 @@ static struct
+@@ -1902,7 +1902,7 @@
  }
    const_shift_helpers[] =
  {
diff --git a/packages/gcc/5.5.0/110-xtensa-implement-trap-pattern.patch b/packages/gcc-linaro/5.4-2017.05/0004-xtensa-implement-trap-pattern.patch
similarity index 83%
rename from packages/gcc/5.5.0/110-xtensa-implement-trap-pattern.patch
rename to packages/gcc-linaro/5.4-2017.05/0004-xtensa-implement-trap-pattern.patch
index 33045322..b25bbda6 100644
--- a/packages/gcc/5.5.0/110-xtensa-implement-trap-pattern.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0004-xtensa-implement-trap-pattern.patch
@@ -10,15 +10,13 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.h  |  1 +
- gcc/config/xtensa/xtensa.md | 15 ++++++++++++++-
+ gcc/config/xtensa/xtensa.h  |    1 +
+ gcc/config/xtensa/xtensa.md |   15 ++++++++++++++-
  2 files changed, 15 insertions(+), 1 deletion(-)
 
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 011411c..584080b 100644
 --- a/gcc/config/xtensa/xtensa.h
 +++ b/gcc/config/xtensa/xtensa.h
-@@ -67,6 +67,7 @@ extern unsigned xtensa_current_frame_size;
+@@ -67,6 +67,7 @@
  #define TARGET_THREADPTR	XCHAL_HAVE_THREADPTR
  #define TARGET_LOOPS	        XCHAL_HAVE_LOOPS
  #define TARGET_WINDOWED_ABI	(XSHAL_ABI == XTHAL_ABI_WINDOWED)
@@ -26,8 +24,6 @@ index 011411c..584080b 100644
  
  #define TARGET_DEFAULT \
    ((XCHAL_HAVE_L32R	? 0 : MASK_CONST16) |				\
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..a577aa3 100644
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -86,7 +86,7 @@
@@ -59,6 +55,3 @@ index 6d84384..a577aa3 100644
  ;; Setting up a frame pointer is tricky for Xtensa because GCC doesn't
  ;; know if a frame pointer is required until the reload pass, and
  ;; because there may be an incoming argument value in the hard frame
--- 
-1.8.1.4
-
diff --git a/packages/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/packages/gcc-linaro/5.4-2017.05/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
similarity index 82%
rename from packages/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
rename to packages/gcc-linaro/5.4-2017.05/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
index c11ad35a..cf529506 100644
--- a/packages/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
@@ -8,14 +8,12 @@ Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
 
 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 ---
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ gcc/config.gcc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 4a7cbd2..9cc765e 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -439,7 +439,7 @@ powerpc*-*-*)
+@@ -435,7 +435,7 @@
  	cpu_type=rs6000
  	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
  	case x$with_cpu in
@@ -24,6 +22,3 @@ index 4a7cbd2..9cc765e 100644
  		cpu_is_64bit=yes
  		;;
  	esac
--- 
-2.6.2
-
diff --git a/packages/gcc-linaro/6.4-2017.08/301-missing-execinfo_h.patch b/packages/gcc-linaro/5.4-2017.05/0006-missing-execinfo_h.patch
similarity index 79%
rename from packages/gcc-linaro/6.4-2017.08/301-missing-execinfo_h.patch
rename to packages/gcc-linaro/5.4-2017.05/0006-missing-execinfo_h.patch
index 2d0e7baa..c90222a1 100644
--- a/packages/gcc-linaro/6.4-2017.08/301-missing-execinfo_h.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0006-missing-execinfo_h.patch
@@ -1,5 +1,7 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
+---
+ boehm-gc/include/gc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/boehm-gc/include/gc.h
 +++ b/boehm-gc/include/gc.h
 @@ -503,7 +503,7 @@
diff --git a/packages/gcc-linaro/7.1-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc-linaro/5.4-2017.05/0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
similarity index 84%
rename from packages/gcc-linaro/7.1-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
rename to packages/gcc-linaro/5.4-2017.05/0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index d8986d5f..74f6f3f4 100644
--- a/packages/gcc-linaro/7.1-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,6 +1,11 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
+---
+ config/gcc-plugin.m4 |   18 +++++++++++++-----
+ gcc/configure        |   22 +++++++++++++++-------
+ libcc1/configure     |   22 +++++++++++++++-------
+ 3 files changed, 43 insertions(+), 19 deletions(-)
+
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
 @@ -20,6 +20,9 @@
  
     pluginlibs=
@@ -46,10 +51,9 @@ diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
         [AC_MSG_RESULT([yes]); have_pic_shared=yes],
         [AC_MSG_RESULT([no]); have_pic_shared=no])
       if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -28465,6 +28465,9 @@
  
     pluginlibs=
  
@@ -59,7 +63,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
+@@ -28475,6 +28478,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -71,7 +75,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
+@@ -28587,23 +28595,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -102,9 +106,8 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
    ;
    return 0;
  }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
+--- a/libcc1/configure
++++ b/libcc1/configure
 @@ -14500,6 +14500,9 @@
  
     pluginlibs=
diff --git a/packages/gcc-linaro/5.4-2017.05/0008-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/5.4-2017.05/0008-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 00000000..5f9a07a2
--- /dev/null
+++ b/packages/gcc-linaro/5.4-2017.05/0008-gcc-plugin-POSIX-include-sys-select-h.patch
@@ -0,0 +1,14 @@
+---
+ libcc1/connection.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libcc1/connection.cc
++++ b/libcc1/connection.cc
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "marshall.hh"
diff --git a/packages/gcc-linaro/4.9-2017.01/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/5.4-2017.05/0009-arm-softfloat-libgcc.patch
similarity index 80%
rename from packages/gcc-linaro/4.9-2017.01/810-arm-softfloat-libgcc.patch
rename to packages/gcc-linaro/5.4-2017.05/0009-arm-softfloat-libgcc.patch
index 5efa7fd1..350857dd 100644
--- a/packages/gcc-linaro/4.9-2017.01/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0009-arm-softfloat-libgcc.patch
@@ -1,5 +1,8 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
 @@ -60,7 +60,7 @@
@@ -11,8 +14,6 @@ Index: b/gcc/config/arm/linux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-Index: b/libgcc/config/arm/t-linux
-===================================================================
 --- a/libgcc/config/arm/t-linux
 +++ b/libgcc/config/arm/t-linux
 @@ -1,6 +1,11 @@
diff --git a/packages/gcc/4.8.5/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/5.4-2017.05/0010-arm_unbreak_armv4t.patch
similarity index 83%
rename from packages/gcc/4.8.5/830-arm_unbreak_armv4t.patch
rename to packages/gcc-linaro/5.4-2017.05/0010-arm_unbreak_armv4t.patch
index 37f8f2a5..7c374453 100644
--- a/packages/gcc/4.8.5/830-arm_unbreak_armv4t.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0010-arm_unbreak_armv4t.patch
@@ -1,5 +1,9 @@
 http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
 
+---
+ gcc/config/arm/linux-eabi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -45,7 +45,7 @@
diff --git a/packages/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch b/packages/gcc-linaro/5.4-2017.05/0011-microblaze-enable-dwarf-eh-support.patch
similarity index 84%
rename from packages/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch
rename to packages/gcc-linaro/5.4-2017.05/0011-microblaze-enable-dwarf-eh-support.patch
index 9d29090a..67a322a4 100644
--- a/packages/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0011-microblaze-enable-dwarf-eh-support.patch
@@ -26,15 +26,13 @@ Changelog
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 ---
- gcc/common/config/microblaze/microblaze-common.c |  3 ---
- gcc/config/microblaze/microblaze-protos.h        |  1 +
- gcc/config/microblaze/microblaze.c               | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h               | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md              | 11 +++++++++
+ gcc/common/config/microblaze/microblaze-common.c |    3 --
+ gcc/config/microblaze/microblaze-protos.h        |    1 
+ gcc/config/microblaze/microblaze.c               |   29 +++++++++++++++++++----
+ gcc/config/microblaze/microblaze.h               |   15 +++++++++++
+ gcc/config/microblaze/microblaze.md              |   11 ++++++++
  5 files changed, 52 insertions(+), 7 deletions(-)
 
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
 --- a/gcc/common/config/microblaze/microblaze-common.c
 +++ b/gcc/common/config/microblaze/microblaze-common.c
 @@ -37,7 +37,4 @@
@@ -45,8 +43,6 @@ Index: b/gcc/common/config/microblaze/microblaze-common.c
 -#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
 -
  struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze-protos.h
 +++ b/gcc/config/microblaze/microblaze-protos.h
 @@ -56,6 +56,7 @@
@@ -57,8 +53,6 @@ Index: b/gcc/config/microblaze/microblaze-protos.h
  #endif  /* RTX_CODE */
  
  /* Declare functions in microblaze-c.c.  */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
 --- a/gcc/config/microblaze/microblaze.c
 +++ b/gcc/config/microblaze/microblaze.c
 @@ -1959,6 +1959,11 @@
@@ -118,8 +112,6 @@ Index: b/gcc/config/microblaze/microblaze.c
  }
  
  /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze.h
 +++ b/gcc/config/microblaze/microblaze.h
 @@ -184,6 +184,21 @@
@@ -144,8 +136,6 @@ Index: b/gcc/config/microblaze/microblaze.h
  /* Use DWARF 2 debugging information by default.  */
  #define DWARF2_DEBUGGING_INFO
  #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
 --- a/gcc/config/microblaze/microblaze.md
 +++ b/gcc/config/microblaze/microblaze.md
 @@ -2272,4 +2272,15 @@
diff --git a/packages/gcc-linaro/5.4-2017.05/850-libstdcxx-uclibc-c99.patch b/packages/gcc-linaro/5.4-2017.05/0012-libstdcxx-uclibc-c99.patch
similarity index 75%
rename from packages/gcc-linaro/5.4-2017.05/850-libstdcxx-uclibc-c99.patch
rename to packages/gcc-linaro/5.4-2017.05/0012-libstdcxx-uclibc-c99.patch
index 9e97d945..0b211b9d 100644
--- a/packages/gcc-linaro/5.4-2017.05/850-libstdcxx-uclibc-c99.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0012-libstdcxx-uclibc-c99.patch
@@ -15,8 +15,28 @@ that uClibc defines the __UCLIBC__ definition.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
+---
+ libstdc++-v3/config/locale/generic/c_locale.h     |    2 +-
+ libstdc++-v3/config/locale/gnu/c_locale.h         |    2 +-
+ libstdc++-v3/include/bits/basic_string.h          |    2 +-
+ libstdc++-v3/include/bits/locale_facets.tcc       |    2 +-
+ libstdc++-v3/include/bits/locale_facets_nonio.tcc |    2 +-
+ libstdc++-v3/include/c_compatibility/math.h       |    2 +-
+ libstdc++-v3/include/c_compatibility/wchar.h      |    2 +-
+ libstdc++-v3/include/c_global/cstdio              |    2 +-
+ libstdc++-v3/include/c_global/cstdlib             |    2 +-
+ libstdc++-v3/include/c_global/cwchar              |    4 ++--
+ libstdc++-v3/include/c_std/cstdio                 |    2 +-
+ libstdc++-v3/include/c_std/cstdlib                |    2 +-
+ libstdc++-v3/include/c_std/cwchar                 |    2 +-
+ libstdc++-v3/include/ext/vstring.h                |    2 +-
+ libstdc++-v3/include/tr1/cstdio                   |    2 +-
+ libstdc++-v3/include/tr1/cstdlib                  |    2 +-
+ libstdc++-v3/include/tr1/cwchar                   |    2 +-
+ libstdc++-v3/include/tr1/stdlib.h                 |    2 +-
+ libstdc++-v3/src/c++11/debug.cc                   |    2 +-
+ 19 files changed, 20 insertions(+), 20 deletions(-)
+
 --- a/libstdc++-v3/config/locale/generic/c_locale.h
 +++ b/libstdc++-v3/config/locale/generic/c_locale.h
 @@ -70,7 +70,7 @@
@@ -28,8 +48,6 @@ Index: b/libstdc++-v3/config/locale/generic/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
 --- a/libstdc++-v3/config/locale/gnu/c_locale.h
 +++ b/libstdc++-v3/config/locale/gnu/c_locale.h
 @@ -88,7 +88,7 @@
@@ -41,11 +59,9 @@ Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
 --- a/libstdc++-v3/include/bits/basic_string.h
 +++ b/libstdc++-v3/include/bits/basic_string.h
-@@ -5239,7 +5239,7 @@
+@@ -5344,7 +5344,7 @@
  _GLIBCXX_END_NAMESPACE_VERSION
  } // namespace
  
@@ -54,8 +70,6 @@ Index: b/libstdc++-v3/include/bits/basic_string.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets.tcc
 @@ -992,7 +992,7 @@
@@ -67,8 +81,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets.tcc
  	// Precision is always used except for hexfloat format.
  	const bool __use_prec =
  	  (__io.flags() & ios_base::floatfield) != ios_base::floatfield;
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 @@ -578,7 +578,7 @@
@@ -80,8 +92,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
        // First try a buffer perhaps big enough.
        int __cs_size = 64;
        char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/math.h
 +++ b/libstdc++-v3/include/c_compatibility/math.h
 @@ -56,7 +56,7 @@
@@ -93,8 +103,6 @@ Index: b/libstdc++-v3/include/c_compatibility/math.h
  using std::fpclassify;
  using std::isfinite;
  using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/wchar.h
 +++ b/libstdc++-v3/include/c_compatibility/wchar.h
 @@ -103,7 +103,7 @@
@@ -106,8 +114,6 @@ Index: b/libstdc++-v3/include/c_compatibility/wchar.h
  using std::wcstold;
  using std::wcstoll;
  using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdlib
 +++ b/libstdc++-v3/include/c_global/cstdlib
 @@ -195,7 +195,7 @@
@@ -119,8 +125,6 @@ Index: b/libstdc++-v3/include/c_global/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_global/cwchar
 +++ b/libstdc++-v3/include/c_global/cwchar
 @@ -232,7 +232,7 @@
@@ -141,8 +145,6 @@ Index: b/libstdc++-v3/include/c_global/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdio
 +++ b/libstdc++-v3/include/c_std/cstdio
 @@ -144,7 +144,7 @@
@@ -154,8 +156,6 @@ Index: b/libstdc++-v3/include/c_std/cstdio
  
  #undef snprintf
  #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdlib
 +++ b/libstdc++-v3/include/c_std/cstdlib
 @@ -192,7 +192,7 @@
@@ -167,8 +167,6 @@ Index: b/libstdc++-v3/include/c_std/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_std/cwchar
 +++ b/libstdc++-v3/include/c_std/cwchar
 @@ -228,7 +228,7 @@
@@ -180,8 +178,6 @@ Index: b/libstdc++-v3/include/c_std/cwchar
  
  #undef wcstold
  #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
 --- a/libstdc++-v3/include/ext/vstring.h
 +++ b/libstdc++-v3/include/ext/vstring.h
 @@ -2680,7 +2680,7 @@
@@ -193,8 +189,6 @@ Index: b/libstdc++-v3/include/ext/vstring.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdio
 +++ b/libstdc++-v3/include/tr1/cstdio
 @@ -33,7 +33,7 @@
@@ -206,8 +200,6 @@ Index: b/libstdc++-v3/include/tr1/cstdio
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdlib
 +++ b/libstdc++-v3/include/tr1/cstdlib
 @@ -35,7 +35,7 @@
@@ -219,8 +211,6 @@ Index: b/libstdc++-v3/include/tr1/cstdlib
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
 --- a/libstdc++-v3/include/tr1/cwchar
 +++ b/libstdc++-v3/include/tr1/cwchar
 @@ -52,7 +52,7 @@
@@ -232,8 +222,6 @@ Index: b/libstdc++-v3/include/tr1/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
 --- a/libstdc++-v3/include/tr1/stdlib.h
 +++ b/libstdc++-v3/include/tr1/stdlib.h
 @@ -33,7 +33,7 @@
@@ -245,8 +233,6 @@ Index: b/libstdc++-v3/include/tr1/stdlib.h
  
  using std::tr1::atoll;
  using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
 --- a/libstdc++-v3/src/c++11/debug.cc
 +++ b/libstdc++-v3/src/c++11/debug.cc
 @@ -788,7 +788,7 @@
@@ -258,8 +244,6 @@ Index: b/libstdc++-v3/src/c++11/debug.cc
        std::snprintf(__buf, __n, __fmt, __s);
  #else
        std::sprintf(__buf, __fmt, __s);
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdio
 +++ b/libstdc++-v3/include/c_global/cstdio
 @@ -146,7 +146,7 @@
diff --git a/packages/gcc/5.5.0/860-cilk-wchar.patch b/packages/gcc-linaro/5.4-2017.05/0013-cilk-wchar.patch
similarity index 95%
rename from packages/gcc/5.5.0/860-cilk-wchar.patch
rename to packages/gcc-linaro/5.4-2017.05/0013-cilk-wchar.patch
index 1d9916f5..300837f0 100644
--- a/packages/gcc/5.5.0/860-cilk-wchar.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0013-cilk-wchar.patch
@@ -10,8 +10,6 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
 --- a/libcilkrts/include/cilk/reducer_min_max.h
 +++ b/libcilkrts/include/cilk/reducer_min_max.h
 @@ -3154,7 +3154,9 @@
diff --git a/packages/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch b/packages/gcc-linaro/5.4-2017.05/0014-xtensa-add-mauto-litpools-option.patch
similarity index 86%
rename from packages/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch
rename to packages/gcc-linaro/5.4-2017.05/0014-xtensa-add-mauto-litpools-option.patch
index aa1376c4..3db8ec8e 100644
--- a/packages/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0014-xtensa-add-mauto-litpools-option.patch
@@ -39,17 +39,15 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: r226828
 Changes to ChangeLogs and documentation are dropped.
 
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
+ gcc/config/xtensa/constraints.md |    5 +++++
+ gcc/config/xtensa/elf.h          |    4 +++-
+ gcc/config/xtensa/linux.h        |    4 +++-
+ gcc/config/xtensa/predicates.md  |    3 ++-
+ gcc/config/xtensa/xtensa.c       |   19 ++++++++++++++++++-
+ gcc/config/xtensa/xtensa.md      |   35 +++++++++++++++++++----------------
+ gcc/config/xtensa/xtensa.opt     |    4 ++++
  7 files changed, 54 insertions(+), 20 deletions(-)
 
-diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md
-index 30f4c1f..773d4f9 100644
 --- a/gcc/config/xtensa/constraints.md
 +++ b/gcc/config/xtensa/constraints.md
 @@ -111,6 +111,11 @@
@@ -64,11 +62,9 @@ index 30f4c1f..773d4f9 100644
  ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
  ;; causes reload to force some constants into the constant pool, but since
  ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
-index e59bede..12056f7 100644
 --- a/gcc/config/xtensa/elf.h
 +++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3.  If not see
+@@ -48,7 +48,9 @@
    %{mtarget-align:--target-align} \
    %{mno-target-align:--no-target-align} \
    %{mlongcalls:--longcalls} \
@@ -79,11 +75,9 @@ index e59bede..12056f7 100644
  
  #undef LIB_SPEC
  #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
-index 675aacf..5b0243a 100644
 --- a/gcc/config/xtensa/linux.h
 +++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3.  If not see
+@@ -42,7 +42,9 @@
    %{mtarget-align:--target-align} \
    %{mno-target-align:--no-target-align} \
    %{mlongcalls:--longcalls} \
@@ -94,8 +88,6 @@ index 675aacf..5b0243a 100644
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
  
-diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md
-index e02209e..d7dfa11 100644
 --- a/gcc/config/xtensa/predicates.md
 +++ b/gcc/config/xtensa/predicates.md
 @@ -142,7 +142,8 @@
@@ -108,11 +100,9 @@ index e02209e..d7dfa11 100644
  			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
  
  ;; Accept the floating point constant 1 in the appropriate mode.
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..206ff80 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands)
+@@ -501,6 +501,9 @@
      {
        int dst_regnum = xt_true_regnum (operands[0]);
  
@@ -122,7 +112,7 @@ index eb039ba..206ff80 100644
        /* The stack pointer can only be assigned with a MOVSP opcode.  */
        if (dst_regnum == STACK_POINTER_REGNUM)
  	return !TARGET_WINDOWED_ABI
-@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode)
+@@ -1069,7 +1072,7 @@
  	  return 1;
  	}
  
@@ -131,7 +121,7 @@ index eb039ba..206ff80 100644
  	{
  	  src = force_const_mem (SImode, src);
  	  operands[1] = src;
-@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2449,6 +2452,20 @@
  	}
        break;
  
@@ -152,8 +142,6 @@ index eb039ba..206ff80 100644
      default:
        if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
  	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..0e673a3 100644
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -761,8 +761,8 @@
@@ -270,11 +258,9 @@ index 6d84384..0e673a3 100644
    "register_operand (operands[0], DFmode)
     || register_operand (operands[1], DFmode)"
    "#"
-diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
-index 2fd6cee..21c6e96 100644
 --- a/gcc/config/xtensa/xtensa.opt
 +++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@ mtext-section-literals
+@@ -38,6 +38,10 @@
  Target
  Intersperse literal pools with code in the text section
  
@@ -285,6 +271,3 @@ index 2fd6cee..21c6e96 100644
  mserialize-volatile
  Target Report Mask(SERIALIZE_VOLATILE)
  -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/871-xtensa-reimplement-register-spilling.patch b/packages/gcc-linaro/5.4-2017.05/0015-xtensa-reimplement-register-spilling.patch
similarity index 84%
rename from packages/gcc-linaro/5.4-2017.05/871-xtensa-reimplement-register-spilling.patch
rename to packages/gcc-linaro/5.4-2017.05/0015-xtensa-reimplement-register-spilling.patch
index 4056f8b8..b85ecb96 100644
--- a/packages/gcc-linaro/5.4-2017.05/871-xtensa-reimplement-register-spilling.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0015-xtensa-reimplement-register-spilling.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226962
 
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
+ libgcc/config/xtensa/lib2funcs.S |   30 +++++++++++++++++++++++-------
  1 file changed, 23 insertions(+), 7 deletions(-)
 
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 4d451c8..ef0703f 100644
 --- a/libgcc/config/xtensa/lib2funcs.S
 +++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -34,10 +34,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -34,10 +34,29 @@
  	.global	__xtensa_libgcc_window_spill
  	.type	__xtensa_libgcc_window_spill,@function
  __xtensa_libgcc_window_spill:
@@ -51,15 +49,15 @@ index 4d451c8..ef0703f 100644
 +#elif XCHAL_NUM_AREGS % 12 == 8
 +	mov	a12, a12
 +#endif
- 	retw
++	retw
 +#else
 +	mov	a8, a8
-+	retw
+ 	retw
 +#endif
  	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
  #endif
  
-@@ -61,10 +80,7 @@ __xtensa_nonlocal_goto:
+@@ -61,10 +80,7 @@
  	entry	sp, 32
  
  	/* Flush registers.  */
@@ -71,6 +69,3 @@ index 4d451c8..ef0703f 100644
  
  	/* Because the save area for a0-a3 is stored one frame below
  	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/packages/gcc-linaro/5.4-2017.05/0016-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
similarity index 84%
rename from packages/gcc-linaro/5.4-2017.05/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
rename to packages/gcc-linaro/5.4-2017.05/0016-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
index 9707f688..96b89e32 100644
--- a/packages/gcc-linaro/5.4-2017.05/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0016-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
@@ -15,17 +15,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226963
 
- libgcc/config/xtensa/t-windowed | 2 +-
+ libgcc/config/xtensa/t-windowed |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index 7d9e9db..a99156c 100644
 --- a/libgcc/config/xtensa/t-windowed
 +++ b/libgcc/config/xtensa/t-windowed
 @@ -1,2 +1,2 @@
  LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
 -   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
 +   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/873-xtensa-fix-_Unwind_GetCFA.patch b/packages/gcc-linaro/5.4-2017.05/0017-xtensa-fix-_Unwind_GetCFA.patch
similarity index 81%
rename from packages/gcc-linaro/5.4-2017.05/873-xtensa-fix-_Unwind_GetCFA.patch
rename to packages/gcc-linaro/5.4-2017.05/0017-xtensa-fix-_Unwind_GetCFA.patch
index 2d8eb7c7..2222fdbf 100644
--- a/packages/gcc-linaro/5.4-2017.05/873-xtensa-fix-_Unwind_GetCFA.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0017-xtensa-fix-_Unwind_GetCFA.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226964
 
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
+ libgcc/config/xtensa/unwind-dw2-xtensa.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 82b0e63..8e579c7 100644
 --- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
 +++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
+@@ -130,7 +130,7 @@
  _Unwind_Word
  _Unwind_GetCFA (struct _Unwind_Context *context)
  {
@@ -35,6 +33,3 @@ index 82b0e63..8e579c7 100644
  }
  
  /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/874-xtensa-add-uclinux-support.patch b/packages/gcc-linaro/5.4-2017.05/0018-xtensa-add-uclinux-support.patch
similarity index 87%
rename from packages/gcc-linaro/5.4-2017.05/874-xtensa-add-uclinux-support.patch
rename to packages/gcc-linaro/5.4-2017.05/0018-xtensa-add-uclinux-support.patch
index 23db3d86..643eff14 100644
--- a/packages/gcc-linaro/5.4-2017.05/874-xtensa-add-uclinux-support.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0018-xtensa-add-uclinux-support.patch
@@ -16,19 +16,17 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r228450
 
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
+ gcc/config.gcc                |    5 +++
+ gcc/config/xtensa/uclinux.h   |   69 ++++++++++++++++++++++++++++++++++++++++++
+ gcc/config/xtensa/uclinux.opt |   32 +++++++++++++++++++
+ libgcc/config.host            |    5 +++
  4 files changed, 111 insertions(+)
  create mode 100644 gcc/config/xtensa/uclinux.h
  create mode 100644 gcc/config/xtensa/uclinux.opt
 
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index c52f5a8..56797bd 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -2995,6 +2995,11 @@ xtensa*-*-linux*)
+@@ -2976,6 +2976,11 @@
  	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
  	tmake_file="${tmake_file} xtensa/t-xtensa"
  	;;
@@ -40,9 +38,6 @@ index c52f5a8..56797bd 100644
  am33_2.0-*-linux*)
  	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
  	gas=yes gnu_ld=yes
-diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
-new file mode 100644
-index 0000000..4606020
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.h
 @@ -0,0 +1,69 @@
@@ -115,9 +110,6 @@ index 0000000..4606020
 +
 +#undef DBX_REGISTER_NUMBER
 +
-diff --git a/gcc/config/xtensa/uclinux.opt b/gcc/config/xtensa/uclinux.opt
-new file mode 100644
-index 0000000..95ef777
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.opt
 @@ -0,0 +1,32 @@
@@ -153,11 +145,9 @@ index 0000000..95ef777
 +Driver JoinedOrMissing
 +
 +; This comment is to ensure we retain the blank line above.
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 2c64756..2ee92c1 100644
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
-@@ -1295,6 +1295,11 @@ xtensa*-*-linux*)
+@@ -1289,6 +1289,11 @@
  	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
  	md_unwind_header=xtensa/linux-unwind.h
  	;;
@@ -169,6 +159,3 @@ index 2c64756..2ee92c1 100644
  am33_2.0-*-linux*)
  	# Don't need crtbeginT.o from *-*-linux* default.
  	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch b/packages/gcc-linaro/5.4-2017.05/0019-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
similarity index 79%
rename from packages/gcc-linaro/5.4-2017.05/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
rename to packages/gcc-linaro/5.4-2017.05/0019-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
index d128596d..2b46a29d 100644
--- a/packages/gcc-linaro/5.4-2017.05/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0019-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
@@ -18,15 +18,13 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227809 138bc75d-0d04-0410-961f-8
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.h          |  4 +++-
- libgcc/config/xtensa/linux-unwind.h | 30 ++++++++++++++++++++++++++++--
+ gcc/config/xtensa/xtensa.h          |    4 +++-
+ libgcc/config/xtensa/linux-unwind.h |   30 ++++++++++++++++++++++++++++--
  2 files changed, 31 insertions(+), 3 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 584080b..e165def 100644
 --- a/gcc/config/xtensa/xtensa.h
 +++ b/gcc/config/xtensa/xtensa.h
-@@ -813,7 +813,9 @@ typedef struct xtensa_args
+@@ -813,7 +813,9 @@
     for debugging.  */
  #define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (Pmode, 0)
  #define DWARF_FRAME_RETURN_COLUMN DWARF_FRAME_REGNUM (0)
@@ -37,11 +35,9 @@ index 584080b..e165def 100644
  #define EH_RETURN_DATA_REGNO(N) ((N) < 2 ? (N) + 2 : INVALID_REGNUM)
  #define ASM_PREFERRED_EH_DATA_FORMAT(CODE, GLOBAL)			\
    (flag_pic								\
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9daf738..9a67b5d 100644
 --- a/libgcc/config/xtensa/linux-unwind.h
 +++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -52,7 +52,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -52,7 +52,6 @@
  #define ENTRY_BYTE 0x36
  #endif
  
@@ -49,7 +45,7 @@ index 9daf738..9a67b5d 100644
  #define MD_FALLBACK_FRAME_STATE_FOR xtensa_fallback_frame_state
  
  static _Unwind_Reason_Code
-@@ -61,6 +60,10 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -61,6 +60,10 @@
  {
    unsigned char *pc = context->ra;
    struct sigcontext *sc;
@@ -60,7 +56,7 @@ index 9daf738..9a67b5d 100644
  
    struct rt_sigframe {
      siginfo_t info;
-@@ -76,6 +79,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -76,6 +79,7 @@
        || pc[5] != SYSC_BYTE2)
      return _URC_END_OF_STACK;
  
@@ -68,7 +64,7 @@ index 9daf738..9a67b5d 100644
    rt_ = context->sp;
    sc = &rt_->uc.uc_mcontext;
    fs->signal_regs = (_Unwind_Word *) sc->sc_a;
-@@ -90,11 +94,33 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -90,11 +94,33 @@
     }
    else
      fs->signal_ra = sc->sc_pc;
@@ -103,6 +99,3 @@ index 9daf738..9a67b5d 100644
 -#endif /* __XTENSA_WINDOWED_ABI__ */
  
  #endif /* ifdef inhibit_libc  */
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/876-xtensa-fix-libgcc-build-with-text-section-literals.patch b/packages/gcc-linaro/5.4-2017.05/0020-xtensa-fix-libgcc-build-with-text-section-literals.patch
similarity index 76%
rename from packages/gcc-linaro/5.4-2017.05/876-xtensa-fix-libgcc-build-with-text-section-literals.patch
rename to packages/gcc-linaro/5.4-2017.05/0020-xtensa-fix-libgcc-build-with-text-section-literals.patch
index 4b2334a7..6ccede3e 100644
--- a/packages/gcc-linaro/5.4-2017.05/876-xtensa-fix-libgcc-build-with-text-section-literals.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0020-xtensa-fix-libgcc-build-with-text-section-literals.patch
@@ -18,15 +18,13 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233505 138bc75d-0d04-0410-961f-8
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- libgcc/config/xtensa/ieee754-df.S | 2 ++
- libgcc/config/xtensa/ieee754-sf.S | 2 ++
+ libgcc/config/xtensa/ieee754-df.S |    2 ++
+ libgcc/config/xtensa/ieee754-sf.S |    2 ++
  2 files changed, 4 insertions(+)
 
-diff --git a/libgcc/config/xtensa/ieee754-df.S b/libgcc/config/xtensa/ieee754-df.S
-index a7ae209..26f2abd 100644
 --- a/libgcc/config/xtensa/ieee754-df.S
 +++ b/libgcc/config/xtensa/ieee754-df.S
-@@ -606,6 +606,7 @@ __subdf3:
+@@ -606,6 +606,7 @@
  #define XCHAL_NO_MUL 1
  #endif
  
@@ -34,7 +32,7 @@ index a7ae209..26f2abd 100644
  __muldf3_aux:
  
  	/* Handle unusual cases (zeros, subnormals, NaNs and Infinities).
-@@ -1216,6 +1217,7 @@ __muldf3:
+@@ -1216,6 +1217,7 @@
  
  #ifdef L_divdf3
  
@@ -42,11 +40,9 @@ index a7ae209..26f2abd 100644
  	/* Division */
  __divdf3_aux:
  
-diff --git a/libgcc/config/xtensa/ieee754-sf.S b/libgcc/config/xtensa/ieee754-sf.S
-index 7e397dc..a5e6e3c 100644
 --- a/libgcc/config/xtensa/ieee754-sf.S
 +++ b/libgcc/config/xtensa/ieee754-sf.S
-@@ -487,6 +487,7 @@ __subsf3:
+@@ -487,6 +487,7 @@
  #define XCHAL_NO_MUL 1
  #endif
  
@@ -54,7 +50,7 @@ index 7e397dc..a5e6e3c 100644
  __mulsf3_aux:
  
  	/* Handle unusual cases (zeros, subnormals, NaNs and Infinities).
-@@ -884,6 +885,7 @@ __mulsf3:
+@@ -884,6 +885,7 @@
  
  #ifdef L_divsf3
  
@@ -62,6 +58,3 @@ index 7e397dc..a5e6e3c 100644
  	/* Division */
  __divsf3_aux:
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch b/packages/gcc-linaro/5.4-2017.05/0021-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
similarity index 79%
rename from packages/gcc-linaro/5.4-2017.05/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
rename to packages/gcc-linaro/5.4-2017.05/0021-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
index 6e0ce6e3..97927797 100644
--- a/packages/gcc-linaro/5.4-2017.05/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0021-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
@@ -26,37 +26,28 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@241313 138bc75d-0d04-0410-961f-8
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- libgcc/config/xtensa/t-elf      | 2 ++
- libgcc/config/xtensa/t-linux    | 2 ++
- libgcc/config/xtensa/t-windowed | 2 +-
+ libgcc/config/xtensa/t-elf      |    2 ++
+ libgcc/config/xtensa/t-linux    |    2 ++
+ libgcc/config/xtensa/t-windowed |    2 +-
  3 files changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/t-elf b/libgcc/config/xtensa/t-elf
-index 59d5121..967cf9b 100644
 --- a/libgcc/config/xtensa/t-elf
 +++ b/libgcc/config/xtensa/t-elf
-@@ -3,3 +3,5 @@ CRTSTUFF_T_CFLAGS += -mlongcalls
+@@ -3,3 +3,5 @@
  CRTSTUFF_T_CFLAGS_S += -mlongcalls
  
  HOST_LIBGCC2_CFLAGS += -mlongcalls
 +
 +LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde.c
-diff --git a/libgcc/config/xtensa/t-linux b/libgcc/config/xtensa/t-linux
-index 6f4ae89..412ecca 100644
 --- a/libgcc/config/xtensa/t-linux
 +++ b/libgcc/config/xtensa/t-linux
 @@ -1 +1,3 @@
  SHLIB_MAPFILES += $(srcdir)/config/xtensa/libgcc-glibc.ver
 +
 +LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde-dip.c
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index a99156c..f140136 100644
 --- a/libgcc/config/xtensa/t-windowed
 +++ b/libgcc/config/xtensa/t-windowed
 @@ -1,2 +1,2 @@
  LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
 -   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
 +   $(LIB2ADDEH_XTENSA_UNWIND_DW2_FDE) $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/878-xtensa-Fix-PR-target-78603.patch b/packages/gcc-linaro/5.4-2017.05/0022-xtensa-Fix-PR-target-78603.patch
similarity index 83%
rename from packages/gcc-linaro/5.4-2017.05/878-xtensa-Fix-PR-target-78603.patch
rename to packages/gcc-linaro/5.4-2017.05/0022-xtensa-Fix-PR-target-78603.patch
index 4646d3c6..cd840f83 100644
--- a/packages/gcc-linaro/5.4-2017.05/878-xtensa-Fix-PR-target-78603.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0022-xtensa-Fix-PR-target-78603.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 5 ++++-
+ gcc/config/xtensa/xtensa.c |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 206ff80..36ab1e3 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -4182,7 +4182,10 @@ hwloop_optimize (hwloop_info loop)
+@@ -4182,7 +4182,10 @@
        entry_after = BB_END (entry_bb);
        while (DEBUG_INSN_P (entry_after)
               || (NOTE_P (entry_after)
@@ -30,6 +28,3 @@ index 206ff80..36ab1e3 100644
          entry_after = PREV_INSN (entry_after);
  
        emit_insn_after (seq, entry_after);
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/879-gcc-xtensa-fix-fprintf-format-specifiers.patch b/packages/gcc-linaro/5.4-2017.05/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
similarity index 83%
rename from packages/gcc-linaro/5.4-2017.05/879-gcc-xtensa-fix-fprintf-format-specifiers.patch
rename to packages/gcc-linaro/5.4-2017.05/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
index e75e2587..a14b3cf5 100644
--- a/packages/gcc-linaro/5.4-2017.05/879-gcc-xtensa-fix-fprintf-format-specifiers.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
@@ -17,14 +17,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 11 ++++++-----
+ gcc/config/xtensa/xtensa.c |   11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 36ab1e3..8e62d63 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1811,7 +1811,8 @@ xtensa_emit_call (int callop, rtx *operands)
+@@ -1811,7 +1811,8 @@
    rtx tgt = operands[callop];
  
    if (GET_CODE (tgt) == CONST_INT)
@@ -34,7 +32,7 @@ index 36ab1e3..8e62d63 100644
    else if (register_operand (tgt, VOIDmode))
      sprintf (result, "callx%d\t%%%d", WINDOW_SIZE, callop);
    else
-@@ -2382,14 +2383,14 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2382,14 +2383,14 @@
  
      case 'L':
        if (GET_CODE (x) == CONST_INT)
@@ -51,7 +49,7 @@ index 36ab1e3..8e62d63 100644
        else
  	output_operand_lossage ("invalid %%R value");
        break;
-@@ -2403,7 +2404,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2403,7 +2404,7 @@
  
      case 'd':
        if (GET_CODE (x) == CONST_INT)
@@ -60,7 +58,7 @@ index 36ab1e3..8e62d63 100644
        else
  	output_operand_lossage ("invalid %%d value");
        break;
-@@ -2472,7 +2473,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2472,7 +2473,7 @@
        else if (GET_CODE (x) == MEM)
  	output_address (XEXP (x, 0));
        else if (GET_CODE (x) == CONST_INT)
@@ -69,6 +67,3 @@ index 36ab1e3..8e62d63 100644
        else
  	output_addr_const (file, x);
      }
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/880-xtensa-fix-PR-target-82181.patch b/packages/gcc-linaro/5.4-2017.05/0024-xtensa-fix-PR-target-82181.patch
similarity index 76%
rename from packages/gcc-linaro/5.4-2017.05/880-xtensa-fix-PR-target-82181.patch
rename to packages/gcc-linaro/5.4-2017.05/0024-xtensa-fix-PR-target-82181.patch
index b8c2263e..0717f35d 100644
--- a/packages/gcc-linaro/5.4-2017.05/880-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0024-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 8e62d631bce0..a30aa1bcfc33 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -637,6 +637,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
+@@ -637,6 +637,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 8e62d631bce0..a30aa1bcfc33 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc/4.9.4/890-fix-m68k-compile.patch b/packages/gcc-linaro/5.4-2017.05/0025-fix-m68k-compile.patch
similarity index 52%
rename from packages/gcc/4.9.4/890-fix-m68k-compile.patch
rename to packages/gcc-linaro/5.4-2017.05/0025-fix-m68k-compile.patch
index 140977b3..9437f252 100644
--- a/packages/gcc/4.9.4/890-fix-m68k-compile.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0025-fix-m68k-compile.patch
@@ -2,9 +2,12 @@ remove unused header, which breaks the toolchain building
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c gcc-4.9.3/libgcc/config/m68k/linux-atomic.c
---- gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c	2014-01-02 23:25:22.000000000 +0100
-+++ gcc-4.9.3/libgcc/config/m68k/linux-atomic.c	2016-03-18 22:24:40.000000000 +0100
+---
+ libgcc/config/m68k/linux-atomic.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/libgcc/config/m68k/linux-atomic.c
++++ b/libgcc/config/m68k/linux-atomic.c
 @@ -33,7 +33,6 @@
     using the kernel helper defined below.  There is no support for
     64-bit operations yet.  */
diff --git a/packages/gcc-linaro/6.4-2017.08/891-fix-m68k-uclinux.patch b/packages/gcc-linaro/5.4-2017.05/0026-fix-m68k-uclinux.patch
similarity index 66%
rename from packages/gcc-linaro/6.4-2017.08/891-fix-m68k-uclinux.patch
rename to packages/gcc-linaro/5.4-2017.05/0026-fix-m68k-uclinux.patch
index 4e186bd3..8a6309e9 100644
--- a/packages/gcc-linaro/6.4-2017.08/891-fix-m68k-uclinux.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0026-fix-m68k-uclinux.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -808,7 +808,7 @@
  m68k*-*-openbsd*)
  	;;
  m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
diff --git a/packages/gcc/5.5.0/892-microblaze-uclibc.patch b/packages/gcc-linaro/5.4-2017.05/0027-microblaze-uclibc.patch
similarity index 67%
rename from packages/gcc/5.5.0/892-microblaze-uclibc.patch
rename to packages/gcc-linaro/5.4-2017.05/0027-microblaze-uclibc.patch
index a8eb5a69..91d0aa48 100644
--- a/packages/gcc/5.5.0/892-microblaze-uclibc.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0027-microblaze-uclibc.patch
@@ -2,9 +2,12 @@ Add dynamic linker support for uClibc
 
 Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
 
-diff -Nur gcc-5.3.0.orig/gcc/config/microblaze/linux.h gcc-5.3.0/gcc/config/microblaze/linux.h
---- gcc-5.3.0.orig/gcc/config/microblaze/linux.h	2015-05-28 16:08:19.000000000 +0200
-+++ gcc-5.3.0/gcc/config/microblaze/linux.h	2016-05-13 09:21:01.579262885 +0200
+---
+ gcc/config/microblaze/linux.h |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/gcc/config/microblaze/linux.h
++++ b/gcc/config/microblaze/linux.h
 @@ -28,7 +28,15 @@
  #undef TLS_NEEDS_GOT
  #define TLS_NEEDS_GOT 1
diff --git a/packages/gcc/5.5.0/902-unwind-fix-for-musl.patch b/packages/gcc-linaro/5.4-2017.05/0028-unwind-fix-for-musl.patch
similarity index 89%
rename from packages/gcc/5.5.0/902-unwind-fix-for-musl.patch
rename to packages/gcc-linaro/5.4-2017.05/0028-unwind-fix-for-musl.patch
index ef470540..d6c63a0d 100644
--- a/packages/gcc/5.5.0/902-unwind-fix-for-musl.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0028-unwind-fix-for-musl.patch
@@ -17,11 +17,13 @@ On behalf of szabolcs.nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
+---
+ libgcc/unwind-dw2-fde-dip.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -59,6 +59,12 @@
+@@ -65,6 +65,12 @@
  
  #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
      && defined(TARGET_DL_ITERATE_PHDR) \
diff --git a/packages/gcc-linaro/5.4-2017.05/910-nios2-bad-multilib-default.patch b/packages/gcc-linaro/5.4-2017.05/0029-nios2-bad-multilib-default.patch
similarity index 58%
rename from packages/gcc-linaro/5.4-2017.05/910-nios2-bad-multilib-default.patch
rename to packages/gcc-linaro/5.4-2017.05/0029-nios2-bad-multilib-default.patch
index d94697f2..5dfe211d 100644
--- a/packages/gcc-linaro/5.4-2017.05/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0029-nios2-bad-multilib-default.patch
@@ -1,6 +1,10 @@
-diff -urpN gcc-5.3.0.orig/gcc/config/nios2/nios2.h gcc-5.3.0/gcc/config/nios2/nios2.h
---- gcc-5.3.0.orig/gcc/config/nios2/nios2.h	2016-04-18 10:32:41.046254061 -0700
-+++ gcc-5.3.0/gcc/config/nios2/nios2.h	2016-04-18 10:37:25.998841674 -0700
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
 @@ -55,11 +55,11 @@
  #if TARGET_ENDIAN_DEFAULT == 0
  # define ASM_SPEC "%{!meb:-EL} %{meb:-EB}"
@@ -15,9 +19,8 @@ diff -urpN gcc-5.3.0.orig/gcc/config/nios2/nios2.h gcc-5.3.0/gcc/config/nios2/ni
  #endif
  
  #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -urpN gcc-5.3.0.orig/gcc/config/nios2/t-nios2 gcc-5.3.0/gcc/config/nios2/t-nios2
---- gcc-5.3.0.orig/gcc/config/nios2/t-nios2	2016-04-18 10:32:41.046254061 -0700
-+++ gcc-5.3.0/gcc/config/nios2/t-nios2	2016-04-18 10:36:41.091312157 -0700
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
 @@ -22,6 +22,5 @@
  # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
  # MULTILIB_EXCEPTIONS = 
diff --git a/packages/gcc-linaro/6.4-2017.08/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc-linaro/5.4-2017.05/0030-libgcc-disable-split-stack-nothreads.patch
similarity index 62%
rename from packages/gcc-linaro/6.4-2017.08/930-libgcc-disable-split-stack-nothreads.patch
rename to packages/gcc-linaro/5.4-2017.05/0030-libgcc-disable-split-stack-nothreads.patch
index 07f9a739..df91a9ff 100644
--- a/packages/gcc-linaro/6.4-2017.08/930-libgcc-disable-split-stack-nothreads.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0030-libgcc-disable-split-stack-nothreads.patch
@@ -2,9 +2,12 @@ disable split-stack for non-thread builds
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
 @@ -1,4 +1,6 @@
  # Makefile fragment to provide generic support for -fsplit-stack.
  # This should be used in config.host for any host which supports
diff --git a/packages/gcc-linaro/6.4-2017.08/940-uclinux-enable-threads.patch b/packages/gcc-linaro/5.4-2017.05/0031-uclinux-enable-threads.patch
similarity index 65%
rename from packages/gcc-linaro/6.4-2017.08/940-uclinux-enable-threads.patch
rename to packages/gcc-linaro/5.4-2017.05/0031-uclinux-enable-threads.patch
index 490a55b4..0addac91 100644
--- a/packages/gcc-linaro/6.4-2017.08/940-uclinux-enable-threads.patch
+++ b/packages/gcc-linaro/5.4-2017.05/0031-uclinux-enable-threads.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
---- gcc-5.4.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.4.0/gcc/config.gcc	2016-07-01 21:26:02.772958441 +0200
-@@ -808,6 +808,9 @@
+---
+ gcc/config.gcc |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -818,6 +818,9 @@
  *-*-uclinux*)
    extra_options="$extra_options gnu-user.opt"
    use_gcc_stdint=wrap
diff --git a/packages/gcc-linaro/5.4-2017.05/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/5.4-2017.05/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48ee..00000000
--- a/packages/gcc-linaro/5.4-2017.05/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/packages/gcc-linaro/5.4-2017.05/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/5.4-2017.05/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index b7300591..00000000
--- a/packages/gcc-linaro/5.4-2017.05/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/packages/gcc-linaro/5.4-2017.05/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/6.4-2017.08/0000-libtool-leave-framework-alone.patch
similarity index 74%
rename from packages/gcc-linaro/5.4-2017.05/1000-libtool-leave-framework-alone.patch
rename to packages/gcc-linaro/6.4-2017.08/0000-libtool-leave-framework-alone.patch
index 0f4912a8..1a86e415 100644
--- a/packages/gcc-linaro/5.4-2017.05/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0000-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-5.4.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-5.4.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
 @@ -36,6 +36,11 @@
  for arg
  do
diff --git a/packages/gcc-linaro/6.4-2017.08/100-uclibc-conf.patch b/packages/gcc-linaro/6.4-2017.08/0001-uclibc-conf.patch
similarity index 82%
rename from packages/gcc-linaro/6.4-2017.08/100-uclibc-conf.patch
rename to packages/gcc-linaro/6.4-2017.08/0001-uclibc-conf.patch
index 73d1f0d3..aef750af 100644
--- a/packages/gcc-linaro/6.4-2017.08/100-uclibc-conf.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0001-uclibc-conf.patch
@@ -1,5 +1,7 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/contrib/regression/objs-gcc.sh
 +++ b/contrib/regression/objs-gcc.sh
 @@ -106,6 +106,10 @@
diff --git a/packages/gcc/6.4.0/301-missing-execinfo_h.patch b/packages/gcc-linaro/6.4-2017.08/0002-missing-execinfo_h.patch
similarity index 79%
rename from packages/gcc/6.4.0/301-missing-execinfo_h.patch
rename to packages/gcc-linaro/6.4-2017.08/0002-missing-execinfo_h.patch
index 2d0e7baa..c90222a1 100644
--- a/packages/gcc/6.4.0/301-missing-execinfo_h.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0002-missing-execinfo_h.patch
@@ -1,5 +1,7 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
+---
+ boehm-gc/include/gc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/boehm-gc/include/gc.h
 +++ b/boehm-gc/include/gc.h
 @@ -503,7 +503,7 @@
diff --git a/packages/gcc-linaro/6.4-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc-linaro/6.4-2017.08/0003-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
similarity index 83%
rename from packages/gcc-linaro/6.4-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
rename to packages/gcc-linaro/6.4-2017.08/0003-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index d8986d5f..fe0f146e 100644
--- a/packages/gcc-linaro/6.4-2017.08/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0003-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,6 +1,11 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
+---
+ config/gcc-plugin.m4 |   18 +++++++++++++-----
+ gcc/configure        |   22 +++++++++++++++-------
+ libcc1/configure     |   22 +++++++++++++++-------
+ 3 files changed, 43 insertions(+), 19 deletions(-)
+
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
 @@ -20,6 +20,9 @@
  
     pluginlibs=
@@ -46,10 +51,9 @@ diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
         [AC_MSG_RESULT([yes]); have_pic_shared=yes],
         [AC_MSG_RESULT([no]); have_pic_shared=no])
       if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -29200,6 +29200,9 @@
  
     pluginlibs=
  
@@ -59,7 +63,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
+@@ -29210,6 +29213,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -71,7 +75,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
+@@ -29322,23 +29330,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -102,10 +106,9 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
    ;
    return 0;
  }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
-@@ -14500,6 +14500,9 @@
+--- a/libcc1/configure
++++ b/libcc1/configure
+@@ -14531,6 +14531,9 @@
  
     pluginlibs=
  
@@ -115,7 +118,7 @@ diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -14510,6 +14513,11 @@
+@@ -14541,6 +14544,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -127,7 +130,7 @@ diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -14622,23 +14630,23 @@
+@@ -14653,23 +14661,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc-linaro/6.4-2017.08/0004-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/6.4-2017.08/0004-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 00000000..5f9a07a2
--- /dev/null
+++ b/packages/gcc-linaro/6.4-2017.08/0004-gcc-plugin-POSIX-include-sys-select-h.patch
@@ -0,0 +1,14 @@
+---
+ libcc1/connection.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libcc1/connection.cc
++++ b/libcc1/connection.cc
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "marshall.hh"
diff --git a/packages/gcc-linaro/6.4-2017.08/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/6.4-2017.08/0005-arm-softfloat-libgcc.patch
similarity index 80%
rename from packages/gcc-linaro/6.4-2017.08/810-arm-softfloat-libgcc.patch
rename to packages/gcc-linaro/6.4-2017.08/0005-arm-softfloat-libgcc.patch
index 5efa7fd1..350857dd 100644
--- a/packages/gcc-linaro/6.4-2017.08/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0005-arm-softfloat-libgcc.patch
@@ -1,5 +1,8 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
 @@ -60,7 +60,7 @@
@@ -11,8 +14,6 @@ Index: b/gcc/config/arm/linux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-Index: b/libgcc/config/arm/t-linux
-===================================================================
 --- a/libgcc/config/arm/t-linux
 +++ b/libgcc/config/arm/t-linux
 @@ -1,6 +1,11 @@
diff --git a/packages/gcc/4.9.4/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/6.4-2017.08/0006-arm_unbreak_armv4t.patch
similarity index 83%
rename from packages/gcc/4.9.4/830-arm_unbreak_armv4t.patch
rename to packages/gcc-linaro/6.4-2017.08/0006-arm_unbreak_armv4t.patch
index 37f8f2a5..7c374453 100644
--- a/packages/gcc/4.9.4/830-arm_unbreak_armv4t.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0006-arm_unbreak_armv4t.patch
@@ -1,5 +1,9 @@
 http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
 
+---
+ gcc/config/arm/linux-eabi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -45,7 +45,7 @@
diff --git a/packages/gcc-linaro/5.4-2017.05/860-cilk-wchar.patch b/packages/gcc-linaro/6.4-2017.08/0007-cilk-wchar.patch
similarity index 95%
rename from packages/gcc-linaro/5.4-2017.05/860-cilk-wchar.patch
rename to packages/gcc-linaro/6.4-2017.08/0007-cilk-wchar.patch
index 1d9916f5..300837f0 100644
--- a/packages/gcc-linaro/5.4-2017.05/860-cilk-wchar.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0007-cilk-wchar.patch
@@ -10,8 +10,6 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
 --- a/libcilkrts/include/cilk/reducer_min_max.h
 +++ b/libcilkrts/include/cilk/reducer_min_max.h
 @@ -3154,7 +3154,9 @@
diff --git a/packages/gcc/6.4.0/870-xtensa-fix-PR-target-82181.patch b/packages/gcc-linaro/6.4-2017.08/0008-xtensa-fix-PR-target-82181.patch
similarity index 76%
rename from packages/gcc/6.4.0/870-xtensa-fix-PR-target-82181.patch
rename to packages/gcc-linaro/6.4-2017.08/0008-xtensa-fix-PR-target-82181.patch
index 5fe38414..1258023d 100644
--- a/packages/gcc/6.4.0/870-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0008-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 2bdf5ccef979..92fdeb08046d 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -601,6 +601,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
+@@ -601,6 +601,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 2bdf5ccef979..92fdeb08046d 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/5.4-2017.05/890-fix-m68k-compile.patch b/packages/gcc-linaro/6.4-2017.08/0009-fix-m68k-compile.patch
similarity index 52%
rename from packages/gcc-linaro/5.4-2017.05/890-fix-m68k-compile.patch
rename to packages/gcc-linaro/6.4-2017.08/0009-fix-m68k-compile.patch
index 6e63de0c..9437f252 100644
--- a/packages/gcc-linaro/5.4-2017.05/890-fix-m68k-compile.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0009-fix-m68k-compile.patch
@@ -2,9 +2,12 @@ remove unused header, which breaks the toolchain building
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c
---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c	2016-03-19 09:25:07.000000000 +0100
+---
+ libgcc/config/m68k/linux-atomic.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/libgcc/config/m68k/linux-atomic.c
++++ b/libgcc/config/m68k/linux-atomic.c
 @@ -33,7 +33,6 @@
     using the kernel helper defined below.  There is no support for
     64-bit operations yet.  */
diff --git a/packages/gcc-linaro/7.1-2017.08/891-fix-m68k-uclinux.patch b/packages/gcc-linaro/6.4-2017.08/0010-fix-m68k-uclinux.patch
similarity index 66%
rename from packages/gcc-linaro/7.1-2017.08/891-fix-m68k-uclinux.patch
rename to packages/gcc-linaro/6.4-2017.08/0010-fix-m68k-uclinux.patch
index 4e186bd3..20d7c4af 100644
--- a/packages/gcc-linaro/7.1-2017.08/891-fix-m68k-uclinux.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0010-fix-m68k-uclinux.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -824,7 +824,7 @@
  m68k*-*-openbsd*)
  	;;
  m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
diff --git a/packages/gcc/6.4.0/892-libgcc-mkmap-symver-support-skip_underscore.patch b/packages/gcc-linaro/6.4-2017.08/0011-libgcc-mkmap-symver-support-skip_underscore.patch
similarity index 91%
rename from packages/gcc/6.4.0/892-libgcc-mkmap-symver-support-skip_underscore.patch
rename to packages/gcc-linaro/6.4-2017.08/0011-libgcc-mkmap-symver-support-skip_underscore.patch
index 73ee6c5f..c6421d09 100644
--- a/packages/gcc/6.4.0/892-libgcc-mkmap-symver-support-skip_underscore.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0011-libgcc-mkmap-symver-support-skip_underscore.patch
@@ -35,14 +35,12 @@ version information for Blackfin, instead of using a custom one.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libgcc/mkmap-symver.awk | 6 +++++-
+ libgcc/mkmap-symver.awk |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/libgcc/mkmap-symver.awk b/libgcc/mkmap-symver.awk
-index 266832a..30bb179 100644
 --- a/libgcc/mkmap-symver.awk
 +++ b/libgcc/mkmap-symver.awk
-@@ -47,7 +47,11 @@ state == "nm" && ($1 == "U" || $2 == "U") {
+@@ -47,7 +47,11 @@
  
  state == "nm" && NF == 3 {
    split ($3, s, "@")
@@ -55,6 +53,3 @@ index 266832a..30bb179 100644
    sawsymbol = 1;
    next;
  }
--- 
-2.7.4
-
diff --git a/packages/gcc/6.4.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch b/packages/gcc-linaro/6.4-2017.08/0012-libgcc-config-bfin-use-the-generic-linker-version-in.patch
similarity index 99%
rename from packages/gcc/6.4.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
rename to packages/gcc-linaro/6.4-2017.08/0012-libgcc-config-bfin-use-the-generic-linker-version-in.patch
index 454295d0..ac75cfa5 100644
--- a/packages/gcc/6.4.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0012-libgcc-config-bfin-use-the-generic-linker-version-in.patch
@@ -22,12 +22,10 @@ symbols in libgcc, and therefore all libgcc symbols were marked as
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libgcc/config/bfin/libgcc-glibc.ver | 1894 +----------------------------------
- libgcc/config/bfin/t-linux          |    3 +-
+ libgcc/config/bfin/libgcc-glibc.ver | 1894 ------------------------------------
+ libgcc/config/bfin/t-linux          |    3 
  2 files changed, 4 insertions(+), 1893 deletions(-)
 
-diff --git a/libgcc/config/bfin/libgcc-glibc.ver b/libgcc/config/bfin/libgcc-glibc.ver
-index b1bd2df..2af3df7 100644
 --- a/libgcc/config/bfin/libgcc-glibc.ver
 +++ b/libgcc/config/bfin/libgcc-glibc.ver
 @@ -16,1898 +16,8 @@
@@ -1931,14 +1929,9 @@ index b1bd2df..2af3df7 100644
 +  __smulsi3_highpart
 +  __umulsi3_highpart
  }
-diff --git a/libgcc/config/bfin/t-linux b/libgcc/config/bfin/t-linux
-index 1c42e48..8898157 100644
 --- a/libgcc/config/bfin/t-linux
 +++ b/libgcc/config/bfin/t-linux
 @@ -1 +1,2 @@
 -SHLIB_MAPFILES = $(srcdir)/config/bfin/libgcc-glibc.ver
 +SHLIB_MAPFILES += $(srcdir)/config/bfin/libgcc-glibc.ver
 +SHLIB_MKMAP_OPTS = -v skip_underscore=1
--- 
-2.7.4
-
diff --git a/packages/gcc/6.4.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch b/packages/gcc-linaro/6.4-2017.08/0013-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
similarity index 80%
rename from packages/gcc/6.4.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
rename to packages/gcc-linaro/6.4-2017.08/0013-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
index ce49de7e..f0ada67a 100644
--- a/packages/gcc/6.4.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0013-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
@@ -17,14 +17,12 @@ Fixes PR gcc/68468.
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libgcc/unwind-dw2-fde-dip.c | 8 ++++++--
+ libgcc/unwind-dw2-fde-dip.c |    8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
-index f7a1c3f..801bce8 100644
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -124,7 +124,11 @@ static struct frame_hdr_cache_element
+@@ -124,7 +124,11 @@
  {
    _Unwind_Ptr pc_low;
    _Unwind_Ptr pc_high;
@@ -36,7 +34,7 @@ index f7a1c3f..801bce8 100644
    const ElfW(Phdr) *p_eh_frame_hdr;
    const ElfW(Phdr) *p_dynamic;
    struct frame_hdr_cache_element *link;
-@@ -163,7 +167,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
+@@ -163,7 +167,7 @@
    struct unw_eh_callback_data *data = (struct unw_eh_callback_data *) ptr;
    const ElfW(Phdr) *phdr, *p_eh_frame_hdr, *p_dynamic;
    long n, match;
@@ -45,7 +43,7 @@ index f7a1c3f..801bce8 100644
    struct elf32_fdpic_loadaddr load_base;
  #else
    _Unwind_Ptr load_base;
-@@ -347,7 +351,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
+@@ -347,7 +351,7 @@
  	    break;
  	  }
      }
@@ -54,6 +52,3 @@ index f7a1c3f..801bce8 100644
    data->dbase = load_base.got_value;
  # else
  #  error What is DW_EH_PE_datarel base on this platform?
--- 
-2.7.4
-
diff --git a/packages/gcc-linaro/6.4-2017.08/895-bfin-define-REENTRANT.patch b/packages/gcc-linaro/6.4-2017.08/0014-bfin-define-REENTRANT.patch
similarity index 64%
rename from packages/gcc-linaro/6.4-2017.08/895-bfin-define-REENTRANT.patch
rename to packages/gcc-linaro/6.4-2017.08/0014-bfin-define-REENTRANT.patch
index e2828a51..633084b9 100644
--- a/packages/gcc-linaro/6.4-2017.08/895-bfin-define-REENTRANT.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0014-bfin-define-REENTRANT.patch
@@ -2,9 +2,12 @@ enable _REENTRANT when -lpthread is used
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-6.2.0.orig/gcc/config/bfin/linux.h gcc-6.2.0/gcc/config/bfin/linux.h
---- gcc-6.2.0.orig/gcc/config/bfin/linux.h	2016-01-04 15:30:50.000000000 +0100
-+++ gcc-6.2.0/gcc/config/bfin/linux.h	2016-09-30 20:48:17.446636819 +0200
+---
+ gcc/config/bfin/linux.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gcc/config/bfin/linux.h
++++ b/gcc/config/bfin/linux.h
 @@ -38,6 +38,9 @@
    "%{static:--start-group} %{mfast-fp:-lbffastfp} %G %L %{static:--end-group} \
     %{!static:%{mfast-fp:-lbffastfp} %G}"
diff --git a/packages/gcc-linaro/6.4-2017.08/900-libgfortran-missing-include.patch b/packages/gcc-linaro/6.4-2017.08/0015-libgfortran-missing-include.patch
similarity index 51%
rename from packages/gcc-linaro/6.4-2017.08/900-libgfortran-missing-include.patch
rename to packages/gcc-linaro/6.4-2017.08/0015-libgfortran-missing-include.patch
index 1f474696..701e7b4f 100644
--- a/packages/gcc-linaro/6.4-2017.08/900-libgfortran-missing-include.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0015-libgfortran-missing-include.patch
@@ -1,5 +1,9 @@
---- gcc-6.3.0/libgfortran/io/close.c.org	2017-01-17 09:43:48.395850000 +0100
-+++ gcc-6.3.0/libgfortran/io/close.c	2017-01-17 09:21:05.000000000 +0100
+---
+ libgfortran/io/close.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libgfortran/io/close.c
++++ b/libgfortran/io/close.c
 @@ -25,6 +25,7 @@
  #include "io.h"
  #include "unix.h"
diff --git a/packages/gcc/6.4.0/910-nios2-bad-multilib-default.patch b/packages/gcc-linaro/6.4-2017.08/0016-nios2-bad-multilib-default.patch
similarity index 59%
rename from packages/gcc/6.4.0/910-nios2-bad-multilib-default.patch
rename to packages/gcc-linaro/6.4-2017.08/0016-nios2-bad-multilib-default.patch
index 61989e56..4acc4918 100644
--- a/packages/gcc/6.4.0/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0016-nios2-bad-multilib-default.patch
@@ -1,6 +1,10 @@
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios2.h
---- gcc-6.2.0.orig/gcc/config/nios2/nios2.h	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/nios2.h	2016-11-29 10:29:55.069624746 -0800
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
 @@ -63,11 +63,11 @@
  #if TARGET_ENDIAN_DEFAULT == 0
  # define ASM_SPEC "%{!meb:-EL} %{meb:-EB} %{march=*:-march=%*}"
@@ -15,9 +19,8 @@ diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios
  #endif
  
  #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/t-nios2 gcc-6.2.0/gcc/config/nios2/t-nios2
---- gcc-6.2.0.orig/gcc/config/nios2/t-nios2	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/t-nios2	2016-11-29 10:29:03.517151014 -0800
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
 @@ -22,6 +22,5 @@
  # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
  # MULTILIB_EXCEPTIONS = 
diff --git a/packages/gcc-linaro/4.9-2017.01/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc-linaro/6.4-2017.08/0017-libgcc-disable-split-stack-nothreads.patch
similarity index 62%
rename from packages/gcc-linaro/4.9-2017.01/930-libgcc-disable-split-stack-nothreads.patch
rename to packages/gcc-linaro/6.4-2017.08/0017-libgcc-disable-split-stack-nothreads.patch
index 670cf8da..df91a9ff 100644
--- a/packages/gcc-linaro/4.9-2017.01/930-libgcc-disable-split-stack-nothreads.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0017-libgcc-disable-split-stack-nothreads.patch
@@ -2,9 +2,12 @@ disable split-stack for non-thread builds
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-4.9.3.orig/libgcc/config/t-stack gcc-4.9.3/libgcc/config/t-stack
---- gcc-4.9.3.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-4.9.3/libgcc/config/t-stack	2016-03-07 01:34:32.000000000 +0100
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
 @@ -1,4 +1,6 @@
  # Makefile fragment to provide generic support for -fsplit-stack.
  # This should be used in config.host for any host which supports
diff --git a/packages/gcc-linaro/5.4-2017.05/940-uclinux-enable-threads.patch b/packages/gcc-linaro/6.4-2017.08/0018-uclinux-enable-threads.patch
similarity index 65%
rename from packages/gcc-linaro/5.4-2017.05/940-uclinux-enable-threads.patch
rename to packages/gcc-linaro/6.4-2017.08/0018-uclinux-enable-threads.patch
index 490a55b4..8e4e0a26 100644
--- a/packages/gcc-linaro/5.4-2017.05/940-uclinux-enable-threads.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0018-uclinux-enable-threads.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
---- gcc-5.4.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.4.0/gcc/config.gcc	2016-07-01 21:26:02.772958441 +0200
-@@ -808,6 +808,9 @@
+---
+ gcc/config.gcc |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -838,6 +838,9 @@
  *-*-uclinux*)
    extra_options="$extra_options gnu-user.opt"
    use_gcc_stdint=wrap
diff --git a/packages/gcc/7.2.0/951-bionic-ndk.patch b/packages/gcc-linaro/6.4-2017.08/0019-bionic-ndk.patch
similarity index 91%
rename from packages/gcc/7.2.0/951-bionic-ndk.patch
rename to packages/gcc-linaro/6.4-2017.08/0019-bionic-ndk.patch
index 59c50a89..474dd8c0 100644
--- a/packages/gcc/7.2.0/951-bionic-ndk.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0019-bionic-ndk.patch
@@ -4,8 +4,10 @@ Date:   Tue Apr 25 19:02:18 2017 -0700
 
     Fix ctype for newer NDK headers
 
-diff --git a/libstdc++-v3/config/os/bionic/ctype_base.h b/libstdc++-v3/config/os/bionic/ctype_base.h
-index 33978f3..c36e63c 100644
+---
+ libstdc++-v3/config/os/bionic/ctype_base.h |   34 +++++++++++++++++++----------
+ 1 file changed, 23 insertions(+), 11 deletions(-)
+
 --- a/libstdc++-v3/config/os/bionic/ctype_base.h
 +++ b/libstdc++-v3/config/os/bionic/ctype_base.h
 @@ -28,6 +28,18 @@
@@ -27,7 +29,7 @@ index 33978f3..c36e63c 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -41,17 +53,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -41,17 +53,17 @@
      // NB: Offsets into ctype<char>::_M_table force a particular size
      // on the mask type. Because of this, we don't use an enum.
      typedef char 		mask;
diff --git a/packages/gcc/6.4.0/952-bionic-errno.patch b/packages/gcc-linaro/6.4-2017.08/0020-bionic-errno.patch
similarity index 66%
rename from packages/gcc/6.4.0/952-bionic-errno.patch
rename to packages/gcc-linaro/6.4-2017.08/0020-bionic-errno.patch
index 91f6ca34..0a1a6327 100644
--- a/packages/gcc/6.4.0/952-bionic-errno.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0020-bionic-errno.patch
@@ -4,11 +4,13 @@ Date:   Tue Apr 25 20:17:03 2017 -0700
 
     Fix, errno is volatile int
 
-diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/dir.cc
-index 6ff12d0..5bbd664 100644
+---
+ libstdc++-v3/src/filesystem/dir.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/libstdc++-v3/src/filesystem/dir.cc
 +++ b/libstdc++-v3/src/filesystem/dir.cc
-@@ -147,7 +147,7 @@ fs::_Dir::advance(error_code* ec, directory_options options)
+@@ -146,7 +146,7 @@
  
    int err = std::exchange(errno, 0);
    const auto entp = readdir(dirp);
diff --git a/packages/gcc-linaro/6.4-2017.08/970-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0021-crystax.patch
similarity index 82%
rename from packages/gcc-linaro/6.4-2017.08/970-crystax.patch
rename to packages/gcc-linaro/6.4-2017.08/0021-crystax.patch
index 30b06d51..f7a051bc 100644
--- a/packages/gcc-linaro/6.4-2017.08/970-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0021-crystax.patch
@@ -7,12 +7,34 @@ Date:   Wed Jul 29 11:28:29 2015 +0300
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
 [Edited: keep libstdc++, drop libcrystax-related modifications]
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index f66e48cd1..1c253496b 100644
+---
+ gcc/config.gcc                             |   17 +++++++-
+ gcc/config/aarch64/aarch64-linux-android.h |   59 +++++++++++++++++++++++++++++
+ gcc/config/aarch64/aarch64-linux.h         |    9 +++-
+ gcc/config/arm/arm.h                       |    3 -
+ gcc/config/arm/arm.md                      |    2 
+ gcc/config/arm/arm.opt                     |    4 +
+ gcc/config/arm/elf.h                       |   10 ++--
+ gcc/config/arm/linux-eabi.h                |    7 ++-
+ gcc/config/i386/gnu-user.h                 |    7 ++-
+ gcc/config/i386/gnu-user64.h               |    5 ++
+ gcc/config/i386/linux-common.h             |    8 +++
+ gcc/config/linux-android.h                 |   13 +++---
+ gcc/config/mips/android.h                  |   49 ++++++++++++++++++++++++
+ gcc/config/mips/gnu-user.h                 |    6 +-
+ gcc/config/mips/linux-common.h             |    2 
+ gcc/config/mips/t-linux-android            |    3 +
+ gcc/config/mips/t-linux-android64          |    4 +
+ libgcc/gthr-posix.h                        |   13 ++++++
+ libstdc++-v3/configure                     |   12 +++++
+ libstdc++-v3/include/bits/locale_facets.h  |   18 +++++++-
+ libstdc++-v3/libsupc++/guard.cc            |    5 ++
+ 21 files changed, 235 insertions(+), 21 deletions(-)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -942,13 +942,17 @@ aarch64*-*-elf | aarch64*-*-rtems*)
- 	TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
+@@ -955,13 +955,17 @@
+ 	tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-freebsd"
  	;;
  aarch64*-*-linux*)
 -	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h"
@@ -30,7 +52,7 @@ index f66e48cd1..1c253496b 100644
  	esac
  	aarch64_multilibs="${with_multilib_list}"
  	if test "$aarch64_multilibs" = "default"; then
-@@ -2055,6 +2059,17 @@ mips*-*-linux*)				# Linux MIPS, either endian.
+@@ -2072,6 +2076,17 @@
  	tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h"
  	extra_options="${extra_options} linux-android.opt"
  	case ${target} in
@@ -48,9 +70,6 @@ index f66e48cd1..1c253496b 100644
  		mipsisa32r6*)
  			default_mips_arch=mips32r6
  			;;
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-new file mode 100644
-index 000000000..db1288fd0
 --- /dev/null
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
 @@ -0,0 +1,59 @@
@@ -113,8 +132,6 @@ index 000000000..db1288fd0
 +  LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
 +
 +#endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 5fcaa59a3..6864195ee 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,14 @@
@@ -133,11 +150,9 @@ index 5fcaa59a3..6864195ee 100644
  
  #undef MUSL_DYNAMIC_LINKER
  #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
-index ad123dde9..97b059de6 100644
 --- a/gcc/config/arm/arm.h
 +++ b/gcc/config/arm/arm.h
-@@ -1888,10 +1888,11 @@ enum arm_auto_incmodes
+@@ -1922,10 +1922,11 @@
  
  #define CASE_VECTOR_PC_RELATIVE (TARGET_THUMB2				\
  				 || (TARGET_THUMB1			\
@@ -150,11 +165,9 @@ index ad123dde9..97b059de6 100644
     ? (min >= 0 && max < 512						\
        ? (ADDR_DIFF_VEC_FLAGS (body).offset_unsigned = 1, QImode)	\
        : min >= -256 && max < 256					\
-diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
-index 47171b996..eb22d1181 100644
 --- a/gcc/config/arm/arm.md
 +++ b/gcc/config/arm/arm.md
-@@ -8179,7 +8179,7 @@
+@@ -8657,7 +8657,7 @@
     (match_operand:SI 2 "const_int_operand" "")	; total range
     (match_operand:SI 3 "" "")			; table label
     (match_operand:SI 4 "" "")]			; Out of range label
@@ -163,11 +176,9 @@ index 47171b996..eb22d1181 100644
    "
    {
      enum insn_code code;
-diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
-index 0ebe01743..772453889 100644
 --- a/gcc/config/arm/arm.opt
 +++ b/gcc/config/arm/arm.opt
-@@ -193,6 +193,10 @@ mthumb-interwork
+@@ -193,6 +193,10 @@
  Target Report Mask(INTERWORK)
  Support calls between Thumb and ARM instruction sets.
  
@@ -178,8 +189,6 @@ index 0ebe01743..772453889 100644
  mtls-dialect=
  Target RejectNegative Joined Enum(tls_type) Var(target_tls_dialect) Init(TLS_GNU)
  Specify thread local storage scheme.
-diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
-index 77f30554d..32158ed65 100644
 --- a/gcc/config/arm/elf.h
 +++ b/gcc/config/arm/elf.h
 @@ -56,8 +56,7 @@
@@ -202,7 +211,7 @@ index 77f30554d..32158ed65 100644
  #endif
  
  /* The ARM uses @ are a comment character so we need to redefine
-@@ -104,8 +106,8 @@
+@@ -95,8 +97,8 @@
     the code more efficient, but for Thumb-1 it's better to put them out of
     band unless we are generating compressed tables.  */
  #define JUMP_TABLES_IN_TEXT_SECTION					\
@@ -213,8 +222,6 @@ index 77f30554d..32158ed65 100644
  
  #ifndef LINK_SPEC
  #define LINK_SPEC "%{mbig-endian:-EB} %{mlittle-endian:-EL} -X"
-diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
-index ace84816e..8c8fa6553 100644
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -108,11 +108,16 @@
@@ -235,11 +242,9 @@ index ace84816e..8c8fa6553 100644
  #undef  LIB_SPEC
  #define LIB_SPEC							\
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC,			\
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index fee33a3ef..22fb2ced9 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -65,9 +65,14 @@ along with GCC; see the file COPYING3.  If not see
+@@ -65,9 +65,14 @@
     When the -shared link option is used a final link is not being
     done.  */
  
@@ -255,11 +260,9 @@ index fee33a3ef..22fb2ced9 100644
  
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 7a02a7eb4..cac4179bc 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
-@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -46,6 +46,11 @@
  #define SPEC_X32 "mx32"
  #endif
  
@@ -271,11 +274,9 @@ index 7a02a7eb4..cac4179bc 100644
  #undef ASM_SPEC
  #define ASM_SPEC "%{" SPEC_32 ":--32} \
   %{" SPEC_64 ":--64} \
-diff --git a/gcc/config/i386/linux-common.h b/gcc/config/i386/linux-common.h
-index 4b9910fa9..3b11ed086 100644
 --- a/gcc/config/i386/linux-common.h
 +++ b/gcc/config/i386/linux-common.h
-@@ -30,7 +30,13 @@ along with GCC; see the file COPYING3.  If not see
+@@ -30,7 +30,13 @@
  #undef CC1_SPEC
  #define CC1_SPEC \
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \
@@ -290,11 +291,9 @@ index 4b9910fa9..3b11ed086 100644
  
  #undef	LINK_SPEC
  #define LINK_SPEC \
-diff --git a/gcc/config/linux-android.h b/gcc/config/linux-android.h
-index 301a41ccd..9623c88d0 100644
 --- a/gcc/config/linux-android.h
 +++ b/gcc/config/linux-android.h
-@@ -38,15 +39,18 @@
+@@ -38,15 +38,18 @@
    "%{" NOANDROID "|tno-android-ld:" LINUX_SPEC ";:" ANDROID_SPEC "}"
  
  #define ANDROID_LINK_SPEC \
@@ -318,9 +317,6 @@ index 301a41ccd..9623c88d0 100644
  
  #define ANDROID_LIB_SPEC \
    "%{!static: -ldl}"
-diff --git a/gcc/config/mips/android.h b/gcc/config/mips/android.h
-new file mode 100644
-index 000000000..32c539c8d
 --- /dev/null
 +++ b/gcc/config/mips/android.h
 @@ -0,0 +1,49 @@
@@ -373,11 +369,9 @@ index 000000000..32c539c8d
 +									\
 +  /* Use the standard linux specs for everything else.  */		\
 +  LINUX_DRIVER_SELF_SPECS
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 15b549c08..4a2816014 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
-@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -36,6 +36,7 @@
      /* The GNU C++ standard library requires this.  */		\
      if (c_dialect_cxx ())					\
        builtin_define ("_GNU_SOURCE");				\
@@ -385,7 +379,7 @@ index 15b549c08..4a2816014 100644
    } while (0)
  
  #undef SUBTARGET_CPP_SPEC
-@@ -71,7 +72,8 @@ along with GCC; see the file COPYING3.  If not see
+@@ -71,7 +72,8 @@
  
  #undef SUBTARGET_ASM_SPEC
  #define SUBTARGET_ASM_SPEC \
@@ -395,7 +389,7 @@ index 15b549c08..4a2816014 100644
  
  /* The MIPS assembler has different syntax for .set. We set it to
     .dummy to trap any errors.  */
-@@ -120,7 +122,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -120,7 +122,7 @@
  #endif
  
  #define LINUX_DRIVER_SELF_SPECS \
@@ -404,11 +398,9 @@ index 15b549c08..4a2816014 100644
    MARCH_MTUNE_NATIVE_SPECS,						\
    /* -mplt has no effect without -mno-shared.  Simplify later		\
       specs handling by removing a redundant option.  */			\
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8429a7ca2..8bfacf994 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -35,7 +35,7 @@
  #undef  SUBTARGET_CC1_SPEC
  #define SUBTARGET_CC1_SPEC						\
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC,			\
@@ -417,18 +409,12 @@ index 8429a7ca2..8bfacf994 100644
  
  #undef  CC1PLUS_SPEC
  #define CC1PLUS_SPEC							\
-diff --git a/gcc/config/mips/t-linux-android b/gcc/config/mips/t-linux-android
-new file mode 100644
-index 000000000..39f512c81
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android
 @@ -0,0 +1,3 @@
 +MULTILIB_OPTIONS = mips32r2/mips32r6
 +MULTILIB_DIRNAMES = mips-r2 mips-r6
 +MULTILIB_OSDIRNAMES = ../libr2 ../libr6
-diff --git a/gcc/config/mips/t-linux-android64 b/gcc/config/mips/t-linux-android64
-new file mode 100644
-index 000000000..55cab7d62
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android64
 @@ -0,0 +1,4 @@
@@ -436,11 +422,9 @@ index 000000000..55cab7d62
 +MULTILIB_DIRNAMES = 32 mips-r1 mips-r2 mips-r6 mips64-r2 mips64-r6
 +MULTILIB_OSDIRNAMES = ../lib ../lib ../libr2 ../libr6 ../lib64r2 ../lib64
 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6
-diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h
-index 555c0fe24..47c8655f9 100644
 --- a/libgcc/gthr-posix.h
 +++ b/libgcc/gthr-posix.h
-@@ -32,6 +32,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -32,6 +32,19 @@
  #define __GTHREADS 1
  #define __GTHREADS_CXX0X 1
  
@@ -460,11 +444,9 @@ index 555c0fe24..47c8655f9 100644
  #include <pthread.h>
  
  #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 41797a971..f746e8353 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -78319,6 +78341,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78389,6 +78389,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -477,7 +459,7 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-@@ -78377,6 +78405,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78447,6 +78453,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -490,8 +472,6 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
-index e3e206b7d..e85dc2c76 100644
 --- a/libstdc++-v3/include/bits/locale_facets.h
 +++ b/libstdc++-v3/include/bits/locale_facets.h
 @@ -47,6 +47,20 @@
@@ -515,7 +495,7 @@ index e3e206b7d..e85dc2c76 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -1102,7 +1116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1102,7 +1116,7 @@
         *  @return  @a __hi.
        */
        virtual const char*
@@ -524,7 +504,7 @@ index e3e206b7d..e85dc2c76 100644
        {
  	__builtin_memcpy(__to, __lo, __hi - __lo);
  	return __hi;
-@@ -1163,7 +1177,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1163,7 +1177,7 @@
  
      private:
        void _M_narrow_init() const;
@@ -533,8 +513,6 @@ index e3e206b7d..e85dc2c76 100644
      };
  
  #ifdef _GLIBCXX_USE_WCHAR_T
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 9b617998f..c149169bb 100644
 --- a/libstdc++-v3/libsupc++/guard.cc
 +++ b/libstdc++-v3/libsupc++/guard.cc
 @@ -33,7 +33,12 @@
diff --git a/packages/gcc/6.4.0/971-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0022-crystax.patch
similarity index 88%
rename from packages/gcc/6.4.0/971-crystax.patch
rename to packages/gcc-linaro/6.4-2017.08/0022-crystax.patch
index 748a3812..f1f9eb12 100644
--- a/packages/gcc/6.4.0/971-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0022-crystax.patch
@@ -6,8 +6,10 @@ Date:   Thu Aug 13 16:11:54 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/t-linux-androideabi b/gcc/config/arm/t-linux-androideabi
-index 8f1307c55..cbbec5bd2 100644
+---
+ gcc/config/arm/t-linux-androideabi |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
 --- a/gcc/config/arm/t-linux-androideabi
 +++ b/gcc/config/arm/t-linux-androideabi
 @@ -1,8 +1,9 @@
diff --git a/packages/gcc/6.4.0/972-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0023-crystax.patch
similarity index 82%
rename from packages/gcc/6.4.0/972-crystax.patch
rename to packages/gcc-linaro/6.4-2017.08/0023-crystax.patch
index b9077bef..f6dc7257 100644
--- a/packages/gcc/6.4.0/972-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0023-crystax.patch
@@ -10,11 +10,23 @@ Date:   Mon Apr 14 15:59:47 2014 -0700
     Change-Id: Ibda473188e5a10f2a0592f2494ad00ad1f91e04b
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config.in b/gcc/config.in
-index 115cb6163..933916833 100644
+---
+ gcc/config.in                          |    6 +++++
+ gcc/config/alpha/elf.h                 |    4 +++
+ gcc/config/freebsd.h                   |    4 +++
+ gcc/config/gnu-user.h                  |    4 +++
+ gcc/config/openbsd.h                   |    4 +++
+ gcc/config/rs6000/sysv4.h              |    6 ++++-
+ gcc/config/sol2.h                      |    4 +++
+ gcc/configure                          |   36 +++++++++++++++++++++++++++++++++
+ gcc/configure.ac                       |   29 ++++++++++++++++++++++++++
+ gcc/testsuite/g++.dg/eh/spec3-static.C |   25 ++++++++++++++++++++++
+ libgcc/crtstuff.c                      |   11 ++++++----
+ 11 files changed, 128 insertions(+), 5 deletions(-)
+
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -2119,6 +2119,12 @@
+@@ -2144,6 +2144,12 @@
  #endif
  
  
@@ -27,11 +39,9 @@ index 115cb6163..933916833 100644
  /* Define to 1 if the 'long long' type is wider than 'long' but still
     efficiently supported by the host hardware. */
  #ifndef USED_FOR_TARGET
-diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h
-index 093c38bba..54b3e0c91 100644
 --- a/gcc/config/alpha/elf.h
 +++ b/gcc/config/alpha/elf.h
-@@ -168,5 +168,9 @@ extern int alpha_this_gpdisp_sequence_number;
+@@ -168,5 +168,9 @@
     I imagine that other systems will catch up.  In the meantime, it
     doesn't harm to make sure that the data exists to be used later.  */
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -41,11 +51,9 @@ index 093c38bba..54b3e0c91 100644
  #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
  #endif
 +#endif
-diff --git a/gcc/config/freebsd.h b/gcc/config/freebsd.h
-index 5ded869d2..5f51ac81d 100644
 --- a/gcc/config/freebsd.h
 +++ b/gcc/config/freebsd.h
-@@ -45,8 +45,12 @@ along with GCC; see the file COPYING3.  If not see
+@@ -45,8 +45,12 @@
  #define LIB_SPEC FBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -58,11 +66,9 @@ index 5ded869d2..5f51ac81d 100644
  
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index b0bf40a95..d1874bc29 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -118,8 +118,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -118,8 +118,12 @@
  #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -75,11 +81,9 @@ index b0bf40a95..d1874bc29 100644
  
  #undef LINK_GCC_C_SEQUENCE_SPEC
  #define LINK_GCC_C_SEQUENCE_SPEC \
-diff --git a/gcc/config/openbsd.h b/gcc/config/openbsd.h
-index 37ecfc43f..a5f1b9955 100644
 --- a/gcc/config/openbsd.h
 +++ b/gcc/config/openbsd.h
-@@ -136,8 +136,12 @@ while (0)
+@@ -136,8 +136,12 @@
  #define LIB_SPEC OBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -92,11 +96,9 @@ index 37ecfc43f..a5f1b9955 100644
  
  #undef LIB_SPEC
  #define LIB_SPEC OBSD_LIB_SPEC
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index cbf909722..eb2217fad 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -789,7 +789,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -800,7 +800,11 @@
    -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -109,11 +111,9 @@ index cbf909722..eb2217fad 100644
  #endif
  
  #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
-diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
-index 5160e1fda..7632a5081 100644
 --- a/gcc/config/sol2.h
 +++ b/gcc/config/sol2.h
-@@ -347,7 +347,11 @@ along with GCC; see the file COPYING3.  If not see
+@@ -347,7 +347,11 @@
  /* Solaris 11 build 135+ implements dl_iterate_phdr.  GNU ld needs
     --eh-frame-hdr to create the required .eh_frame_hdr sections.  */
  #if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
@@ -125,11 +125,9 @@ index 5160e1fda..7632a5081 100644
  #endif /* HAVE_LD_EH_FRAME && TARGET_DL_ITERATE_PHDR */
  #endif
  
-diff --git a/gcc/configure b/gcc/configure
-index 1c6e3407c..28ad05004 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -934,6 +934,7 @@ enable_fix_cortex_a53_835769
+@@ -934,6 +934,7 @@
  enable_fix_cortex_a53_843419
  with_glibc_version
  enable_gnu_unique_object
@@ -137,7 +135,7 @@ index 1c6e3407c..28ad05004 100755
  enable_linker_build_id
  enable_default_ssp
  with_long_double_128
-@@ -1670,6 +1671,9 @@ Optional Features:
+@@ -1670,6 +1671,9 @@
    --enable-gnu-unique-object
                            enable the use of the @gnu_unique_object ELF
                            extension on glibc systems
@@ -147,7 +145,7 @@ index 1c6e3407c..28ad05004 100755
    --enable-linker-build-id
                            compiler will always pass --build-id to linker
    --enable-default-ssp    enable Stack Smashing Protection as default
-@@ -27703,6 +27707,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
+@@ -27786,6 +27790,38 @@
  
  $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h
  
@@ -186,11 +184,9 @@ index 1c6e3407c..28ad05004 100755
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld_eh_frame_hdr" >&5
  $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; }
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6c1dcd9ae..0cf7419e7 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4828,6 +4828,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
+@@ -4861,6 +4861,35 @@
  if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
  	AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1,
  [Define if your linker supports .eh_frame_hdr.])
@@ -226,9 +222,6 @@ index 6c1dcd9ae..0cf7419e7 100644
  fi
  AC_MSG_RESULT($gcc_cv_ld_eh_frame_hdr)
  
-diff --git a/gcc/testsuite/g++.dg/eh/spec3-static.C b/gcc/testsuite/g++.dg/eh/spec3-static.C
-new file mode 100644
-index 000000000..15408effa
 --- /dev/null
 +++ b/gcc/testsuite/g++.dg/eh/spec3-static.C
 @@ -0,0 +1,25 @@
@@ -257,11 +250,9 @@ index 000000000..15408effa
 +  try {	func(); }
 +  catch (A& a) { }
 +}
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index f3343fc4f..d42647779 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -88,7 +88,8 @@ call_ ## FUNC (void)					\
+@@ -88,7 +88,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -271,7 +262,7 @@ index f3343fc4f..d42647779 100644
      && defined(BSD_DL_ITERATE_PHDR_AVAILABLE)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -97,7 +98,8 @@ call_ ## FUNC (void)					\
+@@ -97,7 +98,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \
@@ -281,7 +272,7 @@ index f3343fc4f..d42647779 100644
      && defined(__sun__) && defined(__svr4__)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -106,7 +108,8 @@ call_ ## FUNC (void)					\
+@@ -106,7 +108,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -291,7 +282,7 @@ index f3343fc4f..d42647779 100644
      && defined(__GLIBC__) && __GLIBC__ >= 2
  #include <link.h>
  /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
-@@ -121,7 +124,7 @@ call_ ## FUNC (void)					\
+@@ -121,7 +124,7 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
diff --git a/packages/gcc-linaro/7.1-2017.08/973-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0024-crystax.patch
similarity index 77%
rename from packages/gcc-linaro/7.1-2017.08/973-crystax.patch
rename to packages/gcc-linaro/6.4-2017.08/0024-crystax.patch
index b96ece33..e5476478 100644
--- a/packages/gcc-linaro/7.1-2017.08/973-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0024-crystax.patch
@@ -6,11 +6,13 @@ Date:   Thu Aug 20 19:11:07 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 3d044e8bd..5c89fcab0 100644
+---
+ gcc/config/i386/i386.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
-@@ -14631,6 +14631,7 @@ legitimate_pic_address_disp_p (rtx disp)
+@@ -14684,6 +14684,7 @@
  	  else if (!SYMBOL_REF_FAR_ADDR_P (op0)
  		   && (SYMBOL_REF_LOCAL_P (op0)
  		       || (HAVE_LD_PIE_COPYRELOC
diff --git a/packages/gcc/6.4.0/974-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0025-crystax.patch
similarity index 73%
rename from packages/gcc/6.4.0/974-crystax.patch
rename to packages/gcc-linaro/6.4-2017.08/0025-crystax.patch
index 9db4f545..8f2eb438 100644
--- a/packages/gcc/6.4.0/974-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0025-crystax.patch
@@ -6,11 +6,13 @@ Date:   Fri Aug 21 17:41:59 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index 47a7d061a..67a680f90 100644
+---
+ libgcc/gthr.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
-@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -145,7 +145,11 @@
  #define GTHREAD_USE_WEAK 1
  #endif
  #endif
diff --git a/packages/gcc/6.4.0/975-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0026-crystax.patch
similarity index 88%
rename from packages/gcc/6.4.0/975-crystax.patch
rename to packages/gcc-linaro/6.4-2017.08/0026-crystax.patch
index 9efc2a48..f555f276 100644
--- a/packages/gcc/6.4.0/975-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0026-crystax.patch
@@ -9,11 +9,13 @@ Date:   Mon Apr 14 21:05:51 2014 -0700
     Change-Id: Ie1de9f946f397196bb6f1623f5add86933739484
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
-index 5974c65d3..71b2c7aa9 100644
+---
+ gcc/config/arm/arm.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/arm.c
 +++ b/gcc/config/arm/arm.c
-@@ -22403,9 +22403,13 @@ arm_print_operand (FILE *stream, rtx x, int code)
+@@ -22178,9 +22178,13 @@
  	memsize = MEM_SIZE (x);
  
  	/* Only certain alignment specifiers are supported by the hardware.  */
diff --git a/packages/gcc/6.4.0/976-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0027-crystax.patch
similarity index 84%
rename from packages/gcc/6.4.0/976-crystax.patch
rename to packages/gcc-linaro/6.4-2017.08/0027-crystax.patch
index 790d4a9d..8c21a1cc 100644
--- a/packages/gcc/6.4.0/976-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0027-crystax.patch
@@ -6,8 +6,10 @@ Date:   Sat Aug 22 09:55:55 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index a1f98d3d1..3725799be 100644
+---
+ gcc/config/i386/pmm_malloc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
 @@ -31,7 +31,7 @@
diff --git a/packages/gcc/7.2.0/977-crystax.patch b/packages/gcc-linaro/6.4-2017.08/0028-crystax.patch
similarity index 74%
rename from packages/gcc/7.2.0/977-crystax.patch
rename to packages/gcc-linaro/6.4-2017.08/0028-crystax.patch
index 61d22617..ccb81fd6 100644
--- a/packages/gcc/7.2.0/977-crystax.patch
+++ b/packages/gcc-linaro/6.4-2017.08/0028-crystax.patch
@@ -6,8 +6,11 @@ Date:   Tue Aug 25 09:36:42 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-index db1288fd0..38bc64d61 100644
+---
+ gcc/config/aarch64/aarch64-linux-android.h |    4 ++++
+ gcc/config/mips/linux-common.h             |    4 ++++
+ 2 files changed, 8 insertions(+)
+
 --- a/gcc/config/aarch64/aarch64-linux-android.h
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
 @@ -56,4 +56,8 @@
@@ -19,11 +22,9 @@ index db1288fd0..38bc64d61 100644
 +#endif
 +
  #endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8bfacf994..262a9a341 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -62,3 +62,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -62,3 +62,7 @@
  
  /* The default value isn't sufficient in 64-bit mode.  */
  #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024)
diff --git a/packages/gcc-linaro/6.4-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/6.4-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48ee..00000000
--- a/packages/gcc-linaro/6.4-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/packages/gcc-linaro/6.4-2017.08/830-arm_unbreak_armv4t.patch b/packages/gcc-linaro/6.4-2017.08/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index b7300591..00000000
--- a/packages/gcc-linaro/6.4-2017.08/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/packages/gcc-linaro/6.4-2017.08/1000-libtool-leave-framework-alone.patch b/packages/gcc-linaro/7.1-2017.08/0000-libtool-leave-framework-alone.patch
similarity index 74%
rename from packages/gcc-linaro/6.4-2017.08/1000-libtool-leave-framework-alone.patch
rename to packages/gcc-linaro/7.1-2017.08/0000-libtool-leave-framework-alone.patch
index bce09eb7..1a86e415 100644
--- a/packages/gcc-linaro/6.4-2017.08/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0000-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-6.2.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-6.2.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
 @@ -36,6 +36,11 @@
  for arg
  do
diff --git a/packages/gcc-linaro/7.1-2017.08/0001-uclibc-conf.patch b/packages/gcc-linaro/7.1-2017.08/0001-uclibc-conf.patch
new file mode 100644
index 00000000..aef750af
--- /dev/null
+++ b/packages/gcc-linaro/7.1-2017.08/0001-uclibc-conf.patch
@@ -0,0 +1,17 @@
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
diff --git a/packages/gcc-linaro/5.4-2017.05/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc-linaro/7.1-2017.08/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
similarity index 83%
rename from packages/gcc-linaro/5.4-2017.05/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
rename to packages/gcc-linaro/7.1-2017.08/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index d8986d5f..56e05c52 100644
--- a/packages/gcc-linaro/5.4-2017.05/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,6 +1,11 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
+---
+ config/gcc-plugin.m4 |   18 +++++++++++++-----
+ gcc/configure        |   22 +++++++++++++++-------
+ libcc1/configure     |   22 +++++++++++++++-------
+ 3 files changed, 43 insertions(+), 19 deletions(-)
+
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
 @@ -20,6 +20,9 @@
  
     pluginlibs=
@@ -46,10 +51,9 @@ diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
         [AC_MSG_RESULT([yes]); have_pic_shared=yes],
         [AC_MSG_RESULT([no]); have_pic_shared=no])
       if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -29444,6 +29444,9 @@
  
     pluginlibs=
  
@@ -59,7 +63,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
+@@ -29454,6 +29457,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -71,7 +75,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
+@@ -29566,23 +29574,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -102,10 +106,9 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
    ;
    return 0;
  }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
-@@ -14500,6 +14500,9 @@
+--- a/libcc1/configure
++++ b/libcc1/configure
+@@ -14553,6 +14553,9 @@
  
     pluginlibs=
  
@@ -115,7 +118,7 @@ diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -14510,6 +14513,11 @@
+@@ -14563,6 +14566,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -127,7 +130,7 @@ diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -14622,23 +14630,23 @@
+@@ -14675,23 +14683,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc-linaro/7.1-2017.08/0003-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/7.1-2017.08/0003-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 00000000..5f9a07a2
--- /dev/null
+++ b/packages/gcc-linaro/7.1-2017.08/0003-gcc-plugin-POSIX-include-sys-select-h.patch
@@ -0,0 +1,14 @@
+---
+ libcc1/connection.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libcc1/connection.cc
++++ b/libcc1/connection.cc
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "marshall.hh"
diff --git a/packages/gcc/7.2.0/810-arm-softfloat-libgcc.patch b/packages/gcc-linaro/7.1-2017.08/0004-arm-softfloat-libgcc.patch
similarity index 80%
rename from packages/gcc/7.2.0/810-arm-softfloat-libgcc.patch
rename to packages/gcc-linaro/7.1-2017.08/0004-arm-softfloat-libgcc.patch
index 490ee733..d9800365 100644
--- a/packages/gcc/7.2.0/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0004-arm-softfloat-libgcc.patch
@@ -1,5 +1,8 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
 @@ -58,7 +58,7 @@
@@ -11,8 +14,6 @@ Index: b/gcc/config/arm/linux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-Index: b/libgcc/config/arm/t-linux
-===================================================================
 --- a/libgcc/config/arm/t-linux
 +++ b/libgcc/config/arm/t-linux
 @@ -1,6 +1,11 @@
diff --git a/packages/gcc/7.2.0/860-cilk-wchar.patch b/packages/gcc-linaro/7.1-2017.08/0005-cilk-wchar.patch
similarity index 95%
rename from packages/gcc/7.2.0/860-cilk-wchar.patch
rename to packages/gcc-linaro/7.1-2017.08/0005-cilk-wchar.patch
index 7ca2796b..d2230cd4 100644
--- a/packages/gcc/7.2.0/860-cilk-wchar.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0005-cilk-wchar.patch
@@ -10,8 +10,6 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
 --- a/libcilkrts/include/cilk/reducer_min_max.h
 +++ b/libcilkrts/include/cilk/reducer_min_max.h
 @@ -3289,7 +3289,9 @@
diff --git a/packages/gcc/7.2.0/870-xtensa-fix-PR-target-82181.patch b/packages/gcc-linaro/7.1-2017.08/0006-xtensa-fix-PR-target-82181.patch
similarity index 76%
rename from packages/gcc/7.2.0/870-xtensa-fix-PR-target-82181.patch
rename to packages/gcc-linaro/7.1-2017.08/0006-xtensa-fix-PR-target-82181.patch
index 7ac7cd95..ec9f1f8c 100644
--- a/packages/gcc/7.2.0/870-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0006-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 25e4a2894c3b..8c404187107b 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -605,6 +605,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
+@@ -605,6 +605,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 25e4a2894c3b..8c404187107b 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/891-fix-m68k-uclinux.patch b/packages/gcc-linaro/7.1-2017.08/0007-fix-m68k-uclinux.patch
similarity index 66%
rename from packages/gcc-linaro/4.9-2017.01/891-fix-m68k-uclinux.patch
rename to packages/gcc-linaro/7.1-2017.08/0007-fix-m68k-uclinux.patch
index 4347642d..0acbdfc2 100644
--- a/packages/gcc-linaro/4.9-2017.01/891-fix-m68k-uclinux.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0007-fix-m68k-uclinux.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-4.9.3.orig/libgcc/config.host gcc-4.9.3/libgcc/config.host
---- gcc-4.9.3.orig/libgcc/config.host	2014-03-27 16:40:31.000000000 +0100
-+++ gcc-4.9.3/libgcc/config.host	2016-04-05 16:20:53.422809885 +0200
-@@ -750,7 +750,7 @@
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -837,7 +837,7 @@
  m68k*-*-openbsd*)
  	;;
  m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
diff --git a/packages/gcc-linaro/7.1-2017.08/900-libgfortran-missing-include.patch b/packages/gcc-linaro/7.1-2017.08/0008-libgfortran-missing-include.patch
similarity index 51%
rename from packages/gcc-linaro/7.1-2017.08/900-libgfortran-missing-include.patch
rename to packages/gcc-linaro/7.1-2017.08/0008-libgfortran-missing-include.patch
index 1f474696..701e7b4f 100644
--- a/packages/gcc-linaro/7.1-2017.08/900-libgfortran-missing-include.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0008-libgfortran-missing-include.patch
@@ -1,5 +1,9 @@
---- gcc-6.3.0/libgfortran/io/close.c.org	2017-01-17 09:43:48.395850000 +0100
-+++ gcc-6.3.0/libgfortran/io/close.c	2017-01-17 09:21:05.000000000 +0100
+---
+ libgfortran/io/close.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libgfortran/io/close.c
++++ b/libgfortran/io/close.c
 @@ -25,6 +25,7 @@
  #include "io.h"
  #include "unix.h"
diff --git a/packages/gcc-linaro/6.4-2017.08/910-nios2-bad-multilib-default.patch b/packages/gcc-linaro/7.1-2017.08/0009-nios2-bad-multilib-default.patch
similarity index 59%
rename from packages/gcc-linaro/6.4-2017.08/910-nios2-bad-multilib-default.patch
rename to packages/gcc-linaro/7.1-2017.08/0009-nios2-bad-multilib-default.patch
index 61989e56..4acc4918 100644
--- a/packages/gcc-linaro/6.4-2017.08/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0009-nios2-bad-multilib-default.patch
@@ -1,6 +1,10 @@
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios2.h
---- gcc-6.2.0.orig/gcc/config/nios2/nios2.h	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/nios2.h	2016-11-29 10:29:55.069624746 -0800
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
 @@ -63,11 +63,11 @@
  #if TARGET_ENDIAN_DEFAULT == 0
  # define ASM_SPEC "%{!meb:-EL} %{meb:-EB} %{march=*:-march=%*}"
@@ -15,9 +19,8 @@ diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios
  #endif
  
  #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/t-nios2 gcc-6.2.0/gcc/config/nios2/t-nios2
---- gcc-6.2.0.orig/gcc/config/nios2/t-nios2	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/t-nios2	2016-11-29 10:29:03.517151014 -0800
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
 @@ -22,6 +22,5 @@
  # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
  # MULTILIB_EXCEPTIONS = 
diff --git a/packages/gcc-linaro/7.1-2017.08/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc-linaro/7.1-2017.08/0010-libgcc-disable-split-stack-nothreads.patch
similarity index 62%
rename from packages/gcc-linaro/7.1-2017.08/930-libgcc-disable-split-stack-nothreads.patch
rename to packages/gcc-linaro/7.1-2017.08/0010-libgcc-disable-split-stack-nothreads.patch
index 07f9a739..df91a9ff 100644
--- a/packages/gcc-linaro/7.1-2017.08/930-libgcc-disable-split-stack-nothreads.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0010-libgcc-disable-split-stack-nothreads.patch
@@ -2,9 +2,12 @@ disable split-stack for non-thread builds
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
 @@ -1,4 +1,6 @@
  # Makefile fragment to provide generic support for -fsplit-stack.
  # This should be used in config.host for any host which supports
diff --git a/packages/gcc-linaro/6.4-2017.08/951-bionic-ndk.patch b/packages/gcc-linaro/7.1-2017.08/0011-bionic-ndk.patch
similarity index 91%
rename from packages/gcc-linaro/6.4-2017.08/951-bionic-ndk.patch
rename to packages/gcc-linaro/7.1-2017.08/0011-bionic-ndk.patch
index 59c50a89..474dd8c0 100644
--- a/packages/gcc-linaro/6.4-2017.08/951-bionic-ndk.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0011-bionic-ndk.patch
@@ -4,8 +4,10 @@ Date:   Tue Apr 25 19:02:18 2017 -0700
 
     Fix ctype for newer NDK headers
 
-diff --git a/libstdc++-v3/config/os/bionic/ctype_base.h b/libstdc++-v3/config/os/bionic/ctype_base.h
-index 33978f3..c36e63c 100644
+---
+ libstdc++-v3/config/os/bionic/ctype_base.h |   34 +++++++++++++++++++----------
+ 1 file changed, 23 insertions(+), 11 deletions(-)
+
 --- a/libstdc++-v3/config/os/bionic/ctype_base.h
 +++ b/libstdc++-v3/config/os/bionic/ctype_base.h
 @@ -28,6 +28,18 @@
@@ -27,7 +29,7 @@ index 33978f3..c36e63c 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -41,17 +53,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -41,17 +53,17 @@
      // NB: Offsets into ctype<char>::_M_table force a particular size
      // on the mask type. Because of this, we don't use an enum.
      typedef char 		mask;
diff --git a/packages/gcc-linaro/7.1-2017.08/952-bionic-errno.patch b/packages/gcc-linaro/7.1-2017.08/0012-bionic-errno.patch
similarity index 66%
rename from packages/gcc-linaro/7.1-2017.08/952-bionic-errno.patch
rename to packages/gcc-linaro/7.1-2017.08/0012-bionic-errno.patch
index 91f6ca34..0a1a6327 100644
--- a/packages/gcc-linaro/7.1-2017.08/952-bionic-errno.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0012-bionic-errno.patch
@@ -4,11 +4,13 @@ Date:   Tue Apr 25 20:17:03 2017 -0700
 
     Fix, errno is volatile int
 
-diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/dir.cc
-index 6ff12d0..5bbd664 100644
+---
+ libstdc++-v3/src/filesystem/dir.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/libstdc++-v3/src/filesystem/dir.cc
 +++ b/libstdc++-v3/src/filesystem/dir.cc
-@@ -147,7 +147,7 @@ fs::_Dir::advance(error_code* ec, directory_options options)
+@@ -146,7 +146,7 @@
  
    int err = std::exchange(errno, 0);
    const auto entp = readdir(dirp);
diff --git a/packages/gcc/7.2.0/970-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0013-crystax.patch
similarity index 83%
rename from packages/gcc/7.2.0/970-crystax.patch
rename to packages/gcc-linaro/7.1-2017.08/0013-crystax.patch
index f498aec1..e53bcb82 100644
--- a/packages/gcc/7.2.0/970-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0013-crystax.patch
@@ -7,11 +7,33 @@ Date:   Wed Jul 29 11:28:29 2015 +0300
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
 [Edited: keep libstdc++, drop libcrystax-related modifications]
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index a9196cd..5f7fed2 100644
+---
+ gcc/config.gcc                             |   17 +++++++-
+ gcc/config/aarch64/aarch64-linux-android.h |   59 +++++++++++++++++++++++++++++
+ gcc/config/aarch64/aarch64-linux.h         |    9 +++-
+ gcc/config/arm/arm.h                       |    3 -
+ gcc/config/arm/arm.md                      |    2 
+ gcc/config/arm/arm.opt                     |    4 +
+ gcc/config/arm/elf.h                       |    9 ++--
+ gcc/config/arm/linux-eabi.h                |    7 ++-
+ gcc/config/i386/gnu-user.h                 |    7 ++-
+ gcc/config/i386/gnu-user64.h               |    5 ++
+ gcc/config/i386/linux-common.h             |    8 +++
+ gcc/config/linux-android.h                 |   13 +++---
+ gcc/config/mips/android.h                  |   49 ++++++++++++++++++++++++
+ gcc/config/mips/gnu-user.h                 |    6 +-
+ gcc/config/mips/linux-common.h             |    2 
+ gcc/config/mips/t-linux-android            |    3 +
+ gcc/config/mips/t-linux-android64          |    4 +
+ libgcc/gthr-posix.h                        |   13 ++++++
+ libstdc++-v3/configure                     |   12 +++++
+ libstdc++-v3/include/bits/locale_facets.h  |   18 +++++++-
+ libstdc++-v3/libsupc++/guard.cc            |    5 ++
+ 21 files changed, 235 insertions(+), 20 deletions(-)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -961,13 +961,17 @@ aarch64*-*-freebsd*)
+@@ -961,13 +961,17 @@
  	tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-freebsd"
  	;;
  aarch64*-*-linux*)
@@ -30,7 +52,7 @@ index a9196cd..5f7fed2 100644
  	esac
  	aarch64_multilibs="${with_multilib_list}"
  	if test "$aarch64_multilibs" = "default"; then
-@@ -2079,6 +2083,17 @@ mips*-*-linux*)				# Linux MIPS, either endian.
+@@ -2074,6 +2078,17 @@
  	tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h"
  	extra_options="${extra_options} linux-android.opt"
  	case ${target} in
@@ -48,9 +70,6 @@ index a9196cd..5f7fed2 100644
  		mipsisa32r6*)
  			default_mips_arch=mips32r6
  			;;
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-new file mode 100644
-index 0000000..91d235f
 --- /dev/null
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
 @@ -0,0 +1,59 @@
@@ -113,8 +132,6 @@ index 0000000..91d235f
 +  LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
 +
 +#endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index c45fc1d..4dc6211 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,14 @@
@@ -133,11 +150,9 @@ index c45fc1d..4dc6211 100644
  
  #undef MUSL_DYNAMIC_LINKER
  #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
-index b3c6db0..c646613 100644
 --- a/gcc/config/arm/arm.h
 +++ b/gcc/config/arm/arm.h
-@@ -1878,10 +1878,11 @@ enum arm_auto_incmodes
+@@ -1878,10 +1878,11 @@
  
  #define CASE_VECTOR_PC_RELATIVE (TARGET_THUMB2				\
  				 || (TARGET_THUMB1			\
@@ -150,8 +165,6 @@ index b3c6db0..c646613 100644
     ? (min >= 0 && max < 512						\
        ? (ADDR_DIFF_VEC_FLAGS (body).offset_unsigned = 1, QImode)	\
        : min >= -256 && max < 256					\
-diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
-index f9365cd..804ba8e 100644
 --- a/gcc/config/arm/arm.md
 +++ b/gcc/config/arm/arm.md
 @@ -8668,7 +8668,7 @@
@@ -163,11 +176,9 @@ index f9365cd..804ba8e 100644
    "
    {
      enum insn_code code;
-diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
-index 9f8116d..bb3e44d 100644
 --- a/gcc/config/arm/arm.opt
 +++ b/gcc/config/arm/arm.opt
-@@ -193,6 +193,10 @@ mthumb-interwork
+@@ -193,6 +193,10 @@
  Target Report Mask(INTERWORK)
  Support calls between Thumb and ARM instruction sets.
  
@@ -178,8 +189,6 @@ index 9f8116d..bb3e44d 100644
  mtls-dialect=
  Target RejectNegative Joined Enum(tls_type) Var(target_tls_dialect) Init(TLS_GNU)
  Specify thread local storage scheme.
-diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
-index f119b87..83e5343 100644
 --- a/gcc/config/arm/elf.h
 +++ b/gcc/config/arm/elf.h
 @@ -56,8 +56,7 @@
@@ -212,8 +221,6 @@ index f119b87..83e5343 100644
      && !target_pure_code)
  
  #ifndef LINK_SPEC
-diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
-index f794e8f..d19529b 100644
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -102,11 +102,16 @@
@@ -234,11 +241,9 @@ index f794e8f..d19529b 100644
  #undef  LIB_SPEC
  #define LIB_SPEC							\
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC,			\
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index a4c88f1..1f76b3f 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -65,9 +65,14 @@ along with GCC; see the file COPYING3.  If not see
+@@ -65,9 +65,14 @@
     When the -shared link option is used a final link is not being
     done.  */
  
@@ -254,11 +259,9 @@ index a4c88f1..1f76b3f 100644
  
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 39f5ef6..bb43280 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
-@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -46,6 +46,11 @@
  #define SPEC_X32 "mx32"
  #endif
  
@@ -270,11 +273,9 @@ index 39f5ef6..bb43280 100644
  #undef ASM_SPEC
  #define ASM_SPEC "%{" SPEC_32 ":--32} \
   %{" SPEC_64 ":--64} \
-diff --git a/gcc/config/i386/linux-common.h b/gcc/config/i386/linux-common.h
-index 6380639..ea6fa1b 100644
 --- a/gcc/config/i386/linux-common.h
 +++ b/gcc/config/i386/linux-common.h
-@@ -30,7 +30,13 @@ along with GCC; see the file COPYING3.  If not see
+@@ -30,7 +30,13 @@
  #undef CC1_SPEC
  #define CC1_SPEC \
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \
@@ -289,8 +290,6 @@ index 6380639..ea6fa1b 100644
  
  #undef	LINK_SPEC
  #define LINK_SPEC \
-diff --git a/gcc/config/linux-android.h b/gcc/config/linux-android.h
-index 19c55c3..468303d 100644
 --- a/gcc/config/linux-android.h
 +++ b/gcc/config/linux-android.h
 @@ -38,15 +38,18 @@
@@ -317,9 +316,6 @@ index 19c55c3..468303d 100644
  
  #define ANDROID_LIB_SPEC \
    "%{!static: -ldl}"
-diff --git a/gcc/config/mips/android.h b/gcc/config/mips/android.h
-new file mode 100644
-index 0000000..32c539c
 --- /dev/null
 +++ b/gcc/config/mips/android.h
 @@ -0,0 +1,49 @@
@@ -372,11 +368,9 @@ index 0000000..32c539c
 +									\
 +  /* Use the standard linux specs for everything else.  */		\
 +  LINUX_DRIVER_SELF_SPECS
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index af45d18..b3e89df 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
-@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -36,6 +36,7 @@
      /* The GNU C++ standard library requires this.  */		\
      if (c_dialect_cxx ())					\
        builtin_define ("_GNU_SOURCE");				\
@@ -384,7 +378,7 @@ index af45d18..b3e89df 100644
    } while (0)
  
  #undef SUBTARGET_CPP_SPEC
-@@ -71,7 +72,8 @@ along with GCC; see the file COPYING3.  If not see
+@@ -71,7 +72,8 @@
  
  #undef SUBTARGET_ASM_SPEC
  #define SUBTARGET_ASM_SPEC \
@@ -394,7 +388,7 @@ index af45d18..b3e89df 100644
  
  /* The MIPS assembler has different syntax for .set. We set it to
     .dummy to trap any errors.  */
-@@ -120,7 +122,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -120,7 +122,7 @@
  #endif
  
  #define LINUX_DRIVER_SELF_SPECS \
@@ -403,11 +397,9 @@ index af45d18..b3e89df 100644
    MARCH_MTUNE_NATIVE_SPECS,						\
    /* -mplt has no effect without -mno-shared.  Simplify later		\
       specs handling by removing a redundant option.  */			\
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 6c8fda7..b8fae26 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -35,7 +35,7 @@
  #undef  SUBTARGET_CC1_SPEC
  #define SUBTARGET_CC1_SPEC						\
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC,			\
@@ -416,18 +408,12 @@ index 6c8fda7..b8fae26 100644
  
  #undef  CC1PLUS_SPEC
  #define CC1PLUS_SPEC							\
-diff --git a/gcc/config/mips/t-linux-android b/gcc/config/mips/t-linux-android
-new file mode 100644
-index 0000000..39f512c
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android
 @@ -0,0 +1,3 @@
 +MULTILIB_OPTIONS = mips32r2/mips32r6
 +MULTILIB_DIRNAMES = mips-r2 mips-r6
 +MULTILIB_OSDIRNAMES = ../libr2 ../libr6
-diff --git a/gcc/config/mips/t-linux-android64 b/gcc/config/mips/t-linux-android64
-new file mode 100644
-index 0000000..55cab7d
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android64
 @@ -0,0 +1,4 @@
@@ -435,11 +421,9 @@ index 0000000..55cab7d
 +MULTILIB_DIRNAMES = 32 mips-r1 mips-r2 mips-r6 mips64-r2 mips64-r6
 +MULTILIB_OSDIRNAMES = ../lib ../lib ../libr2 ../libr6 ../lib64r2 ../lib64
 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6
-diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h
-index a54a32e..0d81ec7 100644
 --- a/libgcc/gthr-posix.h
 +++ b/libgcc/gthr-posix.h
-@@ -32,6 +32,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -32,6 +32,19 @@
  #define __GTHREADS 1
  #define __GTHREADS_CXX0X 1
  
@@ -459,11 +443,9 @@ index a54a32e..0d81ec7 100644
  #include <pthread.h>
  
  #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index e70fdd6..014f956 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -78536,6 +78536,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78536,6 +78536,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -476,7 +458,7 @@ index e70fdd6..014f956 100755
  int
  main ()
  {
-@@ -78594,6 +78600,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78594,6 +78600,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -489,8 +471,6 @@ index e70fdd6..014f956 100755
  int
  main ()
  {
-diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
-index 1ad0eb5..9f322d8 100644
 --- a/libstdc++-v3/include/bits/locale_facets.h
 +++ b/libstdc++-v3/include/bits/locale_facets.h
 @@ -47,6 +47,20 @@
@@ -514,7 +494,7 @@ index 1ad0eb5..9f322d8 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -1102,7 +1116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1102,7 +1116,7 @@
         *  @return  @a __hi.
        */
        virtual const char*
@@ -523,7 +503,7 @@ index 1ad0eb5..9f322d8 100644
        {
  	__builtin_memcpy(__to, __lo, __hi - __lo);
  	return __hi;
-@@ -1163,7 +1177,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1163,7 +1177,7 @@
  
      private:
        void _M_narrow_init() const;
@@ -532,8 +512,6 @@ index 1ad0eb5..9f322d8 100644
      };
  
  #ifdef _GLIBCXX_USE_WCHAR_T
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 19953bc..5ae24af 100644
 --- a/libstdc++-v3/libsupc++/guard.cc
 +++ b/libstdc++-v3/libsupc++/guard.cc
 @@ -34,7 +34,12 @@
diff --git a/packages/gcc-linaro/6.4-2017.08/971-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0014-crystax.patch
similarity index 88%
rename from packages/gcc-linaro/6.4-2017.08/971-crystax.patch
rename to packages/gcc-linaro/7.1-2017.08/0014-crystax.patch
index 748a3812..f1f9eb12 100644
--- a/packages/gcc-linaro/6.4-2017.08/971-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0014-crystax.patch
@@ -6,8 +6,10 @@ Date:   Thu Aug 13 16:11:54 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/t-linux-androideabi b/gcc/config/arm/t-linux-androideabi
-index 8f1307c55..cbbec5bd2 100644
+---
+ gcc/config/arm/t-linux-androideabi |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
 --- a/gcc/config/arm/t-linux-androideabi
 +++ b/gcc/config/arm/t-linux-androideabi
 @@ -1,8 +1,9 @@
diff --git a/packages/gcc-linaro/7.1-2017.08/972-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0015-crystax.patch
similarity index 82%
rename from packages/gcc-linaro/7.1-2017.08/972-crystax.patch
rename to packages/gcc-linaro/7.1-2017.08/0015-crystax.patch
index b9077bef..f1de8ede 100644
--- a/packages/gcc-linaro/7.1-2017.08/972-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0015-crystax.patch
@@ -10,11 +10,23 @@ Date:   Mon Apr 14 15:59:47 2014 -0700
     Change-Id: Ibda473188e5a10f2a0592f2494ad00ad1f91e04b
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config.in b/gcc/config.in
-index 115cb6163..933916833 100644
+---
+ gcc/config.in                          |    6 +++++
+ gcc/config/alpha/elf.h                 |    4 +++
+ gcc/config/freebsd.h                   |    4 +++
+ gcc/config/gnu-user.h                  |    4 +++
+ gcc/config/openbsd.h                   |    4 +++
+ gcc/config/rs6000/sysv4.h              |    6 ++++-
+ gcc/config/sol2.h                      |    4 +++
+ gcc/configure                          |   36 +++++++++++++++++++++++++++++++++
+ gcc/configure.ac                       |   29 ++++++++++++++++++++++++++
+ gcc/testsuite/g++.dg/eh/spec3-static.C |   25 ++++++++++++++++++++++
+ libgcc/crtstuff.c                      |   11 ++++++----
+ 11 files changed, 128 insertions(+), 5 deletions(-)
+
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -2119,6 +2119,12 @@
+@@ -2176,6 +2176,12 @@
  #endif
  
  
@@ -27,11 +39,9 @@ index 115cb6163..933916833 100644
  /* Define to 1 if the 'long long' type is wider than 'long' but still
     efficiently supported by the host hardware. */
  #ifndef USED_FOR_TARGET
-diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h
-index 093c38bba..54b3e0c91 100644
 --- a/gcc/config/alpha/elf.h
 +++ b/gcc/config/alpha/elf.h
-@@ -168,5 +168,9 @@ extern int alpha_this_gpdisp_sequence_number;
+@@ -168,5 +168,9 @@
     I imagine that other systems will catch up.  In the meantime, it
     doesn't harm to make sure that the data exists to be used later.  */
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -41,11 +51,9 @@ index 093c38bba..54b3e0c91 100644
  #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
  #endif
 +#endif
-diff --git a/gcc/config/freebsd.h b/gcc/config/freebsd.h
-index 5ded869d2..5f51ac81d 100644
 --- a/gcc/config/freebsd.h
 +++ b/gcc/config/freebsd.h
-@@ -45,8 +45,12 @@ along with GCC; see the file COPYING3.  If not see
+@@ -45,8 +45,12 @@
  #define LIB_SPEC FBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -58,11 +66,9 @@ index 5ded869d2..5f51ac81d 100644
  
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index b0bf40a95..d1874bc29 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -118,8 +118,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -118,8 +118,12 @@
  #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -75,11 +81,9 @@ index b0bf40a95..d1874bc29 100644
  
  #undef LINK_GCC_C_SEQUENCE_SPEC
  #define LINK_GCC_C_SEQUENCE_SPEC \
-diff --git a/gcc/config/openbsd.h b/gcc/config/openbsd.h
-index 37ecfc43f..a5f1b9955 100644
 --- a/gcc/config/openbsd.h
 +++ b/gcc/config/openbsd.h
-@@ -136,8 +136,12 @@ while (0)
+@@ -136,8 +136,12 @@
  #define LIB_SPEC OBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -92,11 +96,9 @@ index 37ecfc43f..a5f1b9955 100644
  
  #undef LIB_SPEC
  #define LIB_SPEC OBSD_LIB_SPEC
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index cbf909722..eb2217fad 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -789,7 +789,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -805,7 +805,11 @@
    -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -109,11 +111,9 @@ index cbf909722..eb2217fad 100644
  #endif
  
  #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
-diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
-index 5160e1fda..7632a5081 100644
 --- a/gcc/config/sol2.h
 +++ b/gcc/config/sol2.h
-@@ -347,7 +347,11 @@ along with GCC; see the file COPYING3.  If not see
+@@ -367,7 +367,11 @@
  /* Solaris 11 build 135+ implements dl_iterate_phdr.  GNU ld needs
     --eh-frame-hdr to create the required .eh_frame_hdr sections.  */
  #if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
@@ -125,11 +125,9 @@ index 5160e1fda..7632a5081 100644
  #endif /* HAVE_LD_EH_FRAME && TARGET_DL_ITERATE_PHDR */
  #endif
  
-diff --git a/gcc/configure b/gcc/configure
-index 1c6e3407c..28ad05004 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -934,6 +934,7 @@ enable_fix_cortex_a53_835769
+@@ -939,6 +939,7 @@
  enable_fix_cortex_a53_843419
  with_glibc_version
  enable_gnu_unique_object
@@ -137,7 +135,7 @@ index 1c6e3407c..28ad05004 100755
  enable_linker_build_id
  enable_default_ssp
  with_long_double_128
-@@ -1670,6 +1671,9 @@ Optional Features:
+@@ -1676,6 +1677,9 @@
    --enable-gnu-unique-object
                            enable the use of the @gnu_unique_object ELF
                            extension on glibc systems
@@ -147,7 +145,7 @@ index 1c6e3407c..28ad05004 100755
    --enable-linker-build-id
                            compiler will always pass --build-id to linker
    --enable-default-ssp    enable Stack Smashing Protection as default
-@@ -27703,6 +27707,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
+@@ -28016,6 +28020,38 @@
  
  $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h
  
@@ -186,11 +184,9 @@ index 1c6e3407c..28ad05004 100755
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld_eh_frame_hdr" >&5
  $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; }
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6c1dcd9ae..0cf7419e7 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4828,6 +4828,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
+@@ -4969,6 +4969,35 @@
  if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
  	AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1,
  [Define if your linker supports .eh_frame_hdr.])
@@ -226,9 +222,6 @@ index 6c1dcd9ae..0cf7419e7 100644
  fi
  AC_MSG_RESULT($gcc_cv_ld_eh_frame_hdr)
  
-diff --git a/gcc/testsuite/g++.dg/eh/spec3-static.C b/gcc/testsuite/g++.dg/eh/spec3-static.C
-new file mode 100644
-index 000000000..15408effa
 --- /dev/null
 +++ b/gcc/testsuite/g++.dg/eh/spec3-static.C
 @@ -0,0 +1,25 @@
@@ -257,11 +250,9 @@ index 000000000..15408effa
 +  try {	func(); }
 +  catch (A& a) { }
 +}
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index f3343fc4f..d42647779 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -88,7 +88,8 @@ call_ ## FUNC (void)					\
+@@ -88,7 +88,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -271,7 +262,7 @@ index f3343fc4f..d42647779 100644
      && defined(BSD_DL_ITERATE_PHDR_AVAILABLE)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -97,7 +98,8 @@ call_ ## FUNC (void)					\
+@@ -97,7 +98,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \
@@ -281,7 +272,7 @@ index f3343fc4f..d42647779 100644
      && defined(__sun__) && defined(__svr4__)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -106,7 +108,8 @@ call_ ## FUNC (void)					\
+@@ -106,7 +108,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -291,7 +282,7 @@ index f3343fc4f..d42647779 100644
      && defined(__GLIBC__) && __GLIBC__ >= 2
  #include <link.h>
  /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
-@@ -121,7 +124,7 @@ call_ ## FUNC (void)					\
+@@ -121,7 +124,7 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
diff --git a/packages/gcc/6.4.0/973-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0016-crystax.patch
similarity index 77%
rename from packages/gcc/6.4.0/973-crystax.patch
rename to packages/gcc-linaro/7.1-2017.08/0016-crystax.patch
index b96ece33..8dfbd0d1 100644
--- a/packages/gcc/6.4.0/973-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0016-crystax.patch
@@ -6,11 +6,13 @@ Date:   Thu Aug 20 19:11:07 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 3d044e8bd..5c89fcab0 100644
+---
+ gcc/config/i386/i386.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
-@@ -14631,6 +14631,7 @@ legitimate_pic_address_disp_p (rtx disp)
+@@ -15747,6 +15747,7 @@
  	  else if (!SYMBOL_REF_FAR_ADDR_P (op0)
  		   && (SYMBOL_REF_LOCAL_P (op0)
  		       || (HAVE_LD_PIE_COPYRELOC
diff --git a/packages/gcc-linaro/7.1-2017.08/974-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0017-crystax.patch
similarity index 73%
rename from packages/gcc-linaro/7.1-2017.08/974-crystax.patch
rename to packages/gcc-linaro/7.1-2017.08/0017-crystax.patch
index 9db4f545..8f2eb438 100644
--- a/packages/gcc-linaro/7.1-2017.08/974-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0017-crystax.patch
@@ -6,11 +6,13 @@ Date:   Fri Aug 21 17:41:59 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index 47a7d061a..67a680f90 100644
+---
+ libgcc/gthr.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
-@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -145,7 +145,11 @@
  #define GTHREAD_USE_WEAK 1
  #endif
  #endif
diff --git a/packages/gcc/7.2.0/975-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0018-crystax.patch
similarity index 88%
rename from packages/gcc/7.2.0/975-crystax.patch
rename to packages/gcc-linaro/7.1-2017.08/0018-crystax.patch
index 3305a433..50ee371a 100644
--- a/packages/gcc/7.2.0/975-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0018-crystax.patch
@@ -9,11 +9,13 @@ Date:   Mon Apr 14 21:05:51 2014 -0700
     Change-Id: Ie1de9f946f397196bb6f1623f5add86933739484
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
-index 5974c65d3..71b2c7aa9 100644
+---
+ gcc/config/arm/arm.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/arm.c
 +++ b/gcc/config/arm/arm.c
-@@ -22270,9 +22270,13 @@ arm_print_operand (FILE *stream, rtx x, int code)
+@@ -22293,9 +22293,13 @@
  	memsize = MEM_SIZE (x);
  
  	/* Only certain alignment specifiers are supported by the hardware.  */
diff --git a/packages/gcc/7.2.0/976-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0019-crystax.patch
similarity index 84%
rename from packages/gcc/7.2.0/976-crystax.patch
rename to packages/gcc-linaro/7.1-2017.08/0019-crystax.patch
index 790d4a9d..8c21a1cc 100644
--- a/packages/gcc/7.2.0/976-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0019-crystax.patch
@@ -6,8 +6,10 @@ Date:   Sat Aug 22 09:55:55 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index a1f98d3d1..3725799be 100644
+---
+ gcc/config/i386/pmm_malloc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
 @@ -31,7 +31,7 @@
diff --git a/packages/gcc-linaro/6.4-2017.08/977-crystax.patch b/packages/gcc-linaro/7.1-2017.08/0020-crystax.patch
similarity index 73%
rename from packages/gcc-linaro/6.4-2017.08/977-crystax.patch
rename to packages/gcc-linaro/7.1-2017.08/0020-crystax.patch
index 0211d728..ccb81fd6 100644
--- a/packages/gcc-linaro/6.4-2017.08/977-crystax.patch
+++ b/packages/gcc-linaro/7.1-2017.08/0020-crystax.patch
@@ -6,11 +6,14 @@ Date:   Tue Aug 25 09:36:42 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-index db1288fd0..38bc64d61 100644
+---
+ gcc/config/aarch64/aarch64-linux-android.h |    4 ++++
+ gcc/config/mips/linux-common.h             |    4 ++++
+ 2 files changed, 8 insertions(+)
+
 --- a/gcc/config/aarch64/aarch64-linux-android.h
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
-@@ -57,4 +57,8 @@
+@@ -56,4 +56,8 @@
  #define ENDFILE_SPEC \
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
  
@@ -19,11 +22,9 @@ index db1288fd0..38bc64d61 100644
 +#endif
 +
  #endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8bfacf994..262a9a341 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -63,3 +63,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -62,3 +62,7 @@
  
  /* The default value isn't sufficient in 64-bit mode.  */
  #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024)
diff --git a/packages/gcc-linaro/7.1-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc-linaro/7.1-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48ee..00000000
--- a/packages/gcc-linaro/7.1-2017.08/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/packages/gcc-linaro/4.8-2015.06/001_gcc_bug_62231.patch b/packages/gcc/4.8.5/0000-gcc_bug_62231.patch
similarity index 88%
rename from packages/gcc-linaro/4.8-2015.06/001_gcc_bug_62231.patch
rename to packages/gcc/4.8.5/0000-gcc_bug_62231.patch
index e7c9cf97..603e1c25 100644
--- a/packages/gcc-linaro/4.8-2015.06/001_gcc_bug_62231.patch
+++ b/packages/gcc/4.8.5/0000-gcc_bug_62231.patch
@@ -4,9 +4,14 @@ https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02625.html
 
 Linked from bug62231 comment 4 there
 
-diff -durN a/gcc/defaults.h b/gcc/defaults.h
---- a/gcc/defaults.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/defaults.h	2014-12-15 13:26:13.498904465 -0800
+---
+ gcc/defaults.h      |    5 +++
+ gcc/dwarf2cfi.c     |   76 +++++++++++++++++++++++++++++++++++-----------------
+ libgcc/unwind-dw2.c |    4 --
+ 3 files changed, 57 insertions(+), 28 deletions(-)
+
+--- a/gcc/defaults.h
++++ b/gcc/defaults.h
 @@ -438,6 +438,11 @@
  #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
  #endif
@@ -19,9 +24,8 @@ diff -durN a/gcc/defaults.h b/gcc/defaults.h
  /* Map register numbers held in the call frame info that gcc has
     collected using DWARF_FRAME_REGNUM to those that should be output in
     .debug_frame and .eh_frame.  */
-diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
---- a/gcc/dwarf2cfi.c	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/dwarf2cfi.c	2014-12-15 13:50:24.554883694 -0800
+--- a/gcc/dwarf2cfi.c
++++ b/gcc/dwarf2cfi.c
 @@ -225,7 +225,44 @@
    emit_move_insn (adjust_address (mem, mode, offset), GEN_INT (size));
  }
@@ -74,7 +78,9 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
      {
 -      unsigned int dnum = DWARF_FRAME_REGNUM (i);
 -      unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
--
++      enum machine_mode save_mode = reg_raw_mode[i];
++      rtx span;
+ 
 -      if (rnum < DWARF_FRAME_REGISTERS)
 -	{
 -	  HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode);
@@ -92,9 +98,7 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
 -	  size = GET_MODE_SIZE (save_mode);
 -	  if (offset < 0)
 -	    continue;
-+      enum machine_mode save_mode = reg_raw_mode[i];
-+      rtx span;
- 
+-
 -	  emit_move_insn (adjust_address (mem, mode, offset),
 -			  gen_int_mode (size, mode));
 -	}
@@ -113,9 +117,8 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
      }
  
    if (!wrote_return_column)
-diff -durN a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
---- a/libgcc/unwind-dw2.c	2013-05-31 16:21:46.000000000 -0700
-+++ b/libgcc/unwind-dw2.c	2014-12-15 13:26:13.570904866 -0800
+--- a/libgcc/unwind-dw2.c
++++ b/libgcc/unwind-dw2.c
 @@ -55,10 +55,6 @@
  #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS
  #endif
diff --git a/packages/gcc-linaro/4.8-2015.06/002_gcc_bug_62231.patch b/packages/gcc/4.8.5/0001-gcc_bug_62231.patch
similarity index 64%
rename from packages/gcc-linaro/4.8-2015.06/002_gcc_bug_62231.patch
rename to packages/gcc/4.8.5/0001-gcc_bug_62231.patch
index b970ebc8..0fed72dd 100644
--- a/packages/gcc-linaro/4.8-2015.06/002_gcc_bug_62231.patch
+++ b/packages/gcc/4.8.5/0001-gcc_bug_62231.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/ml/gcc-patches/2014-10/msg02605.html
 
 Linked from bug62231 comment 4 there
 
-diff -durN a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
---- a/gcc/config/rs6000/rs6000.c	2014-12-08 17:29:04.000000000 -0800
-+++ b/gcc/config/rs6000/rs6000.c	2014-12-15 14:44:46.568801843 -0800
-@@ -1673,7 +1673,7 @@
+---
+ gcc/config/rs6000/rs6000.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -1677,7 +1677,7 @@
       SCmode so as to pass the value correctly in a pair of
       registers.  */
    else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode
diff --git a/packages/gcc-linaro/4.9-2017.01/1000-libtool-leave-framework-alone.patch b/packages/gcc/4.8.5/0002-libtool-leave-framework-alone.patch
similarity index 73%
rename from packages/gcc-linaro/4.9-2017.01/1000-libtool-leave-framework-alone.patch
rename to packages/gcc/4.8.5/0002-libtool-leave-framework-alone.patch
index 525592e6..e67e0e88 100644
--- a/packages/gcc-linaro/4.9-2017.01/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc/4.8.5/0002-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-4.9.4/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-4.9.4/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
 @@ -36,6 +36,11 @@
  for arg
  do
diff --git a/packages/gcc/4.8.5/0003-uclibc-conf.patch b/packages/gcc/4.8.5/0003-uclibc-conf.patch
new file mode 100644
index 00000000..aef750af
--- /dev/null
+++ b/packages/gcc/4.8.5/0003-uclibc-conf.patch
@@ -0,0 +1,17 @@
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
diff --git a/packages/gcc/4.9.4/111-alpha-bad-eh_frame.patch b/packages/gcc/4.8.5/0004-alpha-bad-eh_frame.patch
similarity index 80%
rename from packages/gcc/4.9.4/111-alpha-bad-eh_frame.patch
rename to packages/gcc/4.8.5/0004-alpha-bad-eh_frame.patch
index 93f6e943..f341a063 100644
--- a/packages/gcc/4.9.4/111-alpha-bad-eh_frame.patch
+++ b/packages/gcc/4.8.5/0004-alpha-bad-eh_frame.patch
@@ -1,7 +1,9 @@
 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80037
 
-diff --git a/libgcc/config/alpha/t-alpha b/libgcc/config/alpha/t-alpha
-index 0b6ffb1..0c2f840 100644
+---
+ libgcc/config/alpha/t-alpha |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/config/alpha/t-alpha
 +++ b/libgcc/config/alpha/t-alpha
 @@ -1,2 +1,6 @@
diff --git a/packages/gcc-linaro/4.8-2015.06/111-pr65730.patch b/packages/gcc/4.8.5/0005-pr65730.patch
similarity index 82%
rename from packages/gcc-linaro/4.8-2015.06/111-pr65730.patch
rename to packages/gcc/4.8.5/0005-pr65730.patch
index f195e308..3cea1a11 100644
--- a/packages/gcc-linaro/4.8-2015.06/111-pr65730.patch
+++ b/packages/gcc/4.8.5/0005-pr65730.patch
@@ -13,14 +13,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
 Changes to ChangeLog are dropped.
 
- gcc/config/xtensa/xtensa.c | 5 +++--
+ gcc/config/xtensa/xtensa.c |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..7296e36 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1461,8 +1461,9 @@ init_alignment_context (struct alignment_context *ac, rtx mem)
+@@ -1423,8 +1423,9 @@
    if (ac->shift != NULL_RTX)
      {
        /* Shift is the byte count, but we need the bitcount.  */
@@ -32,6 +30,3 @@ index eb039ba..7296e36 100644
  				       NULL_RTX, 1, OPTAB_DIRECT);
        ac->modemask = expand_simple_binop (SImode, ASHIFT,
  					  GEN_INT (GET_MODE_MASK (mode)),
--- 
-1.8.1.4
-
diff --git a/packages/gcc/4.8.5/130-pr43538.patch b/packages/gcc/4.8.5/0006-pr43538.patch
similarity index 85%
rename from packages/gcc/4.8.5/130-pr43538.patch
rename to packages/gcc/4.8.5/0006-pr43538.patch
index 19e57bb0..c2a20462 100644
--- a/packages/gcc/4.8.5/130-pr43538.patch
+++ b/packages/gcc/4.8.5/0006-pr43538.patch
@@ -10,16 +10,11 @@ Subject: [PATCH] 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- config/mt-gnu    | 2 +-
+ config/mt-gnu |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
 --- a/config/mt-gnu
 +++ b/config/mt-gnu
 @@ -1 +1 @@
 -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
 +CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch b/packages/gcc/4.8.5/0007-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
similarity index 87%
rename from packages/gcc-linaro/4.8-2015.06/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
rename to packages/gcc/4.8.5/0007-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
index 1c49fb0a..d8666619 100644
--- a/packages/gcc-linaro/4.8-2015.06/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
+++ b/packages/gcc/4.8.5/0007-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
@@ -10,11 +10,9 @@ Subject: [PATCH] 2014-11-17  Bob Dunlop  <bob.dunlop@xyzzy.org.uk>
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217739 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- config/mt-ospace | 4 ++--
+ config/mt-ospace |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/config/mt-ospace b/config/mt-ospace
-index 7f09104..ce29ff4 100644
 --- a/config/mt-ospace
 +++ b/config/mt-ospace
 @@ -1,3 +1,3 @@
@@ -23,6 +21,3 @@ index 7f09104..ce29ff4 100644
 - CXXFLAGS_FOR_TARGET = -g -Os
 + CFLAGS_FOR_TARGET += -g -Os
 + CXXFLAGS_FOR_TARGET += -g -Os
--- 
-2.1.4
-
diff --git a/packages/gcc/4.8.5/132-build_gcc-5_with_gcc-6.patch b/packages/gcc/4.8.5/0008-build_gcc-5_with_gcc-6.patch
similarity index 81%
rename from packages/gcc/4.8.5/132-build_gcc-5_with_gcc-6.patch
rename to packages/gcc/4.8.5/0008-build_gcc-5_with_gcc-6.patch
index ac1d8461..b49d7dab 100644
--- a/packages/gcc/4.8.5/132-build_gcc-5_with_gcc-6.patch
+++ b/packages/gcc/4.8.5/0008-build_gcc-5_with_gcc-6.patch
@@ -15,16 +15,22 @@ Subject: [PATCH 1/1] 2016-02-25  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
 
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@233720 138bc75d-0d04-0410-961f-82ee72b054a4
-diff -urpN a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
---- a/gcc/cp/cfns.gperf	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/cfns.gperf	2016-12-05 13:55:20.331616274 -0800
+---
+ gcc/cp/Make-lang.in |    2 +-
+ gcc/cp/cfns.gperf   |   10 ++--------
+ gcc/cp/cfns.h       |   41 ++++++++++++++---------------------------
+ gcc/cp/except.c     |    3 ++-
+ 4 files changed, 19 insertions(+), 37 deletions(-)
+
+--- a/gcc/cp/cfns.gperf
++++ b/gcc/cp/cfns.gperf
 @@ -1,3 +1,5 @@
 +%language=C++
 +%define class-name libc_name
  %{
  /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
  
-@@ -16,14 +18,6 @@ for more details.
+@@ -16,14 +18,6 @@
  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/>.  */
@@ -39,9 +45,8 @@ diff -urpN a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
  %}
  %%
  # The standard C library functions, for feeding to gperf; the result is used
-diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
---- a/gcc/cp/cfns.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/cfns.h	2016-12-05 13:55:20.331616274 -0800
+--- a/gcc/cp/cfns.h
++++ b/gcc/cp/cfns.h
 @@ -1,5 +1,5 @@
 -/* ANSI-C code produced by gperf version 3.0.3 */
 -/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf  */
@@ -59,7 +64,7 @@ diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
  
  /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
  
-@@ -47,25 +47,18 @@ for more details.
+@@ -47,25 +47,18 @@
  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/>.  */
@@ -95,7 +100,7 @@ diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
  {
    static const unsigned short asso_values[] =
      {
-@@ -122,14 +115,8 @@ hash (register const char *str, register
+@@ -122,14 +115,8 @@
    return hval + asso_values[(unsigned char)str[len - 1]];
  }
  
@@ -111,10 +116,9 @@ diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
  {
    enum
      {
-diff -urpN a/gcc/cp/except.c b/gcc/cp/except.c
---- a/gcc/cp/except.c	2013-10-25 06:49:48.000000000 -0700
-+++ b/gcc/cp/except.c	2016-12-05 13:55:20.331616274 -0800
-@@ -1025,7 +1025,8 @@ nothrow_libfn_p (const_tree fn)
+--- a/gcc/cp/except.c
++++ b/gcc/cp/except.c
+@@ -1025,7 +1025,8 @@
       unless the system headers are playing rename tricks, and if
       they are, we don't want to be confused by them.  */
    id = DECL_NAME (fn);
@@ -124,10 +128,9 @@ diff -urpN a/gcc/cp/except.c b/gcc/cp/except.c
  }
  
  /* Returns nonzero if an exception of type FROM will be caught by a
-diff -urpN a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
---- a/gcc/cp/Make-lang.in	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/Make-lang.in	2016-12-05 13:55:20.331616274 -0800
-@@ -115,7 +115,7 @@ else
+--- a/gcc/cp/Make-lang.in
++++ b/gcc/cp/Make-lang.in
+@@ -115,7 +115,7 @@
  # deleting the $(srcdir)/cp/cfns.h file.
  $(srcdir)/cp/cfns.h:
  endif
diff --git a/packages/gcc/4.8.5/0009-missing-execinfo_h.patch b/packages/gcc/4.8.5/0009-missing-execinfo_h.patch
new file mode 100644
index 00000000..c90222a1
--- /dev/null
+++ b/packages/gcc/4.8.5/0009-missing-execinfo_h.patch
@@ -0,0 +1,15 @@
+---
+ boehm-gc/include/gc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/boehm-gc/include/gc.h
++++ b/boehm-gc/include/gc.h
+@@ -503,7 +503,7 @@
+ #if defined(__linux__) || defined(__GLIBC__)
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/packages/gcc/4.8.5/305-libmudflap-susv3-legacy.patch b/packages/gcc/4.8.5/0010-libmudflap-susv3-legacy.patch
similarity index 81%
rename from packages/gcc/4.8.5/305-libmudflap-susv3-legacy.patch
rename to packages/gcc/4.8.5/0010-libmudflap-susv3-legacy.patch
index 35d5f502..c63f9116 100644
--- a/packages/gcc/4.8.5/305-libmudflap-susv3-legacy.patch
+++ b/packages/gcc/4.8.5/0010-libmudflap-susv3-legacy.patch
@@ -1,7 +1,9 @@
-Index: gcc-4.8.0/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.8.0.orig/libmudflap/mf-hooks2.c	2013-02-03 18:48:05.000000000 +0100
-+++ gcc-4.8.0/libmudflap/mf-hooks2.c	2013-03-23 17:39:43.000000000 +0100
+---
+ libmudflap/mf-hooks2.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/libmudflap/mf-hooks2.c
++++ b/libmudflap/mf-hooks2.c
 @@ -424,7 +424,7 @@
  {
    TRACE ("%s\n", __PRETTY_FUNCTION__);
diff --git a/packages/gcc/4.9.4/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/4.8.5/0011-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
similarity index 77%
rename from packages/gcc/4.9.4/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
rename to packages/gcc/4.8.5/0011-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index c3bab158..e52292c0 100644
--- a/packages/gcc/4.9.4/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc/4.8.5/0011-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,7 +1,11 @@
-diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc/configure
---- gcc-4.9.4.orig/gcc/configure	2016-05-22 01:53:32.000000000 -0700
-+++ gcc-4.9.4/gcc/configure	2017-02-11 16:54:52.879474293 -0800
-@@ -28058,6 +28058,9 @@ fi
+---
+ gcc/configure    |   22 +++++++++++++++-------
+ gcc/configure.ac |   18 +++++++++++++-----
+ 2 files changed, 28 insertions(+), 12 deletions(-)
+
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -27364,6 +27364,9 @@
  
  
  pluginlibs=
@@ -11,7 +15,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc
  
  case "${host}" in
    *-*-darwin*)
-@@ -28069,6 +28072,11 @@ case "${host}" in
+@@ -27375,6 +27378,11 @@
        export_sym_check=
      fi
    ;;
@@ -23,7 +27,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -28181,23 +28189,23 @@ fi
+@@ -27487,23 +27495,23 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -54,10 +58,9 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc
    ;
    return 0;
  }
-diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure.ac gcc-4.9.4/gcc/configure.ac
---- gcc-4.9.4.orig/gcc/configure.ac	2016-05-22 01:53:32.000000000 -0700
-+++ gcc-4.9.4/gcc/configure.ac	2017-02-11 16:49:59.820965424 -0800
-@@ -5583,6 +5583,9 @@ enable_plugin=$enableval,
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -5243,6 +5243,9 @@
  enable_plugin=yes; default_plugin=yes)
  
  pluginlibs=
@@ -67,7 +70,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure.ac gcc-4.9.4/
  
  case "${host}" in
    *-*-darwin*)
-@@ -5594,6 +5597,11 @@ case "${host}" in
+@@ -5254,6 +5257,11 @@
        export_sym_check=
      fi
    ;;
@@ -79,7 +82,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure.ac gcc-4.9.4/
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -5645,17 +5653,17 @@ if test x"$enable_plugin" = x"yes"; then
+@@ -5305,17 +5313,17 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc/4.8.5/0012-arm-softfloat-libgcc.patch b/packages/gcc/4.8.5/0012-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..7b0265a9
--- /dev/null
+++ b/packages/gcc/4.8.5/0012-arm-softfloat-libgcc.patch
@@ -0,0 +1,31 @@
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -55,7 +55,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
+@@ -1,6 +1,11 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
diff --git a/packages/gcc/4.8.5/0013-arm_unbreak_armv4t.patch b/packages/gcc/4.8.5/0013-arm_unbreak_armv4t.patch
new file mode 100644
index 00000000..7c374453
--- /dev/null
+++ b/packages/gcc/4.8.5/0013-arm_unbreak_armv4t.patch
@@ -0,0 +1,17 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+---
+ gcc/config/arm/linux-eabi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -45,7 +45,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/packages/gcc-linaro/4.8-2015.06/841-PR57717-E500v2.patch b/packages/gcc/4.8.5/0014-PR57717-E500v2.patch
similarity index 71%
rename from packages/gcc-linaro/4.8-2015.06/841-PR57717-E500v2.patch
rename to packages/gcc/4.8.5/0014-PR57717-E500v2.patch
index a011e241..079a0f23 100644
--- a/packages/gcc-linaro/4.8-2015.06/841-PR57717-E500v2.patch
+++ b/packages/gcc/4.8.5/0014-PR57717-E500v2.patch
@@ -7,10 +7,13 @@ Signed-off-by: Julian Brown <Julian_Brown@mentor.com>
 fix for PR57717 (PowerPC E500v2)
 http://gcc.gnu.org/ml/gcc-patches/2013-08/msg00668.html
 
-diff -Nura gcc-4.8.3/gcc/config/rs6000/rs6000.c gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c
---- gcc-4.8.3/gcc/config/rs6000/rs6000.c	2014-05-04 23:18:35.000000000 -0300
-+++ gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c	2014-05-22 15:20:12.554270919 -0300
-@@ -7343,9 +7343,7 @@
+---
+ gcc/config/rs6000/rs6000.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -7479,9 +7479,7 @@
        && GET_CODE (XEXP (x, 1)) == CONST_INT
        && reg_offset_p
        && !SPE_VECTOR_MODE (mode)
diff --git a/packages/gcc-linaro/4.8-2015.06/842-PR60155.patch b/packages/gcc/4.8.5/0015-PR60155.patch
similarity index 90%
rename from packages/gcc-linaro/4.8-2015.06/842-PR60155.patch
rename to packages/gcc/4.8.5/0015-PR60155.patch
index 7bc2122f..f9603c82 100644
--- a/packages/gcc-linaro/4.8-2015.06/842-PR60155.patch
+++ b/packages/gcc/4.8.5/0015-PR60155.patch
@@ -3,9 +3,13 @@ Upstream status: in trunk.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
---- trunk/gcc/gcse.c	2014/02/12 14:50:06	207726
-+++ trunk/gcc/gcse.c	2014/04/04 22:25:51	209134
-@@ -2502,6 +2502,65 @@
+---
+ gcc/gcse.c |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 64 insertions(+), 7 deletions(-)
+
+--- a/gcc/gcse.c
++++ b/gcc/gcse.c
+@@ -2479,6 +2479,65 @@
        }
  }
  
@@ -71,7 +75,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  /* Emit move from SRC to DEST noting the equivalence with expression computed
     in INSN.  */
  
-@@ -2509,7 +2568,8 @@
+@@ -2486,7 +2545,8 @@
  gcse_emit_move_after (rtx dest, rtx src, rtx insn)
  {
    rtx new_rtx;
@@ -81,7 +85,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
    rtx note;
    rtx eqv = NULL_RTX;
  
-@@ -3369,13 +3429,12 @@
+@@ -3345,13 +3405,12 @@
  	      FOR_EACH_VEC_ELT (occrs_to_hoist, j, occr)
  		{
  		  rtx insn;
@@ -97,7 +101,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  
  		  /* Create a pseudo-reg to store the result of reaching
  		     expressions into.  Get the mode for the new pseudo
-@@ -3456,10 +3515,8 @@
+@@ -3432,10 +3491,8 @@
  {
    rtx reg;
    enum reg_class pressure_class;
diff --git a/packages/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch b/packages/gcc/4.8.5/0016-aarch64-vmlaq_lane_s32-typo.patch
similarity index 90%
rename from packages/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch
rename to packages/gcc/4.8.5/0016-aarch64-vmlaq_lane_s32-typo.patch
index afa650c8..e827b431 100644
--- a/packages/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch
+++ b/packages/gcc/4.8.5/0016-aarch64-vmlaq_lane_s32-typo.patch
@@ -9,8 +9,10 @@ Change-Id: I4e35a764d369d378808dab29beefe34d1f93249b
 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
 
-diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h
-index 73c7e7d..92b0119 100644
+---
+ gcc/config/aarch64/arm_neon.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/aarch64/arm_neon.h
 +++ b/gcc/config/aarch64/arm_neon.h
 @@ -9984,7 +9984,7 @@
diff --git a/packages/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch b/packages/gcc/4.8.5/0017-libstdcxx-uclibc-c99.patch
similarity index 76%
rename from packages/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch
rename to packages/gcc/4.8.5/0017-libstdcxx-uclibc-c99.patch
index 792976fd..21df8cf3 100644
--- a/packages/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch
+++ b/packages/gcc/4.8.5/0017-libstdcxx-uclibc-c99.patch
@@ -15,8 +15,28 @@ that uClibc defines the __UCLIBC__ definition.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
+---
+ libstdc++-v3/config/locale/generic/c_locale.h     |    2 +-
+ libstdc++-v3/config/locale/gnu/c_locale.h         |    2 +-
+ libstdc++-v3/include/bits/basic_string.h          |    2 +-
+ libstdc++-v3/include/bits/locale_facets.tcc       |    2 +-
+ libstdc++-v3/include/bits/locale_facets_nonio.tcc |    2 +-
+ libstdc++-v3/include/c_compatibility/math.h       |    2 +-
+ libstdc++-v3/include/c_compatibility/wchar.h      |    2 +-
+ libstdc++-v3/include/c_global/cstdio              |    2 +-
+ libstdc++-v3/include/c_global/cstdlib             |    2 +-
+ libstdc++-v3/include/c_global/cwchar              |    4 ++--
+ libstdc++-v3/include/c_std/cstdio                 |    2 +-
+ libstdc++-v3/include/c_std/cstdlib                |    2 +-
+ libstdc++-v3/include/c_std/cwchar                 |    2 +-
+ libstdc++-v3/include/ext/vstring.h                |    2 +-
+ libstdc++-v3/include/tr1/cstdio                   |    2 +-
+ libstdc++-v3/include/tr1/cstdlib                  |    2 +-
+ libstdc++-v3/include/tr1/cwchar                   |    2 +-
+ libstdc++-v3/include/tr1/stdlib.h                 |    2 +-
+ libstdc++-v3/src/c++11/debug.cc                   |    2 +-
+ 19 files changed, 20 insertions(+), 20 deletions(-)
+
 --- a/libstdc++-v3/config/locale/generic/c_locale.h
 +++ b/libstdc++-v3/config/locale/generic/c_locale.h
 @@ -70,7 +70,7 @@
@@ -28,8 +48,6 @@ Index: b/libstdc++-v3/config/locale/generic/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
 --- a/libstdc++-v3/config/locale/gnu/c_locale.h
 +++ b/libstdc++-v3/config/locale/gnu/c_locale.h
 @@ -88,7 +88,7 @@
@@ -41,8 +59,6 @@ Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
 --- a/libstdc++-v3/include/bits/basic_string.h
 +++ b/libstdc++-v3/include/bits/basic_string.h
 @@ -2809,7 +2809,7 @@
@@ -54,8 +70,6 @@ Index: b/libstdc++-v3/include/bits/basic_string.h
       && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
  
  #include <ext/string_conversions.h>
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets.tcc
 @@ -987,7 +987,7 @@
@@ -67,8 +81,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets.tcc
  	// First try a buffer perhaps big enough (most probably sufficient
  	// for non-ios_base::fixed outputs)
  	int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 @@ -572,7 +572,7 @@
@@ -80,8 +92,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
        // First try a buffer perhaps big enough.
        int __cs_size = 64;
        char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/math.h
 +++ b/libstdc++-v3/include/c_compatibility/math.h
 @@ -56,7 +56,7 @@
@@ -93,8 +103,6 @@ Index: b/libstdc++-v3/include/c_compatibility/math.h
  using std::fpclassify;
  using std::isfinite;
  using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/wchar.h
 +++ b/libstdc++-v3/include/c_compatibility/wchar.h
 @@ -103,7 +103,7 @@
@@ -106,8 +114,6 @@ Index: b/libstdc++-v3/include/c_compatibility/wchar.h
  using std::wcstold;
  using std::wcstoll;
  using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdlib
 +++ b/libstdc++-v3/include/c_global/cstdlib
 @@ -182,7 +182,7 @@
@@ -119,8 +125,6 @@ Index: b/libstdc++-v3/include/c_global/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_global/cwchar
 +++ b/libstdc++-v3/include/c_global/cwchar
 @@ -232,7 +232,7 @@
@@ -141,8 +145,6 @@ Index: b/libstdc++-v3/include/c_global/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdio
 +++ b/libstdc++-v3/include/c_std/cstdio
 @@ -139,7 +139,7 @@
@@ -154,8 +156,6 @@ Index: b/libstdc++-v3/include/c_std/cstdio
  
  #undef snprintf
  #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdlib
 +++ b/libstdc++-v3/include/c_std/cstdlib
 @@ -180,7 +180,7 @@
@@ -167,8 +167,6 @@ Index: b/libstdc++-v3/include/c_std/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_std/cwchar
 +++ b/libstdc++-v3/include/c_std/cwchar
 @@ -228,7 +228,7 @@
@@ -180,8 +178,6 @@ Index: b/libstdc++-v3/include/c_std/cwchar
  
  #undef wcstold
  #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
 --- a/libstdc++-v3/include/ext/vstring.h
 +++ b/libstdc++-v3/include/ext/vstring.h
 @@ -2571,7 +2571,7 @@
@@ -193,8 +189,6 @@ Index: b/libstdc++-v3/include/ext/vstring.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdio
 +++ b/libstdc++-v3/include/tr1/cstdio
 @@ -33,7 +33,7 @@
@@ -206,8 +200,6 @@ Index: b/libstdc++-v3/include/tr1/cstdio
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdlib
 +++ b/libstdc++-v3/include/tr1/cstdlib
 @@ -35,7 +35,7 @@
@@ -219,8 +211,6 @@ Index: b/libstdc++-v3/include/tr1/cstdlib
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
 --- a/libstdc++-v3/include/tr1/cwchar
 +++ b/libstdc++-v3/include/tr1/cwchar
 @@ -52,7 +52,7 @@
@@ -232,8 +222,6 @@ Index: b/libstdc++-v3/include/tr1/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
 --- a/libstdc++-v3/include/tr1/stdlib.h
 +++ b/libstdc++-v3/include/tr1/stdlib.h
 @@ -33,7 +33,7 @@
@@ -245,8 +233,6 @@ Index: b/libstdc++-v3/include/tr1/stdlib.h
  
  using std::tr1::atoll;
  using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
 --- a/libstdc++-v3/src/c++11/debug.cc
 +++ b/libstdc++-v3/src/c++11/debug.cc
 @@ -787,7 +787,7 @@
@@ -258,8 +244,6 @@ Index: b/libstdc++-v3/src/c++11/debug.cc
        std::snprintf(__buf, __n, __fmt, __s);
  #else
        std::sprintf(__buf, __fmt, __s);
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdio
 +++ b/libstdc++-v3/include/c_global/cstdio
 @@ -139,7 +139,7 @@
diff --git a/packages/gcc-linaro/4.8-2015.06/851-PR-other-56780.patch b/packages/gcc/4.8.5/0018-PR-other-56780.patch
similarity index 89%
rename from packages/gcc-linaro/4.8-2015.06/851-PR-other-56780.patch
rename to packages/gcc/4.8.5/0018-PR-other-56780.patch
index feb43392..e393ec36 100644
--- a/packages/gcc-linaro/4.8-2015.06/851-PR-other-56780.patch
+++ b/packages/gcc/4.8.5/0018-PR-other-56780.patch
@@ -28,16 +28,14 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-8
   Remove the ChangeLog]
 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
 ---
- libiberty/Makefile.in  | 24 ++++++++++-----------
- libiberty/configure    | 57 +++++++++++++++++++++++++++-----------------------
- libiberty/configure.ac | 47 ++++++++++++++++++++++-------------------
+ libiberty/Makefile.in  |   24 ++++++++++----------
+ libiberty/configure    |   57 ++++++++++++++++++++++++++-----------------------
+ libiberty/configure.ac |   47 +++++++++++++++++++++-------------------
  3 files changed, 68 insertions(+), 60 deletions(-)
 
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index f6a3ebd..75ff82d 100644
 --- a/libiberty/Makefile.in
 +++ b/libiberty/Makefile.in
-@@ -355,19 +355,19 @@ install-strip: install
+@@ -355,19 +355,19 @@
  # since it will be passed the multilib flags.
  MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
  install_to_libdir: all
@@ -69,11 +67,9 @@ index f6a3ebd..75ff82d 100644
  	fi
  	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
  
-diff --git a/libiberty/configure b/libiberty/configure
-index 5367027..4feb95a 100755
 --- a/libiberty/configure
 +++ b/libiberty/configure
-@@ -675,8 +675,8 @@ with_cross_host
+@@ -675,8 +675,8 @@
  with_newlib
  enable_maintainer_mode
  enable_multilib
@@ -83,7 +79,7 @@ index 5367027..4feb95a 100755
  '
        ac_precious_vars='build_alias
  host_alias
-@@ -1303,8 +1303,8 @@ Optional Features:
+@@ -1303,8 +1303,8 @@
                            enable make rules and dependencies not useful
                            (and sometimes confusing) to the casual installer
    --enable-multilib       build many library versions (default)
@@ -93,7 +89,7 @@ index 5367027..4feb95a 100755
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \
+@@ -2784,6 +2784,35 @@
     cross_compiling=maybe
  fi
  
@@ -129,7 +125,7 @@ index 5367027..4feb95a 100755
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -5476,7 +5505,6 @@ fi
+@@ -5476,7 +5505,6 @@
  
  setobjs=
  CHECK=
@@ -137,7 +133,7 @@ index 5367027..4feb95a 100755
  if test -n "${with_target_subdir}"; then
  
    # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -5759,29 +5787,6 @@ _ACEOF
+@@ -5759,29 +5787,6 @@
  
    esac
  
@@ -167,11 +163,9 @@ index 5367027..4feb95a 100755
  else
  
     # Not a target library, so we set things up to run the test suite.
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index c763894..f17e6b6 100644
 --- a/libiberty/configure.ac
 +++ b/libiberty/configure.ac
-@@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \
+@@ -128,6 +128,31 @@
     cross_compiling=maybe
  fi
  
@@ -203,7 +197,7 @@ index c763894..f17e6b6 100644
  GCC_NO_EXECUTABLES
  AC_PROG_CC
  AC_SYS_LARGEFILE
-@@ -380,7 +405,6 @@ fi
+@@ -380,7 +405,6 @@
  
  setobjs=
  CHECK=
@@ -211,7 +205,7 @@ index c763894..f17e6b6 100644
  if test -n "${with_target_subdir}"; then
  
    # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -492,27 +516,6 @@ if test -n "${with_target_subdir}"; then
+@@ -492,27 +516,6 @@
  
    esac
  
@@ -239,6 +233,3 @@ index c763894..f17e6b6 100644
  else
  
     # Not a target library, so we set things up to run the test suite.
--- 
-1.9.3
-
diff --git a/packages/gcc/4.8.5/0019-xtensa-add-mauto-litpools-option.patch b/packages/gcc/4.8.5/0019-xtensa-add-mauto-litpools-option.patch
new file mode 100644
index 00000000..6a22717c
--- /dev/null
+++ b/packages/gcc/4.8.5/0019-xtensa-add-mauto-litpools-option.patch
@@ -0,0 +1,273 @@
+From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Thu, 6 Aug 2015 01:16:02 +0300
+Subject: [PATCH] xtensa: add -mauto-litpools option
+
+With support from assembler this option allows compiling huge functions,
+where single literal pool at the beginning of a function may not be
+reachable by L32R instructions at its end.
+
+Currently assembler --auto-litpools option cannot deal with literals
+used from multiple locations separated by more than 256 KBytes of code.
+Don't turn constants into literals, instead use MOVI instruction to load
+them into registers and let the assembler turn them into literals as
+necessary.
+
+2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
+gcc/
+	* config/xtensa/constraints.md (define_constraint "Y"): New
+	constraint.
+	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
+	* config/xtensa/linux.h (ASM_SPEC): Likewise.
+	* config/xtensa/predicates.md (move_operand): Match constants
+	and symbols in the presence of TARGET_AUTO_LITPOOLS.
+	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
+	immediate references to TLS data.
+	(xtensa_emit_move_sequence): Don't force constants to memory in
+	the presence of TARGET_AUTO_LITPOOLS.
+	(print_operand): Add 'y' format, same as default, but capable of
+	printing SF mode constants as well.
+	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
+	(movsf_internal): Add movi pattern that loads literal.
+	(movsf, movdf): Don't force constants to memory in the presence
+	of TARGET_AUTO_LITPOOLS.
+	(movdf_internal): Add 'Y' constraint.
+	* config/xtensa/xtensa.opt (mauto-litpools): New option.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+---
+Backported from: r226828
+Changes to ChangeLogs and documentation are dropped.
+
+ gcc/config/xtensa/constraints.md |    5 +++++
+ gcc/config/xtensa/elf.h          |    4 +++-
+ gcc/config/xtensa/linux.h        |    4 +++-
+ gcc/config/xtensa/predicates.md  |    3 ++-
+ gcc/config/xtensa/xtensa.c       |   19 ++++++++++++++++++-
+ gcc/config/xtensa/xtensa.md      |   35 +++++++++++++++++++----------------
+ gcc/config/xtensa/xtensa.opt     |    4 ++++
+ 7 files changed, 54 insertions(+), 20 deletions(-)
+
+--- a/gcc/config/xtensa/constraints.md
++++ b/gcc/config/xtensa/constraints.md
+@@ -111,6 +111,11 @@
+  (and (match_code "const_int")
+       (match_test "xtensa_mask_immediate (ival)")))
+ 
++(define_constraint "Y"
++ "A constant that can be used in relaxed MOVI instructions."
++ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
++      (match_test "TARGET_AUTO_LITPOOLS")))
++
+ ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
+ ;; causes reload to force some constants into the constant pool, but since
+ ;; the Xtensa constant pool can only be accessed with L32R instructions, it
+--- a/gcc/config/xtensa/elf.h
++++ b/gcc/config/xtensa/elf.h
+@@ -48,7 +48,9 @@
+   %{mtarget-align:--target-align} \
+   %{mno-target-align:--no-target-align} \
+   %{mlongcalls:--longcalls} \
+-  %{mno-longcalls:--no-longcalls}"
++  %{mno-longcalls:--no-longcalls} \
++  %{mauto-litpools:--auto-litpools} \
++  %{mno-auto-litpools:--no-auto-litpools}"
+ 
+ #undef LIB_SPEC
+ #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
+--- a/gcc/config/xtensa/linux.h
++++ b/gcc/config/xtensa/linux.h
+@@ -42,7 +42,9 @@
+   %{mtarget-align:--target-align} \
+   %{mno-target-align:--no-target-align} \
+   %{mlongcalls:--longcalls} \
+-  %{mno-longcalls:--no-longcalls}"
++  %{mno-longcalls:--no-longcalls} \
++  %{mauto-litpools:--auto-litpools} \
++  %{mno-auto-litpools:--no-auto-litpools}"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ 
+--- a/gcc/config/xtensa/predicates.md
++++ b/gcc/config/xtensa/predicates.md
+@@ -142,7 +142,8 @@
+ 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
+ 			    && xtensa_simm12b (INTVAL (op))"))
+ 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
+-	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
++	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
++			    && CONSTANT_P (op)
+ 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
+ 
+ ;; Accept the floating point constant 1 in the appropriate mode.
+--- a/gcc/config/xtensa/xtensa.c
++++ b/gcc/config/xtensa/xtensa.c
+@@ -464,6 +464,9 @@
+     {
+       int dst_regnum = xt_true_regnum (operands[0]);
+ 
++      if (xtensa_tls_referenced_p (operands[1]))
++	return FALSE;
++
+       /* The stack pointer can only be assigned with a MOVSP opcode.  */
+       if (dst_regnum == STACK_POINTER_REGNUM)
+ 	return (mode == SImode
+@@ -1031,7 +1034,7 @@
+ 	  return 1;
+ 	}
+ 
+-      if (! TARGET_CONST16)
++      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
+ 	{
+ 	  src = force_const_mem (SImode, src);
+ 	  operands[1] = src;
+@@ -2415,6 +2418,20 @@
+ 	}
+       break;
+ 
++    case 'y':
++      if (GET_CODE (x) == CONST_DOUBLE &&
++	  GET_MODE (x) == SFmode)
++	{
++	  REAL_VALUE_TYPE r;
++	  long l;
++	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
++	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
++	  fprintf (file, "0x%08lx", l);
++	  break;
++	}
++
++      /* fall through */
++
+     default:
+       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
+ 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
+--- a/gcc/config/xtensa/xtensa.md
++++ b/gcc/config/xtensa/xtensa.md
+@@ -799,8 +799,8 @@
+ })
+ 
+ (define_insn "movsi_internal"
+-  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
+-	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
++  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
++	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
+   "xtensa_valid_move (SImode, operands)"
+   "@
+    movi.n\t%0, %x1
+@@ -812,15 +812,16 @@
+    mov\t%0, %1
+    movsp\t%0, %1
+    movi\t%0, %x1
++   movi\t%0, %1
+    const16\t%0, %t1\;const16\t%0, %b1
+    %v1l32r\t%0, %1
+    %v1l32i\t%0, %1
+    %v0s32i\t%1, %0
+    rsr\t%0, ACCLO
+    wsr\t%1, ACCLO"
+-  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
++  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
+    (set_attr "mode"	"SI")
+-   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
++   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
+ 
+ ;; 16-bit Integer moves
+ 
+@@ -834,21 +835,22 @@
+ })
+ 
+ (define_insn "movhi_internal"
+-  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
+-	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
++  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
++	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
+   "xtensa_valid_move (HImode, operands)"
+   "@
+    movi.n\t%0, %x1
+    mov.n\t%0, %1
+    mov\t%0, %1
+    movi\t%0, %x1
++   movi\t%0, %1
+    %v1l16ui\t%0, %1
+    %v0s16i\t%1, %0
+    rsr\t%0, ACCLO
+    wsr\t%1, ACCLO"
+-  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
++  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
+    (set_attr "mode"	"HI")
+-   (set_attr "length"	"2,2,3,3,3,3,3,3")])
++   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
+ 
+ ;; 8-bit Integer moves
+ 
+@@ -919,7 +921,7 @@
+ 	(match_operand:SF 1 "general_operand" ""))]
+   ""
+ {
+-  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
++  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
+     operands[1] = force_const_mem (SFmode, operands[1]);
+ 
+   if ((!register_operand (operands[0], SFmode)
+@@ -934,8 +936,8 @@
+ })
+ 
+ (define_insn "movsf_internal"
+-  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
+-	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
++  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
++	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
+   "((register_operand (operands[0], SFmode)
+      || register_operand (operands[1], SFmode))
+     && !(FP_REG_P (xt_true_regnum (operands[0]))
+@@ -950,13 +952,14 @@
+    mov\t%0, %1
+    wfr\t%0, %1
+    rfr\t%0, %1
++   movi\t%0, %y1
+    const16\t%0, %t1\;const16\t%0, %b1
+    %v1l32r\t%0, %1
+    %v1l32i\t%0, %1
+    %v0s32i\t%1, %0"
+-  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
++  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
+    (set_attr "mode"	"SF")
+-   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
++   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
+ 
+ (define_insn "*lsiu"
+   [(set (match_operand:SF 0 "register_operand" "=f")
+@@ -997,7 +1000,7 @@
+ 	(match_operand:DF 1 "general_operand" ""))]
+   ""
+ {
+-  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
++  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
+     operands[1] = force_const_mem (DFmode, operands[1]);
+ 
+   if (!register_operand (operands[0], DFmode)
+@@ -1008,8 +1011,8 @@
+ })
+ 
+ (define_insn_and_split "movdf_internal"
+-  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
+-	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
++  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
++	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
+   "register_operand (operands[0], DFmode)
+    || register_operand (operands[1], DFmode)"
+   "#"
+--- a/gcc/config/xtensa/xtensa.opt
++++ b/gcc/config/xtensa/xtensa.opt
+@@ -38,6 +38,10 @@
+ Target
+ Intersperse literal pools with code in the text section
+ 
++mauto-litpools
++Target Report Mask(AUTO_LITPOOLS)
++Relax literals in assembler and place them automatically in the text section
++
+ mserialize-volatile
+ Target Report Mask(SERIALIZE_VOLATILE)
+ -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
diff --git a/packages/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch b/packages/gcc/4.8.5/0020-xtensa-reimplement-register-spilling.patch
similarity index 84%
rename from packages/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch
rename to packages/gcc/4.8.5/0020-xtensa-reimplement-register-spilling.patch
index abc7a08e..776914d1 100644
--- a/packages/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch
+++ b/packages/gcc/4.8.5/0020-xtensa-reimplement-register-spilling.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226962
 
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
+ libgcc/config/xtensa/lib2funcs.S |   30 +++++++++++++++++++++++-------
  1 file changed, 23 insertions(+), 7 deletions(-)
 
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
 --- a/libgcc/config/xtensa/lib2funcs.S
 +++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,10 +33,29 @@
  	.global	__xtensa_libgcc_window_spill
  	.type	__xtensa_libgcc_window_spill,@function
  __xtensa_libgcc_window_spill:
@@ -59,7 +57,7 @@ index 3ac8c1d..2e678af 100644
  	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
  
  
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
+@@ -58,10 +77,7 @@
  	entry	sp, 32
  
  	/* Flush registers.  */
@@ -71,6 +69,3 @@ index 3ac8c1d..2e678af 100644
  
  	/* Because the save area for a0-a3 is stored one frame below
  	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/packages/gcc/4.8.5/0021-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
similarity index 79%
rename from packages/gcc-linaro/4.8-2015.06/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
rename to packages/gcc/4.8.5/0021-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
index f23a5c07..ef753c1a 100644
--- a/packages/gcc-linaro/4.8-2015.06/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ b/packages/gcc/4.8.5/0021-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
@@ -15,19 +15,14 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226963
 
- libgcc/config/xtensa/t-xtensa | 2 +-
+ libgcc/config/xtensa/t-xtensa |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
 --- a/libgcc/config/xtensa/t-xtensa
 +++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
+@@ -13,4 +13,4 @@
  LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
  
  LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
 -   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
 +   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/873-xtensa-fix-_Unwind_GetCFA.patch b/packages/gcc/4.8.5/0022-xtensa-fix-_Unwind_GetCFA.patch
similarity index 81%
rename from packages/gcc-linaro/4.8-2015.06/873-xtensa-fix-_Unwind_GetCFA.patch
rename to packages/gcc/4.8.5/0022-xtensa-fix-_Unwind_GetCFA.patch
index dc405132..0fbaeec3 100644
--- a/packages/gcc-linaro/4.8-2015.06/873-xtensa-fix-_Unwind_GetCFA.patch
+++ b/packages/gcc/4.8.5/0022-xtensa-fix-_Unwind_GetCFA.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226964
 
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
+ libgcc/config/xtensa/unwind-dw2-xtensa.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
 --- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
 +++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
+@@ -130,7 +130,7 @@
  _Unwind_Word
  _Unwind_GetCFA (struct _Unwind_Context *context)
  {
@@ -35,6 +33,3 @@ index 35f7797..ef6b900 100644
  }
  
  /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/packages/gcc/4.8.5/874-gcc-xtensa-fix-fprintf-format-specifiers.patch b/packages/gcc/4.8.5/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
similarity index 83%
rename from packages/gcc/4.8.5/874-gcc-xtensa-fix-fprintf-format-specifiers.patch
rename to packages/gcc/4.8.5/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
index 6013fef7..52d0ee56 100644
--- a/packages/gcc/4.8.5/874-gcc-xtensa-fix-fprintf-format-specifiers.patch
+++ b/packages/gcc/4.8.5/0023-gcc-xtensa-fix-fprintf-format-specifiers.patch
@@ -17,14 +17,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 10 +++++-----
+ gcc/config/xtensa/xtensa.c |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index dbc5bd3..466adb5 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1772,7 +1772,7 @@ xtensa_emit_call (int callop, rtx *operands)
+@@ -1773,7 +1773,7 @@
    rtx tgt = operands[callop];
  
    if (GET_CODE (tgt) == CONST_INT)
@@ -33,7 +31,7 @@ index dbc5bd3..466adb5 100644
    else if (register_operand (tgt, VOIDmode))
      sprintf (result, "callx8\t%%%d", callop);
    else
-@@ -2347,14 +2347,14 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2348,14 +2348,14 @@
  
      case 'L':
        if (GET_CODE (x) == CONST_INT)
@@ -50,7 +48,7 @@ index dbc5bd3..466adb5 100644
        else
  	output_operand_lossage ("invalid %%R value");
        break;
-@@ -2368,7 +2368,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2369,7 +2369,7 @@
  
      case 'd':
        if (GET_CODE (x) == CONST_INT)
@@ -59,7 +57,7 @@ index dbc5bd3..466adb5 100644
        else
  	output_operand_lossage ("invalid %%d value");
        break;
-@@ -2437,7 +2437,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2438,7 +2438,7 @@
        else if (GET_CODE (x) == MEM)
  	output_address (XEXP (x, 0));
        else if (GET_CODE (x) == CONST_INT)
@@ -68,6 +66,3 @@ index dbc5bd3..466adb5 100644
        else
  	output_addr_const (file, x);
      }
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/875-xtensa-fix-PR-target-82181.patch b/packages/gcc/4.8.5/0024-xtensa-fix-PR-target-82181.patch
similarity index 76%
rename from packages/gcc-linaro/4.8-2015.06/875-xtensa-fix-PR-target-82181.patch
rename to packages/gcc/4.8.5/0024-xtensa-fix-PR-target-82181.patch
index 0a011a6b..7476071a 100644
--- a/packages/gcc-linaro/4.8-2015.06/875-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc/4.8.5/0024-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 466adb5103ca..3ba2965ecf5e 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -599,6 +599,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode)
+@@ -599,6 +599,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 466adb5103ca..3ba2965ecf5e 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.8-2015.06/900-musl-support.patch b/packages/gcc/4.8.5/0025-musl-support.patch
similarity index 88%
rename from packages/gcc-linaro/4.8-2015.06/900-musl-support.patch
rename to packages/gcc/4.8.5/0025-musl-support.patch
index 6743a88b..22b292c4 100644
--- a/packages/gcc-linaro/4.8-2015.06/900-musl-support.patch
+++ b/packages/gcc/4.8.5/0025-musl-support.patch
@@ -22,8 +22,32 @@ https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version:
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 [Gustavo: Update for gcc 4.8.3]
 
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
+---
+ fixincludes/mkfixinc.sh            |    3 -
+ gcc/config.gcc                     |    9 ++-
+ gcc/config/aarch64/aarch64-linux.h |    5 +
+ gcc/config/arm/linux-eabi.h        |   17 +++++
+ gcc/config/i386/linux.h            |    2 
+ gcc/config/i386/linux64.h          |    7 ++
+ gcc/config/linux.h                 |  111 ++++++++++++++++++++++++++++++++-----
+ gcc/config/linux.opt               |    4 +
+ gcc/config/microblaze/linux.h      |   18 +++++-
+ gcc/config/mips/linux.h            |    8 ++
+ gcc/config/mips/linux64.h          |    2 
+ gcc/config/rs6000/linux64.h        |   14 +++-
+ gcc/config/rs6000/secureplt.h      |    1 
+ gcc/config/rs6000/sysv4.h          |   16 ++++-
+ gcc/config/sh/linux.h              |    8 ++
+ gcc/configure                      |    3 +
+ gcc/configure.ac                   |    3 +
+ gcc/ginclude/stddef.h              |    3 +
+ libgcc/unwind-dw2-fde-dip.c        |    7 ++
+ libgomp/config/posix/time.c        |    2 
+ libitm/config/arm/hwcap.cc         |    4 +
+ libitm/config/linux/x86/tls.h      |    8 ++
+ libstdc++-v3/configure.host        |   10 +++
+ 23 files changed, 238 insertions(+), 27 deletions(-)
+
 --- a/fixincludes/mkfixinc.sh
 +++ b/fixincludes/mkfixinc.sh
 @@ -19,7 +19,8 @@
@@ -36,8 +60,6 @@ Index: b/fixincludes/mkfixinc.sh
  	#  IF there is no include fixing,
  	#  THEN create a no-op fixer and exit
  	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,12 @@
@@ -53,8 +75,6 @@ Index: b/gcc/config/aarch64/aarch64-linux.h
  
  #define CPP_SPEC "%{pthread:-D_REENTRANT}"
  
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -77,6 +77,23 @@
@@ -81,8 +101,6 @@ Index: b/gcc/config/arm/linux-eabi.h
  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
     use the GNU/Linux version, not the generic BPABI version.  */
  #undef  LINK_SPEC
-Index: b/gcc/config/i386/linux64.h
-===================================================================
 --- a/gcc/config/i386/linux64.h
 +++ b/gcc/config/i386/linux64.h
 @@ -30,3 +30,10 @@
@@ -96,8 +114,6 @@ Index: b/gcc/config/i386/linux64.h
 +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
 +#undef MUSL_DYNAMIC_LINKERX32
 +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-Index: b/gcc/config/i386/linux.h
-===================================================================
 --- a/gcc/config/i386/linux.h
 +++ b/gcc/config/i386/linux.h
 @@ -21,3 +21,5 @@
@@ -106,8 +122,6 @@ Index: b/gcc/config/i386/linux.h
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
 +#undef MUSL_DYNAMIC_LINKER
 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/linux.h
-===================================================================
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
 @@ -32,10 +32,12 @@
@@ -266,8 +280,6 @@ Index: b/gcc/config/linux.h
 +    { 0, 0, 0, 0, 0, 0 }				\
 +  }
 +#endif
-Index: b/gcc/config/linux.opt
-===================================================================
 --- a/gcc/config/linux.opt
 +++ b/gcc/config/linux.opt
 @@ -30,3 +30,7 @@
@@ -278,11 +290,9 @@ Index: b/gcc/config/linux.opt
 +mmusl
 +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
 +Use musl C library
-Index: b/gcc/config/microblaze/linux.h
-===================================================================
 --- a/gcc/config/microblaze/linux.h
 +++ b/gcc/config/microblaze/linux.h
-@@ -25,7 +25,23 @@
+@@ -28,7 +28,23 @@
  #undef TLS_NEEDS_GOT
  #define TLS_NEEDS_GOT 1
  
@@ -307,8 +317,6 @@ Index: b/gcc/config/microblaze/linux.h
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
    { "dynamic_linker", DYNAMIC_LINKER }
-Index: b/gcc/config/mips/linux64.h
-===================================================================
 --- a/gcc/config/mips/linux64.h
 +++ b/gcc/config/mips/linux64.h
 @@ -29,4 +29,4 @@
@@ -317,8 +325,6 @@ Index: b/gcc/config/mips/linux64.h
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
 -			 BIONIC_DYNAMIC_LINKERN32)
 +			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER)
-Index: b/gcc/config/mips/linux.h
-===================================================================
 --- a/gcc/config/mips/linux.h
 +++ b/gcc/config/mips/linux.h
 @@ -18,3 +18,11 @@
@@ -333,11 +339,9 @@ Index: b/gcc/config/mips/linux.h
 +#endif
 +#undef MUSL_DYNAMIC_LINKER
 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
-@@ -374,17 +374,23 @@
+@@ -370,17 +370,23 @@
  #endif
  #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
  #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
@@ -365,8 +369,6 @@ Index: b/gcc/config/rs6000/linux64.h
  
  #undef  DEFAULT_ASM_ENDIAN
  #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-Index: b/gcc/config/rs6000/secureplt.h
-===================================================================
 --- a/gcc/config/rs6000/secureplt.h
 +++ b/gcc/config/rs6000/secureplt.h
 @@ -18,3 +18,4 @@
@@ -374,8 +376,6 @@ Index: b/gcc/config/rs6000/secureplt.h
  
  #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
 +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
 @@ -537,6 +537,9 @@
@@ -428,8 +428,6 @@ Index: b/gcc/config/rs6000/sysv4.h
    { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
    { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
    { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-Index: b/gcc/config/sh/linux.h
-===================================================================
 --- a/gcc/config/sh/linux.h
 +++ b/gcc/config/sh/linux.h
 @@ -43,7 +43,15 @@
@@ -448,8 +446,6 @@ Index: b/gcc/config/sh/linux.h
  
  #undef SUBTARGET_LINK_EMUL_SUFFIX
  #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-Index: b/gcc/config.gcc
-===================================================================
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
 @@ -550,7 +550,7 @@
@@ -471,7 +467,7 @@ Index: b/gcc/config.gcc
      *)
        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
        ;;
-@@ -2135,6 +2138,10 @@
+@@ -2145,6 +2148,10 @@
  	    powerpc*-*-linux*paired*)
  		tm_file="${tm_file} rs6000/750cl.h" ;;
  	esac
@@ -482,11 +478,9 @@ Index: b/gcc/config.gcc
  	if test x${enable_secureplt} = xyes; then
  		tm_file="rs6000/secureplt.h ${tm_file}"
  	fi
-Index: b/gcc/configure
-===================================================================
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -26936,6 +26940,9 @@
+@@ -26967,6 +26967,9 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -496,11 +490,9 @@ Index: b/gcc/configure
  esac
  
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4848,6 +4852,9 @@
+@@ -4874,6 +4874,9 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -510,8 +502,6 @@ Index: b/gcc/configure.ac
  esac
  GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/ginclude/stddef.h
-===================================================================
 --- a/gcc/ginclude/stddef.h
 +++ b/gcc/ginclude/stddef.h
 @@ -181,6 +181,7 @@
@@ -538,8 +528,6 @@ Index: b/gcc/ginclude/stddef.h
  #endif /* __size_t */
  #endif /* _SIZET_ */
  #endif /* _GCC_SIZE_T */
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
 @@ -75,6 +75,13 @@
@@ -556,8 +544,6 @@ Index: b/libgcc/unwind-dw2-fde-dip.c
  #if defined(USE_PT_GNU_EH_FRAME)
  
  #include <link.h>
-Index: b/libgomp/config/posix/time.c
-===================================================================
 --- a/libgomp/config/posix/time.c
 +++ b/libgomp/config/posix/time.c
 @@ -28,6 +28,8 @@
@@ -569,8 +555,6 @@ Index: b/libgomp/config/posix/time.c
  #include "libgomp.h"
  #include <unistd.h>
  #if TIME_WITH_SYS_TIME
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
 --- a/libitm/config/arm/hwcap.cc
 +++ b/libitm/config/arm/hwcap.cc
 @@ -40,7 +40,11 @@
@@ -585,8 +569,6 @@ Index: b/libitm/config/arm/hwcap.cc
  #include <elf.h>
  
  static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
 --- a/libitm/config/linux/x86/tls.h
 +++ b/libitm/config/linux/x86/tls.h
 @@ -25,16 +25,19 @@
@@ -618,11 +600,9 @@ Index: b/libitm/config/linux/x86/tls.h
 +#endif
  
  #endif // LIBITM_X86_TLS_H
-Index: b/libstdc++-v3/configure.host
-===================================================================
 --- a/libstdc++-v3/configure.host
 +++ b/libstdc++-v3/configure.host
-@@ -264,6 +264,13 @@
+@@ -263,6 +263,13 @@
      os_include_dir="os/bsd/freebsd"
      ;;
    gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
@@ -636,7 +616,7 @@ Index: b/libstdc++-v3/configure.host
      if [ "$uclibc" = "yes" ]; then
        os_include_dir="os/uclibc"
      elif [ "$bionic" = "yes" ]; then
-@@ -272,6 +279,9 @@
+@@ -271,6 +278,9 @@
        os_include_dir="os/gnu-linux"
      fi
      ;;
diff --git a/packages/gcc-linaro/4.8-2015.06/950-cygwin64.patch b/packages/gcc/4.8.5/0026-cygwin64.patch
similarity index 64%
rename from packages/gcc-linaro/4.8-2015.06/950-cygwin64.patch
rename to packages/gcc/4.8.5/0026-cygwin64.patch
index 67182eec..d39236a5 100644
--- a/packages/gcc-linaro/4.8-2015.06/950-cygwin64.patch
+++ b/packages/gcc/4.8.5/0026-cygwin64.patch
@@ -1,5 +1,9 @@
---- gcc-4.8.5/gcc/config.host.orig	2017-02-10 20:45:10.425515700 -0800
-+++ gcc-4.8.5/gcc/config.host	2017-02-10 20:47:33.935525500 -0800
+---
+ gcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config.host
++++ b/gcc/config.host
 @@ -214,7 +214,7 @@
          ;;
      esac
diff --git a/packages/gcc/4.8.5/100-uclibc-conf.patch b/packages/gcc/4.8.5/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a1..00000000
--- a/packages/gcc/4.8.5/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/packages/gcc/4.8.5/301-missing-execinfo_h.patch b/packages/gcc/4.8.5/301-missing-execinfo_h.patch
deleted file mode 100644
index 00efda24..00000000
--- a/packages/gcc/4.8.5/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/packages/gcc/4.8.5/810-arm-softfloat-libgcc.patch b/packages/gcc/4.8.5/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index c8cb377d..00000000
--- a/packages/gcc/4.8.5/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: gcc-4.8.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.0/gcc/config/arm/linux-elf.h	2013-03-23 17:40:00.000000000 +0100
-@@ -55,7 +55,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: gcc-4.8.0/libgcc/config/arm/t-linux
-===================================================================
---- gcc-4.8.0.orig/libgcc/config/arm/t-linux	2012-03-22 16:14:46.000000000 +0100
-+++ gcc-4.8.0/libgcc/config/arm/t-linux	2013-03-23 17:40:54.000000000 +0100
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/packages/gcc-linaro/4.9-2017.01/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch b/packages/gcc/4.9.4/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
similarity index 65%
rename from packages/gcc-linaro/4.9-2017.01/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
rename to packages/gcc/4.9.4/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
index 1a6f7e5f..4629c90e 100644
--- a/packages/gcc-linaro/4.9-2017.01/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
+++ b/packages/gcc/4.9.4/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
@@ -32,23 +32,21 @@ build-many-glibcs.py.
 
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@249958 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
- libgcc/config/aarch64/linux-unwind.h | 2 +-
- libgcc/config/alpha/linux-unwind.h   | 2 +-
- libgcc/config/bfin/linux-unwind.h    | 2 +-
- libgcc/config/i386/linux-unwind.h    | 4 ++--
- libgcc/config/m68k/linux-unwind.h    | 2 +-
- libgcc/config/nios2/linux-unwind.h   | 2 +-
- libgcc/config/pa/linux-unwind.h      | 2 +-
- libgcc/config/sh/linux-unwind.h      | 2 +-
- libgcc/config/tilepro/linux-unwind.h | 2 +-
- libgcc/config/xtensa/linux-unwind.h  | 2 +-
+ libgcc/config/aarch64/linux-unwind.h |    2 +-
+ libgcc/config/alpha/linux-unwind.h   |    2 +-
+ libgcc/config/bfin/linux-unwind.h    |    2 +-
+ libgcc/config/i386/linux-unwind.h    |    4 ++--
+ libgcc/config/m68k/linux-unwind.h    |    2 +-
+ libgcc/config/nios2/linux-unwind.h   |    2 +-
+ libgcc/config/pa/linux-unwind.h      |    2 +-
+ libgcc/config/sh/linux-unwind.h      |    2 +-
+ libgcc/config/tilepro/linux-unwind.h |    2 +-
+ libgcc/config/xtensa/linux-unwind.h  |    2 +-
  10 files changed, 11 insertions(+), 11 deletions(-)
 
-diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
-index 86d17b1c798..909f68f7311 100644
 --- a/libgcc/config/aarch64/linux-unwind.h
 +++ b/libgcc/config/aarch64/linux-unwind.h
-@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
    struct rt_sigframe
    {
      siginfo_t info;
@@ -57,11 +55,9 @@ index 86d17b1c798..909f68f7311 100644
    };
  
    struct rt_sigframe *rt_;
-diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
-index d65474fec12..9a226b195b5 100644
 --- a/libgcc/config/alpha/linux-unwind.h
 +++ b/libgcc/config/alpha/linux-unwind.h
-@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+@@ -51,7 +51,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -70,11 +66,9 @@ index d65474fec12..9a226b195b5 100644
        } *rt_ = context->cfa;
        sc = &rt_->uc.uc_mcontext;
      }
-diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
-index 0c270e435c7..7fa95d2dc96 100644
 --- a/libgcc/config/bfin/linux-unwind.h
 +++ b/libgcc/config/bfin/linux-unwind.h
-@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
  	void *puc;
  	char retcode[8];
  	siginfo_t info;
@@ -83,11 +77,9 @@ index 0c270e435c7..7fa95d2dc96 100644
        } *rt_ = context->cfa;
  
        /* The void * cast is necessary to avoid an aliasing warning.
-diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
-index e54bf73b1fd..d35fc4566ce 100644
 --- a/libgcc/config/i386/linux-unwind.h
 +++ b/libgcc/config/i386/linux-unwind.h
-@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -58,7 +58,7 @@
    if (*(unsigned char *)(pc+0) == 0x48
        && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
      {
@@ -96,7 +88,7 @@ index e54bf73b1fd..d35fc4566ce 100644
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
           because it does not alias anything.  */
-@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+@@ -138,7 +138,7 @@
  	siginfo_t *pinfo;
  	void *puc;
  	siginfo_t info;
@@ -105,11 +97,9 @@ index e54bf73b1fd..d35fc4566ce 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
-index fb79a4d63cd..b2f5ea4cd7c 100644
 --- a/libgcc/config/m68k/linux-unwind.h
 +++ b/libgcc/config/m68k/linux-unwind.h
-@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,7 +33,7 @@
  /* <sys/ucontext.h> is unfortunately broken right now.  */
  struct uw_ucontext {
  	unsigned long	  uc_flags;
@@ -118,11 +108,9 @@ index fb79a4d63cd..b2f5ea4cd7c 100644
  	stack_t		  uc_stack;
  	mcontext_t	  uc_mcontext;
  	unsigned long	  uc_filler[80];
-diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
-index dff1c20076e..1d88afecb12 100644
 --- a/libgcc/config/nios2/linux-unwind.h
 +++ b/libgcc/config/nios2/linux-unwind.h
-@@ -38,7 +38,7 @@ struct nios2_mcontext {
+@@ -38,7 +38,7 @@
  
  struct nios2_ucontext {
    unsigned long uc_flags;
@@ -131,11 +119,9 @@ index dff1c20076e..1d88afecb12 100644
    stack_t uc_stack;
    struct nios2_mcontext uc_mcontext;
    sigset_t uc_sigmask;	/* mask last for extensibility */
-diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
-index 01494685ea4..91575356803 100644
 --- a/libgcc/config/pa/linux-unwind.h
 +++ b/libgcc/config/pa/linux-unwind.h
-@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+@@ -80,7 +80,7 @@
    struct sigcontext *sc;
    struct rt_sigframe {
      siginfo_t info;
@@ -144,11 +130,9 @@ index 01494685ea4..91575356803 100644
    } *frame;
  
    /* rt_sigreturn trampoline:
-diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
-index e63091f287c..67033f06b4b 100644
 --- a/libgcc/config/sh/linux-unwind.h
 +++ b/libgcc/config/sh/linux-unwind.h
-@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+@@ -180,7 +180,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -157,11 +141,9 @@ index e63091f287c..67033f06b4b 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
-index fd83ba7c275..e3c9ef0840d 100644
 --- a/libgcc/config/tilepro/linux-unwind.h
 +++ b/libgcc/config/tilepro/linux-unwind.h
-@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
+@@ -61,7 +61,7 @@
    struct rt_sigframe {
      unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
      siginfo_t info;
@@ -170,11 +152,9 @@ index fd83ba7c275..e3c9ef0840d 100644
    } *rt_;
  
    /* Return if this is not a signal handler.  */
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9daf738ff57..ff6b66373a9 100644
 --- a/libgcc/config/xtensa/linux-unwind.h
 +++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -64,7 +64,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -63,7 +63,7 @@
  
    struct rt_sigframe {
      siginfo_t info;
@@ -183,6 +163,3 @@ index 9daf738ff57..ff6b66373a9 100644
    } *rt_;
  
    /* movi a2, __NR_rt_sigreturn; syscall */
--- 
-2.14.1
-
diff --git a/packages/gcc-linaro/4.9-2017.01/001-gcc_bug_62231.patch b/packages/gcc/4.9.4/0001-gcc_bug_62231.patch
similarity index 85%
rename from packages/gcc-linaro/4.9-2017.01/001-gcc_bug_62231.patch
rename to packages/gcc/4.9.4/0001-gcc_bug_62231.patch
index e7c9cf97..3256f804 100644
--- a/packages/gcc-linaro/4.9-2017.01/001-gcc_bug_62231.patch
+++ b/packages/gcc/4.9.4/0001-gcc_bug_62231.patch
@@ -4,9 +4,14 @@ https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02625.html
 
 Linked from bug62231 comment 4 there
 
-diff -durN a/gcc/defaults.h b/gcc/defaults.h
---- a/gcc/defaults.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/defaults.h	2014-12-15 13:26:13.498904465 -0800
+---
+ gcc/defaults.h      |    5 +++
+ gcc/dwarf2cfi.c     |   76 +++++++++++++++++++++++++++++++++++-----------------
+ libgcc/unwind-dw2.c |    4 --
+ 3 files changed, 57 insertions(+), 28 deletions(-)
+
+--- a/gcc/defaults.h
++++ b/gcc/defaults.h
 @@ -438,6 +438,11 @@
  #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
  #endif
@@ -19,11 +24,10 @@ diff -durN a/gcc/defaults.h b/gcc/defaults.h
  /* Map register numbers held in the call frame info that gcc has
     collected using DWARF_FRAME_REGNUM to those that should be output in
     .debug_frame and .eh_frame.  */
-diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
---- a/gcc/dwarf2cfi.c	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/dwarf2cfi.c	2014-12-15 13:50:24.554883694 -0800
-@@ -225,7 +225,44 @@
-   emit_move_insn (adjust_address (mem, mode, offset), GEN_INT (size));
+--- a/gcc/dwarf2cfi.c
++++ b/gcc/dwarf2cfi.c
+@@ -252,7 +252,44 @@
+ 		  gen_int_mode (size, mode));
  }
  
 -/* Generate code to initialize the register size table.  */
@@ -68,13 +72,15 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
  
  void
  expand_builtin_init_dwarf_reg_sizes (tree address)
-@@ -238,30 +275,21 @@
+@@ -265,30 +302,21 @@
  
    for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
      {
 -      unsigned int dnum = DWARF_FRAME_REGNUM (i);
 -      unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
--
++      enum machine_mode save_mode = reg_raw_mode[i];
++      rtx span;
+ 
 -      if (rnum < DWARF_FRAME_REGISTERS)
 -	{
 -	  HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode);
@@ -92,9 +98,7 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
 -	  size = GET_MODE_SIZE (save_mode);
 -	  if (offset < 0)
 -	    continue;
-+      enum machine_mode save_mode = reg_raw_mode[i];
-+      rtx span;
- 
+-
 -	  emit_move_insn (adjust_address (mem, mode, offset),
 -			  gen_int_mode (size, mode));
 -	}
@@ -113,9 +117,8 @@ diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
      }
  
    if (!wrote_return_column)
-diff -durN a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
---- a/libgcc/unwind-dw2.c	2013-05-31 16:21:46.000000000 -0700
-+++ b/libgcc/unwind-dw2.c	2014-12-15 13:26:13.570904866 -0800
+--- a/libgcc/unwind-dw2.c
++++ b/libgcc/unwind-dw2.c
 @@ -55,10 +55,6 @@
  #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS
  #endif
diff --git a/packages/gcc/4.9.4/002-gcc_bug_62231.patch b/packages/gcc/4.9.4/0002-gcc_bug_62231.patch
similarity index 64%
rename from packages/gcc/4.9.4/002-gcc_bug_62231.patch
rename to packages/gcc/4.9.4/0002-gcc_bug_62231.patch
index b970ebc8..953af509 100644
--- a/packages/gcc/4.9.4/002-gcc_bug_62231.patch
+++ b/packages/gcc/4.9.4/0002-gcc_bug_62231.patch
@@ -4,10 +4,13 @@ https://gcc.gnu.org/ml/gcc-patches/2014-10/msg02605.html
 
 Linked from bug62231 comment 4 there
 
-diff -durN a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
---- a/gcc/config/rs6000/rs6000.c	2014-12-08 17:29:04.000000000 -0800
-+++ b/gcc/config/rs6000/rs6000.c	2014-12-15 14:44:46.568801843 -0800
-@@ -1673,7 +1673,7 @@
+---
+ gcc/config/rs6000/rs6000.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -1707,7 +1707,7 @@
       SCmode so as to pass the value correctly in a pair of
       registers.  */
    else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode
diff --git a/packages/gcc/4.9.4/1000-libtool-leave-framework-alone.patch b/packages/gcc/4.9.4/0003-libtool-leave-framework-alone.patch
similarity index 73%
rename from packages/gcc/4.9.4/1000-libtool-leave-framework-alone.patch
rename to packages/gcc/4.9.4/0003-libtool-leave-framework-alone.patch
index 525592e6..e67e0e88 100644
--- a/packages/gcc/4.9.4/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc/4.9.4/0003-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-4.9.4/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-4.9.4/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
 @@ -36,6 +36,11 @@
  for arg
  do
diff --git a/packages/gcc/4.9.4/0004-uclibc-conf.patch b/packages/gcc/4.9.4/0004-uclibc-conf.patch
new file mode 100644
index 00000000..aef750af
--- /dev/null
+++ b/packages/gcc/4.9.4/0004-uclibc-conf.patch
@@ -0,0 +1,17 @@
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
diff --git a/packages/gcc-linaro/4.9-2017.01/1100-msp430-string-literals.patch b/packages/gcc/4.9.4/0005-msp430-string-literals.patch
similarity index 85%
rename from packages/gcc-linaro/4.9-2017.01/1100-msp430-string-literals.patch
rename to packages/gcc/4.9.4/0005-msp430-string-literals.patch
index 346842e8..c65911f7 100644
--- a/packages/gcc-linaro/4.9-2017.01/1100-msp430-string-literals.patch
+++ b/packages/gcc/4.9.4/0005-msp430-string-literals.patch
@@ -12,11 +12,13 @@ Date:   Wed May 13 01:11:13 2015 +0000
     git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223106 138bc75d-0d04-0410-961f-82ee72b054a4
 
 [4.9 change: remove non-applicable parts of the patch]
-diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
-index bec168ca2ae..58d0efea1de 100644
+---
+ gcc/config/msp430/msp430.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/msp430/msp430.c
 +++ b/gcc/config/msp430/msp430.c
-@@ -2248,7 +2248,7 @@ static struct
+@@ -1629,7 +1629,7 @@
  }
    const_shift_helpers[] =
  {
diff --git a/packages/gcc/5.5.0/111-alpha-bad-eh_frame.patch b/packages/gcc/4.9.4/0006-alpha-bad-eh_frame.patch
similarity index 80%
rename from packages/gcc/5.5.0/111-alpha-bad-eh_frame.patch
rename to packages/gcc/4.9.4/0006-alpha-bad-eh_frame.patch
index 93f6e943..f341a063 100644
--- a/packages/gcc/5.5.0/111-alpha-bad-eh_frame.patch
+++ b/packages/gcc/4.9.4/0006-alpha-bad-eh_frame.patch
@@ -1,7 +1,9 @@
 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80037
 
-diff --git a/libgcc/config/alpha/t-alpha b/libgcc/config/alpha/t-alpha
-index 0b6ffb1..0c2f840 100644
+---
+ libgcc/config/alpha/t-alpha |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/config/alpha/t-alpha
 +++ b/libgcc/config/alpha/t-alpha
 @@ -1,2 +1,6 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/111-pr65730.patch b/packages/gcc/4.9.4/0007-pr65730.patch
similarity index 89%
rename from packages/gcc-linaro/4.9-2017.01/111-pr65730.patch
rename to packages/gcc/4.9.4/0007-pr65730.patch
index 8a41fd2a..6bcab27e 100644
--- a/packages/gcc-linaro/4.9-2017.01/111-pr65730.patch
+++ b/packages/gcc/4.9.4/0007-pr65730.patch
@@ -13,11 +13,9 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
 Changes to ChangeLog are dropped.
 
- gcc/config/xtensa/xtensa.c | 5 +++--
+ gcc/config/xtensa/xtensa.c |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
 @@ -1436,8 +1436,9 @@
diff --git a/packages/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/packages/gcc/4.9.4/0008-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
similarity index 84%
rename from packages/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
rename to packages/gcc/4.9.4/0008-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
index bb77c4b9..9eb11495 100644
--- a/packages/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ b/packages/gcc/4.9.4/0008-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
@@ -8,11 +8,9 @@ Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
 
 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 ---
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ gcc/config.gcc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: b/gcc/config.gcc
-===================================================================
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
 @@ -441,7 +441,7 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/130-pr43538.patch b/packages/gcc/4.9.4/0009-pr43538.patch
similarity index 85%
rename from packages/gcc-linaro/4.9-2017.01/130-pr43538.patch
rename to packages/gcc/4.9.4/0009-pr43538.patch
index 19e57bb0..c2a20462 100644
--- a/packages/gcc-linaro/4.9-2017.01/130-pr43538.patch
+++ b/packages/gcc/4.9.4/0009-pr43538.patch
@@ -10,16 +10,11 @@ Subject: [PATCH] 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- config/mt-gnu    | 2 +-
+ config/mt-gnu |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
 --- a/config/mt-gnu
 +++ b/config/mt-gnu
 @@ -1 +1 @@
 -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
 +CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
--- 
-2.1.4
-
diff --git a/packages/gcc/4.9.4/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch b/packages/gcc/4.9.4/0010-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
similarity index 87%
rename from packages/gcc/4.9.4/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
rename to packages/gcc/4.9.4/0010-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
index 1c49fb0a..d8666619 100644
--- a/packages/gcc/4.9.4/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
+++ b/packages/gcc/4.9.4/0010-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
@@ -10,11 +10,9 @@ Subject: [PATCH] 2014-11-17  Bob Dunlop  <bob.dunlop@xyzzy.org.uk>
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217739 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- config/mt-ospace | 4 ++--
+ config/mt-ospace |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/config/mt-ospace b/config/mt-ospace
-index 7f09104..ce29ff4 100644
 --- a/config/mt-ospace
 +++ b/config/mt-ospace
 @@ -1,3 +1,3 @@
@@ -23,6 +21,3 @@ index 7f09104..ce29ff4 100644
 - CXXFLAGS_FOR_TARGET = -g -Os
 + CFLAGS_FOR_TARGET += -g -Os
 + CXXFLAGS_FOR_TARGET += -g -Os
--- 
-2.1.4
-
diff --git a/packages/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch b/packages/gcc/4.9.4/0011-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
similarity index 82%
rename from packages/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
rename to packages/gcc/4.9.4/0011-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
index 55f32288..28ced14a 100644
--- a/packages/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
+++ b/packages/gcc/4.9.4/0011-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
@@ -9,14 +9,12 @@ but this one file must be built with 32-bit off_t. More details in the code.
 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@220328 91177308-0d34-0410-b5e6-96231b3b80d8
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 8 ++++++++
+ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index bbc1108..fc09522 100644
 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
 +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -13,7 +13,15 @@
+@@ -13,6 +13,14 @@
  
  #include "sanitizer_platform.h"
  #if SANITIZER_LINUX || SANITIZER_MAC
@@ -31,7 +29,3 @@ index bbc1108..fc09522 100644
  
  #include "sanitizer_internal_defs.h"
  #include "sanitizer_platform_limits_posix.h"
- 
--- 
-2.1.4
-
diff --git a/packages/gcc/4.9.4/0012-missing-execinfo_h.patch b/packages/gcc/4.9.4/0012-missing-execinfo_h.patch
new file mode 100644
index 00000000..c90222a1
--- /dev/null
+++ b/packages/gcc/4.9.4/0012-missing-execinfo_h.patch
@@ -0,0 +1,15 @@
+---
+ boehm-gc/include/gc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/boehm-gc/include/gc.h
++++ b/boehm-gc/include/gc.h
+@@ -503,7 +503,7 @@
+ #if defined(__linux__) || defined(__GLIBC__)
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/packages/gcc-linaro/4.8-2015.06/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/4.9.4/0013-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
similarity index 77%
rename from packages/gcc-linaro/4.8-2015.06/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
rename to packages/gcc/4.9.4/0013-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index 3cf66b25..06d45f1f 100644
--- a/packages/gcc-linaro/4.8-2015.06/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc/4.9.4/0013-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,7 +1,11 @@
-diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc/configure
---- gcc-4.8.5.orig/gcc/configure	2014-12-08 03:29:43.000000000 -0800
-+++ gcc-4.8.5/gcc/configure	2017-02-11 16:57:27.424807994 -0800
-@@ -27364,6 +27364,9 @@ fi
+---
+ gcc/configure    |   22 +++++++++++++++-------
+ gcc/configure.ac |   18 +++++++++++++-----
+ 2 files changed, 28 insertions(+), 12 deletions(-)
+
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -28058,6 +28058,9 @@
  
  
  pluginlibs=
@@ -11,7 +15,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc
  
  case "${host}" in
    *-*-darwin*)
-@@ -27375,6 +27378,11 @@ case "${host}" in
+@@ -28069,6 +28072,11 @@
        export_sym_check=
      fi
    ;;
@@ -23,7 +27,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -27487,23 +27495,23 @@ fi
+@@ -28181,23 +28189,23 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -54,10 +58,9 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc
    ;
    return 0;
  }
-diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/gcc/configure.ac
---- gcc-4.8.5.orig/gcc/configure.ac	2014-12-08 03:29:43.000000000 -0800
-+++ gcc-4.8.5/gcc/configure.ac	2017-02-11 16:57:27.424807994 -0800
-@@ -5243,6 +5243,9 @@ enable_plugin=$enableval,
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -5583,6 +5583,9 @@
  enable_plugin=yes; default_plugin=yes)
  
  pluginlibs=
@@ -67,7 +70,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/
  
  case "${host}" in
    *-*-darwin*)
-@@ -5254,6 +5257,11 @@ case "${host}" in
+@@ -5594,6 +5597,11 @@
        export_sym_check=
      fi
    ;;
@@ -79,7 +82,7 @@ diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/
    *)
      if test x$build = x$host; then
        export_sym_check="objdump${exeext} -T"
-@@ -5305,17 +5313,17 @@ if test x"$enable_plugin" = x"yes"; then
+@@ -5645,17 +5653,17 @@
    case "${host}" in
      *-*-darwin*)
        CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
diff --git a/packages/gcc-linaro/5.4-2017.05/810-arm-softfloat-libgcc.patch b/packages/gcc/4.9.4/0014-arm-softfloat-libgcc.patch
similarity index 80%
rename from packages/gcc-linaro/5.4-2017.05/810-arm-softfloat-libgcc.patch
rename to packages/gcc/4.9.4/0014-arm-softfloat-libgcc.patch
index 5efa7fd1..350857dd 100644
--- a/packages/gcc-linaro/5.4-2017.05/810-arm-softfloat-libgcc.patch
+++ b/packages/gcc/4.9.4/0014-arm-softfloat-libgcc.patch
@@ -1,5 +1,8 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
 @@ -60,7 +60,7 @@
@@ -11,8 +14,6 @@ Index: b/gcc/config/arm/linux-elf.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
-Index: b/libgcc/config/arm/t-linux
-===================================================================
 --- a/libgcc/config/arm/t-linux
 +++ b/libgcc/config/arm/t-linux
 @@ -1,6 +1,11 @@
diff --git a/packages/gcc/4.9.4/0015-arm_unbreak_armv4t.patch b/packages/gcc/4.9.4/0015-arm_unbreak_armv4t.patch
new file mode 100644
index 00000000..7c374453
--- /dev/null
+++ b/packages/gcc/4.9.4/0015-arm_unbreak_armv4t.patch
@@ -0,0 +1,17 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+---
+ gcc/config/arm/linux-eabi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -45,7 +45,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/packages/gcc-linaro/4.9-2017.01/840-microblaze-enable-dwarf-eh-support.patch b/packages/gcc/4.9.4/0016-microblaze-enable-dwarf-eh-support.patch
similarity index 84%
rename from packages/gcc-linaro/4.9-2017.01/840-microblaze-enable-dwarf-eh-support.patch
rename to packages/gcc/4.9.4/0016-microblaze-enable-dwarf-eh-support.patch
index 03fc47f1..68b839a7 100644
--- a/packages/gcc-linaro/4.9-2017.01/840-microblaze-enable-dwarf-eh-support.patch
+++ b/packages/gcc/4.9.4/0016-microblaze-enable-dwarf-eh-support.patch
@@ -26,15 +26,13 @@ Changelog
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 ---
- gcc/common/config/microblaze/microblaze-common.c |  3 ---
- gcc/config/microblaze/microblaze-protos.h        |  1 +
- gcc/config/microblaze/microblaze.c               | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h               | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md              | 11 +++++++++
+ gcc/common/config/microblaze/microblaze-common.c |    3 --
+ gcc/config/microblaze/microblaze-protos.h        |    1 
+ gcc/config/microblaze/microblaze.c               |   29 +++++++++++++++++++----
+ gcc/config/microblaze/microblaze.h               |   15 +++++++++++
+ gcc/config/microblaze/microblaze.md              |   11 ++++++++
  5 files changed, 52 insertions(+), 7 deletions(-)
 
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
 --- a/gcc/common/config/microblaze/microblaze-common.c
 +++ b/gcc/common/config/microblaze/microblaze-common.c
 @@ -37,7 +37,4 @@
@@ -45,8 +43,6 @@ Index: b/gcc/common/config/microblaze/microblaze-common.c
 -#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
 -
  struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze-protos.h
 +++ b/gcc/config/microblaze/microblaze-protos.h
 @@ -54,6 +54,7 @@
@@ -57,8 +53,6 @@ Index: b/gcc/config/microblaze/microblaze-protos.h
  #endif  /* RTX_CODE */
  
  /* Declare functions in microblaze-c.c.  */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
 --- a/gcc/config/microblaze/microblaze.c
 +++ b/gcc/config/microblaze/microblaze.c
 @@ -1906,6 +1906,11 @@
@@ -118,8 +112,6 @@ Index: b/gcc/config/microblaze/microblaze.c
  }
  
  /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze.h
 +++ b/gcc/config/microblaze/microblaze.h
 @@ -184,6 +184,21 @@
@@ -144,8 +136,6 @@ Index: b/gcc/config/microblaze/microblaze.h
  /* Use DWARF 2 debugging information by default.  */
  #define DWARF2_DEBUGGING_INFO
  #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
 --- a/gcc/config/microblaze/microblaze.md
 +++ b/gcc/config/microblaze/microblaze.md
 @@ -2261,4 +2261,15 @@
diff --git a/packages/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch b/packages/gcc/4.9.4/0017-libstdcxx-uclibc-c99.patch
similarity index 76%
rename from packages/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch
rename to packages/gcc/4.9.4/0017-libstdcxx-uclibc-c99.patch
index 533d01fa..5a765de1 100644
--- a/packages/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch
+++ b/packages/gcc/4.9.4/0017-libstdcxx-uclibc-c99.patch
@@ -16,8 +16,28 @@ that uClibc defines the __UCLIBC__ definition.
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 [Gustavo: update for 4.9.3]
 
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
+---
+ libstdc++-v3/config/locale/generic/c_locale.h     |    2 +-
+ libstdc++-v3/config/locale/gnu/c_locale.h         |    2 +-
+ libstdc++-v3/include/bits/basic_string.h          |    2 +-
+ libstdc++-v3/include/bits/locale_facets.tcc       |    2 +-
+ libstdc++-v3/include/bits/locale_facets_nonio.tcc |    2 +-
+ libstdc++-v3/include/c_compatibility/math.h       |    2 +-
+ libstdc++-v3/include/c_compatibility/wchar.h      |    2 +-
+ libstdc++-v3/include/c_global/cstdio              |    2 +-
+ libstdc++-v3/include/c_global/cstdlib             |    2 +-
+ libstdc++-v3/include/c_global/cwchar              |    4 ++--
+ libstdc++-v3/include/c_std/cstdio                 |    2 +-
+ libstdc++-v3/include/c_std/cstdlib                |    2 +-
+ libstdc++-v3/include/c_std/cwchar                 |    2 +-
+ libstdc++-v3/include/ext/vstring.h                |    2 +-
+ libstdc++-v3/include/tr1/cstdio                   |    2 +-
+ libstdc++-v3/include/tr1/cstdlib                  |    2 +-
+ libstdc++-v3/include/tr1/cwchar                   |    2 +-
+ libstdc++-v3/include/tr1/stdlib.h                 |    2 +-
+ libstdc++-v3/src/c++11/debug.cc                   |    2 +-
+ 19 files changed, 20 insertions(+), 20 deletions(-)
+
 --- a/libstdc++-v3/config/locale/generic/c_locale.h
 +++ b/libstdc++-v3/config/locale/generic/c_locale.h
 @@ -70,7 +70,7 @@
@@ -29,8 +49,6 @@ Index: b/libstdc++-v3/config/locale/generic/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
 --- a/libstdc++-v3/config/locale/gnu/c_locale.h
 +++ b/libstdc++-v3/config/locale/gnu/c_locale.h
 @@ -88,7 +88,7 @@
@@ -42,8 +60,6 @@ Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
 --- a/libstdc++-v3/include/bits/basic_string.h
 +++ b/libstdc++-v3/include/bits/basic_string.h
 @@ -2843,7 +2843,7 @@
@@ -55,8 +71,6 @@ Index: b/libstdc++-v3/include/bits/basic_string.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 @@ -572,7 +572,7 @@
@@ -68,8 +82,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
        // First try a buffer perhaps big enough.
        int __cs_size = 64;
        char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets.tcc
 @@ -987,7 +987,7 @@
@@ -81,8 +93,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets.tcc
  	// First try a buffer perhaps big enough (most probably sufficient
  	// for non-ios_base::fixed outputs)
  	int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/math.h
 +++ b/libstdc++-v3/include/c_compatibility/math.h
 @@ -56,7 +56,7 @@
@@ -94,8 +104,6 @@ Index: b/libstdc++-v3/include/c_compatibility/math.h
  using std::fpclassify;
  using std::isfinite;
  using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/wchar.h
 +++ b/libstdc++-v3/include/c_compatibility/wchar.h
 @@ -103,7 +103,7 @@
@@ -107,8 +115,6 @@ Index: b/libstdc++-v3/include/c_compatibility/wchar.h
  using std::wcstold;
  using std::wcstoll;
  using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdio
 +++ b/libstdc++-v3/include/c_global/cstdio
 @@ -146,7 +146,7 @@
@@ -120,8 +126,6 @@ Index: b/libstdc++-v3/include/c_global/cstdio
  
  #undef snprintf
  #undef vfscanf
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdlib
 +++ b/libstdc++-v3/include/c_global/cstdlib
 @@ -182,7 +182,7 @@
@@ -133,8 +137,6 @@ Index: b/libstdc++-v3/include/c_global/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_global/cwchar
 +++ b/libstdc++-v3/include/c_global/cwchar
 @@ -232,7 +232,7 @@
@@ -155,8 +157,6 @@ Index: b/libstdc++-v3/include/c_global/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdio
 +++ b/libstdc++-v3/include/c_std/cstdio
 @@ -144,7 +144,7 @@
@@ -168,8 +168,6 @@ Index: b/libstdc++-v3/include/c_std/cstdio
  
  #undef snprintf
  #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdlib
 +++ b/libstdc++-v3/include/c_std/cstdlib
 @@ -180,7 +180,7 @@
@@ -181,8 +179,6 @@ Index: b/libstdc++-v3/include/c_std/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_std/cwchar
 +++ b/libstdc++-v3/include/c_std/cwchar
 @@ -228,7 +228,7 @@
@@ -194,8 +190,6 @@ Index: b/libstdc++-v3/include/c_std/cwchar
  
  #undef wcstold
  #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
 --- a/libstdc++-v3/include/ext/vstring.h
 +++ b/libstdc++-v3/include/ext/vstring.h
 @@ -2680,7 +2680,7 @@
@@ -207,8 +201,6 @@ Index: b/libstdc++-v3/include/ext/vstring.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdio
 +++ b/libstdc++-v3/include/tr1/cstdio
 @@ -33,7 +33,7 @@
@@ -220,8 +212,6 @@ Index: b/libstdc++-v3/include/tr1/cstdio
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdlib
 +++ b/libstdc++-v3/include/tr1/cstdlib
 @@ -35,7 +35,7 @@
@@ -233,8 +223,6 @@ Index: b/libstdc++-v3/include/tr1/cstdlib
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
 --- a/libstdc++-v3/include/tr1/cwchar
 +++ b/libstdc++-v3/include/tr1/cwchar
 @@ -52,7 +52,7 @@
@@ -246,8 +234,6 @@ Index: b/libstdc++-v3/include/tr1/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
 --- a/libstdc++-v3/include/tr1/stdlib.h
 +++ b/libstdc++-v3/include/tr1/stdlib.h
 @@ -33,7 +33,7 @@
@@ -259,8 +245,6 @@ Index: b/libstdc++-v3/include/tr1/stdlib.h
  
  using std::tr1::atoll;
  using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
 --- a/libstdc++-v3/src/c++11/debug.cc
 +++ b/libstdc++-v3/src/c++11/debug.cc
 @@ -788,7 +788,7 @@
diff --git a/packages/gcc-linaro/6.4-2017.08/860-cilk-wchar.patch b/packages/gcc/4.9.4/0018-cilk-wchar.patch
similarity index 95%
rename from packages/gcc-linaro/6.4-2017.08/860-cilk-wchar.patch
rename to packages/gcc/4.9.4/0018-cilk-wchar.patch
index 1d9916f5..300837f0 100644
--- a/packages/gcc-linaro/6.4-2017.08/860-cilk-wchar.patch
+++ b/packages/gcc/4.9.4/0018-cilk-wchar.patch
@@ -10,8 +10,6 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
 --- a/libcilkrts/include/cilk/reducer_min_max.h
 +++ b/libcilkrts/include/cilk/reducer_min_max.h
 @@ -3154,7 +3154,9 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/870-xtensa-add-mauto-litpools-option.patch b/packages/gcc/4.9.4/0019-xtensa-add-mauto-litpools-option.patch
similarity index 89%
rename from packages/gcc-linaro/4.9-2017.01/870-xtensa-add-mauto-litpools-option.patch
rename to packages/gcc/4.9.4/0019-xtensa-add-mauto-litpools-option.patch
index 98c7b3f3..6cfa5215 100644
--- a/packages/gcc-linaro/4.9-2017.01/870-xtensa-add-mauto-litpools-option.patch
+++ b/packages/gcc/4.9.4/0019-xtensa-add-mauto-litpools-option.patch
@@ -39,17 +39,15 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: r226828
 Changes to ChangeLogs and documentation are dropped.
 
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
+ gcc/config/xtensa/constraints.md |    5 +++++
+ gcc/config/xtensa/elf.h          |    4 +++-
+ gcc/config/xtensa/linux.h        |    4 +++-
+ gcc/config/xtensa/predicates.md  |    3 ++-
+ gcc/config/xtensa/xtensa.c       |   19 ++++++++++++++++++-
+ gcc/config/xtensa/xtensa.md      |   35 +++++++++++++++++++----------------
+ gcc/config/xtensa/xtensa.opt     |    4 ++++
  7 files changed, 54 insertions(+), 20 deletions(-)
 
-Index: b/gcc/config/xtensa/constraints.md
-===================================================================
 --- a/gcc/config/xtensa/constraints.md
 +++ b/gcc/config/xtensa/constraints.md
 @@ -111,6 +111,11 @@
@@ -64,8 +62,6 @@ Index: b/gcc/config/xtensa/constraints.md
  ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
  ;; causes reload to force some constants into the constant pool, but since
  ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-Index: b/gcc/config/xtensa/elf.h
-===================================================================
 --- a/gcc/config/xtensa/elf.h
 +++ b/gcc/config/xtensa/elf.h
 @@ -48,7 +48,9 @@
@@ -79,8 +75,6 @@ Index: b/gcc/config/xtensa/elf.h
  
  #undef LIB_SPEC
  #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-Index: b/gcc/config/xtensa/linux.h
-===================================================================
 --- a/gcc/config/xtensa/linux.h
 +++ b/gcc/config/xtensa/linux.h
 @@ -42,7 +42,9 @@
@@ -94,8 +88,6 @@ Index: b/gcc/config/xtensa/linux.h
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
  
-Index: b/gcc/config/xtensa/predicates.md
-===================================================================
 --- a/gcc/config/xtensa/predicates.md
 +++ b/gcc/config/xtensa/predicates.md
 @@ -142,7 +142,8 @@
@@ -108,8 +100,6 @@ Index: b/gcc/config/xtensa/predicates.md
  			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
  
  ;; Accept the floating point constant 1 in the appropriate mode.
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
 @@ -477,6 +477,9 @@
@@ -152,8 +142,6 @@ Index: b/gcc/config/xtensa/xtensa.c
      default:
        if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
  	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-Index: b/gcc/config/xtensa/xtensa.md
-===================================================================
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -799,8 +799,8 @@
@@ -270,8 +258,6 @@ Index: b/gcc/config/xtensa/xtensa.md
    "register_operand (operands[0], DFmode)
     || register_operand (operands[1], DFmode)"
    "#"
-Index: b/gcc/config/xtensa/xtensa.opt
-===================================================================
 --- a/gcc/config/xtensa/xtensa.opt
 +++ b/gcc/config/xtensa/xtensa.opt
 @@ -38,6 +38,10 @@
diff --git a/packages/gcc-linaro/4.9-2017.01/871-xtensa-reimplement-register-spilling.patch b/packages/gcc/4.9.4/0020-xtensa-reimplement-register-spilling.patch
similarity index 84%
rename from packages/gcc-linaro/4.9-2017.01/871-xtensa-reimplement-register-spilling.patch
rename to packages/gcc/4.9.4/0020-xtensa-reimplement-register-spilling.patch
index abc7a08e..776914d1 100644
--- a/packages/gcc-linaro/4.9-2017.01/871-xtensa-reimplement-register-spilling.patch
+++ b/packages/gcc/4.9.4/0020-xtensa-reimplement-register-spilling.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226962
 
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
+ libgcc/config/xtensa/lib2funcs.S |   30 +++++++++++++++++++++++-------
  1 file changed, 23 insertions(+), 7 deletions(-)
 
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
 --- a/libgcc/config/xtensa/lib2funcs.S
 +++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,10 +33,29 @@
  	.global	__xtensa_libgcc_window_spill
  	.type	__xtensa_libgcc_window_spill,@function
  __xtensa_libgcc_window_spill:
@@ -59,7 +57,7 @@ index 3ac8c1d..2e678af 100644
  	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
  
  
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
+@@ -58,10 +77,7 @@
  	entry	sp, 32
  
  	/* Flush registers.  */
@@ -71,6 +69,3 @@ index 3ac8c1d..2e678af 100644
  
  	/* Because the save area for a0-a3 is stored one frame below
  	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/packages/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/packages/gcc/4.9.4/0021-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
similarity index 79%
rename from packages/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
rename to packages/gcc/4.9.4/0021-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
index f23a5c07..ef753c1a 100644
--- a/packages/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ b/packages/gcc/4.9.4/0021-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
@@ -15,19 +15,14 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226963
 
- libgcc/config/xtensa/t-xtensa | 2 +-
+ libgcc/config/xtensa/t-xtensa |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
 --- a/libgcc/config/xtensa/t-xtensa
 +++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
+@@ -13,4 +13,4 @@
  LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
  
  LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
 -   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
 +   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/packages/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch b/packages/gcc/4.9.4/0022-xtensa-fix-_Unwind_GetCFA.patch
similarity index 81%
rename from packages/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch
rename to packages/gcc/4.9.4/0022-xtensa-fix-_Unwind_GetCFA.patch
index dc405132..0fbaeec3 100644
--- a/packages/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch
+++ b/packages/gcc/4.9.4/0022-xtensa-fix-_Unwind_GetCFA.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226964
 
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
+ libgcc/config/xtensa/unwind-dw2-xtensa.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
 --- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
 +++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
+@@ -130,7 +130,7 @@
  _Unwind_Word
  _Unwind_GetCFA (struct _Unwind_Context *context)
  {
@@ -35,6 +33,3 @@ index 35f7797..ef6b900 100644
  }
  
  /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/874-xtensa-add-uclinux-support.patch b/packages/gcc/4.9.4/0023-xtensa-add-uclinux-support.patch
similarity index 88%
rename from packages/gcc-linaro/4.9-2017.01/874-xtensa-add-uclinux-support.patch
rename to packages/gcc/4.9.4/0023-xtensa-add-uclinux-support.patch
index 881aec09..4f8051d6 100644
--- a/packages/gcc-linaro/4.9-2017.01/874-xtensa-add-uclinux-support.patch
+++ b/packages/gcc/4.9.4/0023-xtensa-add-uclinux-support.patch
@@ -16,16 +16,14 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r228450
 
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
+ gcc/config.gcc                |    5 +++
+ gcc/config/xtensa/uclinux.h   |   69 ++++++++++++++++++++++++++++++++++++++++++
+ gcc/config/xtensa/uclinux.opt |   32 +++++++++++++++++++
+ libgcc/config.host            |    5 +++
  4 files changed, 111 insertions(+)
  create mode 100644 gcc/config/xtensa/uclinux.h
  create mode 100644 gcc/config/xtensa/uclinux.opt
 
-Index: b/gcc/config.gcc
-===================================================================
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
 @@ -2871,6 +2871,11 @@
@@ -40,8 +38,6 @@ Index: b/gcc/config.gcc
  am33_2.0-*-linux*)
  	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
  	gas=yes gnu_ld=yes
-Index: b/gcc/config/xtensa/uclinux.h
-===================================================================
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.h
 @@ -0,0 +1,69 @@
@@ -114,8 +110,6 @@ Index: b/gcc/config/xtensa/uclinux.h
 +
 +#undef DBX_REGISTER_NUMBER
 +
-Index: b/gcc/config/xtensa/uclinux.opt
-===================================================================
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.opt
 @@ -0,0 +1,32 @@
@@ -151,8 +145,6 @@ Index: b/gcc/config/xtensa/uclinux.opt
 +Driver JoinedOrMissing
 +
 +; This comment is to ensure we retain the blank line above.
-Index: b/libgcc/config.host
-===================================================================
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
 @@ -1213,6 +1213,11 @@
diff --git a/packages/gcc/4.9.4/875-gcc-xtensa-fix-fprintf-format-specifiers.patch b/packages/gcc/4.9.4/0024-gcc-xtensa-fix-fprintf-format-specifiers.patch
similarity index 83%
rename from packages/gcc/4.9.4/875-gcc-xtensa-fix-fprintf-format-specifiers.patch
rename to packages/gcc/4.9.4/0024-gcc-xtensa-fix-fprintf-format-specifiers.patch
index 052ffc3d..b8b6f740 100644
--- a/packages/gcc/4.9.4/875-gcc-xtensa-fix-fprintf-format-specifiers.patch
+++ b/packages/gcc/4.9.4/0024-gcc-xtensa-fix-fprintf-format-specifiers.patch
@@ -17,14 +17,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 10 +++++-----
+ gcc/config/xtensa/xtensa.c |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index d8c8298..3c00961 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -1785,7 +1785,7 @@ xtensa_emit_call (int callop, rtx *operands)
+@@ -1786,7 +1786,7 @@
    rtx tgt = operands[callop];
  
    if (GET_CODE (tgt) == CONST_INT)
@@ -33,7 +31,7 @@ index d8c8298..3c00961 100644
    else if (register_operand (tgt, VOIDmode))
      sprintf (result, "callx8\t%%%d", callop);
    else
-@@ -2360,14 +2360,14 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2361,14 +2361,14 @@
  
      case 'L':
        if (GET_CODE (x) == CONST_INT)
@@ -50,7 +48,7 @@ index d8c8298..3c00961 100644
        else
  	output_operand_lossage ("invalid %%R value");
        break;
-@@ -2381,7 +2381,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2382,7 +2382,7 @@
  
      case 'd':
        if (GET_CODE (x) == CONST_INT)
@@ -59,7 +57,7 @@ index d8c8298..3c00961 100644
        else
  	output_operand_lossage ("invalid %%d value");
        break;
-@@ -2450,7 +2450,7 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2451,7 +2451,7 @@
        else if (GET_CODE (x) == MEM)
  	output_address (XEXP (x, 0));
        else if (GET_CODE (x) == CONST_INT)
@@ -68,6 +66,3 @@ index d8c8298..3c00961 100644
        else
  	output_addr_const (file, x);
      }
--- 
-2.1.4
-
diff --git a/packages/gcc-linaro/4.9-2017.01/876-xtensa-fix-PR-target-82181.patch b/packages/gcc/4.9.4/0025-xtensa-fix-PR-target-82181.patch
similarity index 76%
rename from packages/gcc-linaro/4.9-2017.01/876-xtensa-fix-PR-target-82181.patch
rename to packages/gcc/4.9.4/0025-xtensa-fix-PR-target-82181.patch
index a613bb38..fbdcf1ed 100644
--- a/packages/gcc-linaro/4.9-2017.01/876-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc/4.9.4/0025-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 3c0096113775..3eb4db85b971 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -612,6 +612,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode)
+@@ -612,6 +612,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 3c0096113775..3eb4db85b971 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc/4.9.4/880-nios2_legitimize_address.patch b/packages/gcc/4.9.4/0026-nios2_legitimize_address.patch
similarity index 87%
rename from packages/gcc/4.9.4/880-nios2_legitimize_address.patch
rename to packages/gcc/4.9.4/0026-nios2_legitimize_address.patch
index 4623f295..5caeb207 100644
--- a/packages/gcc/4.9.4/880-nios2_legitimize_address.patch
+++ b/packages/gcc/4.9.4/0026-nios2_legitimize_address.patch
@@ -19,14 +19,12 @@ http://autobuild.buildroot.net/results/901/90186d1fe134b804c0101554296b1235dc0cc
 [backported to 4.9.3]
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
 ---
- gcc/config/nios2/nios2.c | 4 ++--
+ gcc/config/nios2/nios2.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
-index 047b615..41dd6f9 100644
 --- a/gcc/config/nios2/nios2.c
 +++ b/gcc/config/nios2/nios2.c
-@@ -1786,15 +1786,15 @@ nios2_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
+@@ -1786,15 +1786,15 @@
  
       Which will be output as '%tls_le(var+48)(r23)' in assembly.  */
    if (GET_CODE (x) == PLUS
@@ -44,6 +42,3 @@ index 047b615..41dd6f9 100644
  	  unspec = copy_rtx (unspec);
  	  XVECEXP (unspec, 0, 0)
  	    = plus_constant (Pmode, XVECEXP (unspec, 0, 0), INTVAL (offset));
--- 
-2.5.0
-
diff --git a/packages/gcc-linaro/6.4-2017.08/890-fix-m68k-compile.patch b/packages/gcc/4.9.4/0027-fix-m68k-compile.patch
similarity index 52%
rename from packages/gcc-linaro/6.4-2017.08/890-fix-m68k-compile.patch
rename to packages/gcc/4.9.4/0027-fix-m68k-compile.patch
index 6e63de0c..9437f252 100644
--- a/packages/gcc-linaro/6.4-2017.08/890-fix-m68k-compile.patch
+++ b/packages/gcc/4.9.4/0027-fix-m68k-compile.patch
@@ -2,9 +2,12 @@ remove unused header, which breaks the toolchain building
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c
---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c	2016-03-19 09:25:07.000000000 +0100
+---
+ libgcc/config/m68k/linux-atomic.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/libgcc/config/m68k/linux-atomic.c
++++ b/libgcc/config/m68k/linux-atomic.c
 @@ -33,7 +33,6 @@
     using the kernel helper defined below.  There is no support for
     64-bit operations yet.  */
diff --git a/packages/gcc/4.9.4/891-fix-m68k-uclinux.patch b/packages/gcc/4.9.4/0028-fix-m68k-uclinux.patch
similarity index 69%
rename from packages/gcc/4.9.4/891-fix-m68k-uclinux.patch
rename to packages/gcc/4.9.4/0028-fix-m68k-uclinux.patch
index 4347642d..8dca97de 100644
--- a/packages/gcc/4.9.4/891-fix-m68k-uclinux.patch
+++ b/packages/gcc/4.9.4/0028-fix-m68k-uclinux.patch
@@ -4,9 +4,12 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-4.9.3.orig/libgcc/config.host gcc-4.9.3/libgcc/config.host
---- gcc-4.9.3.orig/libgcc/config.host	2014-03-27 16:40:31.000000000 +0100
-+++ gcc-4.9.3/libgcc/config.host	2016-04-05 16:20:53.422809885 +0200
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
 @@ -750,7 +750,7 @@
  m68k*-*-openbsd*)
  	;;
diff --git a/packages/gcc/4.9.4/900-musl-support.patch b/packages/gcc/4.9.4/0029-musl-support.patch
similarity index 89%
rename from packages/gcc/4.9.4/900-musl-support.patch
rename to packages/gcc/4.9.4/0029-musl-support.patch
index a862d011..c6dbf7fe 100644
--- a/packages/gcc/4.9.4/900-musl-support.patch
+++ b/packages/gcc/4.9.4/0029-musl-support.patch
@@ -23,8 +23,32 @@ https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version:
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
 
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
+---
+ fixincludes/mkfixinc.sh            |    3 -
+ gcc/config.gcc                     |    9 ++-
+ gcc/config/aarch64/aarch64-linux.h |    2 
+ gcc/config/arm/linux-eabi.h        |   17 +++++
+ gcc/config/i386/linux.h            |    2 
+ gcc/config/i386/linux64.h          |    7 ++
+ gcc/config/linux.h                 |  109 ++++++++++++++++++++++++++++++++-----
+ gcc/config/linux.opt               |    4 +
+ gcc/config/microblaze/linux.h      |   18 +++++-
+ gcc/config/mips/linux.h            |    8 ++
+ gcc/config/mips/linux64.h          |    2 
+ gcc/config/rs6000/linux64.h        |   14 +++-
+ gcc/config/rs6000/secureplt.h      |    1 
+ gcc/config/rs6000/sysv4.h          |   16 ++++-
+ gcc/config/sh/linux.h              |    8 ++
+ gcc/configure                      |    3 +
+ gcc/configure.ac                   |    3 +
+ gcc/ginclude/stddef.h              |    3 +
+ libgcc/unwind-dw2-fde-dip.c        |    7 ++
+ libgomp/config/posix/time.c        |    2 
+ libitm/config/arm/hwcap.cc         |    4 +
+ libitm/config/linux/x86/tls.h      |    8 ++
+ libstdc++-v3/configure.host        |   10 +++
+ 23 files changed, 234 insertions(+), 26 deletions(-)
+
 --- a/fixincludes/mkfixinc.sh
 +++ b/fixincludes/mkfixinc.sh
 @@ -19,7 +19,8 @@
@@ -37,8 +61,6 @@ Index: b/fixincludes/mkfixinc.sh
  	#  IF there is no include fixing,
  	#  THEN create a no-op fixer and exit
  	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-Index: b/gcc/config.gcc
-===================================================================
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
 @@ -594,7 +594,7 @@
@@ -71,8 +93,6 @@ Index: b/gcc/config.gcc
  	if test x${enable_secureplt} = xyes; then
  		tm_file="rs6000/secureplt.h ${tm_file}"
  	fi
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -22,6 +22,8 @@
@@ -84,8 +104,6 @@ Index: b/gcc/config/aarch64/aarch64-linux.h
  
  #define CPP_SPEC "%{pthread:-D_REENTRANT}"
  
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -77,6 +77,23 @@
@@ -112,8 +130,6 @@ Index: b/gcc/config/arm/linux-eabi.h
  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
     use the GNU/Linux version, not the generic BPABI version.  */
  #undef  LINK_SPEC
-Index: b/gcc/config/i386/linux.h
-===================================================================
 --- a/gcc/config/i386/linux.h
 +++ b/gcc/config/i386/linux.h
 @@ -21,3 +21,5 @@
@@ -122,8 +138,6 @@ Index: b/gcc/config/i386/linux.h
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
 +#undef MUSL_DYNAMIC_LINKER
 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/i386/linux64.h
-===================================================================
 --- a/gcc/config/i386/linux64.h
 +++ b/gcc/config/i386/linux64.h
 @@ -30,3 +30,10 @@
@@ -137,8 +151,6 @@ Index: b/gcc/config/i386/linux64.h
 +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
 +#undef MUSL_DYNAMIC_LINKERX32
 +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-Index: b/gcc/config/linux.h
-===================================================================
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
 @@ -32,10 +32,12 @@
@@ -292,8 +304,6 @@ Index: b/gcc/config/linux.h
  #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
  /* This is a *uclinux* target.  We don't define below macros to normal linux
     versions, because doing so would require *uclinux* targets to include
-Index: b/gcc/config/linux.opt
-===================================================================
 --- a/gcc/config/linux.opt
 +++ b/gcc/config/linux.opt
 @@ -30,3 +30,7 @@
@@ -304,8 +314,6 @@ Index: b/gcc/config/linux.opt
 +mmusl
 +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
 +Use musl C library
-Index: b/gcc/config/microblaze/linux.h
-===================================================================
 --- a/gcc/config/microblaze/linux.h
 +++ b/gcc/config/microblaze/linux.h
 @@ -28,7 +28,23 @@
@@ -333,8 +341,6 @@ Index: b/gcc/config/microblaze/linux.h
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
    { "dynamic_linker", DYNAMIC_LINKER }
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
 @@ -371,17 +371,23 @@
@@ -365,8 +371,6 @@ Index: b/gcc/config/rs6000/linux64.h
  
  #undef  DEFAULT_ASM_ENDIAN
  #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-Index: b/gcc/config/rs6000/secureplt.h
-===================================================================
 --- a/gcc/config/rs6000/secureplt.h
 +++ b/gcc/config/rs6000/secureplt.h
 @@ -18,3 +18,4 @@
@@ -374,8 +378,6 @@ Index: b/gcc/config/rs6000/secureplt.h
  
  #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
 +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
 @@ -537,6 +537,9 @@
@@ -428,8 +430,6 @@ Index: b/gcc/config/rs6000/sysv4.h
    { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
    { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
    { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-Index: b/gcc/config/sh/linux.h
-===================================================================
 --- a/gcc/config/sh/linux.h
 +++ b/gcc/config/sh/linux.h
 @@ -43,7 +43,15 @@
@@ -448,8 +448,6 @@ Index: b/gcc/config/sh/linux.h
  
  #undef SUBTARGET_LINK_EMUL_SUFFIX
  #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-Index: b/gcc/configure
-===================================================================
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -27601,6 +27601,9 @@
@@ -462,8 +460,6 @@ Index: b/gcc/configure
  esac
  
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
 @@ -5173,6 +5173,9 @@
@@ -476,8 +472,6 @@ Index: b/gcc/configure.ac
  esac
  GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/ginclude/stddef.h
-===================================================================
 --- a/gcc/ginclude/stddef.h
 +++ b/gcc/ginclude/stddef.h
 @@ -181,6 +181,7 @@
@@ -504,8 +498,6 @@ Index: b/gcc/ginclude/stddef.h
  #endif /* __size_t */
  #endif /* _SIZET_ */
  #endif /* _GCC_SIZE_T */
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
 @@ -73,6 +73,13 @@
@@ -522,8 +514,6 @@ Index: b/libgcc/unwind-dw2-fde-dip.c
  #endif
  
  #if defined(USE_PT_GNU_EH_FRAME)
-Index: b/libgomp/config/posix/time.c
-===================================================================
 --- a/libgomp/config/posix/time.c
 +++ b/libgomp/config/posix/time.c
 @@ -28,6 +28,8 @@
@@ -535,8 +525,6 @@ Index: b/libgomp/config/posix/time.c
  #include "libgomp.h"
  #include <unistd.h>
  #if TIME_WITH_SYS_TIME
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
 --- a/libitm/config/arm/hwcap.cc
 +++ b/libitm/config/arm/hwcap.cc
 @@ -40,7 +40,11 @@
@@ -551,8 +539,6 @@ Index: b/libitm/config/arm/hwcap.cc
  #include <elf.h>
  
  static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
 --- a/libitm/config/linux/x86/tls.h
 +++ b/libitm/config/linux/x86/tls.h
 @@ -25,16 +25,19 @@
@@ -584,8 +570,6 @@ Index: b/libitm/config/linux/x86/tls.h
 +#endif
  
  #endif // LIBITM_X86_TLS_H
-Index: b/libstdc++-v3/configure.host
-===================================================================
 --- a/libstdc++-v3/configure.host
 +++ b/libstdc++-v3/configure.host
 @@ -266,6 +266,13 @@
@@ -612,8 +596,6 @@ Index: b/libstdc++-v3/configure.host
    hpux*)
      os_include_dir="os/hpux"
      ;;
-Index: b/gcc/config/mips/linux64.h
-===================================================================
 --- a/gcc/config/mips/linux64.h
 +++ b/gcc/config/mips/linux64.h
 @@ -41,4 +41,4 @@
@@ -622,8 +604,6 @@ Index: b/gcc/config/mips/linux64.h
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
 -			 BIONIC_DYNAMIC_LINKERN32)
 +			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER)
-Index: b/gcc/config/mips/linux.h
-===================================================================
 --- a/gcc/config/mips/linux.h
 +++ b/gcc/config/mips/linux.h
 @@ -23,3 +23,11 @@
diff --git a/packages/gcc/4.9.4/901-microblaze-uclibc.patch b/packages/gcc/4.9.4/0030-microblaze-uclibc.patch
similarity index 67%
rename from packages/gcc/4.9.4/901-microblaze-uclibc.patch
rename to packages/gcc/4.9.4/0030-microblaze-uclibc.patch
index 82c44e14..d6f8511f 100644
--- a/packages/gcc/4.9.4/901-microblaze-uclibc.patch
+++ b/packages/gcc/4.9.4/0030-microblaze-uclibc.patch
@@ -2,9 +2,12 @@ Add dynamic linker support for uClibc
 
 Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
 
-diff -Nur gcc-4.9.3.orig/gcc/config/microblaze/linux.h gcc-4.9.3/gcc/config/microblaze/linux.h
---- gcc-4.9.3.orig/gcc/config/microblaze/linux.h	2016-06-04 21:21:09.430646655 +0200
-+++ gcc-4.9.3/gcc/config/microblaze/linux.h	2016-06-04 21:21:44.596003509 +0200
+---
+ gcc/config/microblaze/linux.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gcc/config/microblaze/linux.h
++++ b/gcc/config/microblaze/linux.h
 @@ -36,10 +36,13 @@
  
  #undef MUSL_DYNAMIC_LINKER
diff --git a/packages/gcc/4.9.4/0031-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/4.9.4/0031-libgcc-disable-split-stack-nothreads.patch
new file mode 100644
index 00000000..df91a9ff
--- /dev/null
+++ b/packages/gcc/4.9.4/0031-libgcc-disable-split-stack-nothreads.patch
@@ -0,0 +1,17 @@
+disable split-stack for non-thread builds
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
+@@ -1,4 +1,6 @@
+ # Makefile fragment to provide generic support for -fsplit-stack.
+ # This should be used in config.host for any host which supports
+ # -fsplit-stack.
++ifeq ($(enable_threads),yes)
+ LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
++endif
diff --git a/packages/gcc/4.9.4/940-uclinux-enable-threads.patch b/packages/gcc/4.9.4/0032-uclinux-enable-threads.patch
similarity index 83%
rename from packages/gcc/4.9.4/940-uclinux-enable-threads.patch
rename to packages/gcc/4.9.4/0032-uclinux-enable-threads.patch
index 51081476..6dc434ed 100644
--- a/packages/gcc/4.9.4/940-uclinux-enable-threads.patch
+++ b/packages/gcc/4.9.4/0032-uclinux-enable-threads.patch
@@ -4,8 +4,10 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-Index: b/gcc/config.gcc
-===================================================================
+---
+ gcc/config.gcc |    3 +++
+ 1 file changed, 3 insertions(+)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
 @@ -810,6 +810,9 @@
diff --git a/packages/gcc/4.9.4/100-uclibc-conf.patch b/packages/gcc/4.9.4/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a1..00000000
--- a/packages/gcc/4.9.4/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/packages/gcc/4.9.4/301-missing-execinfo_h.patch b/packages/gcc/4.9.4/301-missing-execinfo_h.patch
deleted file mode 100644
index 00efda24..00000000
--- a/packages/gcc/4.9.4/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/packages/gcc/4.9.4/810-arm-softfloat-libgcc.patch b/packages/gcc/4.9.4/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 5efa7fd1..00000000
--- a/packages/gcc/4.9.4/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: b/libgcc/config/arm/t-linux
-===================================================================
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/packages/gcc/4.9.4/860-cilk-wchar.patch b/packages/gcc/4.9.4/860-cilk-wchar.patch
deleted file mode 100644
index 18374051..00000000
--- a/packages/gcc/4.9.4/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- host-gcc-final-4.9.2.orig/libcilkrts/include/cilk/reducer_min_max.h
-+++ host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/packages/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 670cf8da..00000000
--- a/packages/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.9.3.orig/libgcc/config/t-stack gcc-4.9.3/libgcc/config/t-stack
---- gcc-4.9.3.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-4.9.3/libgcc/config/t-stack	2016-03-07 01:34:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/packages/gcc/5.5.0/1000-libtool-leave-framework-alone.patch b/packages/gcc/5.5.0/0000-libtool-leave-framework-alone.patch
similarity index 74%
rename from packages/gcc/5.5.0/1000-libtool-leave-framework-alone.patch
rename to packages/gcc/5.5.0/0000-libtool-leave-framework-alone.patch
index 0f4912a8..1a86e415 100644
--- a/packages/gcc/5.5.0/1000-libtool-leave-framework-alone.patch
+++ b/packages/gcc/5.5.0/0000-libtool-leave-framework-alone.patch
@@ -1,5 +1,9 @@
---- gcc-5.4.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-5.4.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
 @@ -36,6 +36,11 @@
  for arg
  do
diff --git a/packages/gcc/5.5.0/0001-uclibc-conf.patch b/packages/gcc/5.5.0/0001-uclibc-conf.patch
new file mode 100644
index 00000000..aef750af
--- /dev/null
+++ b/packages/gcc/5.5.0/0001-uclibc-conf.patch
@@ -0,0 +1,17 @@
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
diff --git a/packages/gcc-linaro/5.4-2017.05/1100-msp430-string-literals.patch b/packages/gcc/5.5.0/0002-msp430-string-literals.patch
similarity index 79%
rename from packages/gcc-linaro/5.4-2017.05/1100-msp430-string-literals.patch
rename to packages/gcc/5.5.0/0002-msp430-string-literals.patch
index 819d6d22..24f421f9 100644
--- a/packages/gcc-linaro/5.4-2017.05/1100-msp430-string-literals.patch
+++ b/packages/gcc/5.5.0/0002-msp430-string-literals.patch
@@ -11,11 +11,15 @@ Date:   Wed May 13 01:11:13 2015 +0000
     
     git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223106 138bc75d-0d04-0410-961f-82ee72b054a4
 
-diff --git a/gcc/ada/sigtramp-vxworks.c b/gcc/ada/sigtramp-vxworks.c
-index 2119296dc1d..c697626a03e 100644
+---
+ gcc/ada/sigtramp-vxworks.c |    6 +++---
+ gcc/config/mmix/mmix.c     |    6 +++---
+ gcc/config/msp430/msp430.c |    2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
 --- a/gcc/ada/sigtramp-vxworks.c
 +++ b/gcc/ada/sigtramp-vxworks.c
-@@ -342,16 +342,16 @@ CR("") \
+@@ -342,16 +342,16 @@
  TCR("# Allocate frame and save the non-volatile") \
  TCR("# registers we're going to modify") \
  TCR("mov	ip, sp") \
@@ -35,11 +39,9 @@ index 2119296dc1d..c697626a03e 100644
  
  #else
  Not_implemented;
-diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
-index 6e991207dbc..e0699854e25 100644
 --- a/gcc/config/mmix/mmix.c
 +++ b/gcc/config/mmix/mmix.c
-@@ -2520,7 +2520,7 @@ mmix_output_shiftvalue_op_from_str (FILE *stream,
+@@ -2521,7 +2521,7 @@
    if (! mmix_shiftable_wyde_value (value))
      {
        char s[sizeof ("0xffffffffffffffff")];
@@ -48,7 +50,7 @@ index 6e991207dbc..e0699854e25 100644
        internal_error ("MMIX Internal: %s is not a shiftable int", s);
      }
  
-@@ -2562,7 +2562,7 @@ mmix_output_octa (FILE *stream, int64_t value, int do_begin_end)
+@@ -2563,7 +2563,7 @@
      fprintf (stream, "#" HOST_WIDE_INT_PRINT_HEX_PURE,
  	     (HOST_WIDE_INT) value);
    else /* Need to avoid the hex output; there's no ...WIDEST...HEX_PURE.  */
@@ -57,7 +59,7 @@ index 6e991207dbc..e0699854e25 100644
  
    if (do_begin_end)
      fprintf (stream, "\n");
-@@ -2579,7 +2579,7 @@ mmix_output_shifted_value (FILE *stream, int64_t value)
+@@ -2580,7 +2580,7 @@
    if (! mmix_shiftable_wyde_value (value))
      {
        char s[16+2+1];
@@ -66,11 +68,9 @@ index 6e991207dbc..e0699854e25 100644
        internal_error ("MMIX Internal: %s is not a shiftable int", s);
      }
  
-diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
-index bec168ca2ae..58d0efea1de 100644
 --- a/gcc/config/msp430/msp430.c
 +++ b/gcc/config/msp430/msp430.c
-@@ -2248,7 +2248,7 @@ static struct
+@@ -1902,7 +1902,7 @@
  }
    const_shift_helpers[] =
  {
diff --git a/packages/gcc-linaro/5.4-2017.05/110-xtensa-implement-trap-pattern.patch b/packages/gcc/5.5.0/0003-xtensa-implement-trap-pattern.patch
similarity index 83%
rename from packages/gcc-linaro/5.4-2017.05/110-xtensa-implement-trap-pattern.patch
rename to packages/gcc/5.5.0/0003-xtensa-implement-trap-pattern.patch
index 33045322..b25bbda6 100644
--- a/packages/gcc-linaro/5.4-2017.05/110-xtensa-implement-trap-pattern.patch
+++ b/packages/gcc/5.5.0/0003-xtensa-implement-trap-pattern.patch
@@ -10,15 +10,13 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.h  |  1 +
- gcc/config/xtensa/xtensa.md | 15 ++++++++++++++-
+ gcc/config/xtensa/xtensa.h  |    1 +
+ gcc/config/xtensa/xtensa.md |   15 ++++++++++++++-
  2 files changed, 15 insertions(+), 1 deletion(-)
 
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 011411c..584080b 100644
 --- a/gcc/config/xtensa/xtensa.h
 +++ b/gcc/config/xtensa/xtensa.h
-@@ -67,6 +67,7 @@ extern unsigned xtensa_current_frame_size;
+@@ -67,6 +67,7 @@
  #define TARGET_THREADPTR	XCHAL_HAVE_THREADPTR
  #define TARGET_LOOPS	        XCHAL_HAVE_LOOPS
  #define TARGET_WINDOWED_ABI	(XSHAL_ABI == XTHAL_ABI_WINDOWED)
@@ -26,8 +24,6 @@ index 011411c..584080b 100644
  
  #define TARGET_DEFAULT \
    ((XCHAL_HAVE_L32R	? 0 : MASK_CONST16) |				\
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..a577aa3 100644
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -86,7 +86,7 @@
@@ -59,6 +55,3 @@ index 6d84384..a577aa3 100644
  ;; Setting up a frame pointer is tricky for Xtensa because GCC doesn't
  ;; know if a frame pointer is required until the reload pass, and
  ;; because there may be an incoming argument value in the hard frame
--- 
-1.8.1.4
-
diff --git a/packages/gcc/4.8.5/111-alpha-bad-eh_frame.patch b/packages/gcc/5.5.0/0004-alpha-bad-eh_frame.patch
similarity index 80%
rename from packages/gcc/4.8.5/111-alpha-bad-eh_frame.patch
rename to packages/gcc/5.5.0/0004-alpha-bad-eh_frame.patch
index 93f6e943..f341a063 100644
--- a/packages/gcc/4.8.5/111-alpha-bad-eh_frame.patch
+++ b/packages/gcc/5.5.0/0004-alpha-bad-eh_frame.patch
@@ -1,7 +1,9 @@
 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80037
 
-diff --git a/libgcc/config/alpha/t-alpha b/libgcc/config/alpha/t-alpha
-index 0b6ffb1..0c2f840 100644
+---
+ libgcc/config/alpha/t-alpha |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/config/alpha/t-alpha
 +++ b/libgcc/config/alpha/t-alpha
 @@ -1,2 +1,6 @@
diff --git a/packages/gcc-linaro/5.4-2017.05/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/packages/gcc/5.5.0/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
similarity index 82%
rename from packages/gcc-linaro/5.4-2017.05/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
rename to packages/gcc/5.5.0/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
index c11ad35a..412b9acb 100644
--- a/packages/gcc-linaro/5.4-2017.05/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ b/packages/gcc/5.5.0/0005-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
@@ -8,14 +8,12 @@ Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
 
 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 ---
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ gcc/config.gcc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 4a7cbd2..9cc765e 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -439,7 +439,7 @@ powerpc*-*-*)
+@@ -433,7 +433,7 @@
  	cpu_type=rs6000
  	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
  	case x$with_cpu in
@@ -24,6 +22,3 @@ index 4a7cbd2..9cc765e 100644
  		cpu_is_64bit=yes
  		;;
  	esac
--- 
-2.6.2
-
diff --git a/packages/gcc/5.5.0/0006-missing-execinfo_h.patch b/packages/gcc/5.5.0/0006-missing-execinfo_h.patch
new file mode 100644
index 00000000..c90222a1
--- /dev/null
+++ b/packages/gcc/5.5.0/0006-missing-execinfo_h.patch
@@ -0,0 +1,15 @@
+---
+ boehm-gc/include/gc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/boehm-gc/include/gc.h
++++ b/boehm-gc/include/gc.h
+@@ -503,7 +503,7 @@
+ #if defined(__linux__) || defined(__GLIBC__)
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/packages/gcc/5.5.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/5.5.0/0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
similarity index 84%
rename from packages/gcc/5.5.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
rename to packages/gcc/5.5.0/0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index d8986d5f..180d0cb3 100644
--- a/packages/gcc/5.5.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc/5.5.0/0007-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,6 +1,11 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
+---
+ config/gcc-plugin.m4 |   18 +++++++++++++-----
+ gcc/configure        |   22 +++++++++++++++-------
+ libcc1/configure     |   22 +++++++++++++++-------
+ 3 files changed, 43 insertions(+), 19 deletions(-)
+
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
 @@ -20,6 +20,9 @@
  
     pluginlibs=
@@ -46,10 +51,9 @@ diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
         [AC_MSG_RESULT([yes]); have_pic_shared=yes],
         [AC_MSG_RESULT([no]); have_pic_shared=no])
       if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -28417,6 +28417,9 @@
  
     pluginlibs=
  
@@ -59,7 +63,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
     case "${host}" in
       *-*-darwin*)
         if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
+@@ -28427,6 +28430,11 @@
  	 export_sym_check=
         fi
       ;;
@@ -71,7 +75,7 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
       *)
         if test x$build = x$host; then
  	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
+@@ -28539,23 +28547,23 @@
       case "${host}" in
         *-*-darwin*)
  	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
@@ -102,9 +106,8 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
    ;
    return 0;
  }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
+--- a/libcc1/configure
++++ b/libcc1/configure
 @@ -14500,6 +14500,9 @@
  
     pluginlibs=
diff --git a/packages/gcc/5.5.0/0008-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/5.5.0/0008-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 00000000..5f9a07a2
--- /dev/null
+++ b/packages/gcc/5.5.0/0008-gcc-plugin-POSIX-include-sys-select-h.patch
@@ -0,0 +1,14 @@
+---
+ libcc1/connection.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libcc1/connection.cc
++++ b/libcc1/connection.cc
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "marshall.hh"
diff --git a/packages/gcc/5.5.0/0009-arm-softfloat-libgcc.patch b/packages/gcc/5.5.0/0009-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..350857dd
--- /dev/null
+++ b/packages/gcc/5.5.0/0009-arm-softfloat-libgcc.patch
@@ -0,0 +1,31 @@
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -60,7 +60,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
+@@ -1,6 +1,11 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
diff --git a/packages/gcc/5.5.0/0010-arm_unbreak_armv4t.patch b/packages/gcc/5.5.0/0010-arm_unbreak_armv4t.patch
new file mode 100644
index 00000000..7c374453
--- /dev/null
+++ b/packages/gcc/5.5.0/0010-arm_unbreak_armv4t.patch
@@ -0,0 +1,17 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+---
+ gcc/config/arm/linux-eabi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -45,7 +45,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/packages/gcc-linaro/5.4-2017.05/840-microblaze-enable-dwarf-eh-support.patch b/packages/gcc/5.5.0/0011-microblaze-enable-dwarf-eh-support.patch
similarity index 84%
rename from packages/gcc-linaro/5.4-2017.05/840-microblaze-enable-dwarf-eh-support.patch
rename to packages/gcc/5.5.0/0011-microblaze-enable-dwarf-eh-support.patch
index 9d29090a..67a322a4 100644
--- a/packages/gcc-linaro/5.4-2017.05/840-microblaze-enable-dwarf-eh-support.patch
+++ b/packages/gcc/5.5.0/0011-microblaze-enable-dwarf-eh-support.patch
@@ -26,15 +26,13 @@ Changelog
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 ---
- gcc/common/config/microblaze/microblaze-common.c |  3 ---
- gcc/config/microblaze/microblaze-protos.h        |  1 +
- gcc/config/microblaze/microblaze.c               | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h               | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md              | 11 +++++++++
+ gcc/common/config/microblaze/microblaze-common.c |    3 --
+ gcc/config/microblaze/microblaze-protos.h        |    1 
+ gcc/config/microblaze/microblaze.c               |   29 +++++++++++++++++++----
+ gcc/config/microblaze/microblaze.h               |   15 +++++++++++
+ gcc/config/microblaze/microblaze.md              |   11 ++++++++
  5 files changed, 52 insertions(+), 7 deletions(-)
 
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
 --- a/gcc/common/config/microblaze/microblaze-common.c
 +++ b/gcc/common/config/microblaze/microblaze-common.c
 @@ -37,7 +37,4 @@
@@ -45,8 +43,6 @@ Index: b/gcc/common/config/microblaze/microblaze-common.c
 -#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
 -
  struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze-protos.h
 +++ b/gcc/config/microblaze/microblaze-protos.h
 @@ -56,6 +56,7 @@
@@ -57,8 +53,6 @@ Index: b/gcc/config/microblaze/microblaze-protos.h
  #endif  /* RTX_CODE */
  
  /* Declare functions in microblaze-c.c.  */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
 --- a/gcc/config/microblaze/microblaze.c
 +++ b/gcc/config/microblaze/microblaze.c
 @@ -1959,6 +1959,11 @@
@@ -118,8 +112,6 @@ Index: b/gcc/config/microblaze/microblaze.c
  }
  
  /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
 --- a/gcc/config/microblaze/microblaze.h
 +++ b/gcc/config/microblaze/microblaze.h
 @@ -184,6 +184,21 @@
@@ -144,8 +136,6 @@ Index: b/gcc/config/microblaze/microblaze.h
  /* Use DWARF 2 debugging information by default.  */
  #define DWARF2_DEBUGGING_INFO
  #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
 --- a/gcc/config/microblaze/microblaze.md
 +++ b/gcc/config/microblaze/microblaze.md
 @@ -2272,4 +2272,15 @@
diff --git a/packages/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch b/packages/gcc/5.5.0/0012-libstdcxx-uclibc-c99.patch
similarity index 75%
rename from packages/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch
rename to packages/gcc/5.5.0/0012-libstdcxx-uclibc-c99.patch
index 9e97d945..50bd0623 100644
--- a/packages/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch
+++ b/packages/gcc/5.5.0/0012-libstdcxx-uclibc-c99.patch
@@ -15,8 +15,28 @@ that uClibc defines the __UCLIBC__ definition.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
+---
+ libstdc++-v3/config/locale/generic/c_locale.h     |    2 +-
+ libstdc++-v3/config/locale/gnu/c_locale.h         |    2 +-
+ libstdc++-v3/include/bits/basic_string.h          |    2 +-
+ libstdc++-v3/include/bits/locale_facets.tcc       |    2 +-
+ libstdc++-v3/include/bits/locale_facets_nonio.tcc |    2 +-
+ libstdc++-v3/include/c_compatibility/math.h       |    2 +-
+ libstdc++-v3/include/c_compatibility/wchar.h      |    2 +-
+ libstdc++-v3/include/c_global/cstdio              |    2 +-
+ libstdc++-v3/include/c_global/cstdlib             |    2 +-
+ libstdc++-v3/include/c_global/cwchar              |    4 ++--
+ libstdc++-v3/include/c_std/cstdio                 |    2 +-
+ libstdc++-v3/include/c_std/cstdlib                |    2 +-
+ libstdc++-v3/include/c_std/cwchar                 |    2 +-
+ libstdc++-v3/include/ext/vstring.h                |    2 +-
+ libstdc++-v3/include/tr1/cstdio                   |    2 +-
+ libstdc++-v3/include/tr1/cstdlib                  |    2 +-
+ libstdc++-v3/include/tr1/cwchar                   |    2 +-
+ libstdc++-v3/include/tr1/stdlib.h                 |    2 +-
+ libstdc++-v3/src/c++11/debug.cc                   |    2 +-
+ 19 files changed, 20 insertions(+), 20 deletions(-)
+
 --- a/libstdc++-v3/config/locale/generic/c_locale.h
 +++ b/libstdc++-v3/config/locale/generic/c_locale.h
 @@ -70,7 +70,7 @@
@@ -28,8 +48,6 @@ Index: b/libstdc++-v3/config/locale/generic/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
 --- a/libstdc++-v3/config/locale/gnu/c_locale.h
 +++ b/libstdc++-v3/config/locale/gnu/c_locale.h
 @@ -88,7 +88,7 @@
@@ -41,11 +59,9 @@ Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
      const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
  #else
      const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
 --- a/libstdc++-v3/include/bits/basic_string.h
 +++ b/libstdc++-v3/include/bits/basic_string.h
-@@ -5239,7 +5239,7 @@
+@@ -5347,7 +5347,7 @@
  _GLIBCXX_END_NAMESPACE_VERSION
  } // namespace
  
@@ -54,8 +70,6 @@ Index: b/libstdc++-v3/include/bits/basic_string.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets.tcc
 @@ -992,7 +992,7 @@
@@ -67,8 +81,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets.tcc
  	// Precision is always used except for hexfloat format.
  	const bool __use_prec =
  	  (__io.flags() & ios_base::floatfield) != ios_base::floatfield;
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
 @@ -578,7 +578,7 @@
@@ -80,8 +92,6 @@ Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
        // First try a buffer perhaps big enough.
        int __cs_size = 64;
        char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/math.h
 +++ b/libstdc++-v3/include/c_compatibility/math.h
 @@ -56,7 +56,7 @@
@@ -93,8 +103,6 @@ Index: b/libstdc++-v3/include/c_compatibility/math.h
  using std::fpclassify;
  using std::isfinite;
  using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
 --- a/libstdc++-v3/include/c_compatibility/wchar.h
 +++ b/libstdc++-v3/include/c_compatibility/wchar.h
 @@ -103,7 +103,7 @@
@@ -106,8 +114,6 @@ Index: b/libstdc++-v3/include/c_compatibility/wchar.h
  using std::wcstold;
  using std::wcstoll;
  using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdlib
 +++ b/libstdc++-v3/include/c_global/cstdlib
 @@ -195,7 +195,7 @@
@@ -119,8 +125,6 @@ Index: b/libstdc++-v3/include/c_global/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_global/cwchar
 +++ b/libstdc++-v3/include/c_global/cwchar
 @@ -232,7 +232,7 @@
@@ -141,8 +145,6 @@ Index: b/libstdc++-v3/include/c_global/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdio
 +++ b/libstdc++-v3/include/c_std/cstdio
 @@ -144,7 +144,7 @@
@@ -154,8 +156,6 @@ Index: b/libstdc++-v3/include/c_std/cstdio
  
  #undef snprintf
  #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/c_std/cstdlib
 +++ b/libstdc++-v3/include/c_std/cstdlib
 @@ -192,7 +192,7 @@
@@ -167,8 +167,6 @@ Index: b/libstdc++-v3/include/c_std/cstdlib
  
  #undef _Exit
  #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
 --- a/libstdc++-v3/include/c_std/cwchar
 +++ b/libstdc++-v3/include/c_std/cwchar
 @@ -228,7 +228,7 @@
@@ -180,8 +178,6 @@ Index: b/libstdc++-v3/include/c_std/cwchar
  
  #undef wcstold
  #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
 --- a/libstdc++-v3/include/ext/vstring.h
 +++ b/libstdc++-v3/include/ext/vstring.h
 @@ -2680,7 +2680,7 @@
@@ -193,8 +189,6 @@ Index: b/libstdc++-v3/include/ext/vstring.h
  
  #include <ext/string_conversions.h>
  
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdio
 +++ b/libstdc++-v3/include/tr1/cstdio
 @@ -33,7 +33,7 @@
@@ -206,8 +200,6 @@ Index: b/libstdc++-v3/include/tr1/cstdio
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
 --- a/libstdc++-v3/include/tr1/cstdlib
 +++ b/libstdc++-v3/include/tr1/cstdlib
 @@ -35,7 +35,7 @@
@@ -219,8 +211,6 @@ Index: b/libstdc++-v3/include/tr1/cstdlib
  
  namespace std _GLIBCXX_VISIBILITY(default)
  {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
 --- a/libstdc++-v3/include/tr1/cwchar
 +++ b/libstdc++-v3/include/tr1/cwchar
 @@ -52,7 +52,7 @@
@@ -232,8 +222,6 @@ Index: b/libstdc++-v3/include/tr1/cwchar
    using std::wcstold;
    using std::wcstoll;
    using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
 --- a/libstdc++-v3/include/tr1/stdlib.h
 +++ b/libstdc++-v3/include/tr1/stdlib.h
 @@ -33,7 +33,7 @@
@@ -245,8 +233,6 @@ Index: b/libstdc++-v3/include/tr1/stdlib.h
  
  using std::tr1::atoll;
  using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
 --- a/libstdc++-v3/src/c++11/debug.cc
 +++ b/libstdc++-v3/src/c++11/debug.cc
 @@ -788,7 +788,7 @@
@@ -258,8 +244,6 @@ Index: b/libstdc++-v3/src/c++11/debug.cc
        std::snprintf(__buf, __n, __fmt, __s);
  #else
        std::sprintf(__buf, __fmt, __s);
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
 --- a/libstdc++-v3/include/c_global/cstdio
 +++ b/libstdc++-v3/include/c_global/cstdio
 @@ -146,7 +146,7 @@
diff --git a/packages/gcc/5.5.0/0013-cilk-wchar.patch b/packages/gcc/5.5.0/0013-cilk-wchar.patch
new file mode 100644
index 00000000..300837f0
--- /dev/null
+++ b/packages/gcc/5.5.0/0013-cilk-wchar.patch
@@ -0,0 +1,54 @@
+[PATCH] cilk: fix build without wchar
+
+When building against uClibc with wchar support disabled, WCHAR_MIN and
+WCHAR_MAX are not defined leading to compilation errors.
+
+Fix it by only including the wchar code if available.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/libcilkrts/include/cilk/reducer_min_max.h
++++ b/libcilkrts/include/cilk/reducer_min_max.h
+@@ -3154,7 +3154,9 @@
+ CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
++#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
++#endif
+ CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
+@@ -3306,7 +3308,9 @@
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
++#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
++#endif
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
+@@ -3432,7 +3436,9 @@
+ CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
++#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
++#endif
+ CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
+@@ -3584,7 +3590,9 @@
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
++#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
++#endif
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/packages/gcc-linaro/5.4-2017.05/870-xtensa-add-mauto-litpools-option.patch b/packages/gcc/5.5.0/0014-xtensa-add-mauto-litpools-option.patch
similarity index 86%
rename from packages/gcc-linaro/5.4-2017.05/870-xtensa-add-mauto-litpools-option.patch
rename to packages/gcc/5.5.0/0014-xtensa-add-mauto-litpools-option.patch
index aa1376c4..3c44d03c 100644
--- a/packages/gcc-linaro/5.4-2017.05/870-xtensa-add-mauto-litpools-option.patch
+++ b/packages/gcc/5.5.0/0014-xtensa-add-mauto-litpools-option.patch
@@ -39,17 +39,15 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 Backported from: r226828
 Changes to ChangeLogs and documentation are dropped.
 
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
+ gcc/config/xtensa/constraints.md |    5 +++++
+ gcc/config/xtensa/elf.h          |    4 +++-
+ gcc/config/xtensa/linux.h        |    4 +++-
+ gcc/config/xtensa/predicates.md  |    3 ++-
+ gcc/config/xtensa/xtensa.c       |   19 ++++++++++++++++++-
+ gcc/config/xtensa/xtensa.md      |   35 +++++++++++++++++++----------------
+ gcc/config/xtensa/xtensa.opt     |    4 ++++
  7 files changed, 54 insertions(+), 20 deletions(-)
 
-diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md
-index 30f4c1f..773d4f9 100644
 --- a/gcc/config/xtensa/constraints.md
 +++ b/gcc/config/xtensa/constraints.md
 @@ -111,6 +111,11 @@
@@ -64,11 +62,9 @@ index 30f4c1f..773d4f9 100644
  ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
  ;; causes reload to force some constants into the constant pool, but since
  ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
-index e59bede..12056f7 100644
 --- a/gcc/config/xtensa/elf.h
 +++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3.  If not see
+@@ -48,7 +48,9 @@
    %{mtarget-align:--target-align} \
    %{mno-target-align:--no-target-align} \
    %{mlongcalls:--longcalls} \
@@ -79,11 +75,9 @@ index e59bede..12056f7 100644
  
  #undef LIB_SPEC
  #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
-index 675aacf..5b0243a 100644
 --- a/gcc/config/xtensa/linux.h
 +++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3.  If not see
+@@ -42,7 +42,9 @@
    %{mtarget-align:--target-align} \
    %{mno-target-align:--no-target-align} \
    %{mlongcalls:--longcalls} \
@@ -94,8 +88,6 @@ index 675aacf..5b0243a 100644
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
  
-diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md
-index e02209e..d7dfa11 100644
 --- a/gcc/config/xtensa/predicates.md
 +++ b/gcc/config/xtensa/predicates.md
 @@ -142,7 +142,8 @@
@@ -108,11 +100,9 @@ index e02209e..d7dfa11 100644
  			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
  
  ;; Accept the floating point constant 1 in the appropriate mode.
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..206ff80 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands)
+@@ -501,6 +501,9 @@
      {
        int dst_regnum = xt_true_regnum (operands[0]);
  
@@ -122,7 +112,7 @@ index eb039ba..206ff80 100644
        /* The stack pointer can only be assigned with a MOVSP opcode.  */
        if (dst_regnum == STACK_POINTER_REGNUM)
  	return !TARGET_WINDOWED_ABI
-@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode)
+@@ -1070,7 +1073,7 @@
  	  return 1;
  	}
  
@@ -131,7 +121,7 @@ index eb039ba..206ff80 100644
  	{
  	  src = force_const_mem (SImode, src);
  	  operands[1] = src;
-@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter)
+@@ -2451,6 +2454,20 @@
  	}
        break;
  
@@ -152,8 +142,6 @@ index eb039ba..206ff80 100644
      default:
        if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
  	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..0e673a3 100644
 --- a/gcc/config/xtensa/xtensa.md
 +++ b/gcc/config/xtensa/xtensa.md
 @@ -761,8 +761,8 @@
@@ -270,11 +258,9 @@ index 6d84384..0e673a3 100644
    "register_operand (operands[0], DFmode)
     || register_operand (operands[1], DFmode)"
    "#"
-diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
-index 2fd6cee..21c6e96 100644
 --- a/gcc/config/xtensa/xtensa.opt
 +++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@ mtext-section-literals
+@@ -38,6 +38,10 @@
  Target
  Intersperse literal pools with code in the text section
  
@@ -285,6 +271,3 @@ index 2fd6cee..21c6e96 100644
  mserialize-volatile
  Target Report Mask(SERIALIZE_VOLATILE)
  -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
--- 
-1.8.1.4
-
diff --git a/packages/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch b/packages/gcc/5.5.0/0015-xtensa-reimplement-register-spilling.patch
similarity index 84%
rename from packages/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch
rename to packages/gcc/5.5.0/0015-xtensa-reimplement-register-spilling.patch
index 4056f8b8..b85ecb96 100644
--- a/packages/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch
+++ b/packages/gcc/5.5.0/0015-xtensa-reimplement-register-spilling.patch
@@ -19,14 +19,12 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r226962
 
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
+ libgcc/config/xtensa/lib2funcs.S |   30 +++++++++++++++++++++++-------
  1 file changed, 23 insertions(+), 7 deletions(-)
 
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 4d451c8..ef0703f 100644
 --- a/libgcc/config/xtensa/lib2funcs.S
 +++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -34,10 +34,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -34,10 +34,29 @@
  	.global	__xtensa_libgcc_window_spill
  	.type	__xtensa_libgcc_window_spill,@function
  __xtensa_libgcc_window_spill:
@@ -51,15 +49,15 @@ index 4d451c8..ef0703f 100644
 +#elif XCHAL_NUM_AREGS % 12 == 8
 +	mov	a12, a12
 +#endif
- 	retw
++	retw
 +#else
 +	mov	a8, a8
-+	retw
+ 	retw
 +#endif
  	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
  #endif
  
-@@ -61,10 +80,7 @@ __xtensa_nonlocal_goto:
+@@ -61,10 +80,7 @@
  	entry	sp, 32
  
  	/* Flush registers.  */
@@ -71,6 +69,3 @@ index 4d451c8..ef0703f 100644
  
  	/* Because the save area for a0-a3 is stored one frame below
  	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/packages/gcc/5.5.0/874-xtensa-add-uclinux-support.patch b/packages/gcc/5.5.0/0016-xtensa-add-uclinux-support.patch
similarity index 87%
rename from packages/gcc/5.5.0/874-xtensa-add-uclinux-support.patch
rename to packages/gcc/5.5.0/0016-xtensa-add-uclinux-support.patch
index 23db3d86..b9476b23 100644
--- a/packages/gcc/5.5.0/874-xtensa-add-uclinux-support.patch
+++ b/packages/gcc/5.5.0/0016-xtensa-add-uclinux-support.patch
@@ -16,19 +16,17 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
 Backported from: r228450
 
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
+ gcc/config.gcc                |    5 +++
+ gcc/config/xtensa/uclinux.h   |   69 ++++++++++++++++++++++++++++++++++++++++++
+ gcc/config/xtensa/uclinux.opt |   32 +++++++++++++++++++
+ libgcc/config.host            |    5 +++
  4 files changed, 111 insertions(+)
  create mode 100644 gcc/config/xtensa/uclinux.h
  create mode 100644 gcc/config/xtensa/uclinux.opt
 
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index c52f5a8..56797bd 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -2995,6 +2995,11 @@ xtensa*-*-linux*)
+@@ -2971,6 +2971,11 @@
  	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
  	tmake_file="${tmake_file} xtensa/t-xtensa"
  	;;
@@ -40,9 +38,6 @@ index c52f5a8..56797bd 100644
  am33_2.0-*-linux*)
  	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
  	gas=yes gnu_ld=yes
-diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
-new file mode 100644
-index 0000000..4606020
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.h
 @@ -0,0 +1,69 @@
@@ -115,9 +110,6 @@ index 0000000..4606020
 +
 +#undef DBX_REGISTER_NUMBER
 +
-diff --git a/gcc/config/xtensa/uclinux.opt b/gcc/config/xtensa/uclinux.opt
-new file mode 100644
-index 0000000..95ef777
 --- /dev/null
 +++ b/gcc/config/xtensa/uclinux.opt
 @@ -0,0 +1,32 @@
@@ -153,11 +145,9 @@ index 0000000..95ef777
 +Driver JoinedOrMissing
 +
 +; This comment is to ensure we retain the blank line above.
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 2c64756..2ee92c1 100644
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
-@@ -1295,6 +1295,11 @@ xtensa*-*-linux*)
+@@ -1287,6 +1287,11 @@
  	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
  	md_unwind_header=xtensa/linux-unwind.h
  	;;
@@ -169,6 +159,3 @@ index 2c64756..2ee92c1 100644
  am33_2.0-*-linux*)
  	# Don't need crtbeginT.o from *-*-linux* default.
  	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
--- 
-1.8.1.4
-
diff --git a/packages/gcc/5.5.0/0017-fix-m68k-compile.patch b/packages/gcc/5.5.0/0017-fix-m68k-compile.patch
new file mode 100644
index 00000000..9437f252
--- /dev/null
+++ b/packages/gcc/5.5.0/0017-fix-m68k-compile.patch
@@ -0,0 +1,18 @@
+remove unused header, which breaks the toolchain building
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+---
+ libgcc/config/m68k/linux-atomic.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/libgcc/config/m68k/linux-atomic.c
++++ b/libgcc/config/m68k/linux-atomic.c
+@@ -33,7 +33,6 @@
+    using the kernel helper defined below.  There is no support for
+    64-bit operations yet.  */
+ 
+-#include <asm/unistd.h>
+ #include <stdbool.h>
+ 
+ #ifndef __NR_atomic_cmpxchg_32
diff --git a/packages/gcc/5.5.0/0018-fix-m68k-uclinux.patch b/packages/gcc/5.5.0/0018-fix-m68k-uclinux.patch
new file mode 100644
index 00000000..9a432e33
--- /dev/null
+++ b/packages/gcc/5.5.0/0018-fix-m68k-uclinux.patch
@@ -0,0 +1,21 @@
+avoids internal compiler error while compiling linux-atomic.c
+See here:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -806,7 +806,7 @@
+ m68k*-*-openbsd*)
+ 	;;
+ m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
+-	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
++	tmake_file="$tmake_file m68k/t-floatlib"
+ 	md_unwind_header=m68k/linux-unwind.h
+ 	;;
+ m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/packages/gcc-linaro/5.4-2017.05/892-microblaze-uclibc.patch b/packages/gcc/5.5.0/0019-microblaze-uclibc.patch
similarity index 67%
rename from packages/gcc-linaro/5.4-2017.05/892-microblaze-uclibc.patch
rename to packages/gcc/5.5.0/0019-microblaze-uclibc.patch
index a8eb5a69..91d0aa48 100644
--- a/packages/gcc-linaro/5.4-2017.05/892-microblaze-uclibc.patch
+++ b/packages/gcc/5.5.0/0019-microblaze-uclibc.patch
@@ -2,9 +2,12 @@ Add dynamic linker support for uClibc
 
 Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
 
-diff -Nur gcc-5.3.0.orig/gcc/config/microblaze/linux.h gcc-5.3.0/gcc/config/microblaze/linux.h
---- gcc-5.3.0.orig/gcc/config/microblaze/linux.h	2015-05-28 16:08:19.000000000 +0200
-+++ gcc-5.3.0/gcc/config/microblaze/linux.h	2016-05-13 09:21:01.579262885 +0200
+---
+ gcc/config/microblaze/linux.h |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/gcc/config/microblaze/linux.h
++++ b/gcc/config/microblaze/linux.h
 @@ -28,7 +28,15 @@
  #undef TLS_NEEDS_GOT
  #define TLS_NEEDS_GOT 1
diff --git a/packages/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch b/packages/gcc/5.5.0/0020-libitm-fixes-for-musl-support.patch
similarity index 88%
rename from packages/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch
rename to packages/gcc/5.5.0/0020-libitm-fixes-for-musl-support.patch
index fdf4ee72..8009b894 100644
--- a/packages/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch
+++ b/packages/gcc/5.5.0/0020-libitm-fixes-for-musl-support.patch
@@ -17,8 +17,11 @@ On behalf of Szabolcs.Nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222325 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
+---
+ libitm/config/arm/hwcap.cc    |    2 +-
+ libitm/config/linux/x86/tls.h |    8 ++++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
 --- a/libitm/config/arm/hwcap.cc
 +++ b/libitm/config/arm/hwcap.cc
 @@ -40,7 +40,7 @@
@@ -30,8 +33,6 @@ Index: b/libitm/config/arm/hwcap.cc
  #include <elf.h>
  
  static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
 --- a/libitm/config/linux/x86/tls.h
 +++ b/libitm/config/linux/x86/tls.h
 @@ -25,16 +25,19 @@
diff --git a/packages/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch b/packages/gcc/5.5.0/0021-fixincludes-update-for-musl-support.patch
similarity index 89%
rename from packages/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch
rename to packages/gcc/5.5.0/0021-fixincludes-update-for-musl-support.patch
index 13c08d6b..de94bc84 100644
--- a/packages/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch
+++ b/packages/gcc/5.5.0/0021-fixincludes-update-for-musl-support.patch
@@ -16,8 +16,10 @@ On behalf of Szabolcs.Nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222327 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
+---
+ fixincludes/mkfixinc.sh |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 --- a/fixincludes/mkfixinc.sh
 +++ b/fixincludes/mkfixinc.sh
 @@ -19,7 +19,8 @@
diff --git a/packages/gcc-linaro/5.4-2017.05/902-unwind-fix-for-musl.patch b/packages/gcc/5.5.0/0022-unwind-fix-for-musl.patch
similarity index 91%
rename from packages/gcc-linaro/5.4-2017.05/902-unwind-fix-for-musl.patch
rename to packages/gcc/5.5.0/0022-unwind-fix-for-musl.patch
index ef470540..e6399429 100644
--- a/packages/gcc-linaro/5.4-2017.05/902-unwind-fix-for-musl.patch
+++ b/packages/gcc/5.5.0/0022-unwind-fix-for-musl.patch
@@ -17,8 +17,10 @@ On behalf of szabolcs.nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
+---
+ libgcc/unwind-dw2-fde-dip.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
 @@ -59,6 +59,12 @@
diff --git a/packages/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch b/packages/gcc/5.5.0/0023-libstdc++-libgfortran-gthr-workaround-for-musl.patch
similarity index 82%
rename from packages/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
rename to packages/gcc/5.5.0/0023-libstdc++-libgfortran-gthr-workaround-for-musl.patch
index c8521312..7b2d7b6d 100644
--- a/packages/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
+++ b/packages/gcc/5.5.0/0023-libstdc++-libgfortran-gthr-workaround-for-musl.patch
@@ -24,8 +24,13 @@ On behalf of szabolcs.nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222329 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/libgfortran/acinclude.m4
-===================================================================
+---
+ libgfortran/acinclude.m4                    |    2 +-
+ libgfortran/configure                       |    2 +-
+ libstdc++-v3/config/os/generic/os_defines.h |    5 +++++
+ libstdc++-v3/configure.host                 |    3 +++
+ 4 files changed, 10 insertions(+), 2 deletions(-)
+
 --- a/libgfortran/acinclude.m4
 +++ b/libgfortran/acinclude.m4
 @@ -100,7 +100,7 @@
@@ -37,11 +42,9 @@ Index: b/libgfortran/acinclude.m4
        AC_DEFINE(GTHREAD_USE_WEAK, 0,
  		[Define to 0 if the target shouldn't use #pragma weak])
        ;;
-Index: b/libgfortran/configure
-===================================================================
 --- a/libgfortran/configure
 +++ b/libgfortran/configure
-@@ -26447,7 +26447,7 @@
+@@ -26456,7 +26456,7 @@
  
    fi
    case "$host" in
@@ -50,8 +53,6 @@ Index: b/libgfortran/configure
  
  $as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h
  
-Index: b/libstdc++-v3/config/os/generic/os_defines.h
-===================================================================
 --- a/libstdc++-v3/config/os/generic/os_defines.h
 +++ b/libstdc++-v3/config/os/generic/os_defines.h
 @@ -33,4 +33,9 @@
@@ -64,11 +65,9 @@ Index: b/libstdc++-v3/config/os/generic/os_defines.h
 +#define _GLIBCXX_GTHREAD_USE_WEAK 0
 +
  #endif
-Index: b/libstdc++-v3/configure.host
-===================================================================
 --- a/libstdc++-v3/configure.host
 +++ b/libstdc++-v3/configure.host
-@@ -271,6 +271,9 @@
+@@ -273,6 +273,9 @@
    freebsd*)
      os_include_dir="os/bsd/freebsd"
      ;;
diff --git a/packages/gcc/5.5.0/904-musl-libc-config.patch b/packages/gcc/5.5.0/0024-musl-libc-config.patch
similarity index 93%
rename from packages/gcc/5.5.0/904-musl-libc-config.patch
rename to packages/gcc/5.5.0/0024-musl-libc-config.patch
index 85491406..808c0734 100644
--- a/packages/gcc/5.5.0/904-musl-libc-config.patch
+++ b/packages/gcc/5.5.0/0024-musl-libc-config.patch
@@ -25,8 +25,15 @@ X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a9173ceabaf29
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config.gcc
-===================================================================
+---
+ gcc/config.gcc       |    5 +-
+ gcc/config/linux.h   |  110 ++++++++++++++++++++++++++++++++++++++++++++-------
+ gcc/config/linux.opt |    6 ++
+ gcc/configure        |    3 +
+ gcc/configure.ac     |    3 +
+ gcc/doc/invoke.texi  |   10 +++-
+ 6 files changed, 119 insertions(+), 18 deletions(-)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
 @@ -575,7 +575,7 @@
@@ -48,8 +55,6 @@ Index: b/gcc/config.gcc
      *)
        tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
        ;;
-Index: b/gcc/config/linux.h
-===================================================================
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
 @@ -32,10 +32,12 @@
@@ -206,8 +211,6 @@ Index: b/gcc/config/linux.h
  #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
  /* This is a *uclinux* target.  We don't define below macros to normal linux
     versions, because doing so would require *uclinux* targets to include
-Index: b/gcc/config/linux.opt
-===================================================================
 --- a/gcc/config/linux.opt
 +++ b/gcc/config/linux.opt
 @@ -28,5 +28,9 @@
@@ -221,11 +224,9 @@ Index: b/gcc/config/linux.opt
 +mmusl
 +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
 +Use musl C library
-Index: b/gcc/configure
-===================================================================
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -27809,6 +27813,9 @@
+@@ -27961,6 +27961,9 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -235,11 +236,9 @@ Index: b/gcc/configure
  esac
  
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -5298,6 +5302,9 @@
+@@ -5386,6 +5386,9 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -249,11 +248,9 @@ Index: b/gcc/configure.ac
  esac
  GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/doc/invoke.texi
-===================================================================
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -667,7 +667,7 @@
+@@ -668,7 +668,7 @@
  -mcpu=@var{cpu}}
  
  @emph{GNU/Linux Options}
@@ -262,7 +259,7 @@ Index: b/gcc/doc/invoke.texi
  -tno-android-cc -tno-android-ld}
  
  @emph{H8/300 Options}
-@@ -15324,13 +15324,19 @@
+@@ -15351,13 +15351,19 @@
  @item -mglibc
  @opindex mglibc
  Use the GNU C library.  This is the default except
diff --git a/packages/gcc/5.5.0/905-add-musl-support-to-gcc.patch b/packages/gcc/5.5.0/0025-add-musl-support-to-gcc.patch
similarity index 90%
rename from packages/gcc/5.5.0/905-add-musl-support-to-gcc.patch
rename to packages/gcc/5.5.0/0025-add-musl-support-to-gcc.patch
index 92e74368..c0cc0a41 100644
--- a/packages/gcc/5.5.0/905-add-musl-support-to-gcc.patch
+++ b/packages/gcc/5.5.0/0025-add-musl-support-to-gcc.patch
@@ -19,8 +19,14 @@ X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=f2d678afa5b83
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222905 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config/alpha/linux.h
-===================================================================
+---
+ gcc/config/alpha/linux.h    |    4 ++++
+ gcc/config/glibc-stdint.h   |   14 ++++++++++----
+ gcc/config/linux.h          |    2 ++
+ gcc/config/rs6000/linux.h   |    4 ++++
+ gcc/config/rs6000/linux64.h |    4 ++++
+ 5 files changed, 24 insertions(+), 4 deletions(-)
+
 --- a/gcc/config/alpha/linux.h
 +++ b/gcc/config/alpha/linux.h
 @@ -61,10 +61,14 @@
@@ -38,8 +44,6 @@ Index: b/gcc/config/alpha/linux.h
  #endif
  
  /* Determine what functions are present at the runtime;
-Index: b/gcc/config/glibc-stdint.h
-===================================================================
 --- a/gcc/config/glibc-stdint.h
 +++ b/gcc/config/glibc-stdint.h
 @@ -22,6 +22,12 @@
@@ -72,8 +76,6 @@ Index: b/gcc/config/glibc-stdint.h
  #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
  
  #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
-Index: b/gcc/config/linux.h
-===================================================================
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
 @@ -32,11 +32,13 @@
@@ -90,8 +92,6 @@ Index: b/gcc/config/linux.h
  #define OPTION_MUSL   (linux_libc == LIBC_MUSL)
  #endif
  
-Index: b/gcc/config/rs6000/linux.h
-===================================================================
 --- a/gcc/config/rs6000/linux.h
 +++ b/gcc/config/rs6000/linux.h
 @@ -30,10 +30,14 @@
@@ -109,8 +109,6 @@ Index: b/gcc/config/rs6000/linux.h
  #endif
  
  /* Determine what functions are present at the runtime;
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
 @@ -299,10 +299,14 @@
diff --git a/packages/gcc/5.5.0/906-mips-musl-support.patch b/packages/gcc/5.5.0/0026-mips-musl-support.patch
similarity index 93%
rename from packages/gcc/5.5.0/906-mips-musl-support.patch
rename to packages/gcc/5.5.0/0026-mips-musl-support.patch
index 6b473f98..44e77133 100644
--- a/packages/gcc/5.5.0/906-mips-musl-support.patch
+++ b/packages/gcc/5.5.0/0026-mips-musl-support.patch
@@ -16,8 +16,10 @@ X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2550b6a866c88
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222915 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config/mips/linux.h
-===================================================================
+---
+ gcc/config/mips/linux.h |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
 --- a/gcc/config/mips/linux.h
 +++ b/gcc/config/mips/linux.h
 @@ -37,7 +37,13 @@
diff --git a/packages/gcc/5.5.0/907-x86-musl-support.patch b/packages/gcc/5.5.0/0027-x86-musl-support.patch
similarity index 87%
rename from packages/gcc/5.5.0/907-x86-musl-support.patch
rename to packages/gcc/5.5.0/0027-x86-musl-support.patch
index 3f2fe5df..f40f57c4 100644
--- a/packages/gcc/5.5.0/907-x86-musl-support.patch
+++ b/packages/gcc/5.5.0/0027-x86-musl-support.patch
@@ -17,8 +17,11 @@ On behalf of Szabolcs Nagy.
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223218 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config/i386/linux.h
-===================================================================
+---
+ gcc/config/i386/linux.h   |    3 +++
+ gcc/config/i386/linux64.h |    7 +++++++
+ 2 files changed, 10 insertions(+)
+
 --- a/gcc/config/i386/linux.h
 +++ b/gcc/config/i386/linux.h
 @@ -21,3 +21,6 @@
@@ -28,8 +31,6 @@ Index: b/gcc/config/i386/linux.h
 +
 +#undef MUSL_DYNAMIC_LINKER
 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/i386/linux64.h
-===================================================================
 --- a/gcc/config/i386/linux64.h
 +++ b/gcc/config/i386/linux64.h
 @@ -30,3 +30,10 @@
diff --git a/packages/gcc/5.5.0/908-arm-musl-support.patch b/packages/gcc/5.5.0/0028-arm-musl-support.patch
similarity index 93%
rename from packages/gcc/5.5.0/908-arm-musl-support.patch
rename to packages/gcc/5.5.0/0028-arm-musl-support.patch
index 906355a7..f955ea83 100644
--- a/packages/gcc/5.5.0/908-arm-musl-support.patch
+++ b/packages/gcc/5.5.0/0028-arm-musl-support.patch
@@ -15,8 +15,10 @@ On behalf of szabolcs.nagy@arm.com
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223749 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
+---
+ gcc/config/arm/linux-eabi.h |   17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -77,6 +77,23 @@
diff --git a/packages/gcc/5.5.0/909-aarch64-musl-support.patch b/packages/gcc/5.5.0/0029-aarch64-musl-support.patch
similarity index 89%
rename from packages/gcc/5.5.0/909-aarch64-musl-support.patch
rename to packages/gcc/5.5.0/0029-aarch64-musl-support.patch
index 3d032f51..5460bc67 100644
--- a/packages/gcc/5.5.0/909-aarch64-musl-support.patch
+++ b/packages/gcc/5.5.0/0029-aarch64-musl-support.patch
@@ -17,8 +17,10 @@ gcc/Changelog:
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223766 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
 
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
+---
+ gcc/config/aarch64/aarch64-linux.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -23,6 +23,9 @@
diff --git a/packages/gcc/5.5.0/910-nios2-bad-multilib-default.patch b/packages/gcc/5.5.0/0030-nios2-bad-multilib-default.patch
similarity index 58%
rename from packages/gcc/5.5.0/910-nios2-bad-multilib-default.patch
rename to packages/gcc/5.5.0/0030-nios2-bad-multilib-default.patch
index d94697f2..5dfe211d 100644
--- a/packages/gcc/5.5.0/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc/5.5.0/0030-nios2-bad-multilib-default.patch
@@ -1,6 +1,10 @@
-diff -urpN gcc-5.3.0.orig/gcc/config/nios2/nios2.h gcc-5.3.0/gcc/config/nios2/nios2.h
---- gcc-5.3.0.orig/gcc/config/nios2/nios2.h	2016-04-18 10:32:41.046254061 -0700
-+++ gcc-5.3.0/gcc/config/nios2/nios2.h	2016-04-18 10:37:25.998841674 -0700
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
 @@ -55,11 +55,11 @@
  #if TARGET_ENDIAN_DEFAULT == 0
  # define ASM_SPEC "%{!meb:-EL} %{meb:-EB}"
@@ -15,9 +19,8 @@ diff -urpN gcc-5.3.0.orig/gcc/config/nios2/nios2.h gcc-5.3.0/gcc/config/nios2/ni
  #endif
  
  #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -urpN gcc-5.3.0.orig/gcc/config/nios2/t-nios2 gcc-5.3.0/gcc/config/nios2/t-nios2
---- gcc-5.3.0.orig/gcc/config/nios2/t-nios2	2016-04-18 10:32:41.046254061 -0700
-+++ gcc-5.3.0/gcc/config/nios2/t-nios2	2016-04-18 10:36:41.091312157 -0700
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
 @@ -22,6 +22,5 @@
  # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
  # MULTILIB_EXCEPTIONS = 
diff --git a/packages/gcc/5.5.0/0031-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/5.5.0/0031-libgcc-disable-split-stack-nothreads.patch
new file mode 100644
index 00000000..df91a9ff
--- /dev/null
+++ b/packages/gcc/5.5.0/0031-libgcc-disable-split-stack-nothreads.patch
@@ -0,0 +1,17 @@
+disable split-stack for non-thread builds
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
+@@ -1,4 +1,6 @@
+ # Makefile fragment to provide generic support for -fsplit-stack.
+ # This should be used in config.host for any host which supports
+ # -fsplit-stack.
++ifeq ($(enable_threads),yes)
+ LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
++endif
diff --git a/packages/gcc/5.5.0/0032-uclinux-enable-threads.patch b/packages/gcc/5.5.0/0032-uclinux-enable-threads.patch
new file mode 100644
index 00000000..f7c08efb
--- /dev/null
+++ b/packages/gcc/5.5.0/0032-uclinux-enable-threads.patch
@@ -0,0 +1,22 @@
+Enable POSIX threads for uClinux targets
+Reported upstream:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+---
+ gcc/config.gcc |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -816,6 +816,9 @@
+ *-*-uclinux*)
+   extra_options="$extra_options gnu-user.opt"
+   use_gcc_stdint=wrap
++  case ${enable_threads} in
++    "" | yes | posix) thread_file='posix' ;;
++  esac
+   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
+   ;;
+ *-*-rdos*)
diff --git a/packages/gcc/5.5.0/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/5.5.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48ee..00000000
--- a/packages/gcc/5.5.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/packages/gcc/5.5.0/810-arm-softfloat-libgcc.patch b/packages/gcc/5.5.0/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 5efa7fd1..00000000
--- a/packages/gcc/5.5.0/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: b/libgcc/config/arm/t-linux
-===================================================================
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/packages/gcc/5.5.0/830-arm_unbreak_armv4t.patch b/packages/gcc/5.5.0/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index b7300591..00000000
--- a/packages/gcc/5.5.0/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/packages/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch b/packages/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch
deleted file mode 100644
index aa1376c4..00000000
--- a/packages/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 6 Aug 2015 01:16:02 +0300
-Subject: [PATCH] xtensa: add -mauto-litpools option
-
-With support from assembler this option allows compiling huge functions,
-where single literal pool at the beginning of a function may not be
-reachable by L32R instructions at its end.
-
-Currently assembler --auto-litpools option cannot deal with literals
-used from multiple locations separated by more than 256 KBytes of code.
-Don't turn constants into literals, instead use MOVI instruction to load
-them into registers and let the assembler turn them into literals as
-necessary.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/constraints.md (define_constraint "Y"): New
-	constraint.
-	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
-	* config/xtensa/linux.h (ASM_SPEC): Likewise.
-	* config/xtensa/predicates.md (move_operand): Match constants
-	and symbols in the presence of TARGET_AUTO_LITPOOLS.
-	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
-	immediate references to TLS data.
-	(xtensa_emit_move_sequence): Don't force constants to memory in
-	the presence of TARGET_AUTO_LITPOOLS.
-	(print_operand): Add 'y' format, same as default, but capable of
-	printing SF mode constants as well.
-	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
-	(movsf_internal): Add movi pattern that loads literal.
-	(movsf, movdf): Don't force constants to memory in the presence
-	of TARGET_AUTO_LITPOOLS.
-	(movdf_internal): Add 'Y' constraint.
-	* config/xtensa/xtensa.opt (mauto-litpools): New option.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226828
-Changes to ChangeLogs and documentation are dropped.
-
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
- 7 files changed, 54 insertions(+), 20 deletions(-)
-
-diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md
-index 30f4c1f..773d4f9 100644
---- a/gcc/config/xtensa/constraints.md
-+++ b/gcc/config/xtensa/constraints.md
-@@ -111,6 +111,11 @@
-  (and (match_code "const_int")
-       (match_test "xtensa_mask_immediate (ival)")))
- 
-+(define_constraint "Y"
-+ "A constant that can be used in relaxed MOVI instructions."
-+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-+      (match_test "TARGET_AUTO_LITPOOLS")))
-+
- ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
- ;; causes reload to force some constants into the constant pool, but since
- ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
-index e59bede..12056f7 100644
---- a/gcc/config/xtensa/elf.h
-+++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #undef LIB_SPEC
- #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
-index 675aacf..5b0243a 100644
---- a/gcc/config/xtensa/linux.h
-+++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
-diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md
-index e02209e..d7dfa11 100644
---- a/gcc/config/xtensa/predicates.md
-+++ b/gcc/config/xtensa/predicates.md
-@@ -142,7 +142,8 @@
- 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
- 			    && xtensa_simm12b (INTVAL (op))"))
- 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
--	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
-+	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
-+			    && CONSTANT_P (op)
- 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
- 
- ;; Accept the floating point constant 1 in the appropriate mode.
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..206ff80 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands)
-     {
-       int dst_regnum = xt_true_regnum (operands[0]);
- 
-+      if (xtensa_tls_referenced_p (operands[1]))
-+	return FALSE;
-+
-       /* The stack pointer can only be assigned with a MOVSP opcode.  */
-       if (dst_regnum == STACK_POINTER_REGNUM)
- 	return !TARGET_WINDOWED_ABI
-@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode)
- 	  return 1;
- 	}
- 
--      if (! TARGET_CONST16)
-+      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
- 	{
- 	  src = force_const_mem (SImode, src);
- 	  operands[1] = src;
-@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter)
- 	}
-       break;
- 
-+    case 'y':
-+      if (GET_CODE (x) == CONST_DOUBLE &&
-+	  GET_MODE (x) == SFmode)
-+	{
-+	  REAL_VALUE_TYPE r;
-+	  long l;
-+	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-+	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
-+	  fprintf (file, "0x%08lx", l);
-+	  break;
-+	}
-+
-+      /* fall through */
-+
-     default:
-       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
- 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..0e673a3 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -761,8 +761,8 @@
- })
- 
- (define_insn "movsi_internal"
--  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
--	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
-+  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
-+	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
-   "xtensa_valid_move (SImode, operands)"
-   "@
-    movi.n\t%0, %x1
-@@ -774,15 +774,16 @@
-    mov\t%0, %1
-    movsp\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
-+  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
-    (set_attr "mode"	"SI")
--   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
- 
- ;; 16-bit Integer moves
- 
-@@ -796,21 +797,22 @@
- })
- 
- (define_insn "movhi_internal"
--  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
--	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
-+  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
-+	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
-   "xtensa_valid_move (HImode, operands)"
-   "@
-    movi.n\t%0, %x1
-    mov.n\t%0, %1
-    mov\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    %v1l16ui\t%0, %1
-    %v0s16i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
-+  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
-    (set_attr "mode"	"HI")
--   (set_attr "length"	"2,2,3,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
- 
- ;; 8-bit Integer moves
- 
-@@ -881,7 +883,7 @@
- 	(match_operand:SF 1 "general_operand" ""))]
-   ""
- {
--  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
-+  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
-     operands[1] = force_const_mem (SFmode, operands[1]);
- 
-   if ((!register_operand (operands[0], SFmode)
-@@ -896,8 +898,8 @@
- })
- 
- (define_insn "movsf_internal"
--  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
--	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
-+  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
-+	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
-   "((register_operand (operands[0], SFmode)
-      || register_operand (operands[1], SFmode))
-     && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -912,13 +914,14 @@
-    mov\t%0, %1
-    wfr\t%0, %1
-    rfr\t%0, %1
-+   movi\t%0, %y1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0"
--  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
-+  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
-    (set_attr "mode"	"SF")
--   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
-+   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
- 
- (define_insn "*lsiu"
-   [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -991,7 +994,7 @@
- 	(match_operand:DF 1 "general_operand" ""))]
-   ""
- {
--  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
-+  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
-     operands[1] = force_const_mem (DFmode, operands[1]);
- 
-   if (!register_operand (operands[0], DFmode)
-@@ -1002,8 +1005,8 @@
- })
- 
- (define_insn_and_split "movdf_internal"
--  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
--	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
-+  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
-+	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
-   "register_operand (operands[0], DFmode)
-    || register_operand (operands[1], DFmode)"
-   "#"
-diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
-index 2fd6cee..21c6e96 100644
---- a/gcc/config/xtensa/xtensa.opt
-+++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@ mtext-section-literals
- Target
- Intersperse literal pools with code in the text section
- 
-+mauto-litpools
-+Target Report Mask(AUTO_LITPOOLS)
-+Relax literals in assembler and place them automatically in the text section
-+
- mserialize-volatile
- Target Report Mask(SERIALIZE_VOLATILE)
- -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
--- 
-1.8.1.4
-
diff --git a/packages/gcc/5.5.0/890-fix-m68k-compile.patch b/packages/gcc/5.5.0/890-fix-m68k-compile.patch
deleted file mode 100644
index 6e63de0c..00000000
--- a/packages/gcc/5.5.0/890-fix-m68k-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove unused header, which breaks the toolchain building
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c
---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c	2016-03-19 09:25:07.000000000 +0100
-@@ -33,7 +33,6 @@
-    using the kernel helper defined below.  There is no support for
-    64-bit operations yet.  */
- 
--#include <asm/unistd.h>
- #include <stdbool.h>
- 
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/packages/gcc/5.5.0/891-fix-m68k-uclinux.patch b/packages/gcc/5.5.0/891-fix-m68k-uclinux.patch
deleted file mode 100644
index 4e186bd3..00000000
--- a/packages/gcc/5.5.0/891-fix-m68k-uclinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avoids internal compiler error while compiling linux-atomic.c
-See here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/packages/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 07f9a739..00000000
--- a/packages/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/packages/gcc/5.5.0/940-uclinux-enable-threads.patch b/packages/gcc/5.5.0/940-uclinux-enable-threads.patch
deleted file mode 100644
index 490a55b4..00000000
--- a/packages/gcc/5.5.0/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
---- gcc-5.4.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.4.0/gcc/config.gcc	2016-07-01 21:26:02.772958441 +0200
-@@ -808,6 +808,9 @@
- *-*-uclinux*)
-   extra_options="$extra_options gnu-user.opt"
-   use_gcc_stdint=wrap
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
-   ;;
- *-*-rdos*)
diff --git a/packages/gcc/6.4.0/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch b/packages/gcc/6.4.0/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
similarity index 65%
rename from packages/gcc/6.4.0/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
rename to packages/gcc/6.4.0/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
index 17a77d05..9de88c1a 100644
--- a/packages/gcc/6.4.0/0001-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
+++ b/packages/gcc/6.4.0/0000-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
@@ -32,23 +32,21 @@ build-many-glibcs.py.
 
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4
 ---
- libgcc/config/aarch64/linux-unwind.h | 2 +-
- libgcc/config/alpha/linux-unwind.h   | 2 +-
- libgcc/config/bfin/linux-unwind.h    | 2 +-
- libgcc/config/i386/linux-unwind.h    | 4 ++--
- libgcc/config/m68k/linux-unwind.h    | 2 +-
- libgcc/config/nios2/linux-unwind.h   | 2 +-
- libgcc/config/pa/linux-unwind.h      | 2 +-
- libgcc/config/sh/linux-unwind.h      | 2 +-
- libgcc/config/tilepro/linux-unwind.h | 2 +-
- libgcc/config/xtensa/linux-unwind.h  | 2 +-
+ libgcc/config/aarch64/linux-unwind.h |    2 +-
+ libgcc/config/alpha/linux-unwind.h   |    2 +-
+ libgcc/config/bfin/linux-unwind.h    |    2 +-
+ libgcc/config/i386/linux-unwind.h    |    4 ++--
+ libgcc/config/m68k/linux-unwind.h    |    2 +-
+ libgcc/config/nios2/linux-unwind.h   |    2 +-
+ libgcc/config/pa/linux-unwind.h      |    2 +-
+ libgcc/config/sh/linux-unwind.h      |    2 +-
+ libgcc/config/tilepro/linux-unwind.h |    2 +-
+ libgcc/config/xtensa/linux-unwind.h  |    2 +-
  10 files changed, 11 insertions(+), 11 deletions(-)
 
-diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
-index 4512efbdcc8..06de45aa7ab 100644
 --- a/libgcc/config/aarch64/linux-unwind.h
 +++ b/libgcc/config/aarch64/linux-unwind.h
-@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
    struct rt_sigframe
    {
      siginfo_t info;
@@ -57,11 +55,9 @@ index 4512efbdcc8..06de45aa7ab 100644
    };
  
    struct rt_sigframe *rt_;
-diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
-index bdbba4a3c5d..e84812e33fd 100644
 --- a/libgcc/config/alpha/linux-unwind.h
 +++ b/libgcc/config/alpha/linux-unwind.h
-@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+@@ -51,7 +51,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -70,11 +66,9 @@ index bdbba4a3c5d..e84812e33fd 100644
        } *rt_ = context->cfa;
        sc = &rt_->uc.uc_mcontext;
      }
-diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
-index 77b7c23c708..8bf5e82c55e 100644
 --- a/libgcc/config/bfin/linux-unwind.h
 +++ b/libgcc/config/bfin/linux-unwind.h
-@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+@@ -52,7 +52,7 @@
  	void *puc;
  	char retcode[8];
  	siginfo_t info;
@@ -83,11 +77,9 @@ index 77b7c23c708..8bf5e82c55e 100644
        } *rt_ = context->cfa;
  
        /* The void * cast is necessary to avoid an aliasing warning.
-diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
-index 540a0a25aca..29efbe31d61 100644
 --- a/libgcc/config/i386/linux-unwind.h
 +++ b/libgcc/config/i386/linux-unwind.h
-@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+@@ -58,7 +58,7 @@
    if (*(unsigned char *)(pc+0) == 0x48
        && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
      {
@@ -96,7 +88,7 @@ index 540a0a25aca..29efbe31d61 100644
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
           because it does not alias anything.  */
-@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+@@ -138,7 +138,7 @@
  	siginfo_t *pinfo;
  	void *puc;
  	siginfo_t info;
@@ -105,11 +97,9 @@ index 540a0a25aca..29efbe31d61 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
-index 75b7cf723a0..f964e24c4ee 100644
 --- a/libgcc/config/m68k/linux-unwind.h
 +++ b/libgcc/config/m68k/linux-unwind.h
-@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -33,7 +33,7 @@
  /* <sys/ucontext.h> is unfortunately broken right now.  */
  struct uw_ucontext {
  	unsigned long	  uc_flags;
@@ -118,11 +108,9 @@ index 75b7cf723a0..f964e24c4ee 100644
  	stack_t		  uc_stack;
  	mcontext_t	  uc_mcontext;
  	unsigned long	  uc_filler[80];
-diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
-index 23041420525..30f25ea379e 100644
 --- a/libgcc/config/nios2/linux-unwind.h
 +++ b/libgcc/config/nios2/linux-unwind.h
-@@ -38,7 +38,7 @@ struct nios2_mcontext {
+@@ -38,7 +38,7 @@
  
  struct nios2_ucontext {
    unsigned long uc_flags;
@@ -131,11 +119,9 @@ index 23041420525..30f25ea379e 100644
    stack_t uc_stack;
    struct nios2_mcontext uc_mcontext;
    sigset_t uc_sigmask;	/* mask last for extensibility */
-diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
-index 9a2657f295d..e47493dde91 100644
 --- a/libgcc/config/pa/linux-unwind.h
 +++ b/libgcc/config/pa/linux-unwind.h
-@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+@@ -80,7 +80,7 @@
    struct sigcontext *sc;
    struct rt_sigframe {
      siginfo_t info;
@@ -144,11 +130,9 @@ index 9a2657f295d..e47493dde91 100644
    } *frame;
  
    /* rt_sigreturn trampoline:
-diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
-index e389cacaab8..0bf43ba21c2 100644
 --- a/libgcc/config/sh/linux-unwind.h
 +++ b/libgcc/config/sh/linux-unwind.h
-@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+@@ -180,7 +180,7 @@
      {
        struct rt_sigframe {
  	siginfo_t info;
@@ -157,11 +141,9 @@ index e389cacaab8..0bf43ba21c2 100644
        } *rt_ = context->cfa;
        /* The void * cast is necessary to avoid an aliasing warning.
           The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
-index 796e97620b8..75f8890ce07 100644
 --- a/libgcc/config/tilepro/linux-unwind.h
 +++ b/libgcc/config/tilepro/linux-unwind.h
-@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
+@@ -61,7 +61,7 @@
    struct rt_sigframe {
      unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
      siginfo_t info;
@@ -170,11 +152,9 @@ index 796e97620b8..75f8890ce07 100644
    } *rt_;
  
    /* Return if this is not a signal handler.  */
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9872492acc2..586a9d49e9c 100644
 --- a/libgcc/config/xtensa/linux-unwind.h
 +++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+@@ -67,7 +67,7 @@
  
    struct rt_sigframe {
      siginfo_t info;
@@ -183,6 +163,3 @@ index 9872492acc2..586a9d49e9c 100644
    } *rt_;
  
    /* movi a2, __NR_rt_sigreturn; syscall */
--- 
-2.14.1
-
diff --git a/packages/gcc/6.4.0/0001-libtool-leave-framework-alone.patch b/packages/gcc/6.4.0/0001-libtool-leave-framework-alone.patch
new file mode 100644
index 00000000..1a86e415
--- /dev/null
+++ b/packages/gcc/6.4.0/0001-libtool-leave-framework-alone.patch
@@ -0,0 +1,18 @@
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
+@@ -36,6 +36,11 @@
+ for arg
+ do
+     case $arg in
++	-framework)
++	    # libtool handles this option. It should not be prefixed with
++	    # -Xcompiler, as that would split it from the argument that
++	    # follows.
++	    ;;
+ 	-f*|--*|-static-lib*|-shared-lib*|-B*)
+ 	    # Libtool does not ascribe any special meaning options
+ 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/packages/gcc/6.4.0/0002-uclibc-conf.patch b/packages/gcc/6.4.0/0002-uclibc-conf.patch
new file mode 100644
index 00000000..aef750af
--- /dev/null
+++ b/packages/gcc/6.4.0/0002-uclibc-conf.patch
@@ -0,0 +1,17 @@
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
diff --git a/packages/gcc/6.4.0/0003-missing-execinfo_h.patch b/packages/gcc/6.4.0/0003-missing-execinfo_h.patch
new file mode 100644
index 00000000..c90222a1
--- /dev/null
+++ b/packages/gcc/6.4.0/0003-missing-execinfo_h.patch
@@ -0,0 +1,15 @@
+---
+ boehm-gc/include/gc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/boehm-gc/include/gc.h
++++ b/boehm-gc/include/gc.h
+@@ -503,7 +503,7 @@
+ #if defined(__linux__) || defined(__GLIBC__)
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/packages/gcc/6.4.0/0004-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/6.4.0/0004-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
new file mode 100644
index 00000000..e81522dc
--- /dev/null
+++ b/packages/gcc/6.4.0/0004-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -0,0 +1,163 @@
+---
+ config/gcc-plugin.m4 |   18 +++++++++++++-----
+ gcc/configure        |   22 +++++++++++++++-------
+ libcc1/configure     |   22 +++++++++++++++-------
+ 3 files changed, 43 insertions(+), 19 deletions(-)
+
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
+@@ -20,6 +20,9 @@
+ 
+    pluginlibs=
+ 
++   PICFLAG="-fPIC"
++   UNDEFINEDPREAMBLE="extern int X;"
++   UNDEFINEDCODE="return X == 0;"
+    case "${host}" in
+      *-*-darwin*)
+        if test x$build = x$host; then
+@@ -30,6 +33,11 @@
+ 	 export_sym_check=
+        fi
+      ;;
++     *-*-mingw*|*-*-cygwin*|*-*-msys*)
++       PICFLAG=""
++       UNDEFINEDPREAMBLE=""
++       UNDEFINEDCODE=""
++     ;;
+      *)
+        if test x$build = x$host; then
+ 	 export_sym_check="objdump${exeext} -T"
+@@ -81,17 +89,17 @@
+      case "${host}" in
+        *-*-darwin*)
+ 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
+-	 CFLAGS="$CFLAGS -fPIC"
++	 CFLAGS="$CFLAGS ${PICFLAG}"
+ 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
+        ;;
+        *)
+-	 CFLAGS="$CFLAGS -fPIC"
+-	 LDFLAGS="$LDFLAGS -fPIC -shared"
++	 CFLAGS="$CFLAGS ${PICFLAG}"
++	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
+        ;;
+      esac
+-     AC_MSG_CHECKING([for -fPIC -shared])
++     AC_MSG_CHECKING([for ${PICFLAG} -shared])
+      AC_TRY_LINK(
+-       [extern int X;],[return X == 0;],
++       [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
+        [AC_MSG_RESULT([yes]); have_pic_shared=yes],
+        [AC_MSG_RESULT([no]); have_pic_shared=no])
+      if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -29199,6 +29199,9 @@
+ 
+    pluginlibs=
+ 
++   PICFLAG="-fPIC"
++   UNDEFINEDPREAMBLE="extern int X;"
++   UNDEFINEDCODE="return X == 0;"
+    case "${host}" in
+      *-*-darwin*)
+        if test x$build = x$host; then
+@@ -29209,6 +29212,11 @@
+ 	 export_sym_check=
+        fi
+      ;;
++     *-*-mingw*|*-*-cygwin*|*-*-msys*)
++       PICFLAG=""
++       UNDEFINEDPREAMBLE=""
++       UNDEFINEDCODE=""
++     ;;
+      *)
+        if test x$build = x$host; then
+ 	 export_sym_check="objdump${exeext} -T"
+@@ -29321,23 +29329,23 @@
+      case "${host}" in
+        *-*-darwin*)
+ 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
+-	 CFLAGS="$CFLAGS -fPIC"
++	 CFLAGS="$CFLAGS ${PICFLAG}"
+ 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
+        ;;
+        *)
+-	 CFLAGS="$CFLAGS -fPIC"
+-	 LDFLAGS="$LDFLAGS -fPIC -shared"
++	 CFLAGS="$CFLAGS ${PICFLAG}"
++	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
+        ;;
+      esac
+-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
+-$as_echo_n "checking for -fPIC -shared... " >&6; }
++     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
++$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-extern int X;
++${UNDEFINEDPREAMBLE}
+ int
+ main ()
+ {
+-return X == 0;
++${UNDEFINEDCODE}
+   ;
+   return 0;
+ }
+--- a/libcc1/configure
++++ b/libcc1/configure
+@@ -14531,6 +14531,9 @@
+ 
+    pluginlibs=
+ 
++   PICFLAG="-fPIC"
++   UNDEFINEDPREAMBLE="extern int X;"
++   UNDEFINEDCODE="return X == 0;"
+    case "${host}" in
+      *-*-darwin*)
+        if test x$build = x$host; then
+@@ -14541,6 +14544,11 @@
+ 	 export_sym_check=
+        fi
+      ;;
++     *-*-mingw*|*-*-cygwin*|*-*-msys*)
++       PICFLAG=""
++       UNDEFINEDPREAMBLE=""
++       UNDEFINEDCODE=""
++     ;;
+      *)
+        if test x$build = x$host; then
+ 	 export_sym_check="objdump${exeext} -T"
+@@ -14653,23 +14661,23 @@
+      case "${host}" in
+        *-*-darwin*)
+ 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
+-	 CFLAGS="$CFLAGS -fPIC"
++	 CFLAGS="$CFLAGS ${PICFLAG}"
+ 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
+        ;;
+        *)
+-	 CFLAGS="$CFLAGS -fPIC"
+-	 LDFLAGS="$LDFLAGS -fPIC -shared"
++	 CFLAGS="$CFLAGS ${PICFLAG}"
++	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
+        ;;
+      esac
+-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
+-$as_echo_n "checking for -fPIC -shared... " >&6; }
++     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
++$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-extern int X;
++${UNDEFINEDPREAMBLE}
+ int
+ main ()
+ {
+-return X == 0;
++${UNDEFINEDCODE}
+   ;
+   return 0;
+ }
diff --git a/packages/gcc/6.4.0/0005-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/6.4.0/0005-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 00000000..5f9a07a2
--- /dev/null
+++ b/packages/gcc/6.4.0/0005-gcc-plugin-POSIX-include-sys-select-h.patch
@@ -0,0 +1,14 @@
+---
+ libcc1/connection.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libcc1/connection.cc
++++ b/libcc1/connection.cc
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "marshall.hh"
diff --git a/packages/gcc/6.4.0/0006-arm-softfloat-libgcc.patch b/packages/gcc/6.4.0/0006-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..350857dd
--- /dev/null
+++ b/packages/gcc/6.4.0/0006-arm-softfloat-libgcc.patch
@@ -0,0 +1,31 @@
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -60,7 +60,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
+@@ -1,6 +1,11 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
diff --git a/packages/gcc/6.4.0/0007-arm_unbreak_armv4t.patch b/packages/gcc/6.4.0/0007-arm_unbreak_armv4t.patch
new file mode 100644
index 00000000..7c374453
--- /dev/null
+++ b/packages/gcc/6.4.0/0007-arm_unbreak_armv4t.patch
@@ -0,0 +1,17 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+---
+ gcc/config/arm/linux-eabi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -45,7 +45,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/packages/gcc/6.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/packages/gcc/6.4.0/0008-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
similarity index 93%
rename from packages/gcc/6.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
rename to packages/gcc/6.4.0/0008-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
index af9fb1d6..24371e66 100644
--- a/packages/gcc/6.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
+++ b/packages/gcc/6.4.0/0008-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
@@ -17,11 +17,9 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239772
 [Backport from gcc upstream commit 79f5d5e3cd5a668d5ecb2b6b0cce80ef5706ac53.]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- gcc/config/arm/cortex-a8-neon.md | 14 +++++++++-----
+ gcc/config/arm/cortex-a8-neon.md |   14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
 
-diff --git a/gcc/config/arm/cortex-a8-neon.md b/gcc/config/arm/cortex-a8-neon.md
-index 45f861f..b16c299 100644
 --- a/gcc/config/arm/cortex-a8-neon.md
 +++ b/gcc/config/arm/cortex-a8-neon.md
 @@ -357,30 +357,34 @@
@@ -64,6 +62,3 @@ index 45f861f..b16c299 100644
  
  ;; Comparisons can actually take 7 cycles sometimes instead of four,
  ;; but given all the other instructions lumped into type=ffarith that
--- 
-2.7.4
-
diff --git a/packages/gcc/6.4.0/0009-cilk-wchar.patch b/packages/gcc/6.4.0/0009-cilk-wchar.patch
new file mode 100644
index 00000000..300837f0
--- /dev/null
+++ b/packages/gcc/6.4.0/0009-cilk-wchar.patch
@@ -0,0 +1,54 @@
+[PATCH] cilk: fix build without wchar
+
+When building against uClibc with wchar support disabled, WCHAR_MIN and
+WCHAR_MAX are not defined leading to compilation errors.
+
+Fix it by only including the wchar code if available.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/libcilkrts/include/cilk/reducer_min_max.h
++++ b/libcilkrts/include/cilk/reducer_min_max.h
+@@ -3154,7 +3154,9 @@
+ CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
++#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
++#endif
+ CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
+@@ -3306,7 +3308,9 @@
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
++#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
++#endif
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
+@@ -3432,7 +3436,9 @@
+ CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
++#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
++#endif
+ CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
+@@ -3584,7 +3590,9 @@
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
++#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
++#endif
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/packages/gcc-linaro/6.4-2017.08/870-xtensa-fix-PR-target-82181.patch b/packages/gcc/6.4.0/0010-xtensa-fix-PR-target-82181.patch
similarity index 76%
rename from packages/gcc-linaro/6.4-2017.08/870-xtensa-fix-PR-target-82181.patch
rename to packages/gcc/6.4.0/0010-xtensa-fix-PR-target-82181.patch
index 5fe38414..1258023d 100644
--- a/packages/gcc-linaro/6.4-2017.08/870-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc/6.4.0/0010-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 2bdf5ccef979..92fdeb08046d 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -601,6 +601,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
+@@ -601,6 +601,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 2bdf5ccef979..92fdeb08046d 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc/6.4.0/0011-fix-m68k-compile.patch b/packages/gcc/6.4.0/0011-fix-m68k-compile.patch
new file mode 100644
index 00000000..9437f252
--- /dev/null
+++ b/packages/gcc/6.4.0/0011-fix-m68k-compile.patch
@@ -0,0 +1,18 @@
+remove unused header, which breaks the toolchain building
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+---
+ libgcc/config/m68k/linux-atomic.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/libgcc/config/m68k/linux-atomic.c
++++ b/libgcc/config/m68k/linux-atomic.c
+@@ -33,7 +33,6 @@
+    using the kernel helper defined below.  There is no support for
+    64-bit operations yet.  */
+ 
+-#include <asm/unistd.h>
+ #include <stdbool.h>
+ 
+ #ifndef __NR_atomic_cmpxchg_32
diff --git a/packages/gcc/6.4.0/0012-fix-m68k-uclinux.patch b/packages/gcc/6.4.0/0012-fix-m68k-uclinux.patch
new file mode 100644
index 00000000..20d7c4af
--- /dev/null
+++ b/packages/gcc/6.4.0/0012-fix-m68k-uclinux.patch
@@ -0,0 +1,21 @@
+avoids internal compiler error while compiling linux-atomic.c
+See here:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -824,7 +824,7 @@
+ m68k*-*-openbsd*)
+ 	;;
+ m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
+-	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
++	tmake_file="$tmake_file m68k/t-floatlib"
+ 	md_unwind_header=m68k/linux-unwind.h
+ 	;;
+ m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/packages/gcc-linaro/6.4-2017.08/892-libgcc-mkmap-symver-support-skip_underscore.patch b/packages/gcc/6.4.0/0013-libgcc-mkmap-symver-support-skip_underscore.patch
similarity index 91%
rename from packages/gcc-linaro/6.4-2017.08/892-libgcc-mkmap-symver-support-skip_underscore.patch
rename to packages/gcc/6.4.0/0013-libgcc-mkmap-symver-support-skip_underscore.patch
index 73ee6c5f..c6421d09 100644
--- a/packages/gcc-linaro/6.4-2017.08/892-libgcc-mkmap-symver-support-skip_underscore.patch
+++ b/packages/gcc/6.4.0/0013-libgcc-mkmap-symver-support-skip_underscore.patch
@@ -35,14 +35,12 @@ version information for Blackfin, instead of using a custom one.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libgcc/mkmap-symver.awk | 6 +++++-
+ libgcc/mkmap-symver.awk |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/libgcc/mkmap-symver.awk b/libgcc/mkmap-symver.awk
-index 266832a..30bb179 100644
 --- a/libgcc/mkmap-symver.awk
 +++ b/libgcc/mkmap-symver.awk
-@@ -47,7 +47,11 @@ state == "nm" && ($1 == "U" || $2 == "U") {
+@@ -47,7 +47,11 @@
  
  state == "nm" && NF == 3 {
    split ($3, s, "@")
@@ -55,6 +53,3 @@ index 266832a..30bb179 100644
    sawsymbol = 1;
    next;
  }
--- 
-2.7.4
-
diff --git a/packages/gcc-linaro/6.4-2017.08/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch b/packages/gcc/6.4.0/0014-libgcc-config-bfin-use-the-generic-linker-version-in.patch
similarity index 99%
rename from packages/gcc-linaro/6.4-2017.08/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
rename to packages/gcc/6.4.0/0014-libgcc-config-bfin-use-the-generic-linker-version-in.patch
index 454295d0..ac75cfa5 100644
--- a/packages/gcc-linaro/6.4-2017.08/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
+++ b/packages/gcc/6.4.0/0014-libgcc-config-bfin-use-the-generic-linker-version-in.patch
@@ -22,12 +22,10 @@ symbols in libgcc, and therefore all libgcc symbols were marked as
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libgcc/config/bfin/libgcc-glibc.ver | 1894 +----------------------------------
- libgcc/config/bfin/t-linux          |    3 +-
+ libgcc/config/bfin/libgcc-glibc.ver | 1894 ------------------------------------
+ libgcc/config/bfin/t-linux          |    3 
  2 files changed, 4 insertions(+), 1893 deletions(-)
 
-diff --git a/libgcc/config/bfin/libgcc-glibc.ver b/libgcc/config/bfin/libgcc-glibc.ver
-index b1bd2df..2af3df7 100644
 --- a/libgcc/config/bfin/libgcc-glibc.ver
 +++ b/libgcc/config/bfin/libgcc-glibc.ver
 @@ -16,1898 +16,8 @@
@@ -1931,14 +1929,9 @@ index b1bd2df..2af3df7 100644
 +  __smulsi3_highpart
 +  __umulsi3_highpart
  }
-diff --git a/libgcc/config/bfin/t-linux b/libgcc/config/bfin/t-linux
-index 1c42e48..8898157 100644
 --- a/libgcc/config/bfin/t-linux
 +++ b/libgcc/config/bfin/t-linux
 @@ -1 +1,2 @@
 -SHLIB_MAPFILES = $(srcdir)/config/bfin/libgcc-glibc.ver
 +SHLIB_MAPFILES += $(srcdir)/config/bfin/libgcc-glibc.ver
 +SHLIB_MKMAP_OPTS = -v skip_underscore=1
--- 
-2.7.4
-
diff --git a/packages/gcc-linaro/6.4-2017.08/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch b/packages/gcc/6.4.0/0015-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
similarity index 80%
rename from packages/gcc-linaro/6.4-2017.08/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
rename to packages/gcc/6.4.0/0015-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
index ce49de7e..f0ada67a 100644
--- a/packages/gcc-linaro/6.4-2017.08/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
+++ b/packages/gcc/6.4.0/0015-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
@@ -17,14 +17,12 @@ Fixes PR gcc/68468.
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libgcc/unwind-dw2-fde-dip.c | 8 ++++++--
+ libgcc/unwind-dw2-fde-dip.c |    8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
-index f7a1c3f..801bce8 100644
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -124,7 +124,11 @@ static struct frame_hdr_cache_element
+@@ -124,7 +124,11 @@
  {
    _Unwind_Ptr pc_low;
    _Unwind_Ptr pc_high;
@@ -36,7 +34,7 @@ index f7a1c3f..801bce8 100644
    const ElfW(Phdr) *p_eh_frame_hdr;
    const ElfW(Phdr) *p_dynamic;
    struct frame_hdr_cache_element *link;
-@@ -163,7 +167,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
+@@ -163,7 +167,7 @@
    struct unw_eh_callback_data *data = (struct unw_eh_callback_data *) ptr;
    const ElfW(Phdr) *phdr, *p_eh_frame_hdr, *p_dynamic;
    long n, match;
@@ -45,7 +43,7 @@ index f7a1c3f..801bce8 100644
    struct elf32_fdpic_loadaddr load_base;
  #else
    _Unwind_Ptr load_base;
-@@ -347,7 +351,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
+@@ -347,7 +351,7 @@
  	    break;
  	  }
      }
@@ -54,6 +52,3 @@ index f7a1c3f..801bce8 100644
    data->dbase = load_base.got_value;
  # else
  #  error What is DW_EH_PE_datarel base on this platform?
--- 
-2.7.4
-
diff --git a/packages/gcc/6.4.0/895-bfin-define-REENTRANT.patch b/packages/gcc/6.4.0/0016-bfin-define-REENTRANT.patch
similarity index 64%
rename from packages/gcc/6.4.0/895-bfin-define-REENTRANT.patch
rename to packages/gcc/6.4.0/0016-bfin-define-REENTRANT.patch
index e2828a51..633084b9 100644
--- a/packages/gcc/6.4.0/895-bfin-define-REENTRANT.patch
+++ b/packages/gcc/6.4.0/0016-bfin-define-REENTRANT.patch
@@ -2,9 +2,12 @@ enable _REENTRANT when -lpthread is used
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-6.2.0.orig/gcc/config/bfin/linux.h gcc-6.2.0/gcc/config/bfin/linux.h
---- gcc-6.2.0.orig/gcc/config/bfin/linux.h	2016-01-04 15:30:50.000000000 +0100
-+++ gcc-6.2.0/gcc/config/bfin/linux.h	2016-09-30 20:48:17.446636819 +0200
+---
+ gcc/config/bfin/linux.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gcc/config/bfin/linux.h
++++ b/gcc/config/bfin/linux.h
 @@ -38,6 +38,9 @@
    "%{static:--start-group} %{mfast-fp:-lbffastfp} %G %L %{static:--end-group} \
     %{!static:%{mfast-fp:-lbffastfp} %G}"
diff --git a/packages/gcc/6.4.0/900-libgfortran-missing-include.patch b/packages/gcc/6.4.0/0017-libgfortran-missing-include.patch
similarity index 51%
rename from packages/gcc/6.4.0/900-libgfortran-missing-include.patch
rename to packages/gcc/6.4.0/0017-libgfortran-missing-include.patch
index 1f474696..701e7b4f 100644
--- a/packages/gcc/6.4.0/900-libgfortran-missing-include.patch
+++ b/packages/gcc/6.4.0/0017-libgfortran-missing-include.patch
@@ -1,5 +1,9 @@
---- gcc-6.3.0/libgfortran/io/close.c.org	2017-01-17 09:43:48.395850000 +0100
-+++ gcc-6.3.0/libgfortran/io/close.c	2017-01-17 09:21:05.000000000 +0100
+---
+ libgfortran/io/close.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libgfortran/io/close.c
++++ b/libgfortran/io/close.c
 @@ -25,6 +25,7 @@
  #include "io.h"
  #include "unix.h"
diff --git a/packages/gcc-linaro/7.1-2017.08/910-nios2-bad-multilib-default.patch b/packages/gcc/6.4.0/0018-nios2-bad-multilib-default.patch
similarity index 59%
rename from packages/gcc-linaro/7.1-2017.08/910-nios2-bad-multilib-default.patch
rename to packages/gcc/6.4.0/0018-nios2-bad-multilib-default.patch
index 61989e56..4acc4918 100644
--- a/packages/gcc-linaro/7.1-2017.08/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc/6.4.0/0018-nios2-bad-multilib-default.patch
@@ -1,6 +1,10 @@
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios2.h
---- gcc-6.2.0.orig/gcc/config/nios2/nios2.h	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/nios2.h	2016-11-29 10:29:55.069624746 -0800
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
 @@ -63,11 +63,11 @@
  #if TARGET_ENDIAN_DEFAULT == 0
  # define ASM_SPEC "%{!meb:-EL} %{meb:-EB} %{march=*:-march=%*}"
@@ -15,9 +19,8 @@ diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios
  #endif
  
  #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/t-nios2 gcc-6.2.0/gcc/config/nios2/t-nios2
---- gcc-6.2.0.orig/gcc/config/nios2/t-nios2	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/t-nios2	2016-11-29 10:29:03.517151014 -0800
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
 @@ -22,6 +22,5 @@
  # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
  # MULTILIB_EXCEPTIONS = 
diff --git a/packages/gcc/6.4.0/0019-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/6.4.0/0019-libgcc-disable-split-stack-nothreads.patch
new file mode 100644
index 00000000..df91a9ff
--- /dev/null
+++ b/packages/gcc/6.4.0/0019-libgcc-disable-split-stack-nothreads.patch
@@ -0,0 +1,17 @@
+disable split-stack for non-thread builds
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
+@@ -1,4 +1,6 @@
+ # Makefile fragment to provide generic support for -fsplit-stack.
+ # This should be used in config.host for any host which supports
+ # -fsplit-stack.
++ifeq ($(enable_threads),yes)
+ LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
++endif
diff --git a/packages/gcc/6.4.0/0020-uclinux-enable-threads.patch b/packages/gcc/6.4.0/0020-uclinux-enable-threads.patch
new file mode 100644
index 00000000..8e4e0a26
--- /dev/null
+++ b/packages/gcc/6.4.0/0020-uclinux-enable-threads.patch
@@ -0,0 +1,22 @@
+Enable POSIX threads for uClinux targets
+Reported upstream:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+---
+ gcc/config.gcc |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -838,6 +838,9 @@
+ *-*-uclinux*)
+   extra_options="$extra_options gnu-user.opt"
+   use_gcc_stdint=wrap
++  case ${enable_threads} in
++    "" | yes | posix) thread_file='posix' ;;
++  esac
+   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
+   ;;
+ *-*-rdos*)
diff --git a/packages/gcc-linaro/7.1-2017.08/951-bionic-ndk.patch b/packages/gcc/6.4.0/0021-bionic-ndk.patch
similarity index 91%
rename from packages/gcc-linaro/7.1-2017.08/951-bionic-ndk.patch
rename to packages/gcc/6.4.0/0021-bionic-ndk.patch
index 59c50a89..474dd8c0 100644
--- a/packages/gcc-linaro/7.1-2017.08/951-bionic-ndk.patch
+++ b/packages/gcc/6.4.0/0021-bionic-ndk.patch
@@ -4,8 +4,10 @@ Date:   Tue Apr 25 19:02:18 2017 -0700
 
     Fix ctype for newer NDK headers
 
-diff --git a/libstdc++-v3/config/os/bionic/ctype_base.h b/libstdc++-v3/config/os/bionic/ctype_base.h
-index 33978f3..c36e63c 100644
+---
+ libstdc++-v3/config/os/bionic/ctype_base.h |   34 +++++++++++++++++++----------
+ 1 file changed, 23 insertions(+), 11 deletions(-)
+
 --- a/libstdc++-v3/config/os/bionic/ctype_base.h
 +++ b/libstdc++-v3/config/os/bionic/ctype_base.h
 @@ -28,6 +28,18 @@
@@ -27,7 +29,7 @@ index 33978f3..c36e63c 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -41,17 +53,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -41,17 +53,17 @@
      // NB: Offsets into ctype<char>::_M_table force a particular size
      // on the mask type. Because of this, we don't use an enum.
      typedef char 		mask;
diff --git a/packages/gcc-linaro/6.4-2017.08/952-bionic-errno.patch b/packages/gcc/6.4.0/0022-bionic-errno.patch
similarity index 66%
rename from packages/gcc-linaro/6.4-2017.08/952-bionic-errno.patch
rename to packages/gcc/6.4.0/0022-bionic-errno.patch
index 91f6ca34..0a1a6327 100644
--- a/packages/gcc-linaro/6.4-2017.08/952-bionic-errno.patch
+++ b/packages/gcc/6.4.0/0022-bionic-errno.patch
@@ -4,11 +4,13 @@ Date:   Tue Apr 25 20:17:03 2017 -0700
 
     Fix, errno is volatile int
 
-diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/dir.cc
-index 6ff12d0..5bbd664 100644
+---
+ libstdc++-v3/src/filesystem/dir.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/libstdc++-v3/src/filesystem/dir.cc
 +++ b/libstdc++-v3/src/filesystem/dir.cc
-@@ -147,7 +147,7 @@ fs::_Dir::advance(error_code* ec, directory_options options)
+@@ -146,7 +146,7 @@
  
    int err = std::exchange(errno, 0);
    const auto entp = readdir(dirp);
diff --git a/packages/gcc/6.4.0/970-crystax.patch b/packages/gcc/6.4.0/0023-crystax.patch
similarity index 82%
rename from packages/gcc/6.4.0/970-crystax.patch
rename to packages/gcc/6.4.0/0023-crystax.patch
index e3109cc8..47109006 100644
--- a/packages/gcc/6.4.0/970-crystax.patch
+++ b/packages/gcc/6.4.0/0023-crystax.patch
@@ -7,12 +7,34 @@ Date:   Wed Jul 29 11:28:29 2015 +0300
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
 [Edited: keep libstdc++, drop libcrystax-related modifications]
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index f66e48cd1..1c253496b 100644
+---
+ gcc/config.gcc                             |   17 +++++++-
+ gcc/config/aarch64/aarch64-linux-android.h |   59 +++++++++++++++++++++++++++++
+ gcc/config/aarch64/aarch64-linux.h         |    9 +++-
+ gcc/config/arm/arm.h                       |    3 -
+ gcc/config/arm/arm.md                      |    2 
+ gcc/config/arm/arm.opt                     |    4 +
+ gcc/config/arm/elf.h                       |    9 ++--
+ gcc/config/arm/linux-eabi.h                |    7 ++-
+ gcc/config/i386/gnu-user.h                 |    7 ++-
+ gcc/config/i386/gnu-user64.h               |    5 ++
+ gcc/config/i386/linux-common.h             |    8 +++
+ gcc/config/linux-android.h                 |   13 +++---
+ gcc/config/mips/android.h                  |   49 ++++++++++++++++++++++++
+ gcc/config/mips/gnu-user.h                 |    6 +-
+ gcc/config/mips/linux-common.h             |    2 
+ gcc/config/mips/t-linux-android            |    3 +
+ gcc/config/mips/t-linux-android64          |    4 +
+ libgcc/gthr-posix.h                        |   13 ++++++
+ libstdc++-v3/configure                     |   12 +++++
+ libstdc++-v3/include/bits/locale_facets.h  |   18 +++++++-
+ libstdc++-v3/libsupc++/guard.cc            |    5 ++
+ 21 files changed, 235 insertions(+), 20 deletions(-)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -942,13 +942,17 @@ aarch64*-*-elf | aarch64*-*-rtems*)
- 	TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
+@@ -955,13 +955,17 @@
+ 	tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-freebsd"
  	;;
  aarch64*-*-linux*)
 -	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h"
@@ -30,7 +52,7 @@ index f66e48cd1..1c253496b 100644
  	esac
  	aarch64_multilibs="${with_multilib_list}"
  	if test "$aarch64_multilibs" = "default"; then
-@@ -2055,6 +2059,17 @@ mips*-*-linux*)				# Linux MIPS, either endian.
+@@ -2072,6 +2076,17 @@
  	tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h"
  	extra_options="${extra_options} linux-android.opt"
  	case ${target} in
@@ -48,9 +70,6 @@ index f66e48cd1..1c253496b 100644
  		mipsisa32r6*)
  			default_mips_arch=mips32r6
  			;;
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-new file mode 100644
-index 000000000..db1288fd0
 --- /dev/null
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
 @@ -0,0 +1,59 @@
@@ -113,8 +132,6 @@ index 000000000..db1288fd0
 +  LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
 +
 +#endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 5fcaa59a3..6864195ee 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,14 @@
@@ -133,11 +150,9 @@ index 5fcaa59a3..6864195ee 100644
  
  #undef MUSL_DYNAMIC_LINKER
  #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
-index ad123dde9..97b059de6 100644
 --- a/gcc/config/arm/arm.h
 +++ b/gcc/config/arm/arm.h
-@@ -1888,10 +1888,11 @@ enum arm_auto_incmodes
+@@ -1893,10 +1893,11 @@
  
  #define CASE_VECTOR_PC_RELATIVE (TARGET_THUMB2				\
  				 || (TARGET_THUMB1			\
@@ -150,11 +165,9 @@ index ad123dde9..97b059de6 100644
     ? (min >= 0 && max < 512						\
        ? (ADDR_DIFF_VEC_FLAGS (body).offset_unsigned = 1, QImode)	\
        : min >= -256 && max < 256					\
-diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
-index 47171b996..eb22d1181 100644
 --- a/gcc/config/arm/arm.md
 +++ b/gcc/config/arm/arm.md
-@@ -8179,7 +8179,7 @@
+@@ -8180,7 +8180,7 @@
     (match_operand:SI 2 "const_int_operand" "")	; total range
     (match_operand:SI 3 "" "")			; table label
     (match_operand:SI 4 "" "")]			; Out of range label
@@ -163,11 +176,9 @@ index 47171b996..eb22d1181 100644
    "
    {
      enum insn_code code;
-diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
-index 0ebe01743..772453889 100644
 --- a/gcc/config/arm/arm.opt
 +++ b/gcc/config/arm/arm.opt
-@@ -193,6 +193,10 @@ mthumb-interwork
+@@ -193,6 +193,10 @@
  Target Report Mask(INTERWORK)
  Support calls between Thumb and ARM instruction sets.
  
@@ -178,8 +189,6 @@ index 0ebe01743..772453889 100644
  mtls-dialect=
  Target RejectNegative Joined Enum(tls_type) Var(target_tls_dialect) Init(TLS_GNU)
  Specify thread local storage scheme.
-diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
-index 77f30554d..32158ed65 100644
 --- a/gcc/config/arm/elf.h
 +++ b/gcc/config/arm/elf.h
 @@ -56,8 +56,7 @@
@@ -212,8 +221,6 @@ index 77f30554d..32158ed65 100644
  
  #ifndef LINK_SPEC
  #define LINK_SPEC "%{mbig-endian:-EB} %{mlittle-endian:-EL} -X"
-diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
-index ace84816e..8c8fa6553 100644
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -108,11 +108,16 @@
@@ -234,11 +241,9 @@ index ace84816e..8c8fa6553 100644
  #undef  LIB_SPEC
  #define LIB_SPEC							\
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC,			\
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index fee33a3ef..22fb2ced9 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -65,9 +65,14 @@ along with GCC; see the file COPYING3.  If not see
+@@ -65,9 +65,14 @@
     When the -shared link option is used a final link is not being
     done.  */
  
@@ -254,11 +259,9 @@ index fee33a3ef..22fb2ced9 100644
  
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 7a02a7eb4..cac4179bc 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
-@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -46,6 +46,11 @@
  #define SPEC_X32 "mx32"
  #endif
  
@@ -270,11 +273,9 @@ index 7a02a7eb4..cac4179bc 100644
  #undef ASM_SPEC
  #define ASM_SPEC "%{" SPEC_32 ":--32} \
   %{" SPEC_64 ":--64} \
-diff --git a/gcc/config/i386/linux-common.h b/gcc/config/i386/linux-common.h
-index 4b9910fa9..3b11ed086 100644
 --- a/gcc/config/i386/linux-common.h
 +++ b/gcc/config/i386/linux-common.h
-@@ -30,7 +30,13 @@ along with GCC; see the file COPYING3.  If not see
+@@ -30,7 +30,13 @@
  #undef CC1_SPEC
  #define CC1_SPEC \
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \
@@ -289,11 +290,9 @@ index 4b9910fa9..3b11ed086 100644
  
  #undef	LINK_SPEC
  #define LINK_SPEC \
-diff --git a/gcc/config/linux-android.h b/gcc/config/linux-android.h
-index 301a41ccd..9623c88d0 100644
 --- a/gcc/config/linux-android.h
 +++ b/gcc/config/linux-android.h
-@@ -38,15 +39,18 @@
+@@ -38,15 +38,18 @@
    "%{" NOANDROID "|tno-android-ld:" LINUX_SPEC ";:" ANDROID_SPEC "}"
  
  #define ANDROID_LINK_SPEC \
@@ -317,9 +316,6 @@ index 301a41ccd..9623c88d0 100644
  
  #define ANDROID_LIB_SPEC \
    "%{!static: -ldl}"
-diff --git a/gcc/config/mips/android.h b/gcc/config/mips/android.h
-new file mode 100644
-index 000000000..32c539c8d
 --- /dev/null
 +++ b/gcc/config/mips/android.h
 @@ -0,0 +1,49 @@
@@ -372,11 +368,9 @@ index 000000000..32c539c8d
 +									\
 +  /* Use the standard linux specs for everything else.  */		\
 +  LINUX_DRIVER_SELF_SPECS
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 15b549c08..4a2816014 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
-@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -36,6 +36,7 @@
      /* The GNU C++ standard library requires this.  */		\
      if (c_dialect_cxx ())					\
        builtin_define ("_GNU_SOURCE");				\
@@ -384,7 +378,7 @@ index 15b549c08..4a2816014 100644
    } while (0)
  
  #undef SUBTARGET_CPP_SPEC
-@@ -71,7 +72,8 @@ along with GCC; see the file COPYING3.  If not see
+@@ -71,7 +72,8 @@
  
  #undef SUBTARGET_ASM_SPEC
  #define SUBTARGET_ASM_SPEC \
@@ -394,7 +388,7 @@ index 15b549c08..4a2816014 100644
  
  /* The MIPS assembler has different syntax for .set. We set it to
     .dummy to trap any errors.  */
-@@ -120,7 +122,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -120,7 +122,7 @@
  #endif
  
  #define LINUX_DRIVER_SELF_SPECS \
@@ -403,11 +397,9 @@ index 15b549c08..4a2816014 100644
    MARCH_MTUNE_NATIVE_SPECS,						\
    /* -mplt has no effect without -mno-shared.  Simplify later		\
       specs handling by removing a redundant option.  */			\
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8429a7ca2..8bfacf994 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -35,7 +35,7 @@
  #undef  SUBTARGET_CC1_SPEC
  #define SUBTARGET_CC1_SPEC						\
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC,			\
@@ -416,18 +408,12 @@ index 8429a7ca2..8bfacf994 100644
  
  #undef  CC1PLUS_SPEC
  #define CC1PLUS_SPEC							\
-diff --git a/gcc/config/mips/t-linux-android b/gcc/config/mips/t-linux-android
-new file mode 100644
-index 000000000..39f512c81
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android
 @@ -0,0 +1,3 @@
 +MULTILIB_OPTIONS = mips32r2/mips32r6
 +MULTILIB_DIRNAMES = mips-r2 mips-r6
 +MULTILIB_OSDIRNAMES = ../libr2 ../libr6
-diff --git a/gcc/config/mips/t-linux-android64 b/gcc/config/mips/t-linux-android64
-new file mode 100644
-index 000000000..55cab7d62
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android64
 @@ -0,0 +1,4 @@
@@ -435,11 +421,9 @@ index 000000000..55cab7d62
 +MULTILIB_DIRNAMES = 32 mips-r1 mips-r2 mips-r6 mips64-r2 mips64-r6
 +MULTILIB_OSDIRNAMES = ../lib ../lib ../libr2 ../libr6 ../lib64r2 ../lib64
 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6
-diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h
-index 555c0fe24..47c8655f9 100644
 --- a/libgcc/gthr-posix.h
 +++ b/libgcc/gthr-posix.h
-@@ -32,6 +32,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -32,6 +32,19 @@
  #define __GTHREADS 1
  #define __GTHREADS_CXX0X 1
  
@@ -459,11 +443,9 @@ index 555c0fe24..47c8655f9 100644
  #include <pthread.h>
  
  #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 41797a971..f746e8353 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -78319,6 +78341,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78389,6 +78389,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -476,7 +458,7 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-@@ -78377,6 +78405,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78447,6 +78453,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -489,8 +471,6 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
-index e3e206b7d..e85dc2c76 100644
 --- a/libstdc++-v3/include/bits/locale_facets.h
 +++ b/libstdc++-v3/include/bits/locale_facets.h
 @@ -47,6 +47,20 @@
@@ -514,7 +494,7 @@ index e3e206b7d..e85dc2c76 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -1102,7 +1116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1102,7 +1116,7 @@
         *  @return  @a __hi.
        */
        virtual const char*
@@ -523,7 +503,7 @@ index e3e206b7d..e85dc2c76 100644
        {
  	__builtin_memcpy(__to, __lo, __hi - __lo);
  	return __hi;
-@@ -1163,7 +1177,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1163,7 +1177,7 @@
  
      private:
        void _M_narrow_init() const;
@@ -532,8 +512,6 @@ index e3e206b7d..e85dc2c76 100644
      };
  
  #ifdef _GLIBCXX_USE_WCHAR_T
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 9b617998f..c149169bb 100644
 --- a/libstdc++-v3/libsupc++/guard.cc
 +++ b/libstdc++-v3/libsupc++/guard.cc
 @@ -33,7 +33,12 @@
diff --git a/packages/gcc-linaro/7.1-2017.08/971-crystax.patch b/packages/gcc/6.4.0/0024-crystax.patch
similarity index 88%
rename from packages/gcc-linaro/7.1-2017.08/971-crystax.patch
rename to packages/gcc/6.4.0/0024-crystax.patch
index 748a3812..f1f9eb12 100644
--- a/packages/gcc-linaro/7.1-2017.08/971-crystax.patch
+++ b/packages/gcc/6.4.0/0024-crystax.patch
@@ -6,8 +6,10 @@ Date:   Thu Aug 13 16:11:54 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/t-linux-androideabi b/gcc/config/arm/t-linux-androideabi
-index 8f1307c55..cbbec5bd2 100644
+---
+ gcc/config/arm/t-linux-androideabi |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
 --- a/gcc/config/arm/t-linux-androideabi
 +++ b/gcc/config/arm/t-linux-androideabi
 @@ -1,8 +1,9 @@
diff --git a/packages/gcc-linaro/6.4-2017.08/972-crystax.patch b/packages/gcc/6.4.0/0025-crystax.patch
similarity index 82%
rename from packages/gcc-linaro/6.4-2017.08/972-crystax.patch
rename to packages/gcc/6.4.0/0025-crystax.patch
index b9077bef..16b182fb 100644
--- a/packages/gcc-linaro/6.4-2017.08/972-crystax.patch
+++ b/packages/gcc/6.4.0/0025-crystax.patch
@@ -10,11 +10,23 @@ Date:   Mon Apr 14 15:59:47 2014 -0700
     Change-Id: Ibda473188e5a10f2a0592f2494ad00ad1f91e04b
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config.in b/gcc/config.in
-index 115cb6163..933916833 100644
+---
+ gcc/config.in                          |    6 +++++
+ gcc/config/alpha/elf.h                 |    4 +++
+ gcc/config/freebsd.h                   |    4 +++
+ gcc/config/gnu-user.h                  |    4 +++
+ gcc/config/openbsd.h                   |    4 +++
+ gcc/config/rs6000/sysv4.h              |    6 ++++-
+ gcc/config/sol2.h                      |    4 +++
+ gcc/configure                          |   36 +++++++++++++++++++++++++++++++++
+ gcc/configure.ac                       |   29 ++++++++++++++++++++++++++
+ gcc/testsuite/g++.dg/eh/spec3-static.C |   25 ++++++++++++++++++++++
+ libgcc/crtstuff.c                      |   11 ++++++----
+ 11 files changed, 128 insertions(+), 5 deletions(-)
+
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -2119,6 +2119,12 @@
+@@ -2144,6 +2144,12 @@
  #endif
  
  
@@ -27,11 +39,9 @@ index 115cb6163..933916833 100644
  /* Define to 1 if the 'long long' type is wider than 'long' but still
     efficiently supported by the host hardware. */
  #ifndef USED_FOR_TARGET
-diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h
-index 093c38bba..54b3e0c91 100644
 --- a/gcc/config/alpha/elf.h
 +++ b/gcc/config/alpha/elf.h
-@@ -168,5 +168,9 @@ extern int alpha_this_gpdisp_sequence_number;
+@@ -168,5 +168,9 @@
     I imagine that other systems will catch up.  In the meantime, it
     doesn't harm to make sure that the data exists to be used later.  */
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -41,11 +51,9 @@ index 093c38bba..54b3e0c91 100644
  #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
  #endif
 +#endif
-diff --git a/gcc/config/freebsd.h b/gcc/config/freebsd.h
-index 5ded869d2..5f51ac81d 100644
 --- a/gcc/config/freebsd.h
 +++ b/gcc/config/freebsd.h
-@@ -45,8 +45,12 @@ along with GCC; see the file COPYING3.  If not see
+@@ -45,8 +45,12 @@
  #define LIB_SPEC FBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -58,11 +66,9 @@ index 5ded869d2..5f51ac81d 100644
  
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index b0bf40a95..d1874bc29 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -118,8 +118,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -118,8 +118,12 @@
  #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -75,11 +81,9 @@ index b0bf40a95..d1874bc29 100644
  
  #undef LINK_GCC_C_SEQUENCE_SPEC
  #define LINK_GCC_C_SEQUENCE_SPEC \
-diff --git a/gcc/config/openbsd.h b/gcc/config/openbsd.h
-index 37ecfc43f..a5f1b9955 100644
 --- a/gcc/config/openbsd.h
 +++ b/gcc/config/openbsd.h
-@@ -136,8 +136,12 @@ while (0)
+@@ -136,8 +136,12 @@
  #define LIB_SPEC OBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -92,11 +96,9 @@ index 37ecfc43f..a5f1b9955 100644
  
  #undef LIB_SPEC
  #define LIB_SPEC OBSD_LIB_SPEC
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index cbf909722..eb2217fad 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -789,7 +789,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -800,7 +800,11 @@
    -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -109,11 +111,9 @@ index cbf909722..eb2217fad 100644
  #endif
  
  #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
-diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
-index 5160e1fda..7632a5081 100644
 --- a/gcc/config/sol2.h
 +++ b/gcc/config/sol2.h
-@@ -347,7 +347,11 @@ along with GCC; see the file COPYING3.  If not see
+@@ -347,7 +347,11 @@
  /* Solaris 11 build 135+ implements dl_iterate_phdr.  GNU ld needs
     --eh-frame-hdr to create the required .eh_frame_hdr sections.  */
  #if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
@@ -125,11 +125,9 @@ index 5160e1fda..7632a5081 100644
  #endif /* HAVE_LD_EH_FRAME && TARGET_DL_ITERATE_PHDR */
  #endif
  
-diff --git a/gcc/configure b/gcc/configure
-index 1c6e3407c..28ad05004 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -934,6 +934,7 @@ enable_fix_cortex_a53_835769
+@@ -934,6 +934,7 @@
  enable_fix_cortex_a53_843419
  with_glibc_version
  enable_gnu_unique_object
@@ -137,7 +135,7 @@ index 1c6e3407c..28ad05004 100755
  enable_linker_build_id
  enable_default_ssp
  with_long_double_128
-@@ -1670,6 +1671,9 @@ Optional Features:
+@@ -1670,6 +1671,9 @@
    --enable-gnu-unique-object
                            enable the use of the @gnu_unique_object ELF
                            extension on glibc systems
@@ -147,7 +145,7 @@ index 1c6e3407c..28ad05004 100755
    --enable-linker-build-id
                            compiler will always pass --build-id to linker
    --enable-default-ssp    enable Stack Smashing Protection as default
-@@ -27703,6 +27707,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
+@@ -27785,6 +27789,38 @@
  
  $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h
  
@@ -186,11 +184,9 @@ index 1c6e3407c..28ad05004 100755
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld_eh_frame_hdr" >&5
  $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; }
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6c1dcd9ae..0cf7419e7 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4828,6 +4828,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
+@@ -4861,6 +4861,35 @@
  if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
  	AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1,
  [Define if your linker supports .eh_frame_hdr.])
@@ -226,9 +222,6 @@ index 6c1dcd9ae..0cf7419e7 100644
  fi
  AC_MSG_RESULT($gcc_cv_ld_eh_frame_hdr)
  
-diff --git a/gcc/testsuite/g++.dg/eh/spec3-static.C b/gcc/testsuite/g++.dg/eh/spec3-static.C
-new file mode 100644
-index 000000000..15408effa
 --- /dev/null
 +++ b/gcc/testsuite/g++.dg/eh/spec3-static.C
 @@ -0,0 +1,25 @@
@@ -257,11 +250,9 @@ index 000000000..15408effa
 +  try {	func(); }
 +  catch (A& a) { }
 +}
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index f3343fc4f..d42647779 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -88,7 +88,8 @@ call_ ## FUNC (void)					\
+@@ -88,7 +88,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -271,7 +262,7 @@ index f3343fc4f..d42647779 100644
      && defined(BSD_DL_ITERATE_PHDR_AVAILABLE)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -97,7 +98,8 @@ call_ ## FUNC (void)					\
+@@ -97,7 +98,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \
@@ -281,7 +272,7 @@ index f3343fc4f..d42647779 100644
      && defined(__sun__) && defined(__svr4__)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -106,7 +108,8 @@ call_ ## FUNC (void)					\
+@@ -106,7 +108,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -291,7 +282,7 @@ index f3343fc4f..d42647779 100644
      && defined(__GLIBC__) && __GLIBC__ >= 2
  #include <link.h>
  /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
-@@ -121,7 +124,7 @@ call_ ## FUNC (void)					\
+@@ -121,7 +124,7 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
diff --git a/packages/gcc/7.2.0/973-crystax.patch b/packages/gcc/6.4.0/0026-crystax.patch
similarity index 77%
rename from packages/gcc/7.2.0/973-crystax.patch
rename to packages/gcc/6.4.0/0026-crystax.patch
index c608eb34..8aacba2c 100644
--- a/packages/gcc/7.2.0/973-crystax.patch
+++ b/packages/gcc/6.4.0/0026-crystax.patch
@@ -6,11 +6,13 @@ Date:   Thu Aug 20 19:11:07 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 3d044e8bd..5c89fcab0 100644
+---
+ gcc/config/i386/i386.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
-@@ -15753,6 +15753,7 @@ legitimate_pic_address_disp_p (rtx disp)
+@@ -14683,6 +14683,7 @@
  	  else if (!SYMBOL_REF_FAR_ADDR_P (op0)
  		   && (SYMBOL_REF_LOCAL_P (op0)
  		       || (HAVE_LD_PIE_COPYRELOC
diff --git a/packages/gcc/7.2.0/974-crystax.patch b/packages/gcc/6.4.0/0027-crystax.patch
similarity index 73%
rename from packages/gcc/7.2.0/974-crystax.patch
rename to packages/gcc/6.4.0/0027-crystax.patch
index 9db4f545..8f2eb438 100644
--- a/packages/gcc/7.2.0/974-crystax.patch
+++ b/packages/gcc/6.4.0/0027-crystax.patch
@@ -6,11 +6,13 @@ Date:   Fri Aug 21 17:41:59 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index 47a7d061a..67a680f90 100644
+---
+ libgcc/gthr.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
-@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -145,7 +145,11 @@
  #define GTHREAD_USE_WEAK 1
  #endif
  #endif
diff --git a/packages/gcc-linaro/7.1-2017.08/975-crystax.patch b/packages/gcc/6.4.0/0028-crystax.patch
similarity index 88%
rename from packages/gcc-linaro/7.1-2017.08/975-crystax.patch
rename to packages/gcc/6.4.0/0028-crystax.patch
index 9efc2a48..5e23c3cb 100644
--- a/packages/gcc-linaro/7.1-2017.08/975-crystax.patch
+++ b/packages/gcc/6.4.0/0028-crystax.patch
@@ -9,11 +9,13 @@ Date:   Mon Apr 14 21:05:51 2014 -0700
     Change-Id: Ie1de9f946f397196bb6f1623f5add86933739484
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
-index 5974c65d3..71b2c7aa9 100644
+---
+ gcc/config/arm/arm.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/arm.c
 +++ b/gcc/config/arm/arm.c
-@@ -22403,9 +22403,13 @@ arm_print_operand (FILE *stream, rtx x, int code)
+@@ -22460,9 +22460,13 @@
  	memsize = MEM_SIZE (x);
  
  	/* Only certain alignment specifiers are supported by the hardware.  */
diff --git a/packages/gcc-linaro/6.4-2017.08/976-crystax.patch b/packages/gcc/6.4.0/0029-crystax.patch
similarity index 84%
rename from packages/gcc-linaro/6.4-2017.08/976-crystax.patch
rename to packages/gcc/6.4.0/0029-crystax.patch
index 790d4a9d..8c21a1cc 100644
--- a/packages/gcc-linaro/6.4-2017.08/976-crystax.patch
+++ b/packages/gcc/6.4.0/0029-crystax.patch
@@ -6,8 +6,10 @@ Date:   Sat Aug 22 09:55:55 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index a1f98d3d1..3725799be 100644
+---
+ gcc/config/i386/pmm_malloc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
 @@ -31,7 +31,7 @@
diff --git a/packages/gcc/6.4.0/977-crystax.patch b/packages/gcc/6.4.0/0030-crystax.patch
similarity index 73%
rename from packages/gcc/6.4.0/977-crystax.patch
rename to packages/gcc/6.4.0/0030-crystax.patch
index 0211d728..ccb81fd6 100644
--- a/packages/gcc/6.4.0/977-crystax.patch
+++ b/packages/gcc/6.4.0/0030-crystax.patch
@@ -6,11 +6,14 @@ Date:   Tue Aug 25 09:36:42 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-index db1288fd0..38bc64d61 100644
+---
+ gcc/config/aarch64/aarch64-linux-android.h |    4 ++++
+ gcc/config/mips/linux-common.h             |    4 ++++
+ 2 files changed, 8 insertions(+)
+
 --- a/gcc/config/aarch64/aarch64-linux-android.h
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
-@@ -57,4 +57,8 @@
+@@ -56,4 +56,8 @@
  #define ENDFILE_SPEC \
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
  
@@ -19,11 +22,9 @@ index db1288fd0..38bc64d61 100644
 +#endif
 +
  #endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8bfacf994..262a9a341 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -63,3 +63,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -62,3 +62,7 @@
  
  /* The default value isn't sufficient in 64-bit mode.  */
  #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024)
diff --git a/packages/gcc/6.4.0/100-uclibc-conf.patch b/packages/gcc/6.4.0/100-uclibc-conf.patch
deleted file mode 100644
index 73d1f0d3..00000000
--- a/packages/gcc/6.4.0/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
---- a/contrib/regression/objs-gcc.sh
-+++ b/contrib/regression/objs-gcc.sh
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/packages/gcc/6.4.0/1000-libtool-leave-framework-alone.patch b/packages/gcc/6.4.0/1000-libtool-leave-framework-alone.patch
deleted file mode 100644
index bce09eb7..00000000
--- a/packages/gcc/6.4.0/1000-libtool-leave-framework-alone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc-6.2.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-6.2.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
-@@ -36,6 +36,11 @@
- for arg
- do
-     case $arg in
-+	-framework)
-+	    # libtool handles this option. It should not be prefixed with
-+	    # -Xcompiler, as that would split it from the argument that
-+	    # follows.
-+	    ;;
- 	-f*|--*|-static-lib*|-shared-lib*|-B*)
- 	    # Libtool does not ascribe any special meaning options
- 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/packages/gcc/6.4.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/6.4.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
deleted file mode 100644
index d8986d5f..00000000
--- a/packages/gcc/6.4.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
-@@ -20,6 +20,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -30,6 +33,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -81,17 +89,17 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     AC_MSG_CHECKING([for -fPIC -shared])
-+     AC_MSG_CHECKING([for ${PICFLAG} -shared])
-      AC_TRY_LINK(
--       [extern int X;],[return X == 0;],
-+       [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
-        [AC_MSG_RESULT([yes]); have_pic_shared=yes],
-        [AC_MSG_RESULT([no]); have_pic_shared=no])
-      if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
-@@ -14500,6 +14500,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -14510,6 +14513,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -14622,23 +14630,23 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
diff --git a/packages/gcc/6.4.0/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/6.4.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48ee..00000000
--- a/packages/gcc/6.4.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/packages/gcc/6.4.0/810-arm-softfloat-libgcc.patch b/packages/gcc/6.4.0/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 5efa7fd1..00000000
--- a/packages/gcc/6.4.0/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: b/libgcc/config/arm/t-linux
-===================================================================
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/packages/gcc/6.4.0/830-arm_unbreak_armv4t.patch b/packages/gcc/6.4.0/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index b7300591..00000000
--- a/packages/gcc/6.4.0/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/packages/gcc/6.4.0/860-cilk-wchar.patch b/packages/gcc/6.4.0/860-cilk-wchar.patch
deleted file mode 100644
index 1d9916f5..00000000
--- a/packages/gcc/6.4.0/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- a/libcilkrts/include/cilk/reducer_min_max.h
-+++ b/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/packages/gcc/6.4.0/890-fix-m68k-compile.patch b/packages/gcc/6.4.0/890-fix-m68k-compile.patch
deleted file mode 100644
index 6e63de0c..00000000
--- a/packages/gcc/6.4.0/890-fix-m68k-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove unused header, which breaks the toolchain building
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c
---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c	2016-03-19 09:25:07.000000000 +0100
-@@ -33,7 +33,6 @@
-    using the kernel helper defined below.  There is no support for
-    64-bit operations yet.  */
- 
--#include <asm/unistd.h>
- #include <stdbool.h>
- 
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/packages/gcc/6.4.0/891-fix-m68k-uclinux.patch b/packages/gcc/6.4.0/891-fix-m68k-uclinux.patch
deleted file mode 100644
index 4e186bd3..00000000
--- a/packages/gcc/6.4.0/891-fix-m68k-uclinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avoids internal compiler error while compiling linux-atomic.c
-See here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/packages/gcc/6.4.0/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/6.4.0/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 07f9a739..00000000
--- a/packages/gcc/6.4.0/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/packages/gcc/6.4.0/940-uclinux-enable-threads.patch b/packages/gcc/6.4.0/940-uclinux-enable-threads.patch
deleted file mode 100644
index 490a55b4..00000000
--- a/packages/gcc/6.4.0/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
---- gcc-5.4.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.4.0/gcc/config.gcc	2016-07-01 21:26:02.772958441 +0200
-@@ -808,6 +808,9 @@
- *-*-uclinux*)
-   extra_options="$extra_options gnu-user.opt"
-   use_gcc_stdint=wrap
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
-   ;;
- *-*-rdos*)
diff --git a/packages/gcc/7.2.0/0000-libtool-leave-framework-alone.patch b/packages/gcc/7.2.0/0000-libtool-leave-framework-alone.patch
new file mode 100644
index 00000000..1a86e415
--- /dev/null
+++ b/packages/gcc/7.2.0/0000-libtool-leave-framework-alone.patch
@@ -0,0 +1,18 @@
+---
+ libtool-ldflags |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/libtool-ldflags
++++ b/libtool-ldflags
+@@ -36,6 +36,11 @@
+ for arg
+ do
+     case $arg in
++	-framework)
++	    # libtool handles this option. It should not be prefixed with
++	    # -Xcompiler, as that would split it from the argument that
++	    # follows.
++	    ;;
+ 	-f*|--*|-static-lib*|-shared-lib*|-B*)
+ 	    # Libtool does not ascribe any special meaning options
+ 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/packages/gcc/7.2.0/0001-uclibc-conf.patch b/packages/gcc/7.2.0/0001-uclibc-conf.patch
new file mode 100644
index 00000000..aef750af
--- /dev/null
+++ b/packages/gcc/7.2.0/0001-uclibc-conf.patch
@@ -0,0 +1,17 @@
+---
+ contrib/regression/objs-gcc.sh |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
diff --git a/packages/gcc/7.2.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/7.2.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
similarity index 86%
rename from packages/gcc/7.2.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
rename to packages/gcc/7.2.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
index f13bff1b..a5f37216 100644
--- a/packages/gcc/7.2.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ b/packages/gcc/7.2.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
@@ -1,6 +1,11 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
+---
+ config/gcc-plugin.m4 |   18 +++++++++++++-----
+ gcc/configure        |   22 +++++++++++++++-------
+ libcc1/configure     |   22 +++++++++++++++-------
+ 3 files changed, 43 insertions(+), 19 deletions(-)
+
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
 @@ -20,6 +20,9 @@
  
     pluginlibs=
@@ -46,9 +51,8 @@ diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
         [AC_MSG_RESULT([yes]); have_pic_shared=yes],
         [AC_MSG_RESULT([no]); have_pic_shared=no])
       if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
+--- a/gcc/configure
++++ b/gcc/configure
 @@ -29478,6 +29478,9 @@
  
     pluginlibs=
@@ -102,9 +106,8 @@ diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
    ;
    return 0;
  }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
+--- a/libcc1/configure
++++ b/libcc1/configure
 @@ -14553,6 +14553,9 @@
  
     pluginlibs=
diff --git a/packages/gcc/7.2.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/7.2.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch
new file mode 100644
index 00000000..5f9a07a2
--- /dev/null
+++ b/packages/gcc/7.2.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch
@@ -0,0 +1,14 @@
+---
+ libcc1/connection.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libcc1/connection.cc
++++ b/libcc1/connection.cc
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "marshall.hh"
diff --git a/packages/gcc/7.2.0/0004-arm-softfloat-libgcc.patch b/packages/gcc/7.2.0/0004-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..d9800365
--- /dev/null
+++ b/packages/gcc/7.2.0/0004-arm-softfloat-libgcc.patch
@@ -0,0 +1,31 @@
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ libgcc/config/arm/t-linux  |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -58,7 +58,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
+@@ -1,6 +1,11 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
diff --git a/packages/gcc/7.2.0/0005-cilk-wchar.patch b/packages/gcc/7.2.0/0005-cilk-wchar.patch
new file mode 100644
index 00000000..d2230cd4
--- /dev/null
+++ b/packages/gcc/7.2.0/0005-cilk-wchar.patch
@@ -0,0 +1,54 @@
+[PATCH] cilk: fix build without wchar
+
+When building against uClibc with wchar support disabled, WCHAR_MIN and
+WCHAR_MAX are not defined leading to compilation errors.
+
+Fix it by only including the wchar code if available.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/libcilkrts/include/cilk/reducer_min_max.h
++++ b/libcilkrts/include/cilk/reducer_min_max.h
+@@ -3289,7 +3289,9 @@
+ CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
++#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
++#endif
+ CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
+@@ -3441,7 +3443,9 @@
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
++#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
++#endif
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
+@@ -3567,7 +3571,9 @@
+ CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
++#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
++#endif
+ CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
+@@ -3719,7 +3725,9 @@
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
++#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
++#endif
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/packages/gcc-linaro/7.1-2017.08/870-xtensa-fix-PR-target-82181.patch b/packages/gcc/7.2.0/0006-xtensa-fix-PR-target-82181.patch
similarity index 76%
rename from packages/gcc-linaro/7.1-2017.08/870-xtensa-fix-PR-target-82181.patch
rename to packages/gcc/7.2.0/0006-xtensa-fix-PR-target-82181.patch
index 7ac7cd95..ec9f1f8c 100644
--- a/packages/gcc-linaro/7.1-2017.08/870-xtensa-fix-PR-target-82181.patch
+++ b/packages/gcc/7.2.0/0006-xtensa-fix-PR-target-82181.patch
@@ -11,14 +11,12 @@ gcc/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gcc/config/xtensa/xtensa.c | 1 +
+ gcc/config/xtensa/xtensa.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 25e4a2894c3b..8c404187107b 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
-@@ -605,6 +605,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
+@@ -605,6 +605,7 @@
      case HImode:
        return xtensa_uimm8x2 (v);
  
@@ -26,6 +24,3 @@ index 25e4a2894c3b..8c404187107b 100644
      case DFmode:
        return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
  
--- 
-2.1.4
-
diff --git a/packages/gcc/7.2.0/891-fix-m68k-uclinux.patch b/packages/gcc/7.2.0/0007-fix-m68k-uclinux.patch
similarity index 69%
rename from packages/gcc/7.2.0/891-fix-m68k-uclinux.patch
rename to packages/gcc/7.2.0/0007-fix-m68k-uclinux.patch
index c322b03e..9edd7daf 100644
--- a/packages/gcc/7.2.0/891-fix-m68k-uclinux.patch
+++ b/packages/gcc/7.2.0/0007-fix-m68k-uclinux.patch
@@ -4,9 +4,12 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
+---
+ libgcc/config.host |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libgcc/config.host
++++ b/libgcc/config.host
 @@ -820,7 +820,7 @@
  m68k*-*-openbsd*)
  	;;
diff --git a/packages/gcc/7.2.0/900-libgfortran-missing-include.patch b/packages/gcc/7.2.0/0008-libgfortran-missing-include.patch
similarity index 51%
rename from packages/gcc/7.2.0/900-libgfortran-missing-include.patch
rename to packages/gcc/7.2.0/0008-libgfortran-missing-include.patch
index 1f474696..701e7b4f 100644
--- a/packages/gcc/7.2.0/900-libgfortran-missing-include.patch
+++ b/packages/gcc/7.2.0/0008-libgfortran-missing-include.patch
@@ -1,5 +1,9 @@
---- gcc-6.3.0/libgfortran/io/close.c.org	2017-01-17 09:43:48.395850000 +0100
-+++ gcc-6.3.0/libgfortran/io/close.c	2017-01-17 09:21:05.000000000 +0100
+---
+ libgfortran/io/close.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/libgfortran/io/close.c
++++ b/libgfortran/io/close.c
 @@ -25,6 +25,7 @@
  #include "io.h"
  #include "unix.h"
diff --git a/packages/gcc/7.2.0/910-nios2-bad-multilib-default.patch b/packages/gcc/7.2.0/0009-nios2-bad-multilib-default.patch
similarity index 59%
rename from packages/gcc/7.2.0/910-nios2-bad-multilib-default.patch
rename to packages/gcc/7.2.0/0009-nios2-bad-multilib-default.patch
index 61989e56..4acc4918 100644
--- a/packages/gcc/7.2.0/910-nios2-bad-multilib-default.patch
+++ b/packages/gcc/7.2.0/0009-nios2-bad-multilib-default.patch
@@ -1,6 +1,10 @@
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios2.h
---- gcc-6.2.0.orig/gcc/config/nios2/nios2.h	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/nios2.h	2016-11-29 10:29:55.069624746 -0800
+---
+ gcc/config/nios2/nios2.h |    4 ++--
+ gcc/config/nios2/t-nios2 |    3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+--- a/gcc/config/nios2/nios2.h
++++ b/gcc/config/nios2/nios2.h
 @@ -63,11 +63,11 @@
  #if TARGET_ENDIAN_DEFAULT == 0
  # define ASM_SPEC "%{!meb:-EL} %{meb:-EB} %{march=*:-march=%*}"
@@ -15,9 +19,8 @@ diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios
  #endif
  
  #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/t-nios2 gcc-6.2.0/gcc/config/nios2/t-nios2
---- gcc-6.2.0.orig/gcc/config/nios2/t-nios2	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/t-nios2	2016-11-29 10:29:03.517151014 -0800
+--- a/gcc/config/nios2/t-nios2
++++ b/gcc/config/nios2/t-nios2
 @@ -22,6 +22,5 @@
  # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
  # MULTILIB_EXCEPTIONS = 
diff --git a/packages/gcc/7.2.0/0010-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/7.2.0/0010-libgcc-disable-split-stack-nothreads.patch
new file mode 100644
index 00000000..df91a9ff
--- /dev/null
+++ b/packages/gcc/7.2.0/0010-libgcc-disable-split-stack-nothreads.patch
@@ -0,0 +1,17 @@
+disable split-stack for non-thread builds
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+---
+ libgcc/config/t-stack |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/libgcc/config/t-stack
++++ b/libgcc/config/t-stack
+@@ -1,4 +1,6 @@
+ # Makefile fragment to provide generic support for -fsplit-stack.
+ # This should be used in config.host for any host which supports
+ # -fsplit-stack.
++ifeq ($(enable_threads),yes)
+ LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
++endif
diff --git a/packages/gcc/6.4.0/951-bionic-ndk.patch b/packages/gcc/7.2.0/0011-bionic-ndk.patch
similarity index 91%
rename from packages/gcc/6.4.0/951-bionic-ndk.patch
rename to packages/gcc/7.2.0/0011-bionic-ndk.patch
index 59c50a89..474dd8c0 100644
--- a/packages/gcc/6.4.0/951-bionic-ndk.patch
+++ b/packages/gcc/7.2.0/0011-bionic-ndk.patch
@@ -4,8 +4,10 @@ Date:   Tue Apr 25 19:02:18 2017 -0700
 
     Fix ctype for newer NDK headers
 
-diff --git a/libstdc++-v3/config/os/bionic/ctype_base.h b/libstdc++-v3/config/os/bionic/ctype_base.h
-index 33978f3..c36e63c 100644
+---
+ libstdc++-v3/config/os/bionic/ctype_base.h |   34 +++++++++++++++++++----------
+ 1 file changed, 23 insertions(+), 11 deletions(-)
+
 --- a/libstdc++-v3/config/os/bionic/ctype_base.h
 +++ b/libstdc++-v3/config/os/bionic/ctype_base.h
 @@ -28,6 +28,18 @@
@@ -27,7 +29,7 @@ index 33978f3..c36e63c 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -41,17 +53,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -41,17 +53,17 @@
      // NB: Offsets into ctype<char>::_M_table force a particular size
      // on the mask type. Because of this, we don't use an enum.
      typedef char 		mask;
diff --git a/packages/gcc/7.2.0/952-bionic-errno.patch b/packages/gcc/7.2.0/0012-bionic-errno.patch
similarity index 66%
rename from packages/gcc/7.2.0/952-bionic-errno.patch
rename to packages/gcc/7.2.0/0012-bionic-errno.patch
index 3f77e684..0a1a6327 100644
--- a/packages/gcc/7.2.0/952-bionic-errno.patch
+++ b/packages/gcc/7.2.0/0012-bionic-errno.patch
@@ -4,11 +4,13 @@ Date:   Tue Apr 25 20:17:03 2017 -0700
 
     Fix, errno is volatile int
 
-diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/dir.cc
-index 6ff12d0..5bbd664 100644
+---
+ libstdc++-v3/src/filesystem/dir.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/libstdc++-v3/src/filesystem/dir.cc
 +++ b/libstdc++-v3/src/filesystem/dir.cc
-@@ -146,7 +146,7 @@ fs::_Dir::advance(error_code* ec, directory_options options)
+@@ -146,7 +146,7 @@
  
    int err = std::exchange(errno, 0);
    const auto entp = readdir(dirp);
diff --git a/packages/gcc-linaro/7.1-2017.08/970-crystax.patch b/packages/gcc/7.2.0/0013-crystax.patch
similarity index 81%
rename from packages/gcc-linaro/7.1-2017.08/970-crystax.patch
rename to packages/gcc/7.2.0/0013-crystax.patch
index 7324d7fb..8c87ba3d 100644
--- a/packages/gcc-linaro/7.1-2017.08/970-crystax.patch
+++ b/packages/gcc/7.2.0/0013-crystax.patch
@@ -7,12 +7,34 @@ Date:   Wed Jul 29 11:28:29 2015 +0300
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
 [Edited: keep libstdc++, drop libcrystax-related modifications]
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index f66e48cd1..1c253496b 100644
+---
+ gcc/config.gcc                             |   17 +++++++-
+ gcc/config/aarch64/aarch64-linux-android.h |   59 +++++++++++++++++++++++++++++
+ gcc/config/aarch64/aarch64-linux.h         |    9 +++-
+ gcc/config/arm/arm.h                       |    3 -
+ gcc/config/arm/arm.md                      |    2 
+ gcc/config/arm/arm.opt                     |    4 +
+ gcc/config/arm/elf.h                       |    9 ++--
+ gcc/config/arm/linux-eabi.h                |    7 ++-
+ gcc/config/i386/gnu-user.h                 |    7 ++-
+ gcc/config/i386/gnu-user64.h               |    5 ++
+ gcc/config/i386/linux-common.h             |    8 +++
+ gcc/config/linux-android.h                 |   13 +++---
+ gcc/config/mips/android.h                  |   49 ++++++++++++++++++++++++
+ gcc/config/mips/gnu-user.h                 |    6 +-
+ gcc/config/mips/linux-common.h             |    2 
+ gcc/config/mips/t-linux-android            |    3 +
+ gcc/config/mips/t-linux-android64          |    4 +
+ libgcc/gthr-posix.h                        |   13 ++++++
+ libstdc++-v3/configure                     |   12 +++++
+ libstdc++-v3/include/bits/locale_facets.h  |   18 +++++++-
+ libstdc++-v3/libsupc++/guard.cc            |    5 ++
+ 21 files changed, 235 insertions(+), 20 deletions(-)
+
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -942,13 +942,17 @@ aarch64*-*-elf | aarch64*-*-rtems*)
- 	TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
+@@ -961,13 +961,17 @@
+ 	tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-freebsd"
  	;;
  aarch64*-*-linux*)
 -	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h"
@@ -30,7 +52,7 @@ index f66e48cd1..1c253496b 100644
  	esac
  	aarch64_multilibs="${with_multilib_list}"
  	if test "$aarch64_multilibs" = "default"; then
-@@ -2055,6 +2059,17 @@ mips*-*-linux*)				# Linux MIPS, either endian.
+@@ -2079,6 +2083,17 @@
  	tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h"
  	extra_options="${extra_options} linux-android.opt"
  	case ${target} in
@@ -48,9 +70,6 @@ index f66e48cd1..1c253496b 100644
  		mipsisa32r6*)
  			default_mips_arch=mips32r6
  			;;
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-new file mode 100644
-index 000000000..db1288fd0
 --- /dev/null
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
 @@ -0,0 +1,59 @@
@@ -113,8 +132,6 @@ index 000000000..db1288fd0
 +  LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
 +
 +#endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 5fcaa59a3..6864195ee 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -21,7 +21,14 @@
@@ -133,11 +150,9 @@ index 5fcaa59a3..6864195ee 100644
  
  #undef MUSL_DYNAMIC_LINKER
  #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
-index ad123dde9..97b059de6 100644
 --- a/gcc/config/arm/arm.h
 +++ b/gcc/config/arm/arm.h
-@@ -1888,10 +1888,11 @@ enum arm_auto_incmodes
+@@ -1878,10 +1878,11 @@
  
  #define CASE_VECTOR_PC_RELATIVE (TARGET_THUMB2				\
  				 || (TARGET_THUMB1			\
@@ -150,11 +165,9 @@ index ad123dde9..97b059de6 100644
     ? (min >= 0 && max < 512						\
        ? (ADDR_DIFF_VEC_FLAGS (body).offset_unsigned = 1, QImode)	\
        : min >= -256 && max < 256					\
-diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
-index 47171b996..eb22d1181 100644
 --- a/gcc/config/arm/arm.md
 +++ b/gcc/config/arm/arm.md
-@@ -8179,7 +8179,7 @@
+@@ -8668,7 +8668,7 @@
     (match_operand:SI 2 "const_int_operand" "")	; total range
     (match_operand:SI 3 "" "")			; table label
     (match_operand:SI 4 "" "")]			; Out of range label
@@ -163,11 +176,9 @@ index 47171b996..eb22d1181 100644
    "
    {
      enum insn_code code;
-diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
-index 0ebe01743..772453889 100644
 --- a/gcc/config/arm/arm.opt
 +++ b/gcc/config/arm/arm.opt
-@@ -193,6 +193,10 @@ mthumb-interwork
+@@ -193,6 +193,10 @@
  Target Report Mask(INTERWORK)
  Support calls between Thumb and ARM instruction sets.
  
@@ -178,8 +189,6 @@ index 0ebe01743..772453889 100644
  mtls-dialect=
  Target RejectNegative Joined Enum(tls_type) Var(target_tls_dialect) Init(TLS_GNU)
  Specify thread local storage scheme.
-diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
-index 77f30554d..32158ed65 100644
 --- a/gcc/config/arm/elf.h
 +++ b/gcc/config/arm/elf.h
 @@ -56,8 +56,7 @@
@@ -202,23 +211,19 @@ index 77f30554d..32158ed65 100644
  #endif
  
  /* The ARM uses @ are a comment character so we need to redefine
-@@ -104,8 +106,9 @@
+@@ -95,7 +97,8 @@
     the code more efficient, but for Thumb-1 it's better to put them out of
     band unless we are generating compressed tables.  */
  #define JUMP_TABLES_IN_TEXT_SECTION					\
 -   ((TARGET_32BIT || (TARGET_THUMB && (optimize_size || flag_pic))) \
--    && !target_pure_code)
 +   ((TARGET_32BIT || (TARGET_THUMB && !inline_thumb1_jump_table \
 +                    && (optimize_size || flag_pic))) \
-+    && !target_pure_code)
+     && !target_pure_code)
  
  #ifndef LINK_SPEC
- #define LINK_SPEC "%{mbig-endian:-EB} %{mlittle-endian:-EL} -X"
-diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
-index ace84816e..8c8fa6553 100644
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
-@@ -108,11 +108,16 @@
+@@ -102,11 +102,16 @@
  #define CC1_SPEC							\
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC " " ASAN_CC1_SPEC,	\
  		       GNU_USER_TARGET_CC1_SPEC " " ASAN_CC1_SPEC " "	\
@@ -236,11 +241,9 @@ index ace84816e..8c8fa6553 100644
  #undef  LIB_SPEC
  #define LIB_SPEC							\
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC,			\
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index fee33a3ef..22fb2ced9 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -65,9 +65,14 @@ along with GCC; see the file COPYING3.  If not see
+@@ -65,9 +65,14 @@
     When the -shared link option is used a final link is not being
     done.  */
  
@@ -256,11 +259,9 @@ index fee33a3ef..22fb2ced9 100644
  
  #undef  SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 7a02a7eb4..cac4179bc 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
-@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -46,6 +46,11 @@
  #define SPEC_X32 "mx32"
  #endif
  
@@ -272,11 +273,9 @@ index 7a02a7eb4..cac4179bc 100644
  #undef ASM_SPEC
  #define ASM_SPEC "%{" SPEC_32 ":--32} \
   %{" SPEC_64 ":--64} \
-diff --git a/gcc/config/i386/linux-common.h b/gcc/config/i386/linux-common.h
-index 4b9910fa9..3b11ed086 100644
 --- a/gcc/config/i386/linux-common.h
 +++ b/gcc/config/i386/linux-common.h
-@@ -30,7 +30,13 @@ along with GCC; see the file COPYING3.  If not see
+@@ -30,7 +30,13 @@
  #undef CC1_SPEC
  #define CC1_SPEC \
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \
@@ -291,11 +290,9 @@ index 4b9910fa9..3b11ed086 100644
  
  #undef	LINK_SPEC
  #define LINK_SPEC \
-diff --git a/gcc/config/linux-android.h b/gcc/config/linux-android.h
-index 301a41ccd..9623c88d0 100644
 --- a/gcc/config/linux-android.h
 +++ b/gcc/config/linux-android.h
-@@ -38,15 +39,18 @@
+@@ -38,15 +38,18 @@
    "%{" NOANDROID "|tno-android-ld:" LINUX_SPEC ";:" ANDROID_SPEC "}"
  
  #define ANDROID_LINK_SPEC \
@@ -319,9 +316,6 @@ index 301a41ccd..9623c88d0 100644
  
  #define ANDROID_LIB_SPEC \
    "%{!static: -ldl}"
-diff --git a/gcc/config/mips/android.h b/gcc/config/mips/android.h
-new file mode 100644
-index 000000000..32c539c8d
 --- /dev/null
 +++ b/gcc/config/mips/android.h
 @@ -0,0 +1,49 @@
@@ -374,11 +368,9 @@ index 000000000..32c539c8d
 +									\
 +  /* Use the standard linux specs for everything else.  */		\
 +  LINUX_DRIVER_SELF_SPECS
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 15b549c08..4a2816014 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
-@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -36,6 +36,7 @@
      /* The GNU C++ standard library requires this.  */		\
      if (c_dialect_cxx ())					\
        builtin_define ("_GNU_SOURCE");				\
@@ -386,7 +378,7 @@ index 15b549c08..4a2816014 100644
    } while (0)
  
  #undef SUBTARGET_CPP_SPEC
-@@ -71,7 +72,8 @@ along with GCC; see the file COPYING3.  If not see
+@@ -71,7 +72,8 @@
  
  #undef SUBTARGET_ASM_SPEC
  #define SUBTARGET_ASM_SPEC \
@@ -396,7 +388,7 @@ index 15b549c08..4a2816014 100644
  
  /* The MIPS assembler has different syntax for .set. We set it to
     .dummy to trap any errors.  */
-@@ -120,7 +122,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+@@ -120,7 +122,7 @@
  #endif
  
  #define LINUX_DRIVER_SELF_SPECS \
@@ -405,11 +397,9 @@ index 15b549c08..4a2816014 100644
    MARCH_MTUNE_NATIVE_SPECS,						\
    /* -mplt has no effect without -mno-shared.  Simplify later		\
       specs handling by removing a redundant option.  */			\
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8429a7ca2..8bfacf994 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -35,7 +35,7 @@
  #undef  SUBTARGET_CC1_SPEC
  #define SUBTARGET_CC1_SPEC						\
    LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC,			\
@@ -418,18 +408,12 @@ index 8429a7ca2..8bfacf994 100644
  
  #undef  CC1PLUS_SPEC
  #define CC1PLUS_SPEC							\
-diff --git a/gcc/config/mips/t-linux-android b/gcc/config/mips/t-linux-android
-new file mode 100644
-index 000000000..39f512c81
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android
 @@ -0,0 +1,3 @@
 +MULTILIB_OPTIONS = mips32r2/mips32r6
 +MULTILIB_DIRNAMES = mips-r2 mips-r6
 +MULTILIB_OSDIRNAMES = ../libr2 ../libr6
-diff --git a/gcc/config/mips/t-linux-android64 b/gcc/config/mips/t-linux-android64
-new file mode 100644
-index 000000000..55cab7d62
 --- /dev/null
 +++ b/gcc/config/mips/t-linux-android64
 @@ -0,0 +1,4 @@
@@ -437,11 +421,9 @@ index 000000000..55cab7d62
 +MULTILIB_DIRNAMES = 32 mips-r1 mips-r2 mips-r6 mips64-r2 mips64-r6
 +MULTILIB_OSDIRNAMES = ../lib ../lib ../libr2 ../libr6 ../lib64r2 ../lib64
 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6
-diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h
-index 555c0fe24..47c8655f9 100644
 --- a/libgcc/gthr-posix.h
 +++ b/libgcc/gthr-posix.h
-@@ -32,6 +32,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -32,6 +32,19 @@
  #define __GTHREADS 1
  #define __GTHREADS_CXX0X 1
  
@@ -461,11 +443,9 @@ index 555c0fe24..47c8655f9 100644
  #include <pthread.h>
  
  #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 41797a971..f746e8353 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
-@@ -78319,6 +78341,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78536,6 +78536,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -478,7 +458,7 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-@@ -78377,6 +78405,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -78594,6 +78600,12 @@
  /* end confdefs.h.  */
  #include <sys/syscall.h>
  	   int lk;
@@ -491,8 +471,6 @@ index 41797a971..f746e8353 100755
  int
  main ()
  {
-diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
-index e3e206b7d..e85dc2c76 100644
 --- a/libstdc++-v3/include/bits/locale_facets.h
 +++ b/libstdc++-v3/include/bits/locale_facets.h
 @@ -47,6 +47,20 @@
@@ -516,7 +494,7 @@ index e3e206b7d..e85dc2c76 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -1102,7 +1116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1102,7 +1116,7 @@
         *  @return  @a __hi.
        */
        virtual const char*
@@ -525,7 +503,7 @@ index e3e206b7d..e85dc2c76 100644
        {
  	__builtin_memcpy(__to, __lo, __hi - __lo);
  	return __hi;
-@@ -1163,7 +1177,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -1163,7 +1177,7 @@
  
      private:
        void _M_narrow_init() const;
@@ -534,11 +512,9 @@ index e3e206b7d..e85dc2c76 100644
      };
  
  #ifdef _GLIBCXX_USE_WCHAR_T
-diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
-index 9b617998f..c149169bb 100644
 --- a/libstdc++-v3/libsupc++/guard.cc
 +++ b/libstdc++-v3/libsupc++/guard.cc
-@@ -33,7 +33,12 @@
+@@ -34,7 +34,12 @@
  #if defined(__GTHREADS) && defined(__GTHREAD_HAS_COND) \
    && (ATOMIC_INT_LOCK_FREE > 1) && defined(_GLIBCXX_HAVE_LINUX_FUTEX)
  # include <climits>
diff --git a/packages/gcc/7.2.0/971-crystax.patch b/packages/gcc/7.2.0/0014-crystax.patch
similarity index 88%
rename from packages/gcc/7.2.0/971-crystax.patch
rename to packages/gcc/7.2.0/0014-crystax.patch
index 748a3812..f1f9eb12 100644
--- a/packages/gcc/7.2.0/971-crystax.patch
+++ b/packages/gcc/7.2.0/0014-crystax.patch
@@ -6,8 +6,10 @@ Date:   Thu Aug 13 16:11:54 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/t-linux-androideabi b/gcc/config/arm/t-linux-androideabi
-index 8f1307c55..cbbec5bd2 100644
+---
+ gcc/config/arm/t-linux-androideabi |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
 --- a/gcc/config/arm/t-linux-androideabi
 +++ b/gcc/config/arm/t-linux-androideabi
 @@ -1,8 +1,9 @@
diff --git a/packages/gcc/7.2.0/972-crystax.patch b/packages/gcc/7.2.0/0015-crystax.patch
similarity index 82%
rename from packages/gcc/7.2.0/972-crystax.patch
rename to packages/gcc/7.2.0/0015-crystax.patch
index f68fe1e0..5fd76d79 100644
--- a/packages/gcc/7.2.0/972-crystax.patch
+++ b/packages/gcc/7.2.0/0015-crystax.patch
@@ -10,8 +10,20 @@ Date:   Mon Apr 14 15:59:47 2014 -0700
     Change-Id: Ibda473188e5a10f2a0592f2494ad00ad1f91e04b
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config.in b/gcc/config.in
-index 3fda578..ebe222c 100644
+---
+ gcc/config.in                          |    6 +++++
+ gcc/config/alpha/elf.h                 |    4 +++
+ gcc/config/freebsd.h                   |    4 +++
+ gcc/config/gnu-user.h                  |    4 +++
+ gcc/config/openbsd.h                   |    4 +++
+ gcc/config/rs6000/sysv4.h              |    6 ++++-
+ gcc/config/sol2.h                      |    4 +++
+ gcc/configure                          |   36 +++++++++++++++++++++++++++++++++
+ gcc/configure.ac                       |   29 ++++++++++++++++++++++++++
+ gcc/testsuite/g++.dg/eh/spec3-static.C |   25 ++++++++++++++++++++++
+ libgcc/crtstuff.c                      |   11 ++++++----
+ 11 files changed, 128 insertions(+), 5 deletions(-)
+
 --- a/gcc/config.in
 +++ b/gcc/config.in
 @@ -2180,6 +2180,12 @@
@@ -27,11 +39,9 @@ index 3fda578..ebe222c 100644
  /* Define to 1 if the 'long long' type is wider than 'long' but still
     efficiently supported by the host hardware. */
  #ifndef USED_FOR_TARGET
-diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h
-index c109b07..1ad7363 100644
 --- a/gcc/config/alpha/elf.h
 +++ b/gcc/config/alpha/elf.h
-@@ -168,5 +168,9 @@ extern int alpha_this_gpdisp_sequence_number;
+@@ -168,5 +168,9 @@
     I imagine that other systems will catch up.  In the meantime, it
     doesn't harm to make sure that the data exists to be used later.  */
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -41,11 +51,9 @@ index c109b07..1ad7363 100644
  #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
  #endif
 +#endif
-diff --git a/gcc/config/freebsd.h b/gcc/config/freebsd.h
-index a272455..29d5a1a 100644
 --- a/gcc/config/freebsd.h
 +++ b/gcc/config/freebsd.h
-@@ -45,8 +45,12 @@ along with GCC; see the file COPYING3.  If not see
+@@ -45,8 +45,12 @@
  #define LIB_SPEC FBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -58,11 +66,9 @@ index a272455..29d5a1a 100644
  
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 2787a3d..be47428 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -118,8 +118,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -118,8 +118,12 @@
  #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -75,11 +81,9 @@ index 2787a3d..be47428 100644
  
  #undef LINK_GCC_C_SEQUENCE_SPEC
  #define LINK_GCC_C_SEQUENCE_SPEC \
-diff --git a/gcc/config/openbsd.h b/gcc/config/openbsd.h
-index 1048e31..47044c5 100644
 --- a/gcc/config/openbsd.h
 +++ b/gcc/config/openbsd.h
-@@ -136,8 +136,12 @@ while (0)
+@@ -136,8 +136,12 @@
  #define LIB_SPEC OBSD_LIB_SPEC
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -92,11 +96,9 @@ index 1048e31..47044c5 100644
  
  #undef LIB_SPEC
  #define LIB_SPEC OBSD_LIB_SPEC
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index de38629..06d586a 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -805,7 +805,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+@@ -805,7 +805,11 @@
    -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
  
  #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -109,11 +111,9 @@ index de38629..06d586a 100644
  #endif
  
  #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
-diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
-index 1ae7f9f..98c9482 100644
 --- a/gcc/config/sol2.h
 +++ b/gcc/config/sol2.h
-@@ -367,7 +367,11 @@ along with GCC; see the file COPYING3.  If not see
+@@ -367,7 +367,11 @@
  /* Solaris 11 build 135+ implements dl_iterate_phdr.  GNU ld needs
     --eh-frame-hdr to create the required .eh_frame_hdr sections.  */
  #if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
@@ -125,11 +125,9 @@ index 1ae7f9f..98c9482 100644
  #endif /* HAVE_LD_EH_FRAME && TARGET_DL_ITERATE_PHDR */
  #endif
  
-diff --git a/gcc/configure b/gcc/configure
-index 1d39548..f63716a 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -939,6 +939,7 @@ enable_fix_cortex_a53_835769
+@@ -939,6 +939,7 @@
  enable_fix_cortex_a53_843419
  with_glibc_version
  enable_gnu_unique_object
@@ -137,7 +135,7 @@ index 1d39548..f63716a 100755
  enable_linker_build_id
  enable_default_ssp
  with_long_double_128
-@@ -1676,6 +1677,9 @@ Optional Features:
+@@ -1676,6 +1677,9 @@
    --enable-gnu-unique-object
                            enable the use of the @gnu_unique_object ELF
                            extension on glibc systems
@@ -147,7 +145,7 @@ index 1d39548..f63716a 100755
    --enable-linker-build-id
                            compiler will always pass --build-id to linker
    --enable-default-ssp    enable Stack Smashing Protection as default
-@@ -28050,6 +28054,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
+@@ -28050,6 +28054,38 @@
  
  $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h
  
@@ -186,11 +184,9 @@ index 1d39548..f63716a 100755
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld_eh_frame_hdr" >&5
  $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; }
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 1d5a9d7..736a534 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4981,6 +4981,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
+@@ -4981,6 +4981,35 @@
  if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
  	AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1,
  [Define if your linker supports .eh_frame_hdr.])
@@ -226,9 +222,6 @@ index 1d5a9d7..736a534 100644
  fi
  AC_MSG_RESULT($gcc_cv_ld_eh_frame_hdr)
  
-diff --git a/gcc/testsuite/g++.dg/eh/spec3-static.C b/gcc/testsuite/g++.dg/eh/spec3-static.C
-new file mode 100644
-index 0000000..15408ef
 --- /dev/null
 +++ b/gcc/testsuite/g++.dg/eh/spec3-static.C
 @@ -0,0 +1,25 @@
@@ -257,11 +250,9 @@ index 0000000..15408ef
 +  try {	func(); }
 +  catch (A& a) { }
 +}
-diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
-index c01f94b..00cab57 100644
 --- a/libgcc/crtstuff.c
 +++ b/libgcc/crtstuff.c
-@@ -88,7 +88,8 @@ call_ ## FUNC (void)					\
+@@ -88,7 +88,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -271,7 +262,7 @@ index c01f94b..00cab57 100644
      && defined(BSD_DL_ITERATE_PHDR_AVAILABLE)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -97,7 +98,8 @@ call_ ## FUNC (void)					\
+@@ -97,7 +98,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \
@@ -281,7 +272,7 @@ index c01f94b..00cab57 100644
      && defined(__sun__) && defined(__svr4__)
  #include <link.h>
  # define USE_PT_GNU_EH_FRAME
-@@ -106,7 +108,8 @@ call_ ## FUNC (void)					\
+@@ -106,7 +108,8 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -291,7 +282,7 @@ index c01f94b..00cab57 100644
      && defined(__GLIBC__) && __GLIBC__ >= 2
  #include <link.h>
  /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
-@@ -121,7 +124,7 @@ call_ ## FUNC (void)					\
+@@ -121,7 +124,7 @@
  #if defined(OBJECT_FORMAT_ELF) \
      && !defined(OBJECT_FORMAT_FLAT) \
      && defined(HAVE_LD_EH_FRAME_HDR) \
diff --git a/packages/gcc-linaro/6.4-2017.08/973-crystax.patch b/packages/gcc/7.2.0/0016-crystax.patch
similarity index 77%
rename from packages/gcc-linaro/6.4-2017.08/973-crystax.patch
rename to packages/gcc/7.2.0/0016-crystax.patch
index b96ece33..cd56a564 100644
--- a/packages/gcc-linaro/6.4-2017.08/973-crystax.patch
+++ b/packages/gcc/7.2.0/0016-crystax.patch
@@ -6,11 +6,13 @@ Date:   Thu Aug 20 19:11:07 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 3d044e8bd..5c89fcab0 100644
+---
+ gcc/config/i386/i386.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
-@@ -14631,6 +14631,7 @@ legitimate_pic_address_disp_p (rtx disp)
+@@ -15753,6 +15753,7 @@
  	  else if (!SYMBOL_REF_FAR_ADDR_P (op0)
  		   && (SYMBOL_REF_LOCAL_P (op0)
  		       || (HAVE_LD_PIE_COPYRELOC
diff --git a/packages/gcc-linaro/6.4-2017.08/974-crystax.patch b/packages/gcc/7.2.0/0017-crystax.patch
similarity index 73%
rename from packages/gcc-linaro/6.4-2017.08/974-crystax.patch
rename to packages/gcc/7.2.0/0017-crystax.patch
index 9db4f545..8f2eb438 100644
--- a/packages/gcc-linaro/6.4-2017.08/974-crystax.patch
+++ b/packages/gcc/7.2.0/0017-crystax.patch
@@ -6,11 +6,13 @@ Date:   Fri Aug 21 17:41:59 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/libgcc/gthr.h b/libgcc/gthr.h
-index 47a7d061a..67a680f90 100644
+---
+ libgcc/gthr.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/libgcc/gthr.h
 +++ b/libgcc/gthr.h
-@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -145,7 +145,11 @@
  #define GTHREAD_USE_WEAK 1
  #endif
  #endif
diff --git a/packages/gcc-linaro/6.4-2017.08/975-crystax.patch b/packages/gcc/7.2.0/0018-crystax.patch
similarity index 88%
rename from packages/gcc-linaro/6.4-2017.08/975-crystax.patch
rename to packages/gcc/7.2.0/0018-crystax.patch
index 9efc2a48..bbfcd14c 100644
--- a/packages/gcc-linaro/6.4-2017.08/975-crystax.patch
+++ b/packages/gcc/7.2.0/0018-crystax.patch
@@ -9,11 +9,13 @@ Date:   Mon Apr 14 21:05:51 2014 -0700
     Change-Id: Ie1de9f946f397196bb6f1623f5add86933739484
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
-index 5974c65d3..71b2c7aa9 100644
+---
+ gcc/config/arm/arm.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
 --- a/gcc/config/arm/arm.c
 +++ b/gcc/config/arm/arm.c
-@@ -22403,9 +22403,13 @@ arm_print_operand (FILE *stream, rtx x, int code)
+@@ -22270,9 +22270,13 @@
  	memsize = MEM_SIZE (x);
  
  	/* Only certain alignment specifiers are supported by the hardware.  */
diff --git a/packages/gcc-linaro/7.1-2017.08/976-crystax.patch b/packages/gcc/7.2.0/0019-crystax.patch
similarity index 84%
rename from packages/gcc-linaro/7.1-2017.08/976-crystax.patch
rename to packages/gcc/7.2.0/0019-crystax.patch
index 790d4a9d..8c21a1cc 100644
--- a/packages/gcc-linaro/7.1-2017.08/976-crystax.patch
+++ b/packages/gcc/7.2.0/0019-crystax.patch
@@ -6,8 +6,10 @@ Date:   Sat Aug 22 09:55:55 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index a1f98d3d1..3725799be 100644
+---
+ gcc/config/i386/pmm_malloc.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
 @@ -31,7 +31,7 @@
diff --git a/packages/gcc-linaro/7.1-2017.08/977-crystax.patch b/packages/gcc/7.2.0/0020-crystax.patch
similarity index 73%
rename from packages/gcc-linaro/7.1-2017.08/977-crystax.patch
rename to packages/gcc/7.2.0/0020-crystax.patch
index 0211d728..ccb81fd6 100644
--- a/packages/gcc-linaro/7.1-2017.08/977-crystax.patch
+++ b/packages/gcc/7.2.0/0020-crystax.patch
@@ -6,11 +6,14 @@ Date:   Tue Aug 25 09:36:42 2015 +0300
     
     Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
 
-diff --git a/gcc/config/aarch64/aarch64-linux-android.h b/gcc/config/aarch64/aarch64-linux-android.h
-index db1288fd0..38bc64d61 100644
+---
+ gcc/config/aarch64/aarch64-linux-android.h |    4 ++++
+ gcc/config/mips/linux-common.h             |    4 ++++
+ 2 files changed, 8 insertions(+)
+
 --- a/gcc/config/aarch64/aarch64-linux-android.h
 +++ b/gcc/config/aarch64/aarch64-linux-android.h
-@@ -57,4 +57,8 @@
+@@ -56,4 +56,8 @@
  #define ENDFILE_SPEC \
    LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
  
@@ -19,11 +22,9 @@ index db1288fd0..38bc64d61 100644
 +#endif
 +
  #endif  /* GCC_AARCH64_LINUX_ANDROID_H */
-diff --git a/gcc/config/mips/linux-common.h b/gcc/config/mips/linux-common.h
-index 8bfacf994..262a9a341 100644
 --- a/gcc/config/mips/linux-common.h
 +++ b/gcc/config/mips/linux-common.h
-@@ -63,3 +63,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -62,3 +62,7 @@
  
  /* The default value isn't sufficient in 64-bit mode.  */
  #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024)
diff --git a/packages/gcc/7.2.0/100-uclibc-conf.patch b/packages/gcc/7.2.0/100-uclibc-conf.patch
deleted file mode 100644
index 73d1f0d3..00000000
--- a/packages/gcc/7.2.0/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
---- a/contrib/regression/objs-gcc.sh
-+++ b/contrib/regression/objs-gcc.sh
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/packages/gcc/7.2.0/1000-libtool-leave-framework-alone.patch b/packages/gcc/7.2.0/1000-libtool-leave-framework-alone.patch
deleted file mode 100644
index bce09eb7..00000000
--- a/packages/gcc/7.2.0/1000-libtool-leave-framework-alone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc-6.2.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-6.2.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
-@@ -36,6 +36,11 @@
- for arg
- do
-     case $arg in
-+	-framework)
-+	    # libtool handles this option. It should not be prefixed with
-+	    # -Xcompiler, as that would split it from the argument that
-+	    # follows.
-+	    ;;
- 	-f*|--*|-static-lib*|-shared-lib*|-B*)
- 	    # Libtool does not ascribe any special meaning options
- 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/packages/gcc/7.2.0/380-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/7.2.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48ee..00000000
--- a/packages/gcc/7.2.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/packages/gcc/7.2.0/930-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/7.2.0/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 07f9a739..00000000
--- a/packages/gcc/7.2.0/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/packages/gdb/6.8a/100-dwarf-stack-overflow.patch b/packages/gdb/6.8a/0000-dwarf-stack-overflow.patch
similarity index 88%
rename from packages/gdb/6.8a/100-dwarf-stack-overflow.patch
rename to packages/gdb/6.8a/0000-dwarf-stack-overflow.patch
index 344d5a3c..b409c5be 100644
--- a/packages/gdb/6.8a/100-dwarf-stack-overflow.patch
+++ b/packages/gdb/6.8a/0000-dwarf-stack-overflow.patch
@@ -11,9 +11,12 @@ for gdb/ChangeLog:
 	* dwarfread.c (locval): Likewise.
 
 -= END original header =-
-diff -durN gdb-6.8.orig/gdb/dwarf2read.c gdb-6.8/gdb/dwarf2read.c
---- gdb-6.8.orig/gdb/dwarf2read.c	2008-03-10 15:18:10.000000000 +0100
-+++ gdb-6.8/gdb/dwarf2read.c	2008-06-17 16:07:31.000000000 +0200
+---
+ gdb/dwarf2read.c |   15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+--- a/gdb/dwarf2read.c
++++ b/gdb/dwarf2read.c
 @@ -9124,8 +9124,7 @@
     callers will only want a very basic result and this can become a
     complaint.
diff --git a/packages/gdb/6.8a/110-security-errata-20050610.patch b/packages/gdb/6.8a/0001-security-errata-20050610.patch
similarity index 82%
rename from packages/gdb/6.8a/110-security-errata-20050610.patch
rename to packages/gdb/6.8a/0001-security-errata-20050610.patch
index 27e8174a..eab3e091 100644
--- a/packages/gdb/6.8a/110-security-errata-20050610.patch
+++ b/packages/gdb/6.8a/0001-security-errata-20050610.patch
@@ -19,9 +19,16 @@ Original patch from gentoo: gentoo/src/patchsets/gdb/6.8/35_all_gdb-6.3-security
         FROM_TTY is -1.
 
 -= END original header =-
-diff -durN gdb-6.8.orig/gdb/Makefile.in gdb-6.8/gdb/Makefile.in
---- gdb-6.8.orig/gdb/Makefile.in	2008-03-17 13:15:08.000000000 +0100
-+++ gdb-6.8/gdb/Makefile.in	2008-06-17 16:07:33.000000000 +0200
+---
+ gdb/Makefile.in                       |    2 
+ gdb/cli/cli-cmds.c                    |   22 +++++++
+ gdb/main.c                            |    4 -
+ gdb/testsuite/gdb.base/gdbinit.exp    |   98 ++++++++++++++++++++++++++++++++++
+ gdb/testsuite/gdb.base/gdbinit.sample |    1 
+ 5 files changed, 123 insertions(+), 4 deletions(-)
+
+--- a/gdb/Makefile.in
++++ b/gdb/Makefile.in
 @@ -3004,7 +3004,7 @@
  	$(expression_h) $(frame_h) $(value_h) $(language_h) $(filenames_h) \
  	$(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) $(top_h) \
@@ -31,9 +38,8 @@ diff -durN gdb-6.8.orig/gdb/Makefile.in gdb-6.8/gdb/Makefile.in
  	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-cmds.c
  cli-decode.o: $(srcdir)/cli/cli-decode.c $(defs_h) $(symtab_h) \
  	$(gdb_regex_h) $(gdb_string_h) $(completer_h) $(ui_out_h) \
-diff -durN gdb-6.8.orig/gdb/cli/cli-cmds.c gdb-6.8/gdb/cli/cli-cmds.c
---- gdb-6.8.orig/gdb/cli/cli-cmds.c	2008-01-01 23:53:14.000000000 +0100
-+++ gdb-6.8/gdb/cli/cli-cmds.c	2008-06-17 16:07:33.000000000 +0200
+--- a/gdb/cli/cli-cmds.c
++++ b/gdb/cli/cli-cmds.c
 @@ -36,6 +36,7 @@
  #include "objfiles.h"
  #include "source.h"
@@ -75,9 +81,8 @@ diff -durN gdb-6.8.orig/gdb/cli/cli-cmds.c gdb-6.8/gdb/cli/cli-cmds.c
    stream = fdopen (fd, FOPEN_RT);
    script_from_file (stream, file);
  
-diff -durN gdb-6.8.orig/gdb/main.c gdb-6.8/gdb/main.c
---- gdb-6.8.orig/gdb/main.c	2008-01-05 17:49:53.000000000 +0100
-+++ gdb-6.8/gdb/main.c	2008-06-17 16:07:33.000000000 +0200
+--- a/gdb/main.c
++++ b/gdb/main.c
 @@ -690,7 +690,7 @@
  
        if (!inhibit_gdbinit)
@@ -96,9 +101,8 @@ diff -durN gdb-6.8.orig/gdb/main.c gdb-6.8/gdb/main.c
        }
  
    for (i = 0; i < ncmd; i++)
-diff -durN gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.exp gdb-6.8/gdb/testsuite/gdb.base/gdbinit.exp
---- gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.exp	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.base/gdbinit.exp	2008-06-17 16:07:33.000000000 +0200
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gdbinit.exp
 @@ -0,0 +1,98 @@
 +#   Copyright 2005
 +#   Free Software Foundation, Inc.
@@ -198,8 +202,7 @@ diff -durN gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.exp gdb-6.8/gdb/testsuite
 +}
 +
 +remote_exec build "rm .gdbinit"
-diff -durN gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.sample gdb-6.8/gdb/testsuite/gdb.base/gdbinit.sample
---- gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.sample	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.base/gdbinit.sample	2008-06-17 16:07:33.000000000 +0200
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gdbinit.sample
 @@ -0,0 +1 @@
 +echo "\nin gdbinit"
diff --git a/packages/gdb/6.8a/120-tdep-opcode-include-workaround.patch b/packages/gdb/6.8a/0002-tdep-opcode-include-workaround.patch
similarity index 66%
rename from packages/gdb/6.8a/120-tdep-opcode-include-workaround.patch
rename to packages/gdb/6.8a/0002-tdep-opcode-include-workaround.patch
index 61fdef48..dcdcc1d4 100644
--- a/packages/gdb/6.8a/120-tdep-opcode-include-workaround.patch
+++ b/packages/gdb/6.8a/0002-tdep-opcode-include-workaround.patch
@@ -5,9 +5,13 @@ workaround build failure
 http://bugs.gentoo.org/216368
 
 -= END original header =-
-diff -durN gdb-6.8.orig/gdb/frv-tdep.c gdb-6.8/gdb/frv-tdep.c
---- gdb-6.8.orig/gdb/frv-tdep.c	2008-01-11 14:19:59.000000000 +0100
-+++ gdb-6.8/gdb/frv-tdep.c	2008-06-17 16:07:34.000000000 +0200
+---
+ gdb/frv-tdep.c |    2 +-
+ gdb/mep-tdep.c |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/gdb/frv-tdep.c
++++ b/gdb/frv-tdep.c
 @@ -32,7 +32,7 @@
  #include "gdb_assert.h"
  #include "sim-regno.h"
@@ -17,9 +21,8 @@ diff -durN gdb-6.8.orig/gdb/frv-tdep.c gdb-6.8/gdb/frv-tdep.c
  #include "symtab.h"
  #include "elf-bfd.h"
  #include "elf/frv.h"
-diff -durN gdb-6.8.orig/gdb/mep-tdep.c gdb-6.8/gdb/mep-tdep.c
---- gdb-6.8.orig/gdb/mep-tdep.c	2008-01-11 14:20:02.000000000 +0100
-+++ gdb-6.8/gdb/mep-tdep.c	2008-06-17 16:07:34.000000000 +0200
+--- a/gdb/mep-tdep.c
++++ b/gdb/mep-tdep.c
 @@ -53,8 +53,8 @@
  
  /* Get the user's customized MeP coprocessor register names from
diff --git a/packages/gdb/6.8a/130-reg-no-longer-active.patch b/packages/gdb/6.8a/0003-reg-no-longer-active.patch
similarity index 81%
rename from packages/gdb/6.8a/130-reg-no-longer-active.patch
rename to packages/gdb/6.8a/0003-reg-no-longer-active.patch
index 1c7e7e00..9bb48e83 100644
--- a/packages/gdb/6.8a/130-reg-no-longer-active.patch
+++ b/packages/gdb/6.8a/0003-reg-no-longer-active.patch
@@ -4,10 +4,13 @@ See: http://sourceware.org/ml/crossgcc/2009-05/msg00055.html
 
 Fix from: http://cvs.fedoraproject.org/viewvc/devel/gdb/gdb-6.8-bz436037-reg-no-longer-active.patch?revision=1.1
 
-diff -d -urpN src.0/gdb/valops.c src.1/gdb/valops.c
---- src.0/gdb/valops.c	2008-07-27 04:00:03.000000000 +0200
-+++ src.1/gdb/valops.c	2008-07-31 15:17:42.000000000 +0200
-@@ -813,10 +813,18 @@ value_assign (struct value *toval, struc
+---
+ gdb/valops.c |   12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+--- a/gdb/valops.c
++++ b/gdb/valops.c
+@@ -675,10 +675,18 @@
  	struct frame_info *frame;
  	int value_reg;
  
diff --git a/packages/gdb/7.0a/100-sim-ppc-have-config-h.patch b/packages/gdb/6.8a/0004-sim-ppc-have-config-h.patch
similarity index 51%
rename from packages/gdb/7.0a/100-sim-ppc-have-config-h.patch
rename to packages/gdb/6.8a/0004-sim-ppc-have-config-h.patch
index f3723b57..4bba8274 100644
--- a/packages/gdb/7.0a/100-sim-ppc-have-config-h.patch
+++ b/packages/gdb/6.8a/0004-sim-ppc-have-config-h.patch
@@ -2,9 +2,24 @@ Fix for canadian cross build of sim/ppc
 
 Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
 
-diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
---- gdb-6.8-pl1/sim/ppc/Makefile.in	2006-05-31 17:14:45.000000000 +0200
-+++ gdb-6.8-pl2/sim/ppc/Makefile.in	2008-09-30 15:56:33.000000000 +0200
+---
+ sim/ppc/Makefile.in       |    6 +++---
+ sim/ppc/basics.h          |    2 ++
+ sim/ppc/debug.c           |    2 ++
+ sim/ppc/dgen.c            |    2 ++
+ sim/ppc/filter.c          |    2 ++
+ sim/ppc/filter_filename.c |    2 ++
+ sim/ppc/igen.c            |    2 ++
+ sim/ppc/inline.c          |    2 ++
+ sim/ppc/lf.c              |    2 ++
+ sim/ppc/misc.c            |    2 ++
+ sim/ppc/misc.h            |    2 ++
+ sim/ppc/sim-endian.c      |    2 ++
+ sim/ppc/table.c           |    2 ++
+ 13 files changed, 27 insertions(+), 3 deletions(-)
+
+--- a/sim/ppc/Makefile.in
++++ b/sim/ppc/Makefile.in
 @@ -61,7 +61,7 @@
  AR = @AR@
  AR_FLAGS = rc
@@ -25,9 +40,8 @@ diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
  BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
  
  BUILD_LDFLAGS	=
-diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
---- gdb-6.8-orig/sim/ppc/basics.h	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/basics.h	2008-09-30 15:12:32.000000000 +0200
+--- a/sim/ppc/basics.h
++++ b/sim/ppc/basics.h
 @@ -86,7 +86,9 @@
  
  /* Basic configuration */
@@ -38,9 +52,8 @@ diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
  #include "ppc-config.h"
  #include "inline.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
---- gdb-6.8-orig/sim/ppc/debug.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/debug.c	2008-09-30 15:12:27.000000000 +0200
+--- a/sim/ppc/debug.c
++++ b/sim/ppc/debug.c
 @@ -22,7 +22,9 @@
  #ifndef _DEBUG_C_
  #define _DEBUG_C_
@@ -51,9 +64,8 @@ diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
  #include "basics.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
---- gdb-6.8-orig/sim/ppc/dgen.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/dgen.c	2008-09-30 15:12:22.000000000 +0200
+--- a/sim/ppc/dgen.c
++++ b/sim/ppc/dgen.c
 @@ -27,7 +27,9 @@
  #include <ctype.h>
  #include <stdarg.h>
@@ -64,9 +76,8 @@ diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
  #include "misc.h"
  #include "lf.h"
  #include "table.h"
-diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
---- gdb-6.8-orig/sim/ppc/filter.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter.c	2008-09-30 15:12:15.000000000 +0200
+--- a/sim/ppc/filter.c
++++ b/sim/ppc/filter.c
 @@ -21,7 +21,9 @@
  
  #include <stdio.h>
@@ -77,9 +88,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
  
  #ifdef HAVE_STRING_H
  #include <string.h>
-diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c
---- gdb-6.8-orig/sim/ppc/filter_filename.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter_filename.c	2008-09-30 15:12:11.000000000 +0200
+--- a/sim/ppc/filter_filename.c
++++ b/sim/ppc/filter_filename.c
 @@ -18,7 +18,9 @@
   
      */
@@ -90,9 +100,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_file
  #include "ppc-config.h"
  #include "filter_filename.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
---- gdb-6.8-orig/sim/ppc/igen.c	2003-06-20 05:59:33.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/igen.c	2008-09-30 15:12:06.000000000 +0200
+--- a/sim/ppc/igen.c
++++ b/sim/ppc/igen.c
 @@ -25,7 +25,9 @@
  #include "misc.h"
  #include "lf.h"
@@ -103,9 +112,8 @@ diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
  
  #include "filter.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
---- gdb-6.8-orig/sim/ppc/inline.c	1999-04-16 03:35:10.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/inline.c	2008-09-30 15:11:58.000000000 +0200
+--- a/sim/ppc/inline.c
++++ b/sim/ppc/inline.c
 @@ -22,7 +22,9 @@
  #ifndef _INLINE_C_
  #define _INLINE_C_
@@ -116,9 +124,8 @@ diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
  #include "ppc-config.h"
  
  #include "inline.h"
-diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
---- gdb-6.8-orig/sim/ppc/lf.c	2002-05-30 17:07:06.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/lf.c	2008-09-30 15:33:35.000000000 +0200
+--- a/sim/ppc/lf.c
++++ b/sim/ppc/lf.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -129,9 +136,8 @@ diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
  #include "misc.h"
  #include "lf.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
---- gdb-6.8-orig/sim/ppc/misc.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/misc.c	2008-09-30 15:11:54.000000000 +0200
+--- a/sim/ppc/misc.c
++++ b/sim/ppc/misc.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -142,9 +148,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
  #include "misc.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
---- gdb-6.8-orig/sim/ppc/misc.h	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/misc.h	2008-09-30 15:11:49.000000000 +0200
+--- a/sim/ppc/misc.h
++++ b/sim/ppc/misc.h
 @@ -21,7 +21,9 @@
  
  /* Frustrating header junk */
@@ -155,9 +160,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
  
  #include <stdio.h>
  #include <ctype.h>
-diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
---- gdb-6.8-orig/sim/ppc/sim-endian.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/sim-endian.c	2008-09-30 15:11:44.000000000 +0200
+--- a/sim/ppc/sim-endian.c
++++ b/sim/ppc/sim-endian.c
 @@ -22,7 +22,9 @@
  #ifndef _SIM_ENDIAN_C_
  #define _SIM_ENDIAN_C_
@@ -168,9 +172,8 @@ diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
  #include "basics.h"
  
  
-diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c
---- gdb-6.8-orig/sim/ppc/table.c	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/table.c	2008-09-30 15:11:38.000000000 +0200
+--- a/sim/ppc/table.c
++++ b/sim/ppc/table.c
 @@ -25,7 +25,9 @@
  #include <fcntl.h>
  #include <ctype.h>
diff --git a/packages/gdb/6.8a/150-handle-stpcpy-define.patch b/packages/gdb/6.8a/0005-handle-stpcpy-define.patch
similarity index 50%
rename from packages/gdb/6.8a/150-handle-stpcpy-define.patch
rename to packages/gdb/6.8a/0005-handle-stpcpy-define.patch
index 88d703ff..11142e24 100644
--- a/packages/gdb/6.8a/150-handle-stpcpy-define.patch
+++ b/packages/gdb/6.8a/0005-handle-stpcpy-define.patch
@@ -1,6 +1,9 @@
-diff -ru gdb-6.8.orig/bfd/sysdep.h gdb-6.8/bfd/sysdep.h
---- gdb-6.8.orig/bfd/sysdep.h	2007-07-03 16:26:42.000000000 +0200
-+++ gdb-6.8/bfd/sysdep.h	2011-08-21 13:33:47.000000000 +0200
+---
+ bfd/sysdep.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/bfd/sysdep.h
++++ b/bfd/sysdep.h
 @@ -131,7 +131,7 @@
  extern PTR realloc ();
  #endif
diff --git a/packages/gdb/6.8a/140-sim-ppc-have-config-h.patch b/packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch
similarity index 51%
rename from packages/gdb/6.8a/140-sim-ppc-have-config-h.patch
rename to packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch
index f3723b57..2d068e7a 100644
--- a/packages/gdb/6.8a/140-sim-ppc-have-config-h.patch
+++ b/packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch
@@ -2,10 +2,25 @@ Fix for canadian cross build of sim/ppc
 
 Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
 
-diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
---- gdb-6.8-pl1/sim/ppc/Makefile.in	2006-05-31 17:14:45.000000000 +0200
-+++ gdb-6.8-pl2/sim/ppc/Makefile.in	2008-09-30 15:56:33.000000000 +0200
-@@ -61,7 +61,7 @@
+---
+ sim/ppc/Makefile.in       |    6 +++---
+ sim/ppc/basics.h          |    2 ++
+ sim/ppc/debug.c           |    2 ++
+ sim/ppc/dgen.c            |    2 ++
+ sim/ppc/filter.c          |    2 ++
+ sim/ppc/filter_filename.c |    2 ++
+ sim/ppc/igen.c            |    2 ++
+ sim/ppc/inline.c          |    2 ++
+ sim/ppc/lf.c              |    2 ++
+ sim/ppc/misc.c            |    2 ++
+ sim/ppc/misc.h            |    2 ++
+ sim/ppc/sim-endian.c      |    2 ++
+ sim/ppc/table.c           |    2 ++
+ 13 files changed, 27 insertions(+), 3 deletions(-)
+
+--- a/sim/ppc/Makefile.in
++++ b/sim/ppc/Makefile.in
+@@ -62,7 +62,7 @@
  AR = @AR@
  AR_FLAGS = rc
  CC = @CC@
@@ -14,7 +29,7 @@ diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
  CC_FOR_BUILD = @CC_FOR_BUILD@
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  BISON = bison
-@@ -115,8 +115,8 @@
+@@ -116,8 +116,8 @@
    $(DEVZERO_CFLAGS)
  SIM_FPU_CFLAGS = @sim_fpu_cflags@
  
@@ -25,9 +40,8 @@ diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
  BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
  
  BUILD_LDFLAGS	=
-diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
---- gdb-6.8-orig/sim/ppc/basics.h	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/basics.h	2008-09-30 15:12:32.000000000 +0200
+--- a/sim/ppc/basics.h
++++ b/sim/ppc/basics.h
 @@ -86,7 +86,9 @@
  
  /* Basic configuration */
@@ -38,9 +52,8 @@ diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
  #include "ppc-config.h"
  #include "inline.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
---- gdb-6.8-orig/sim/ppc/debug.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/debug.c	2008-09-30 15:12:27.000000000 +0200
+--- a/sim/ppc/debug.c
++++ b/sim/ppc/debug.c
 @@ -22,7 +22,9 @@
  #ifndef _DEBUG_C_
  #define _DEBUG_C_
@@ -51,9 +64,8 @@ diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
  #include "basics.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
---- gdb-6.8-orig/sim/ppc/dgen.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/dgen.c	2008-09-30 15:12:22.000000000 +0200
+--- a/sim/ppc/dgen.c
++++ b/sim/ppc/dgen.c
 @@ -27,7 +27,9 @@
  #include <ctype.h>
  #include <stdarg.h>
@@ -64,9 +76,8 @@ diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
  #include "misc.h"
  #include "lf.h"
  #include "table.h"
-diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
---- gdb-6.8-orig/sim/ppc/filter.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter.c	2008-09-30 15:12:15.000000000 +0200
+--- a/sim/ppc/filter.c
++++ b/sim/ppc/filter.c
 @@ -21,7 +21,9 @@
  
  #include <stdio.h>
@@ -77,9 +88,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
  
  #ifdef HAVE_STRING_H
  #include <string.h>
-diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c
---- gdb-6.8-orig/sim/ppc/filter_filename.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter_filename.c	2008-09-30 15:12:11.000000000 +0200
+--- a/sim/ppc/filter_filename.c
++++ b/sim/ppc/filter_filename.c
 @@ -18,7 +18,9 @@
   
      */
@@ -90,9 +100,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_file
  #include "ppc-config.h"
  #include "filter_filename.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
---- gdb-6.8-orig/sim/ppc/igen.c	2003-06-20 05:59:33.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/igen.c	2008-09-30 15:12:06.000000000 +0200
+--- a/sim/ppc/igen.c
++++ b/sim/ppc/igen.c
 @@ -25,7 +25,9 @@
  #include "misc.h"
  #include "lf.h"
@@ -103,9 +112,8 @@ diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
  
  #include "filter.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
---- gdb-6.8-orig/sim/ppc/inline.c	1999-04-16 03:35:10.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/inline.c	2008-09-30 15:11:58.000000000 +0200
+--- a/sim/ppc/inline.c
++++ b/sim/ppc/inline.c
 @@ -22,7 +22,9 @@
  #ifndef _INLINE_C_
  #define _INLINE_C_
@@ -116,9 +124,8 @@ diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
  #include "ppc-config.h"
  
  #include "inline.h"
-diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
---- gdb-6.8-orig/sim/ppc/lf.c	2002-05-30 17:07:06.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/lf.c	2008-09-30 15:33:35.000000000 +0200
+--- a/sim/ppc/lf.c
++++ b/sim/ppc/lf.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -129,9 +136,8 @@ diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
  #include "misc.h"
  #include "lf.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
---- gdb-6.8-orig/sim/ppc/misc.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/misc.c	2008-09-30 15:11:54.000000000 +0200
+--- a/sim/ppc/misc.c
++++ b/sim/ppc/misc.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -142,9 +148,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
  #include "misc.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
---- gdb-6.8-orig/sim/ppc/misc.h	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/misc.h	2008-09-30 15:11:49.000000000 +0200
+--- a/sim/ppc/misc.h
++++ b/sim/ppc/misc.h
 @@ -21,7 +21,9 @@
  
  /* Frustrating header junk */
@@ -155,9 +160,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
  
  #include <stdio.h>
  #include <ctype.h>
-diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
---- gdb-6.8-orig/sim/ppc/sim-endian.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/sim-endian.c	2008-09-30 15:11:44.000000000 +0200
+--- a/sim/ppc/sim-endian.c
++++ b/sim/ppc/sim-endian.c
 @@ -22,7 +22,9 @@
  #ifndef _SIM_ENDIAN_C_
  #define _SIM_ENDIAN_C_
@@ -168,9 +172,8 @@ diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
  #include "basics.h"
  
  
-diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c
---- gdb-6.8-orig/sim/ppc/table.c	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/table.c	2008-09-30 15:11:38.000000000 +0200
+--- a/sim/ppc/table.c
++++ b/sim/ppc/table.c
 @@ -25,7 +25,9 @@
  #include <fcntl.h>
  #include <ctype.h>
diff --git a/packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch b/packages/gdb/7.0a/0000-sim-ppc-have-config-h.patch
similarity index 51%
rename from packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch
rename to packages/gdb/7.0a/0000-sim-ppc-have-config-h.patch
index f3723b57..2d068e7a 100644
--- a/packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch
+++ b/packages/gdb/7.0a/0000-sim-ppc-have-config-h.patch
@@ -2,10 +2,25 @@ Fix for canadian cross build of sim/ppc
 
 Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
 
-diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
---- gdb-6.8-pl1/sim/ppc/Makefile.in	2006-05-31 17:14:45.000000000 +0200
-+++ gdb-6.8-pl2/sim/ppc/Makefile.in	2008-09-30 15:56:33.000000000 +0200
-@@ -61,7 +61,7 @@
+---
+ sim/ppc/Makefile.in       |    6 +++---
+ sim/ppc/basics.h          |    2 ++
+ sim/ppc/debug.c           |    2 ++
+ sim/ppc/dgen.c            |    2 ++
+ sim/ppc/filter.c          |    2 ++
+ sim/ppc/filter_filename.c |    2 ++
+ sim/ppc/igen.c            |    2 ++
+ sim/ppc/inline.c          |    2 ++
+ sim/ppc/lf.c              |    2 ++
+ sim/ppc/misc.c            |    2 ++
+ sim/ppc/misc.h            |    2 ++
+ sim/ppc/sim-endian.c      |    2 ++
+ sim/ppc/table.c           |    2 ++
+ 13 files changed, 27 insertions(+), 3 deletions(-)
+
+--- a/sim/ppc/Makefile.in
++++ b/sim/ppc/Makefile.in
+@@ -62,7 +62,7 @@
  AR = @AR@
  AR_FLAGS = rc
  CC = @CC@
@@ -14,7 +29,7 @@ diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
  CC_FOR_BUILD = @CC_FOR_BUILD@
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  BISON = bison
-@@ -115,8 +115,8 @@
+@@ -116,8 +116,8 @@
    $(DEVZERO_CFLAGS)
  SIM_FPU_CFLAGS = @sim_fpu_cflags@
  
@@ -25,9 +40,8 @@ diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
  BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
  
  BUILD_LDFLAGS	=
-diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
---- gdb-6.8-orig/sim/ppc/basics.h	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/basics.h	2008-09-30 15:12:32.000000000 +0200
+--- a/sim/ppc/basics.h
++++ b/sim/ppc/basics.h
 @@ -86,7 +86,9 @@
  
  /* Basic configuration */
@@ -38,9 +52,8 @@ diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
  #include "ppc-config.h"
  #include "inline.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
---- gdb-6.8-orig/sim/ppc/debug.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/debug.c	2008-09-30 15:12:27.000000000 +0200
+--- a/sim/ppc/debug.c
++++ b/sim/ppc/debug.c
 @@ -22,7 +22,9 @@
  #ifndef _DEBUG_C_
  #define _DEBUG_C_
@@ -51,9 +64,8 @@ diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
  #include "basics.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
---- gdb-6.8-orig/sim/ppc/dgen.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/dgen.c	2008-09-30 15:12:22.000000000 +0200
+--- a/sim/ppc/dgen.c
++++ b/sim/ppc/dgen.c
 @@ -27,7 +27,9 @@
  #include <ctype.h>
  #include <stdarg.h>
@@ -64,9 +76,8 @@ diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
  #include "misc.h"
  #include "lf.h"
  #include "table.h"
-diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
---- gdb-6.8-orig/sim/ppc/filter.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter.c	2008-09-30 15:12:15.000000000 +0200
+--- a/sim/ppc/filter.c
++++ b/sim/ppc/filter.c
 @@ -21,7 +21,9 @@
  
  #include <stdio.h>
@@ -77,9 +88,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
  
  #ifdef HAVE_STRING_H
  #include <string.h>
-diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c
---- gdb-6.8-orig/sim/ppc/filter_filename.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter_filename.c	2008-09-30 15:12:11.000000000 +0200
+--- a/sim/ppc/filter_filename.c
++++ b/sim/ppc/filter_filename.c
 @@ -18,7 +18,9 @@
   
      */
@@ -90,9 +100,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_file
  #include "ppc-config.h"
  #include "filter_filename.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
---- gdb-6.8-orig/sim/ppc/igen.c	2003-06-20 05:59:33.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/igen.c	2008-09-30 15:12:06.000000000 +0200
+--- a/sim/ppc/igen.c
++++ b/sim/ppc/igen.c
 @@ -25,7 +25,9 @@
  #include "misc.h"
  #include "lf.h"
@@ -103,9 +112,8 @@ diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
  
  #include "filter.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
---- gdb-6.8-orig/sim/ppc/inline.c	1999-04-16 03:35:10.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/inline.c	2008-09-30 15:11:58.000000000 +0200
+--- a/sim/ppc/inline.c
++++ b/sim/ppc/inline.c
 @@ -22,7 +22,9 @@
  #ifndef _INLINE_C_
  #define _INLINE_C_
@@ -116,9 +124,8 @@ diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
  #include "ppc-config.h"
  
  #include "inline.h"
-diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
---- gdb-6.8-orig/sim/ppc/lf.c	2002-05-30 17:07:06.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/lf.c	2008-09-30 15:33:35.000000000 +0200
+--- a/sim/ppc/lf.c
++++ b/sim/ppc/lf.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -129,9 +136,8 @@ diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
  #include "misc.h"
  #include "lf.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
---- gdb-6.8-orig/sim/ppc/misc.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/misc.c	2008-09-30 15:11:54.000000000 +0200
+--- a/sim/ppc/misc.c
++++ b/sim/ppc/misc.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -142,9 +148,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
  #include "misc.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
---- gdb-6.8-orig/sim/ppc/misc.h	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/misc.h	2008-09-30 15:11:49.000000000 +0200
+--- a/sim/ppc/misc.h
++++ b/sim/ppc/misc.h
 @@ -21,7 +21,9 @@
  
  /* Frustrating header junk */
@@ -155,9 +160,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
  
  #include <stdio.h>
  #include <ctype.h>
-diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
---- gdb-6.8-orig/sim/ppc/sim-endian.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/sim-endian.c	2008-09-30 15:11:44.000000000 +0200
+--- a/sim/ppc/sim-endian.c
++++ b/sim/ppc/sim-endian.c
 @@ -22,7 +22,9 @@
  #ifndef _SIM_ENDIAN_C_
  #define _SIM_ENDIAN_C_
@@ -168,9 +172,8 @@ diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
  #include "basics.h"
  
  
-diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c
---- gdb-6.8-orig/sim/ppc/table.c	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/table.c	2008-09-30 15:11:38.000000000 +0200
+--- a/sim/ppc/table.c
++++ b/sim/ppc/table.c
 @@ -25,7 +25,9 @@
  #include <fcntl.h>
  #include <ctype.h>
diff --git a/packages/gdb/7.10.1/100-musl_fix.patch b/packages/gdb/7.10.1/0000-musl_fix.patch
similarity index 86%
rename from packages/gdb/7.10.1/100-musl_fix.patch
rename to packages/gdb/7.10.1/0000-musl_fix.patch
index c0c1e0ae..9f1b9309 100644
--- a/packages/gdb/7.10.1/100-musl_fix.patch
+++ b/packages/gdb/7.10.1/0000-musl_fix.patch
@@ -1,3 +1,8 @@
+---
+ gdb/linux-nat.c |    5 +++++
+ gdb/stopcode.h  |    4 ++++
+ 2 files changed, 9 insertions(+)
+
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
 @@ -17,6 +17,7 @@
diff --git a/packages/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch b/packages/gdb/7.10.1/0001-xtensa-initialize-call_abi-in-xtensa_tdep.patch
similarity index 87%
rename from packages/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
rename to packages/gdb/7.10.1/0001-xtensa-initialize-call_abi-in-xtensa_tdep.patch
index 1182a455..afa70835 100644
--- a/packages/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
+++ b/packages/gdb/7.10.1/0001-xtensa-initialize-call_abi-in-xtensa_tdep.patch
@@ -17,14 +17,12 @@ gdb/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.h | 3 ++-
+ gdb/xtensa-tdep.h |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h
-index adacaf8..3b6ea66 100644
 --- a/gdb/xtensa-tdep.h
 +++ b/gdb/xtensa-tdep.h
-@@ -246,7 +246,8 @@ struct gdbarch_tdep
+@@ -246,7 +246,8 @@
  	  .spill_location = -1,					\
  	  .spill_size = (spillsz),				\
  	  .unused = 0,						\
@@ -34,6 +32,3 @@ index adacaf8..3b6ea66 100644
  	  .debug_interrupt_level = XCHAL_DEBUGLEVEL,		\
  	  .icache_line_bytes = XCHAL_ICACHE_LINESIZE,		\
  	  .dcache_line_bytes = XCHAL_DCACHE_LINESIZE,		\
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/7.10.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
similarity index 80%
rename from packages/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch
rename to packages/gdb/7.10.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f7..653f0e26 100644
--- a/packages/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/7.10.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
@@ -13,14 +13,12 @@ gdb/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 3 +++
+ gdb/xtensa-tdep.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
+@@ -3175,6 +3175,9 @@
  	tdep->num_regs = n;
      }
  
@@ -30,6 +28,3 @@ index 55e7d98..41f5ec1 100644
    /* Number of pseudo registers.  */
    tdep->num_pseudo_regs = n - tdep->num_regs;
  
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/7.10.1/0003-WIP-end-of-prologue-detection-hack.patch
similarity index 82%
rename from packages/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch
rename to packages/gdb/7.10.1/0003-WIP-end-of-prologue-detection-hack.patch
index 506a57c3..f47b4942 100644
--- a/packages/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/7.10.1/0003-WIP-end-of-prologue-detection-hack.patch
@@ -10,14 +10,12 @@ see
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 2 +-
+ gdb/xtensa-tdep.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
+@@ -2410,7 +2410,7 @@
    /* Find out, if we have an information about the prologue from DWARF.  */
    prologue_sal = find_pc_line (start, 0);
    if (prologue_sal.line != 0) /* Found debug info.  */
@@ -26,6 +24,3 @@ index 41f5ec1..6a7dba7 100644
  
    /* If we are going to analyze the prologue in general without knowing about
       the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.11.1/100-musl_fix.patch b/packages/gdb/7.11.1/0000-musl_fix.patch
similarity index 84%
rename from packages/gdb/7.11.1/100-musl_fix.patch
rename to packages/gdb/7.11.1/0000-musl_fix.patch
index c0c1e0ae..68297806 100644
--- a/packages/gdb/7.11.1/100-musl_fix.patch
+++ b/packages/gdb/7.11.1/0000-musl_fix.patch
@@ -1,3 +1,8 @@
+---
+ gdb/linux-nat.c |    5 +++++
+ gdb/stopcode.h  |    4 ++++
+ 2 files changed, 9 insertions(+)
+
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
 @@ -17,6 +17,7 @@
@@ -8,7 +13,7 @@
  #include "defs.h"
  #include "inferior.h"
  #include "infrun.h"
-@@ -73,6 +74,10 @@
+@@ -71,6 +72,10 @@
  #define SPUFS_MAGIC 0x23c9b64e
  #endif
  
diff --git a/packages/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch b/packages/gdb/7.11.1/0001-uclibc-no-gettimeofday-clobber.patch
similarity index 84%
rename from packages/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch
rename to packages/gdb/7.11.1/0001-uclibc-no-gettimeofday-clobber.patch
index ff59907e..e191e5c3 100644
--- a/packages/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch
+++ b/packages/gdb/7.11.1/0001-uclibc-no-gettimeofday-clobber.patch
@@ -5,8 +5,12 @@ gdb-native step otherwise fails when linking the libinproctrace.so
 
 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
 
---- a/gdb/gnulib/configure	2016-02-25 18:17:04.145903807 +0100
-+++ b/gdb/gnulib/configure	2016-02-25 18:17:28.545903821 +0100
+---
+ gdb/gnulib/configure |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/gdb/gnulib/configure
++++ b/gdb/gnulib/configure
 @@ -13520,8 +13520,9 @@
    if test "$cross_compiling" = yes; then :
    # When cross-compiling:
diff --git a/packages/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/7.11.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
similarity index 80%
rename from packages/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch
rename to packages/gdb/7.11.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f7..653f0e26 100644
--- a/packages/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/7.11.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
@@ -13,14 +13,12 @@ gdb/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 3 +++
+ gdb/xtensa-tdep.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
+@@ -3175,6 +3175,9 @@
  	tdep->num_regs = n;
      }
  
@@ -30,6 +28,3 @@ index 55e7d98..41f5ec1 100644
    /* Number of pseudo registers.  */
    tdep->num_pseudo_regs = n - tdep->num_regs;
  
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/7.11.1/0003-WIP-end-of-prologue-detection-hack.patch
similarity index 82%
rename from packages/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch
rename to packages/gdb/7.11.1/0003-WIP-end-of-prologue-detection-hack.patch
index 506a57c3..f47b4942 100644
--- a/packages/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/7.11.1/0003-WIP-end-of-prologue-detection-hack.patch
@@ -10,14 +10,12 @@ see
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 2 +-
+ gdb/xtensa-tdep.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
+@@ -2410,7 +2410,7 @@
    /* Find out, if we have an information about the prologue from DWARF.  */
    prologue_sal = find_pc_line (start, 0);
    if (prologue_sal.line != 0) /* Found debug info.  */
@@ -26,6 +24,3 @@ index 41f5ec1..6a7dba7 100644
  
    /* If we are going to analyze the prologue in general without knowing about
       the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.12.1/100-musl_fix.patch b/packages/gdb/7.12.1/0000-musl_fix.patch
similarity index 84%
rename from packages/gdb/7.12.1/100-musl_fix.patch
rename to packages/gdb/7.12.1/0000-musl_fix.patch
index c0c1e0ae..68297806 100644
--- a/packages/gdb/7.12.1/100-musl_fix.patch
+++ b/packages/gdb/7.12.1/0000-musl_fix.patch
@@ -1,3 +1,8 @@
+---
+ gdb/linux-nat.c |    5 +++++
+ gdb/stopcode.h  |    4 ++++
+ 2 files changed, 9 insertions(+)
+
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
 @@ -17,6 +17,7 @@
@@ -8,7 +13,7 @@
  #include "defs.h"
  #include "inferior.h"
  #include "infrun.h"
-@@ -73,6 +74,10 @@
+@@ -71,6 +72,10 @@
  #define SPUFS_MAGIC 0x23c9b64e
  #endif
  
diff --git a/packages/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch b/packages/gdb/7.12.1/0001-uclibc-no-gettimeofday-clobber.patch
similarity index 63%
rename from packages/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch
rename to packages/gdb/7.12.1/0001-uclibc-no-gettimeofday-clobber.patch
index cd7a4c67..d6e70728 100644
--- a/packages/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch
+++ b/packages/gdb/7.12.1/0001-uclibc-no-gettimeofday-clobber.patch
@@ -6,10 +6,14 @@ gdb-native step otherwise fails when linking the libinproctrace.so
 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
 Signed-off-by: Alexey Neyman <stilor@att.net>
 
-diff -urpN gdb-7.12.orig/gdb/gnulib/configure gdb-7.12/gdb/gnulib/configure
---- gdb-7.12.orig/gdb/gnulib/configure	2017-01-13 13:42:11.773027566 -0800
-+++ gdb-7.12/gdb/gnulib/configure	2017-01-13 13:44:32.518082618 -0800
-@@ -13522,6 +13522,7 @@ else
+---
+ gdb/gnulib/configure                 |    1 +
+ gdb/gnulib/import/m4/gettimeofday.m4 |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/gdb/gnulib/configure
++++ b/gdb/gnulib/configure
+@@ -13522,6 +13522,7 @@
        case "$host_os" in
                  # Guess all is fine on glibc systems.
          *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
@@ -17,10 +21,9 @@ diff -urpN gdb-7.12.orig/gdb/gnulib/configure gdb-7.12/gdb/gnulib/configure
                  # If we don't know, assume the worst.
          *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
        esac
-diff -urpN gdb-7.12.orig/gdb/gnulib/import/m4/gettimeofday.m4 gdb-7.12/gdb/gnulib/import/m4/gettimeofday.m4
---- gdb-7.12.orig/gdb/gnulib/import/m4/gettimeofday.m4	2017-01-13 13:42:11.777027595 -0800
-+++ gdb-7.12/gdb/gnulib/import/m4/gettimeofday.m4	2017-01-13 13:43:55.781797640 -0800
-@@ -111,6 +111,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
+--- a/gdb/gnulib/import/m4/gettimeofday.m4
++++ b/gdb/gnulib/import/m4/gettimeofday.m4
+@@ -111,6 +111,7 @@
        case "$host_os" in
                  # Guess all is fine on glibc systems.
          *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
diff --git a/packages/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/7.12.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
similarity index 80%
rename from packages/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch
rename to packages/gdb/7.12.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f7..19eb69d2 100644
--- a/packages/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/7.12.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
@@ -13,14 +13,12 @@ gdb/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 3 +++
+ gdb/xtensa-tdep.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
+@@ -3174,6 +3174,9 @@
  	tdep->num_regs = n;
      }
  
@@ -30,6 +28,3 @@ index 55e7d98..41f5ec1 100644
    /* Number of pseudo registers.  */
    tdep->num_pseudo_regs = n - tdep->num_regs;
  
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/7.12.1/0003-WIP-end-of-prologue-detection-hack.patch
similarity index 82%
rename from packages/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch
rename to packages/gdb/7.12.1/0003-WIP-end-of-prologue-detection-hack.patch
index 506a57c3..f47b4942 100644
--- a/packages/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/7.12.1/0003-WIP-end-of-prologue-detection-hack.patch
@@ -10,14 +10,12 @@ see
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 2 +-
+ gdb/xtensa-tdep.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
+@@ -2410,7 +2410,7 @@
    /* Find out, if we have an information about the prologue from DWARF.  */
    prologue_sal = find_pc_line (start, 0);
    if (prologue_sal.line != 0) /* Found debug info.  */
@@ -26,6 +24,3 @@ index 41f5ec1..6a7dba7 100644
  
    /* If we are going to analyze the prologue in general without knowing about
       the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/packages/gdb/8.0.1/200-allow-android.patch b/packages/gdb/7.12.1/0004-allow-android.patch
similarity index 71%
rename from packages/gdb/8.0.1/200-allow-android.patch
rename to packages/gdb/7.12.1/0004-allow-android.patch
index 7954477c..9beb41b6 100644
--- a/packages/gdb/8.0.1/200-allow-android.patch
+++ b/packages/gdb/7.12.1/0004-allow-android.patch
@@ -1,7 +1,11 @@
-diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure gdb-7.12.1/gdb/gdbserver/configure
---- gdb-7.12.1.orig/gdb/gdbserver/configure	2017-05-14 17:02:46.742711695 -0700
-+++ gdb-7.12.1/gdb/gdbserver/configure	2017-05-14 17:03:22.147058607 -0700
-@@ -6671,17 +6671,6 @@ fi
+---
+ gdb/gdbserver/configure    |   11 -----------
+ gdb/gdbserver/configure.ac |   11 -----------
+ 2 files changed, 22 deletions(-)
+
+--- a/gdb/gdbserver/configure
++++ b/gdb/gdbserver/configure
+@@ -6671,17 +6671,6 @@
  
  
  case "${target}" in
@@ -19,10 +23,9 @@ diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure gdb-7.12.1/gdb/gdbserver/conf
    *)
      ac_fn_c_check_type "$LINENO" "Elf32_auxv_t" "ac_cv_type_Elf32_auxv_t" "#include <elf.h>
  
-diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure.ac gdb-7.12.1/gdb/gdbserver/configure.ac
---- gdb-7.12.1.orig/gdb/gdbserver/configure.ac	2017-05-14 17:02:46.742711695 -0700
-+++ gdb-7.12.1/gdb/gdbserver/configure.ac	2017-05-14 17:03:53.219361720 -0700
-@@ -179,17 +179,6 @@ AC_CHECK_TYPES(socklen_t, [], [],
+--- a/gdb/gdbserver/configure.ac
++++ b/gdb/gdbserver/configure.ac
+@@ -179,17 +179,6 @@
  ])
  
  case "${target}" in
diff --git a/packages/gdb/7.2a/100-sim-ppc-lz-fix.patch b/packages/gdb/7.2a/0000-sim-ppc-lz-fix.patch
similarity index 75%
rename from packages/gdb/7.2a/100-sim-ppc-lz-fix.patch
rename to packages/gdb/7.2a/0000-sim-ppc-lz-fix.patch
index 6f08ef82..3cff5182 100644
--- a/packages/gdb/7.2a/100-sim-ppc-lz-fix.patch
+++ b/packages/gdb/7.2a/0000-sim-ppc-lz-fix.patch
@@ -2,14 +2,18 @@ Fix for psim build failure due to -lz
 
 See http://sourceware.org/bugzilla/show_bug.cgi?id=12202
 
---- gdb-7.2.orig/sim/ppc/Makefile.in
-+++ gdb-7.2/sim/ppc/Makefile.in
+---
+ sim/ppc/Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sim/ppc/Makefile.in
++++ b/sim/ppc/Makefile.in
 @@ -551,7 +551,7 @@
  PACKAGE_OBJ = @sim_pk_obj@
-
-
+ 
+ 
 -psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP)
 +psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP)
  	$(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS)
-
+ 
  run: psim
diff --git a/packages/gdb/7.4.1/00_all_ptrace_setsiginfo.patch b/packages/gdb/7.4.1/0000-all_ptrace_setsiginfo.patch
similarity index 76%
rename from packages/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
rename to packages/gdb/7.4.1/0000-all_ptrace_setsiginfo.patch
index 81a92db9..a430d946 100644
--- a/packages/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
+++ b/packages/gdb/7.4.1/0000-all_ptrace_setsiginfo.patch
@@ -29,10 +29,8 @@ gdbserver/
 	(struct linux_target_ops) <siginfo_fixup>: Use siginfo_t instead of
 	struct siginfo.
 ---
- gdb/ChangeLog                 |   15 +++++++++++++++
  gdb/amd64-linux-nat.c         |    4 ++--
  gdb/arm-linux-nat.c           |    2 +-
- gdb/gdbserver/ChangeLog       |   11 +++++++++++
  gdb/gdbserver/linux-arm-low.c |    2 +-
  gdb/gdbserver/linux-low.c     |   10 +++++-----
  gdb/gdbserver/linux-low.h     |    5 ++---
@@ -42,13 +40,11 @@ gdbserver/
  gdb/linux-nat.h               |    6 +++---
  gdb/ppc-linux-nat.c           |    2 +-
  gdb/procfs.c                  |    2 +-
- 13 files changed, 53 insertions(+), 28 deletions(-)
+ 11 files changed, 27 insertions(+), 28 deletions(-)
 
-diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
-index f954483..5ebba3a 100644
 --- a/gdb/amd64-linux-nat.c
 +++ b/gdb/amd64-linux-nat.c
-@@ -731,13 +731,13 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
+@@ -671,13 +671,13 @@
     INF.  */
  
  static int
@@ -64,11 +60,9 @@ index f954483..5ebba3a 100644
  
        if (direction == 0)
  	compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native);
-diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
-index c5ce21c..f9f6ba5 100644
 --- a/gdb/arm-linux-nat.c
 +++ b/gdb/arm-linux-nat.c
-@@ -1137,7 +1137,7 @@ arm_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw,
+@@ -1137,7 +1137,7 @@
  static int
  arm_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
  {
@@ -77,11 +71,9 @@ index c5ce21c..f9f6ba5 100644
    int slot = siginfo_p->si_errno;
  
    /* This must be a hardware breakpoint.  */
-diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
-index ff2437d..01208ef 100644
 --- a/gdb/gdbserver/linux-arm-low.c
 +++ b/gdb/gdbserver/linux-arm-low.c
-@@ -631,7 +631,7 @@ static int
+@@ -631,7 +631,7 @@
  arm_stopped_by_watchpoint (void)
  {
    struct lwp_info *lwp = get_thread_lwp (current_inferior);
@@ -90,11 +82,9 @@ index ff2437d..01208ef 100644
  
    /* We must be able to set hardware watchpoints.  */
    if (arm_linux_get_hw_watchpoint_count () == 0)
-diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
-index d2d4c1d..4734f15 100644
 --- a/gdb/gdbserver/linux-low.c
 +++ b/gdb/gdbserver/linux-low.c
-@@ -4779,7 +4779,7 @@ linux_qxfer_osdata (const char *annex,
+@@ -4522,7 +4522,7 @@
     layout of the inferiors' architecture.  */
  
  static void
@@ -103,7 +93,7 @@ index d2d4c1d..4734f15 100644
  {
    int done = 0;
  
-@@ -4791,9 +4791,9 @@ siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction)
+@@ -4534,9 +4534,9 @@
    if (!done)
      {
        if (direction == 1)
@@ -115,7 +105,7 @@ index d2d4c1d..4734f15 100644
      }
  }
  
-@@ -4802,8 +4802,8 @@ linux_xfer_siginfo (const char *annex, unsigned char *readbuf,
+@@ -4545,8 +4545,8 @@
  		    unsigned const char *writebuf, CORE_ADDR offset, int len)
  {
    int pid;
@@ -126,8 +116,6 @@ index d2d4c1d..4734f15 100644
  
    if (current_inferior == NULL)
      return -1;
-diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h
-index 677d261..3aeae70 100644
 --- a/gdb/gdbserver/linux-low.h
 +++ b/gdb/gdbserver/linux-low.h
 @@ -20,6 +20,7 @@
@@ -138,7 +126,7 @@ index 677d261..3aeae70 100644
  
  #include "gdb_proc_service.h"
  
-@@ -46,8 +47,6 @@ struct regset_info
+@@ -46,8 +47,6 @@
  extern struct regset_info target_regsets[];
  #endif
  
@@ -147,7 +135,7 @@ index 677d261..3aeae70 100644
  struct process_info_private
  {
    /* Arch-specific additions.  */
-@@ -109,7 +108,7 @@ struct linux_target_ops
+@@ -103,7 +102,7 @@
       Returns true if any conversion was done; false otherwise.
       If DIRECTION is 1, then copy from INF to NATIVE.
       If DIRECTION is 0, copy from NATIVE to INF.  */
@@ -156,11 +144,9 @@ index 677d261..3aeae70 100644
  
    /* Hook to call when a new process is created or attached to.
       If extra per-process architecture-specific data is needed,
-diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
-index ed1f8a8..b466b5d 100644
 --- a/gdb/gdbserver/linux-x86-low.c
 +++ b/gdb/gdbserver/linux-x86-low.c
-@@ -918,13 +918,13 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
+@@ -906,13 +906,13 @@
     INF.  */
  
  static int
@@ -176,11 +162,9 @@ index ed1f8a8..b466b5d 100644
  	fatal ("unexpected difference in siginfo");
  
        if (direction == 0)
-diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
-index 8773195..19b827f 100644
 --- a/gdb/ia64-linux-nat.c
 +++ b/gdb/ia64-linux-nat.c
-@@ -637,7 +637,7 @@ static int
+@@ -637,7 +637,7 @@
  ia64_linux_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
  {
    CORE_ADDR psr;
@@ -189,11 +173,9 @@ index 8773195..19b827f 100644
    struct regcache *regcache = get_current_regcache ();
  
    siginfo_p = linux_nat_get_siginfo (inferior_ptid);
-diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
-index f80c0c1..d81d55e 100644
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
-@@ -188,7 +188,7 @@ static void (*linux_nat_prepare_to_resume) (struct lwp_info *);
+@@ -179,7 +179,7 @@
  /* The method to call, if any, when the siginfo object needs to be
     converted between the layout returned by ptrace, and the layout in
     the architecture of the inferior.  */
@@ -202,7 +184,7 @@ index f80c0c1..d81d55e 100644
  				       gdb_byte *,
  				       int);
  
-@@ -4232,7 +4232,7 @@ linux_nat_mourn_inferior (struct target_ops *ops)
+@@ -4138,7 +4138,7 @@
     layout of the inferiors' architecture.  */
  
  static void
@@ -211,7 +193,7 @@ index f80c0c1..d81d55e 100644
  {
    int done = 0;
  
-@@ -4244,9 +4244,9 @@ siginfo_fixup (struct siginfo *siginfo, gdb_byte *inf_siginfo, int direction)
+@@ -4150,9 +4150,9 @@
    if (!done)
      {
        if (direction == 1)
@@ -223,7 +205,7 @@ index f80c0c1..d81d55e 100644
      }
  }
  
-@@ -4256,8 +4256,8 @@ linux_xfer_siginfo (struct target_ops *ops, enum target_object object,
+@@ -4162,8 +4162,8 @@
  		    const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
  {
    int pid;
@@ -234,7 +216,7 @@ index f80c0c1..d81d55e 100644
  
    gdb_assert (object == TARGET_OBJECT_SIGNAL_INFO);
    gdb_assert (readbuf || writebuf);
-@@ -5266,7 +5266,7 @@ linux_nat_set_new_thread (struct target_ops *t,
+@@ -5852,7 +5852,7 @@
     inferior.  */
  void
  linux_nat_set_siginfo_fixup (struct target_ops *t,
@@ -243,7 +225,7 @@ index f80c0c1..d81d55e 100644
  						   gdb_byte *,
  						   int))
  {
-@@ -5285,7 +5285,7 @@ linux_nat_set_prepare_to_resume (struct target_ops *t,
+@@ -5861,7 +5861,7 @@
  }
  
  /* Return the saved siginfo associated with PTID.  */
@@ -252,11 +234,9 @@ index f80c0c1..d81d55e 100644
  linux_nat_get_siginfo (ptid_t ptid)
  {
    struct lwp_info *lp = find_lwp_pid (ptid);
-diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h
-index c9878d9..d87f0cf 100644
 --- a/gdb/linux-nat.h
 +++ b/gdb/linux-nat.h
-@@ -78,7 +78,7 @@ struct lwp_info
+@@ -76,7 +76,7 @@
  
    /* Non-zero si_signo if this LWP stopped with a trap.  si_addr may
       be the address of a hardware watchpoint.  */
@@ -265,7 +245,7 @@ index c9878d9..d87f0cf 100644
  
    /* STOPPED_BY_WATCHPOINT is non-zero if this LWP stopped with a data
       watchpoint trap.  */
-@@ -184,7 +184,7 @@ void linux_nat_set_new_thread (struct target_ops *, void (*) (struct lwp_info *)
+@@ -171,7 +171,7 @@
     that ptrace returns, and the layout in the architecture of the
     inferior.  */
  void linux_nat_set_siginfo_fixup (struct target_ops *,
@@ -274,7 +254,7 @@ index c9878d9..d87f0cf 100644
  					   gdb_byte *,
  					   int));
  
-@@ -198,7 +198,7 @@ void linux_nat_set_prepare_to_resume (struct target_ops *,
+@@ -180,7 +180,7 @@
  void linux_nat_switch_fork (ptid_t new_ptid);
  
  /* Return the saved siginfo associated with PTID.  */
@@ -283,11 +263,9 @@ index c9878d9..d87f0cf 100644
  
  /* Compute and return the processor core of a given thread.  */
  int linux_nat_core_of_thread_1 (ptid_t ptid);
-diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
-index 1bd157b..9bd11fd 100644
 --- a/gdb/ppc-linux-nat.c
 +++ b/gdb/ppc-linux-nat.c
-@@ -2218,7 +2218,7 @@ ppc_linux_thread_exit (struct thread_info *tp, int silent)
+@@ -2213,7 +2213,7 @@
  static int
  ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
  {
@@ -296,11 +274,9 @@ index 1bd157b..9bd11fd 100644
  
    siginfo_p = linux_nat_get_siginfo (inferior_ptid);
  
-diff --git a/gdb/procfs.c b/gdb/procfs.c
-index 903621d..cb4bc7c 100644
 --- a/gdb/procfs.c
 +++ b/gdb/procfs.c
-@@ -266,7 +266,7 @@ typedef struct sigaction gdb_sigaction_t;
+@@ -262,7 +262,7 @@
  #ifdef HAVE_PR_SIGINFO64_T
  typedef pr_siginfo64_t gdb_siginfo_t;
  #else
@@ -309,6 +285,3 @@ index 903621d..cb4bc7c 100644
  #endif
  
  /* On mips-irix, praddset and prdelset are defined in such a way that
--- 
-1.7.9.7
-
diff --git a/packages/gdb/7.4.1/05_all_readline-headers.patch b/packages/gdb/7.4.1/0001-all_readline-headers.patch
similarity index 84%
rename from packages/gdb/7.4.1/05_all_readline-headers.patch
rename to packages/gdb/7.4.1/0001-all_readline-headers.patch
index e65adf6e..4aa05726 100644
--- a/packages/gdb/7.4.1/05_all_readline-headers.patch
+++ b/packages/gdb/7.4.1/0001-all_readline-headers.patch
@@ -1,3 +1,9 @@
+---
+ readline/complete.c |    5 +++++
+ readline/display.c  |    5 +++++
+ readline/mbutil.c   |    5 +++++
+ 3 files changed, 15 insertions(+)
+
 --- a/readline/complete.c
 +++ b/readline/complete.c
 @@ -25,6 +25,11 @@
diff --git a/packages/gdb/8.0.1/100-musl_fix.patch b/packages/gdb/8.0.1/0000-musl_fix.patch
similarity index 84%
rename from packages/gdb/8.0.1/100-musl_fix.patch
rename to packages/gdb/8.0.1/0000-musl_fix.patch
index c0c1e0ae..68297806 100644
--- a/packages/gdb/8.0.1/100-musl_fix.patch
+++ b/packages/gdb/8.0.1/0000-musl_fix.patch
@@ -1,3 +1,8 @@
+---
+ gdb/linux-nat.c |    5 +++++
+ gdb/stopcode.h  |    4 ++++
+ 2 files changed, 9 insertions(+)
+
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
 @@ -17,6 +17,7 @@
@@ -8,7 +13,7 @@
  #include "defs.h"
  #include "inferior.h"
  #include "infrun.h"
-@@ -73,6 +74,10 @@
+@@ -71,6 +72,10 @@
  #define SPUFS_MAGIC 0x23c9b64e
  #endif
  
diff --git a/packages/gdb/8.0.1/101-uclibc-no-gettimeofday-clobber.patch b/packages/gdb/8.0.1/0001-uclibc-no-gettimeofday-clobber.patch
similarity index 63%
rename from packages/gdb/8.0.1/101-uclibc-no-gettimeofday-clobber.patch
rename to packages/gdb/8.0.1/0001-uclibc-no-gettimeofday-clobber.patch
index cd7a4c67..01fdfa1a 100644
--- a/packages/gdb/8.0.1/101-uclibc-no-gettimeofday-clobber.patch
+++ b/packages/gdb/8.0.1/0001-uclibc-no-gettimeofday-clobber.patch
@@ -6,10 +6,14 @@ gdb-native step otherwise fails when linking the libinproctrace.so
 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
 Signed-off-by: Alexey Neyman <stilor@att.net>
 
-diff -urpN gdb-7.12.orig/gdb/gnulib/configure gdb-7.12/gdb/gnulib/configure
---- gdb-7.12.orig/gdb/gnulib/configure	2017-01-13 13:42:11.773027566 -0800
-+++ gdb-7.12/gdb/gnulib/configure	2017-01-13 13:44:32.518082618 -0800
-@@ -13522,6 +13522,7 @@ else
+---
+ gdb/gnulib/configure                 |    1 +
+ gdb/gnulib/import/m4/gettimeofday.m4 |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/gdb/gnulib/configure
++++ b/gdb/gnulib/configure
+@@ -13868,6 +13868,7 @@
        case "$host_os" in
                  # Guess all is fine on glibc systems.
          *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
@@ -17,10 +21,9 @@ diff -urpN gdb-7.12.orig/gdb/gnulib/configure gdb-7.12/gdb/gnulib/configure
                  # If we don't know, assume the worst.
          *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
        esac
-diff -urpN gdb-7.12.orig/gdb/gnulib/import/m4/gettimeofday.m4 gdb-7.12/gdb/gnulib/import/m4/gettimeofday.m4
---- gdb-7.12.orig/gdb/gnulib/import/m4/gettimeofday.m4	2017-01-13 13:42:11.777027595 -0800
-+++ gdb-7.12/gdb/gnulib/import/m4/gettimeofday.m4	2017-01-13 13:43:55.781797640 -0800
-@@ -111,6 +111,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
+--- a/gdb/gnulib/import/m4/gettimeofday.m4
++++ b/gdb/gnulib/import/m4/gettimeofday.m4
+@@ -111,6 +111,7 @@
        case "$host_os" in
                  # Guess all is fine on glibc systems.
          *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
diff --git a/packages/gdb/8.0.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/8.0.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
similarity index 80%
rename from packages/gdb/8.0.1/111-xtensa-make-sure-ar_base-is-initialized.patch
rename to packages/gdb/8.0.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f7..d0567374 100644
--- a/packages/gdb/8.0.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/8.0.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
@@ -13,14 +13,12 @@ gdb/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 3 +++
+ gdb/xtensa-tdep.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
+@@ -3166,6 +3166,9 @@
  	tdep->num_regs = n;
      }
  
@@ -30,6 +28,3 @@ index 55e7d98..41f5ec1 100644
    /* Number of pseudo registers.  */
    tdep->num_pseudo_regs = n - tdep->num_regs;
  
--- 
-1.8.1.4
-
diff --git a/packages/gdb/8.0.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/8.0.1/0003-WIP-end-of-prologue-detection-hack.patch
similarity index 82%
rename from packages/gdb/8.0.1/112-WIP-end-of-prologue-detection-hack.patch
rename to packages/gdb/8.0.1/0003-WIP-end-of-prologue-detection-hack.patch
index 506a57c3..f47b4942 100644
--- a/packages/gdb/8.0.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/8.0.1/0003-WIP-end-of-prologue-detection-hack.patch
@@ -10,14 +10,12 @@ see
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 2 +-
+ gdb/xtensa-tdep.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
+@@ -2410,7 +2410,7 @@
    /* Find out, if we have an information about the prologue from DWARF.  */
    prologue_sal = find_pc_line (start, 0);
    if (prologue_sal.line != 0) /* Found debug info.  */
@@ -26,6 +24,3 @@ index 41f5ec1..6a7dba7 100644
  
    /* If we are going to analyze the prologue in general without knowing about
       the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.12.1/200-allow-android.patch b/packages/gdb/8.0.1/0004-allow-android.patch
similarity index 71%
rename from packages/gdb/7.12.1/200-allow-android.patch
rename to packages/gdb/8.0.1/0004-allow-android.patch
index 7954477c..b97871c6 100644
--- a/packages/gdb/7.12.1/200-allow-android.patch
+++ b/packages/gdb/8.0.1/0004-allow-android.patch
@@ -1,7 +1,11 @@
-diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure gdb-7.12.1/gdb/gdbserver/configure
---- gdb-7.12.1.orig/gdb/gdbserver/configure	2017-05-14 17:02:46.742711695 -0700
-+++ gdb-7.12.1/gdb/gdbserver/configure	2017-05-14 17:03:22.147058607 -0700
-@@ -6671,17 +6671,6 @@ fi
+---
+ gdb/gdbserver/configure    |   11 -----------
+ gdb/gdbserver/configure.ac |   11 -----------
+ 2 files changed, 22 deletions(-)
+
+--- a/gdb/gdbserver/configure
++++ b/gdb/gdbserver/configure
+@@ -7539,17 +7539,6 @@
  
  
  case "${target}" in
@@ -19,10 +23,9 @@ diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure gdb-7.12.1/gdb/gdbserver/conf
    *)
      ac_fn_c_check_type "$LINENO" "Elf32_auxv_t" "ac_cv_type_Elf32_auxv_t" "#include <elf.h>
  
-diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure.ac gdb-7.12.1/gdb/gdbserver/configure.ac
---- gdb-7.12.1.orig/gdb/gdbserver/configure.ac	2017-05-14 17:02:46.742711695 -0700
-+++ gdb-7.12.1/gdb/gdbserver/configure.ac	2017-05-14 17:03:53.219361720 -0700
-@@ -179,17 +179,6 @@ AC_CHECK_TYPES(socklen_t, [], [],
+--- a/gdb/gdbserver/configure.ac
++++ b/gdb/gdbserver/configure.ac
+@@ -176,17 +176,6 @@
  ])
  
  case "${target}" in
diff --git a/packages/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch b/packages/gettext/0.19.7/0000-Fix-linker-error-redefinition-of-vasprintf.patch
similarity index 82%
rename from packages/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch
rename to packages/gettext/0.19.7/0000-Fix-linker-error-redefinition-of-vasprintf.patch
index dacdfb1e..5e632900 100644
--- a/packages/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch
+++ b/packages/gettext/0.19.7/0000-Fix-linker-error-redefinition-of-vasprintf.patch
@@ -8,11 +8,9 @@ The link error was:
 .libs/autosprintf.o:autosprintf.cc:(.text$vasprintf[_vasprintf]+0x0): multiple definition of `_vasprintf'
 .libs/lib-asprintf.o:lib-asprintf.c:(.text+0x4621): first defined here
 ---
- gettext-runtime/libasprintf/autosprintf.cc | 2 ++
+ gettext-runtime/libasprintf/autosprintf.cc |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc
-index ca318f7..2526210 100644
 --- a/gettext-runtime/libasprintf/autosprintf.cc
 +++ b/gettext-runtime/libasprintf/autosprintf.cc
 @@ -19,8 +19,10 @@
@@ -26,6 +24,3 @@ index ca318f7..2526210 100644
  
  /* Specification.  */
  #include "autosprintf.h"
--- 
-1.8.4
-
diff --git a/packages/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch b/packages/gettext/0.19.7/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch
similarity index 72%
rename from packages/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
rename to packages/gettext/0.19.7/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch
index 4624cb5c..5c914185 100644
--- a/packages/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
+++ b/packages/gettext/0.19.7/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch
@@ -4,23 +4,24 @@ Date: Thu, 17 Jan 2013 18:33:40 +0900
 Subject: [PATCH] Fix Woe32 link errors when compiling with -O0.
 
 ---
- gettext-tools/src/Makefile.am                  | 24 ++++++++++++++++++++++--
- gettext-tools/src/color.c                      |  1 +
- gettext-tools/woe32dll/c++color.cc             |  1 +
- gettext-tools/woe32dll/c++file-ostream.cc      |  2 ++
- gettext-tools/woe32dll/c++html-ostream.cc      |  1 +
- gettext-tools/woe32dll/c++styled-ostream.cc    |  1 +
- gettext-tools/woe32dll/c++term-ostream.cc      |  1 +
- gettext-tools/woe32dll/c++write-catalog.cc     |  1 +
- gettext-tools/woe32dll/c++write-po.cc          |  1 +
- gettext-tools/woe32dll/c++write-properties.cc  |  1 +
- gettext-tools/woe32dll/c++write-stringtable.cc |  1 +
- gnulib-local/modules/file-ostream              |  4 ++++
- gnulib-local/modules/html-ostream              |  4 ++++
- gnulib-local/modules/ostream                   |  4 ++++
- gnulib-local/modules/styled-ostream            |  4 ++++
- gnulib-local/modules/term-ostream              |  4 ++++
- 16 files changed, 53 insertions(+), 2 deletions(-)
+ gettext-tools/src/Makefile.am                  |   18 +++-
+ gettext-tools/src/Makefile.in                  |  108 ++++++++++++++++++-------
+ gettext-tools/src/color.c                      |    1 
+ gettext-tools/woe32dll/c++color.cc             |    1 
+ gettext-tools/woe32dll/c++file-ostream.cc      |    2 
+ gettext-tools/woe32dll/c++html-ostream.cc      |    1 
+ gettext-tools/woe32dll/c++styled-ostream.cc    |    1 
+ gettext-tools/woe32dll/c++term-ostream.cc      |    1 
+ gettext-tools/woe32dll/c++write-catalog.cc     |    1 
+ gettext-tools/woe32dll/c++write-po.cc          |    1 
+ gettext-tools/woe32dll/c++write-properties.cc  |    1 
+ gettext-tools/woe32dll/c++write-stringtable.cc |    1 
+ gnulib-local/modules/file-ostream              |    4 
+ gnulib-local/modules/html-ostream              |    4 
+ gnulib-local/modules/ostream                   |    4 
+ gnulib-local/modules/styled-ostream            |    4 
+ gnulib-local/modules/term-ostream              |    4 
+ 17 files changed, 126 insertions(+), 31 deletions(-)
  create mode 100644 gettext-tools/woe32dll/c++color.cc
  create mode 100644 gettext-tools/woe32dll/c++file-ostream.cc
  create mode 100644 gettext-tools/woe32dll/c++html-ostream.cc
@@ -33,10 +34,9 @@ Subject: [PATCH] Fix Woe32 link errors when compiling with -O0.
 
 Additional fix (COLOR_SOURCE) by Ray Donnelly <mingw.android@gmail.com>
 
-diff -urN a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
---- a/gettext-tools/src/Makefile.am	2015-09-11 01:54:21.000000000 +0100
-+++ b/gettext-tools/src/Makefile.am	2015-10-22 00:41:49.601786700 +0100
-@@ -145,10 +145,26 @@
+--- a/gettext-tools/src/Makefile.am
++++ b/gettext-tools/src/Makefile.am
+@@ -146,10 +146,26 @@
    format-lua.c \
    format-javascript.c
  
@@ -64,10 +64,9 @@ diff -urN a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
  msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c msgl-header.c msgl-english.c \
  msgl-check.c file-list.c msgl-charset.c po-time.c plural-exp.c plural-eval.c \
  plural-table.c quote.h sentence.h sentence.c \
-diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
---- a/gettext-tools/src/Makefile.in	2015-09-11 04:05:11.000000000 +0100
-+++ b/gettext-tools/src/Makefile.in	2015-10-22 00:42:26.253852000 +0100
-@@ -387,19 +387,22 @@
+--- a/gettext-tools/src/Makefile.in
++++ b/gettext-tools/src/Makefile.in
+@@ -402,19 +402,22 @@
  am__libgettextsrc_la_SOURCES_DIST = message.c po-error.c po-xerror.c \
  	read-catalog-abstract.c po-lex.c po-gram-gen.y po-charset.c \
  	read-po.c read-properties.c read-stringtable.c open-catalog.c \
@@ -103,7 +102,7 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
  	format-boost.c format-lua.c format-javascript.c \
  	../woe32dll/c++format.cc read-desktop.c locating-rule.c its.c \
  	../woe32dll/gettextsrc-exports.c
-@@ -413,7 +416,18 @@
+@@ -428,7 +431,18 @@
  	libgettextsrc_la-open-catalog.lo libgettextsrc_la-dir-list.lo \
  	libgettextsrc_la-str-list.lo
  am__dirstamp = $(am__leading_dot)dirstamp
@@ -123,7 +122,7 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
  @WOE32DLL_FALSE@	libgettextsrc_la-format-c.lo \
  @WOE32DLL_FALSE@	libgettextsrc_la-format-sh.lo \
  @WOE32DLL_FALSE@	libgettextsrc_la-format-python.lo \
-@@ -440,7 +454,7 @@
+@@ -455,7 +469,7 @@
  @WOE32DLL_FALSE@	libgettextsrc_la-format-boost.lo \
  @WOE32DLL_FALSE@	libgettextsrc_la-format-lua.lo \
  @WOE32DLL_FALSE@	libgettextsrc_la-format-javascript.lo
@@ -132,7 +131,7 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
  @WOE32DLL_TRUE@	../woe32dll/libgettextsrc_la-c++format.lo \
  @WOE32DLL_TRUE@	libgettextsrc_la-format-c.lo \
  @WOE32DLL_TRUE@	libgettextsrc_la-format-sh.lo \
-@@ -468,13 +482,10 @@
+@@ -483,13 +497,10 @@
  @WOE32DLL_TRUE@	libgettextsrc_la-format-boost.lo \
  @WOE32DLL_TRUE@	libgettextsrc_la-format-lua.lo \
  @WOE32DLL_TRUE@	libgettextsrc_la-format-javascript.lo
@@ -149,19 +148,19 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
  	libgettextsrc_la-msgl-iconv.lo libgettextsrc_la-msgl-equal.lo \
  	libgettextsrc_la-msgl-cat.lo libgettextsrc_la-msgl-header.lo \
  	libgettextsrc_la-msgl-english.lo \
-@@ -482,9 +493,9 @@
+@@ -497,9 +508,9 @@
  	libgettextsrc_la-msgl-charset.lo libgettextsrc_la-po-time.lo \
  	libgettextsrc_la-plural-exp.lo libgettextsrc_la-plural-eval.lo \
  	libgettextsrc_la-plural-table.lo libgettextsrc_la-sentence.lo \
 -	$(am__objects_2) libgettextsrc_la-read-desktop.lo \
 +	$(am__objects_4) libgettextsrc_la-read-desktop.lo \
-	libgettextsrc_la-locating-rule.lo libgettextsrc_la-its.lo \
+ 	libgettextsrc_la-locating-rule.lo libgettextsrc_la-its.lo \
 -	$(am__objects_3)
 +	$(am__objects_5)
  libgettextsrc_la_OBJECTS = $(am_libgettextsrc_la_OBJECTS)
  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
  am_cldr_plurals_OBJECTS = cldr_plurals-cldr-plural.$(OBJEXT) \
-@@ -1975,15 +1986,28 @@
+@@ -2250,15 +2261,28 @@
  @WOE32DLL_TRUE@	format-qt.c format-qt-plural.c format-kde.c \
  @WOE32DLL_TRUE@	format-kde-kuit.c format-boost.c format-lua.c \
  @WOE32DLL_TRUE@	format-javascript.c
@@ -197,7 +196,7 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
  
  # msggrep needs pattern matching.
  LIBGREP = ../libgrep/libgrep.a
-@@ -2345,6 +2370,15 @@
+@@ -2620,6 +2644,15 @@
  ../woe32dll/$(am__dirstamp):
  	@$(MKDIR_P) ../woe32dll
  	@: > ../woe32dll/$(am__dirstamp)
@@ -213,7 +212,7 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
  ../woe32dll/libgettextsrc_la-c++format.lo:  \
  	../woe32dll/$(am__dirstamp)
  ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo:  \
-@@ -3156,6 +3190,21 @@
+@@ -3422,6 +3455,21 @@
  .cc.lo:
  	$(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $<
  
@@ -235,9 +234,8 @@ diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
  ../woe32dll/libgettextsrc_la-c++format.lo: ../woe32dll/c++format.cc
  	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++format.lo `test -f '../woe32dll/c++format.cc' || echo '$(srcdir)/'`../woe32dll/c++format.cc
  
-diff -urN a/gettext-tools/src/color.c b/gettext-tools/src/color.c
---- a/gettext-tools/src/color.c	2015-08-21 08:18:27.000000000 +0100
-+++ b/gettext-tools/src/color.c	2015-10-22 00:31:33.326659600 +0100
+--- a/gettext-tools/src/color.c
++++ b/gettext-tools/src/color.c
 @@ -28,6 +28,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -246,55 +244,45 @@ diff -urN a/gettext-tools/src/color.c b/gettext-tools/src/color.c
  #include "term-ostream.h"
  #include "xalloc.h"
  #include "relocatable.h"
-diff -urN a/gettext-tools/woe32dll/c++color.cc b/gettext-tools/woe32dll/c++color.cc
---- a/gettext-tools/woe32dll/c++color.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++color.cc	2015-10-22 00:31:33.326659600 +0100
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++color.cc
 @@ -0,0 +1 @@
 +#include "../src/color.c"
-diff -urN a/gettext-tools/woe32dll/c++file-ostream.cc b/gettext-tools/woe32dll/c++file-ostream.cc
---- a/gettext-tools/woe32dll/c++file-ostream.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++file-ostream.cc	2015-10-22 00:31:33.326659600 +0100
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++file-ostream.cc
 @@ -0,0 +1,2 @@
 +#include "../gnulib-lib/file-ostream.c"
 +
-diff -urN a/gettext-tools/woe32dll/c++html-ostream.cc b/gettext-tools/woe32dll/c++html-ostream.cc
---- a/gettext-tools/woe32dll/c++html-ostream.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++html-ostream.cc	2015-10-22 00:31:33.326659600 +0100
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++html-ostream.cc
 @@ -0,0 +1 @@
 +#include "../gnulib-lib/html-ostream.c"
-diff -urN a/gettext-tools/woe32dll/c++styled-ostream.cc b/gettext-tools/woe32dll/c++styled-ostream.cc
---- a/gettext-tools/woe32dll/c++styled-ostream.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++styled-ostream.cc	2015-10-22 00:31:33.326659600 +0100
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++styled-ostream.cc
 @@ -0,0 +1 @@
 +#include "../gnulib-lib/styled-ostream.c"
-diff -urN a/gettext-tools/woe32dll/c++term-ostream.cc b/gettext-tools/woe32dll/c++term-ostream.cc
---- a/gettext-tools/woe32dll/c++term-ostream.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++term-ostream.cc	2015-10-22 00:31:33.326659600 +0100
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++term-ostream.cc
 @@ -0,0 +1 @@
 +#include "../gnulib-lib/term-ostream.c"
-diff -urN a/gettext-tools/woe32dll/c++write-catalog.cc b/gettext-tools/woe32dll/c++write-catalog.cc
---- a/gettext-tools/woe32dll/c++write-catalog.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++write-catalog.cc	2015-10-22 00:31:33.326659600 +0100
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++write-catalog.cc
 @@ -0,0 +1 @@
 +#include "../src/write-catalog.c"
-diff -urN a/gettext-tools/woe32dll/c++write-po.cc b/gettext-tools/woe32dll/c++write-po.cc
---- a/gettext-tools/woe32dll/c++write-po.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++write-po.cc	2015-10-22 00:31:33.326659600 +0100
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++write-po.cc
 @@ -0,0 +1 @@
 +#include "../src/write-po.c"
-diff -urN a/gettext-tools/woe32dll/c++write-properties.cc b/gettext-tools/woe32dll/c++write-properties.cc
---- a/gettext-tools/woe32dll/c++write-properties.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++write-properties.cc	2015-10-22 00:31:33.326659600 +0100
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++write-properties.cc
 @@ -0,0 +1 @@
 +#include "../src/write-properties.c"
-diff -urN a/gettext-tools/woe32dll/c++write-stringtable.cc b/gettext-tools/woe32dll/c++write-stringtable.cc
---- a/gettext-tools/woe32dll/c++write-stringtable.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++write-stringtable.cc	2015-10-22 00:31:33.326659600 +0100
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++write-stringtable.cc
 @@ -0,0 +1 @@
 +#include "../src/write-stringtable.c"
-diff -urN a/gnulib-local/modules/file-ostream b/gnulib-local/modules/file-ostream
---- a/gnulib-local/modules/file-ostream	2015-08-21 06:48:27.000000000 +0100
-+++ b/gnulib-local/modules/file-ostream	2015-10-22 00:31:33.326659600 +0100
+--- a/gnulib-local/modules/file-ostream
++++ b/gnulib-local/modules/file-ostream
 @@ -12,7 +12,11 @@
  configure.ac:
  
@@ -307,9 +295,8 @@ diff -urN a/gnulib-local/modules/file-ostream b/gnulib-local/modules/file-ostrea
  # This is a Makefile rule that generates multiple files at once; see the
  # automake documentation, node "Multiple Outputs", for details.
  file-ostream.h : $(top_srcdir)/build-aux/moopp file-ostream.oo.h file-ostream.oo.c ostream.oo.h
-diff -urN a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostream
---- a/gnulib-local/modules/html-ostream	2015-08-21 06:48:27.000000000 +0100
-+++ b/gnulib-local/modules/html-ostream	2015-10-22 00:31:33.326659600 +0100
+--- a/gnulib-local/modules/html-ostream
++++ b/gnulib-local/modules/html-ostream
 @@ -15,7 +15,11 @@
  configure.ac:
  
@@ -322,9 +309,8 @@ diff -urN a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostrea
  # This is a Makefile rule that generates multiple files at once; see the
  # automake documentation, node "Multiple Outputs", for details.
  html-ostream.h : $(top_srcdir)/build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h
-diff -urN a/gnulib-local/modules/ostream b/gnulib-local/modules/ostream
---- a/gnulib-local/modules/ostream	2015-08-21 06:48:27.000000000 +0100
-+++ b/gnulib-local/modules/ostream	2015-10-22 00:31:33.342259600 +0100
+--- a/gnulib-local/modules/ostream
++++ b/gnulib-local/modules/ostream
 @@ -11,7 +11,11 @@
  configure.ac:
  
@@ -337,9 +323,8 @@ diff -urN a/gnulib-local/modules/ostream b/gnulib-local/modules/ostream
  # This is a Makefile rule that generates multiple files at once; see the
  # automake documentation, node "Multiple Outputs", for details.
  ostream.h : $(top_srcdir)/build-aux/moopp ostream.oo.h ostream.oo.c
-diff -urN a/gnulib-local/modules/styled-ostream b/gnulib-local/modules/styled-ostream
---- a/gnulib-local/modules/styled-ostream	2015-08-21 06:48:27.000000000 +0100
-+++ b/gnulib-local/modules/styled-ostream	2015-10-22 00:31:33.342259600 +0100
+--- a/gnulib-local/modules/styled-ostream
++++ b/gnulib-local/modules/styled-ostream
 @@ -11,7 +11,11 @@
  configure.ac:
  
@@ -352,9 +337,8 @@ diff -urN a/gnulib-local/modules/styled-ostream b/gnulib-local/modules/styled-os
  # This is a Makefile rule that generates multiple files at once; see the
  # automake documentation, node "Multiple Outputs", for details.
  styled-ostream.h : $(top_srcdir)/build-aux/moopp styled-ostream.oo.h styled-ostream.oo.c ostream.oo.h
-diff -urN a/gnulib-local/modules/term-ostream b/gnulib-local/modules/term-ostream
---- a/gnulib-local/modules/term-ostream	2015-08-21 06:48:27.000000000 +0100
-+++ b/gnulib-local/modules/term-ostream	2015-10-22 00:31:33.342259600 +0100
+--- a/gnulib-local/modules/term-ostream
++++ b/gnulib-local/modules/term-ostream
 @@ -22,7 +22,11 @@
  gl_TERM_OSTREAM
  
diff --git a/packages/gettext/0.19.7/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/packages/gettext/0.19.7/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
new file mode 100644
index 00000000..e4006449
--- /dev/null
+++ b/packages/gettext/0.19.7/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
@@ -0,0 +1,75 @@
+---
+ gettext-tools/gnulib-lib/execute.c        |    2 +-
+ gettext-tools/gnulib-lib/spawn-pipe.c     |    2 +-
+ gettext-tools/gnulib-tests/test-environ.c |    2 +-
+ gnulib-local/lib/execute.c.diff           |    2 +-
+ gnulib-local/lib/spawn-pipe.c.diff        |    2 +-
+ gnulib-local/tests/test-environ.c.diff    |    2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+--- a/gettext-tools/gnulib-lib/execute.c
++++ b/gettext-tools/gnulib-lib/execute.c
+@@ -52,7 +52,7 @@
+    __cygwin_environ variable on cygwin64:
+    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ #if defined __CYGWIN__ && defined __x86_64__
+-extern DLL_VARIABLE char **environ;
++extern __attribute__((dllimport)) char **environ;
+ #endif
+ 
+ 
+--- a/gettext-tools/gnulib-lib/spawn-pipe.c
++++ b/gettext-tools/gnulib-lib/spawn-pipe.c
+@@ -52,7 +52,7 @@
+    __cygwin_environ variable on cygwin64:
+    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ #if defined __CYGWIN__ && defined __x86_64__
+-extern DLL_VARIABLE char **environ;
++extern __attribute__((dllimport)) char **environ;
+ #endif
+ 
+ 
+--- a/gettext-tools/gnulib-tests/test-environ.c
++++ b/gettext-tools/gnulib-tests/test-environ.c
+@@ -26,7 +26,7 @@
+    __cygwin_environ variable on cygwin64:
+    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ #if defined __CYGWIN__ && defined __x86_64__
+-extern DLL_VARIABLE char **environ;
++extern __attribute__((dllimport)) char **environ;
+ #endif
+ 
+ int
+--- a/gnulib-local/lib/execute.c.diff
++++ b/gnulib-local/lib/execute.c.diff
+@@ -10,7 +10,7 @@
+ +   __cygwin_environ variable on cygwin64:
+ +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ +#if defined __CYGWIN__ && defined __x86_64__
+-+extern DLL_VARIABLE char **environ;
+++extern __attribute__((dllimport)) char **environ;
+ +#endif
+ +
+  
+--- a/gnulib-local/lib/spawn-pipe.c.diff
++++ b/gnulib-local/lib/spawn-pipe.c.diff
+@@ -10,7 +10,7 @@
+ +   __cygwin_environ variable on cygwin64:
+ +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ +#if defined __CYGWIN__ && defined __x86_64__
+-+extern DLL_VARIABLE char **environ;
+++extern __attribute__((dllimport)) char **environ;
+ +#endif
+ +
+  
+--- a/gnulib-local/tests/test-environ.c.diff
++++ b/gnulib-local/tests/test-environ.c.diff
+@@ -10,7 +10,7 @@
+ +   __cygwin_environ variable on cygwin64:
+ +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ +#if defined __CYGWIN__ && defined __x86_64__
+-+extern DLL_VARIABLE char **environ;
+++extern __attribute__((dllimport)) char **environ;
+ +#endif
+ +
+  int
diff --git a/packages/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch b/packages/gettext/0.19.7/0003-Fix-Cygwin-sys-select.patch
similarity index 85%
rename from packages/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch
rename to packages/gettext/0.19.7/0003-Fix-Cygwin-sys-select.patch
index 7f980ac2..295f7e47 100644
--- a/packages/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch
+++ b/packages/gettext/0.19.7/0003-Fix-Cygwin-sys-select.patch
@@ -8,12 +8,9 @@ https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00054.html
 * lib/sys_select.in.h [__CYGWIN__]: Avoid "unknown type name"
 diagnostics.
 ---
- ChangeLog           |  8 ++++++++
- lib/sys_select.in.h | 10 ++++++----
- 2 files changed, 14 insertions(+), 4 deletions(-)
+ gettext-tools/gnulib-lib/sys_select.in.h |   10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/gettext-tools/gnulib-lib/sys_select.in.h b/gettext-tools/gnulib-lib/sys_select.in.h
-index d6d3f9f..7281144 100644
 --- a/gettext-tools/gnulib-lib/sys_select.in.h
 +++ b/gettext-tools/gnulib-lib/sys_select.in.h
 @@ -81,8 +81,9 @@
diff --git a/packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch b/packages/gettext/0.19.7/0004-Fix-Cygwin-sys-select-2.patch
similarity index 89%
rename from packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch
rename to packages/gettext/0.19.7/0004-Fix-Cygwin-sys-select-2.patch
index caaf0a0a..c9475f75 100644
--- a/packages/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch
+++ b/packages/gettext/0.19.7/0004-Fix-Cygwin-sys-select-2.patch
@@ -1,3 +1,7 @@
+---
+ gettext-tools/gnulib-lib/sys_select.in.h |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 --- a/gettext-tools/gnulib-lib/sys_select.in.h
 +++ b/gettext-tools/gnulib-lib/sys_select.in.h
 @@ -82,8 +82,8 @@
diff --git a/packages/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/packages/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
deleted file mode 100644
index 34873021..00000000
--- a/packages/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c gettext-0.19.6/gettext-tools/gnulib-lib/execute.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c	2015-10-24 16:54:39.310372500 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-lib/execute.c	2015-10-24 16:55:35.261954100 +0100
-@@ -52,7 +52,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- 
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c	2015-09-11 04:03:56.000000000 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c	2015-10-24 16:56:00.885918100 +0100
-@@ -52,7 +52,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- 
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c	2015-09-11 04:03:58.000000000 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c	2015-10-24 16:56:51.519198900 +0100
-@@ -26,7 +26,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- int
-diff -urN gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff gettext-0.19.6/gnulib-local/lib/execute.c.diff
---- gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/lib/execute.c.diff	2015-10-24 16:58:17.182285000 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  
-diff -urN gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff
---- gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff	2015-10-24 16:58:11.741447300 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  
-diff -urN gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff gettext-0.19.6/gnulib-local/tests/test-environ.c.diff
---- gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/tests/test-environ.c.diff	2015-10-24 16:58:35.915765100 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  int
diff --git a/packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch b/packages/gettext/0.19.8.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch
similarity index 82%
rename from packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch
rename to packages/gettext/0.19.8.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch
index dacdfb1e..5e632900 100644
--- a/packages/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch
+++ b/packages/gettext/0.19.8.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch
@@ -8,11 +8,9 @@ The link error was:
 .libs/autosprintf.o:autosprintf.cc:(.text$vasprintf[_vasprintf]+0x0): multiple definition of `_vasprintf'
 .libs/lib-asprintf.o:lib-asprintf.c:(.text+0x4621): first defined here
 ---
- gettext-runtime/libasprintf/autosprintf.cc | 2 ++
+ gettext-runtime/libasprintf/autosprintf.cc |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc
-index ca318f7..2526210 100644
 --- a/gettext-runtime/libasprintf/autosprintf.cc
 +++ b/gettext-runtime/libasprintf/autosprintf.cc
 @@ -19,8 +19,10 @@
@@ -26,6 +24,3 @@ index ca318f7..2526210 100644
  
  /* Specification.  */
  #include "autosprintf.h"
--- 
-1.8.4
-
diff --git a/packages/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch b/packages/gettext/0.19.8.1/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch
similarity index 65%
rename from packages/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
rename to packages/gettext/0.19.8.1/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch
index 85625ee6..c584df82 100644
--- a/packages/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
+++ b/packages/gettext/0.19.8.1/0001-Fix-Woe32-link-errors-when-compiling-with-O0.patch
@@ -4,23 +4,25 @@ Date: Thu, 17 Jan 2013 18:33:40 +0900
 Subject: [PATCH] Fix Woe32 link errors when compiling with -O0.
 
 ---
- gettext-tools/src/Makefile.am                  | 24 ++++++++++++++++++++++--
- gettext-tools/src/color.c                      |  1 +
- gettext-tools/woe32dll/c++color.cc             |  1 +
- gettext-tools/woe32dll/c++file-ostream.cc      |  2 ++
- gettext-tools/woe32dll/c++html-ostream.cc      |  1 +
- gettext-tools/woe32dll/c++styled-ostream.cc    |  1 +
- gettext-tools/woe32dll/c++term-ostream.cc      |  1 +
- gettext-tools/woe32dll/c++write-catalog.cc     |  1 +
- gettext-tools/woe32dll/c++write-po.cc          |  1 +
- gettext-tools/woe32dll/c++write-properties.cc  |  1 +
- gettext-tools/woe32dll/c++write-stringtable.cc |  1 +
- gnulib-local/modules/file-ostream              |  4 ++++
- gnulib-local/modules/html-ostream              |  4 ++++
- gnulib-local/modules/ostream                   |  4 ++++
- gnulib-local/modules/styled-ostream            |  4 ++++
- gnulib-local/modules/term-ostream              |  4 ++++
- 16 files changed, 53 insertions(+), 2 deletions(-)
+ gettext-tools/Makefile.in                      |   10 +-
+ gettext-tools/src/Makefile.am                  |   18 ++++
+ gettext-tools/src/Makefile.in                  |  106 ++++++++++++++++++-------
+ gettext-tools/src/color.c                      |    1 
+ gettext-tools/woe32dll/c++color.cc             |    1 
+ gettext-tools/woe32dll/c++file-ostream.cc      |    2 
+ gettext-tools/woe32dll/c++html-ostream.cc      |    1 
+ gettext-tools/woe32dll/c++styled-ostream.cc    |    1 
+ gettext-tools/woe32dll/c++term-ostream.cc      |    1 
+ gettext-tools/woe32dll/c++write-catalog.cc     |    1 
+ gettext-tools/woe32dll/c++write-po.cc          |    1 
+ gettext-tools/woe32dll/c++write-properties.cc  |    1 
+ gettext-tools/woe32dll/c++write-stringtable.cc |    1 
+ gnulib-local/modules/file-ostream              |    4 
+ gnulib-local/modules/html-ostream              |    4 
+ gnulib-local/modules/ostream                   |    4 
+ gnulib-local/modules/styled-ostream            |    4 
+ gnulib-local/modules/term-ostream              |    4 
+ 18 files changed, 131 insertions(+), 34 deletions(-)
  create mode 100644 gettext-tools/woe32dll/c++color.cc
  create mode 100644 gettext-tools/woe32dll/c++file-ostream.cc
  create mode 100644 gettext-tools/woe32dll/c++html-ostream.cc
@@ -34,10 +36,9 @@ Subject: [PATCH] Fix Woe32 link errors when compiling with -O0.
 Additional fix (COLOR_SOURCE) by Ray Donnelly <mingw.android@gmail.com>
 Regenerated for 0.19.8.1 by Alexey Neyman <stilor@att.net>
 
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/Makefile.in gettext-0.19.8.1/gettext-tools/Makefile.in
---- gettext-0.19.8.1.orig/gettext-tools/Makefile.in	2016-06-11 06:01:11.000000000 -0700
-+++ gettext-0.19.8.1/gettext-tools/Makefile.in	2017-11-04 10:16:23.980314440 -0700
-@@ -468,10 +468,12 @@ am__DIST_COMMON = $(srcdir)/Makefile.in
+--- a/gettext-tools/Makefile.in
++++ b/gettext-tools/Makefile.in
+@@ -468,10 +468,12 @@
  	$(top_srcdir)/../gettext-runtime/intl/Makefile.in \
  	../build-aux/ar-lib ../build-aux/compile \
  	../build-aux/config.guess ../build-aux/config.rpath \
@@ -54,9 +55,8 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/Makefi
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/color.c gettext-0.19.8.1/gettext-tools/src/color.c
---- gettext-0.19.8.1.orig/gettext-tools/src/color.c	2016-03-20 00:37:53.000000000 -0700
-+++ gettext-0.19.8.1/gettext-tools/src/color.c	2017-11-04 10:15:55.755985937 -0700
+--- a/gettext-tools/src/color.c
++++ b/gettext-tools/src/color.c
 @@ -28,6 +28,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -65,10 +65,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/co
  #include "term-ostream.h"
  #include "xalloc.h"
  #include "relocatable.h"
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Makefile.am gettext-0.19.8.1/gettext-tools/src/Makefile.am
---- gettext-0.19.8.1.orig/gettext-tools/src/Makefile.am	2016-05-27 17:29:03.000000000 -0700
-+++ gettext-0.19.8.1/gettext-tools/src/Makefile.am	2017-11-04 10:15:55.751985891 -0700
-@@ -145,10 +145,26 @@ FORMAT_SOURCE += \
+--- a/gettext-tools/src/Makefile.am
++++ b/gettext-tools/src/Makefile.am
+@@ -145,10 +145,26 @@
    format-lua.c \
    format-javascript.c
  
@@ -96,10 +95,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma
  msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c msgl-header.c msgl-english.c \
  msgl-check.c file-list.c msgl-charset.c po-time.c plural-exp.c plural-eval.c \
  plural-table.c quote.h sentence.h sentence.c \
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Makefile.in gettext-0.19.8.1/gettext-tools/src/Makefile.in
---- gettext-0.19.8.1.orig/gettext-tools/src/Makefile.in	2016-06-11 06:01:14.000000000 -0700
-+++ gettext-0.19.8.1/gettext-tools/src/Makefile.in	2017-11-04 10:16:26.392342570 -0700
-@@ -407,17 +407,20 @@ libgettextsrc_la_LIBADD =
+--- a/gettext-tools/src/Makefile.in
++++ b/gettext-tools/src/Makefile.in
+@@ -407,17 +407,20 @@
  am__libgettextsrc_la_SOURCES_DIST = message.c po-error.c po-xerror.c \
  	read-catalog-abstract.c po-lex.c po-gram-gen.y po-charset.c \
  	read-po.c read-properties.c read-stringtable.c open-catalog.c \
@@ -131,7 +129,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma
  	format-gcc-internal.c format-gfc-internal.c format-qt.c \
  	format-qt-plural.c format-kde.c format-kde-kuit.c \
  	format-boost.c format-lua.c format-javascript.c \
-@@ -433,7 +436,18 @@ am__objects_1 = libgettextsrc_la-message
+@@ -433,7 +436,18 @@
  	libgettextsrc_la-open-catalog.lo libgettextsrc_la-dir-list.lo \
  	libgettextsrc_la-str-list.lo
  am__dirstamp = $(am__leading_dot)dirstamp
@@ -151,7 +149,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma
  @WOE32DLL_FALSE@	libgettextsrc_la-format-c.lo \
  @WOE32DLL_FALSE@	libgettextsrc_la-format-sh.lo \
  @WOE32DLL_FALSE@	libgettextsrc_la-format-python.lo \
-@@ -460,7 +474,7 @@ am__dirstamp = $(am__leading_dot)dirstam
+@@ -460,7 +474,7 @@
  @WOE32DLL_FALSE@	libgettextsrc_la-format-boost.lo \
  @WOE32DLL_FALSE@	libgettextsrc_la-format-lua.lo \
  @WOE32DLL_FALSE@	libgettextsrc_la-format-javascript.lo
@@ -160,7 +158,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma
  @WOE32DLL_TRUE@	../woe32dll/libgettextsrc_la-c++format.lo \
  @WOE32DLL_TRUE@	libgettextsrc_la-format-c.lo \
  @WOE32DLL_TRUE@	libgettextsrc_la-format-sh.lo \
-@@ -488,13 +502,10 @@ am__dirstamp = $(am__leading_dot)dirstam
+@@ -488,13 +502,10 @@
  @WOE32DLL_TRUE@	libgettextsrc_la-format-boost.lo \
  @WOE32DLL_TRUE@	libgettextsrc_la-format-lua.lo \
  @WOE32DLL_TRUE@	libgettextsrc_la-format-javascript.lo
@@ -177,7 +175,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma
  	libgettextsrc_la-msgl-iconv.lo libgettextsrc_la-msgl-equal.lo \
  	libgettextsrc_la-msgl-cat.lo libgettextsrc_la-msgl-header.lo \
  	libgettextsrc_la-msgl-english.lo \
-@@ -502,9 +513,9 @@ am_libgettextsrc_la_OBJECTS = $(am__obje
+@@ -502,9 +513,9 @@
  	libgettextsrc_la-msgl-charset.lo libgettextsrc_la-po-time.lo \
  	libgettextsrc_la-plural-exp.lo libgettextsrc_la-plural-eval.lo \
  	libgettextsrc_la-plural-table.lo libgettextsrc_la-sentence.lo \
@@ -189,7 +187,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma
  libgettextsrc_la_OBJECTS = $(am_libgettextsrc_la_OBJECTS)
  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
  am_cldr_plurals_OBJECTS = cldr_plurals-cldr-plural.$(OBJEXT) \
-@@ -2255,16 +2266,29 @@ dir-list.c str-list.c
+@@ -2255,16 +2266,29 @@
  @WOE32DLL_TRUE@	format-qt.c format-qt-plural.c format-kde.c \
  @WOE32DLL_TRUE@	format-kde-kuit.c format-boost.c format-lua.c \
  @WOE32DLL_TRUE@	format-javascript.c
@@ -227,7 +225,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma
  
  # msggrep needs pattern matching.
  LIBGREP = ../libgrep/libgrep.a
-@@ -2626,6 +2650,15 @@ clean-libLTLIBRARIES:
+@@ -2626,6 +2650,15 @@
  ../woe32dll/$(am__dirstamp):
  	@$(MKDIR_P) ../woe32dll
  	@: > ../woe32dll/$(am__dirstamp)
@@ -243,7 +241,7 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma
  ../woe32dll/libgettextsrc_la-c++format.lo:  \
  	../woe32dll/$(am__dirstamp)
  ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo:  \
-@@ -3431,6 +3464,21 @@ xgettext-x-desktop.obj: x-desktop.c
+@@ -3431,6 +3464,21 @@
  .cc.lo:
  	$(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $<
  
@@ -265,56 +263,46 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/src/Ma
  ../woe32dll/libgettextsrc_la-c++format.lo: ../woe32dll/c++format.cc
  	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++format.lo `test -f '../woe32dll/c++format.cc' || echo '$(srcdir)/'`../woe32dll/c++format.cc
  
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++color.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++color.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++color.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++color.cc	2017-11-04 10:15:55.755985937 -0700
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++color.cc
 @@ -0,0 +1 @@
 +#include "../src/color.c"
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++file-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++file-ostream.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++file-ostream.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++file-ostream.cc	2017-11-04 10:15:55.755985937 -0700
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++file-ostream.cc
 @@ -0,0 +1,2 @@
 +#include "../gnulib-lib/file-ostream.c"
 +
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++html-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++html-ostream.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++html-ostream.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++html-ostream.cc	2017-11-04 10:15:55.755985937 -0700
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++html-ostream.cc
 @@ -0,0 +1 @@
 +#include "../gnulib-lib/html-ostream.c"
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++styled-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++styled-ostream.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++styled-ostream.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++styled-ostream.cc	2017-11-04 10:15:55.755985937 -0700
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++styled-ostream.cc
 @@ -0,0 +1 @@
 +#include "../gnulib-lib/styled-ostream.c"
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++term-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++term-ostream.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++term-ostream.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++term-ostream.cc	2017-11-04 10:15:55.755985937 -0700
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++term-ostream.cc
 @@ -0,0 +1 @@
 +#include "../gnulib-lib/term-ostream.c"
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-catalog.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-catalog.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-catalog.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-catalog.cc	2017-11-04 10:15:55.755985937 -0700
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++write-catalog.cc
 @@ -0,0 +1 @@
 +#include "../src/write-catalog.c"
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-po.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-po.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-po.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-po.cc	2017-11-04 10:15:55.755985937 -0700
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++write-po.cc
 @@ -0,0 +1 @@
 +#include "../src/write-po.c"
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-properties.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-properties.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-properties.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-properties.cc	2017-11-04 10:15:55.755985937 -0700
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++write-properties.cc
 @@ -0,0 +1 @@
 +#include "../src/write-properties.c"
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-stringtable.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-stringtable.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-stringtable.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-stringtable.cc	2017-11-04 10:15:55.755985937 -0700
+--- /dev/null
++++ b/gettext-tools/woe32dll/c++write-stringtable.cc
 @@ -0,0 +1 @@
 +#include "../src/write-stringtable.c"
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules/file-ostream gettext-0.19.8.1/gnulib-local/modules/file-ostream
---- gettext-0.19.8.1.orig/gnulib-local/modules/file-ostream	2012-12-03 22:28:58.000000000 -0800
-+++ gettext-0.19.8.1/gnulib-local/modules/file-ostream	2017-11-04 10:15:55.755985937 -0700
-@@ -12,7 +12,11 @@ xalloc
+--- a/gnulib-local/modules/file-ostream
++++ b/gnulib-local/modules/file-ostream
+@@ -12,7 +12,11 @@
  configure.ac:
  
  Makefile.am:
@@ -326,10 +314,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules
  # This is a Makefile rule that generates multiple files at once; see the
  # automake documentation, node "Multiple Outputs", for details.
  file-ostream.h : $(top_srcdir)/build-aux/moopp file-ostream.oo.h file-ostream.oo.c ostream.oo.h
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules/html-ostream gettext-0.19.8.1/gnulib-local/modules/html-ostream
---- gettext-0.19.8.1.orig/gnulib-local/modules/html-ostream	2012-12-03 22:28:58.000000000 -0800
-+++ gettext-0.19.8.1/gnulib-local/modules/html-ostream	2017-11-04 10:15:55.755985937 -0700
-@@ -15,7 +15,11 @@ xalloc
+--- a/gnulib-local/modules/html-ostream
++++ b/gnulib-local/modules/html-ostream
+@@ -15,7 +15,11 @@
  configure.ac:
  
  Makefile.am:
@@ -341,10 +328,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules
  # This is a Makefile rule that generates multiple files at once; see the
  # automake documentation, node "Multiple Outputs", for details.
  html-ostream.h : $(top_srcdir)/build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules/ostream gettext-0.19.8.1/gnulib-local/modules/ostream
---- gettext-0.19.8.1.orig/gnulib-local/modules/ostream	2012-12-03 22:28:58.000000000 -0800
-+++ gettext-0.19.8.1/gnulib-local/modules/ostream	2017-11-04 10:15:55.755985937 -0700
-@@ -11,7 +11,11 @@ moo
+--- a/gnulib-local/modules/ostream
++++ b/gnulib-local/modules/ostream
+@@ -11,7 +11,11 @@
  configure.ac:
  
  Makefile.am:
@@ -356,10 +342,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules
  # This is a Makefile rule that generates multiple files at once; see the
  # automake documentation, node "Multiple Outputs", for details.
  ostream.h : $(top_srcdir)/build-aux/moopp ostream.oo.h ostream.oo.c
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules/styled-ostream gettext-0.19.8.1/gnulib-local/modules/styled-ostream
---- gettext-0.19.8.1.orig/gnulib-local/modules/styled-ostream	2012-12-03 22:28:58.000000000 -0800
-+++ gettext-0.19.8.1/gnulib-local/modules/styled-ostream	2017-11-04 10:15:55.755985937 -0700
-@@ -11,7 +11,11 @@ ostream
+--- a/gnulib-local/modules/styled-ostream
++++ b/gnulib-local/modules/styled-ostream
+@@ -11,7 +11,11 @@
  configure.ac:
  
  Makefile.am:
@@ -371,10 +356,9 @@ diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules
  # This is a Makefile rule that generates multiple files at once; see the
  # automake documentation, node "Multiple Outputs", for details.
  styled-ostream.h : $(top_srcdir)/build-aux/moopp styled-ostream.oo.h styled-ostream.oo.c ostream.oo.h
-diff -urpN '--exclude=autom4te.cache' gettext-0.19.8.1.orig/gnulib-local/modules/term-ostream gettext-0.19.8.1/gnulib-local/modules/term-ostream
---- gettext-0.19.8.1.orig/gnulib-local/modules/term-ostream	2012-12-03 22:28:58.000000000 -0800
-+++ gettext-0.19.8.1/gnulib-local/modules/term-ostream	2017-11-04 10:15:55.755985937 -0700
-@@ -22,7 +22,11 @@ configure.ac:
+--- a/gnulib-local/modules/term-ostream
++++ b/gnulib-local/modules/term-ostream
+@@ -22,7 +22,11 @@
  gl_TERM_OSTREAM
  
  Makefile.am:
diff --git a/packages/gettext/0.19.8.1/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/packages/gettext/0.19.8.1/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
new file mode 100644
index 00000000..2e3e8c3b
--- /dev/null
+++ b/packages/gettext/0.19.8.1/0002-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
@@ -0,0 +1,75 @@
+---
+ gettext-tools/gnulib-lib/execute.c        |    2 +-
+ gettext-tools/gnulib-lib/spawn-pipe.c     |    2 +-
+ gettext-tools/gnulib-tests/test-environ.c |    2 +-
+ gnulib-local/lib/execute.c.diff           |    2 +-
+ gnulib-local/lib/spawn-pipe.c.diff        |    2 +-
+ gnulib-local/tests/test-environ.c.diff    |    2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+--- a/gettext-tools/gnulib-lib/execute.c
++++ b/gettext-tools/gnulib-lib/execute.c
+@@ -52,7 +52,7 @@
+    __cygwin_environ variable on cygwin64:
+    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ #if defined __CYGWIN__ && defined __x86_64__
+-extern DLL_VARIABLE char **environ;
++extern __attribute__((dllimport)) char **environ;
+ #endif
+ 
+ 
+--- a/gettext-tools/gnulib-lib/spawn-pipe.c
++++ b/gettext-tools/gnulib-lib/spawn-pipe.c
+@@ -53,7 +53,7 @@
+    __cygwin_environ variable on cygwin64:
+    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ #if defined __CYGWIN__ && defined __x86_64__
+-extern DLL_VARIABLE char **environ;
++extern __attribute__((dllimport)) char **environ;
+ #endif
+ 
+ 
+--- a/gettext-tools/gnulib-tests/test-environ.c
++++ b/gettext-tools/gnulib-tests/test-environ.c
+@@ -26,7 +26,7 @@
+    __cygwin_environ variable on cygwin64:
+    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ #if defined __CYGWIN__ && defined __x86_64__
+-extern DLL_VARIABLE char **environ;
++extern __attribute__((dllimport)) char **environ;
+ #endif
+ 
+ int
+--- a/gnulib-local/lib/execute.c.diff
++++ b/gnulib-local/lib/execute.c.diff
+@@ -10,7 +10,7 @@
+ +   __cygwin_environ variable on cygwin64:
+ +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ +#if defined __CYGWIN__ && defined __x86_64__
+-+extern DLL_VARIABLE char **environ;
+++extern __attribute__((dllimport)) char **environ;
+ +#endif
+ +
+  
+--- a/gnulib-local/lib/spawn-pipe.c.diff
++++ b/gnulib-local/lib/spawn-pipe.c.diff
+@@ -10,7 +10,7 @@
+ +   __cygwin_environ variable on cygwin64:
+ +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ +#if defined __CYGWIN__ && defined __x86_64__
+-+extern DLL_VARIABLE char **environ;
+++extern __attribute__((dllimport)) char **environ;
+ +#endif
+ +
+  
+--- a/gnulib-local/tests/test-environ.c.diff
++++ b/gnulib-local/tests/test-environ.c.diff
+@@ -10,7 +10,7 @@
+ +   __cygwin_environ variable on cygwin64:
+ +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
+ +#if defined __CYGWIN__ && defined __x86_64__
+-+extern DLL_VARIABLE char **environ;
+++extern __attribute__((dllimport)) char **environ;
+ +#endif
+ +
+  int
diff --git a/packages/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/packages/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
deleted file mode 100644
index 34873021..00000000
--- a/packages/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c gettext-0.19.6/gettext-tools/gnulib-lib/execute.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c	2015-10-24 16:54:39.310372500 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-lib/execute.c	2015-10-24 16:55:35.261954100 +0100
-@@ -52,7 +52,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- 
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c	2015-09-11 04:03:56.000000000 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c	2015-10-24 16:56:00.885918100 +0100
-@@ -52,7 +52,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- 
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c	2015-09-11 04:03:58.000000000 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c	2015-10-24 16:56:51.519198900 +0100
-@@ -26,7 +26,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- int
-diff -urN gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff gettext-0.19.6/gnulib-local/lib/execute.c.diff
---- gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/lib/execute.c.diff	2015-10-24 16:58:17.182285000 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  
-diff -urN gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff
---- gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff	2015-10-24 16:58:11.741447300 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  
-diff -urN gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff gettext-0.19.6/gnulib-local/tests/test-environ.c.diff
---- gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/tests/test-environ.c.diff	2015-10-24 16:58:35.915765100 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  int
diff --git a/packages/glibc-linaro/2.20-2014.11/100-sparc-nptl.patch b/packages/glibc-linaro/2.20-2014.11/0000-sparc-nptl.patch
similarity index 66%
rename from packages/glibc-linaro/2.20-2014.11/100-sparc-nptl.patch
rename to packages/glibc-linaro/2.20-2014.11/0000-sparc-nptl.patch
index 21f03379..4c5a10e4 100644
--- a/packages/glibc-linaro/2.20-2014.11/100-sparc-nptl.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0000-sparc-nptl.patch
@@ -1,5 +1,7 @@
-diff --git a/sysdeps/sparc/sparc32/sem_trywait.c b/sysdeps/sparc/sparc32/sem_trywait.c
-index 7d0fc55..ad9b4ad 100644
+---
+ sysdeps/sparc/sparc32/sem_trywait.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/sysdeps/sparc/sparc32/sem_trywait.c
 +++ b/sysdeps/sparc/sparc32/sem_trywait.c
 @@ -22,6 +22,7 @@
@@ -10,5 +12,3 @@ index 7d0fc55..ad9b4ad 100644
  
  #include <shlib-compat.h>
  
- 
-
diff --git a/packages/glibc-linaro/2.20-2014.11/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc-linaro/2.20-2014.11/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
similarity index 78%
rename from packages/glibc-linaro/2.20-2014.11/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
rename to packages/glibc-linaro/2.20-2014.11/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..d92014e9 100644
--- a/packages/glibc-linaro/2.20-2014.11/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -5,16 +5,13 @@ Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
  -Wparentheses
 
 ---
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
 
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
 --- a/nis/nis_call.c
 +++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
+@@ -680,16 +680,18 @@
    /* Choose which entry should be evicted from the cache.  */
    loc = &nis_server_cache[0];
    if (*loc != NULL)
@@ -42,11 +39,9 @@ index 3fa37e4..cb7839a 100644
    old = *loc;
    *loc = new;
  
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
 --- a/stdlib/setenv.c
 +++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
+@@ -262,18 +262,20 @@
    ep = __environ;
    if (ep != NULL)
      while (*ep != NULL)
@@ -54,7 +49,12 @@ index da61ee0..e66045f 100644
 -	{
 -	  /* Found it.  Remove this pointer by moving later ones back.  */
 -	  char **dp = ep;
--
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
 -	  do
 -	    dp[0] = dp[1];
 -	  while (*dp++);
@@ -62,12 +62,6 @@ index da61ee0..e66045f 100644
 -	}
 -      else
 -	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
 +	    do
 +		dp[0] = dp[1];
 +	    while (*dp++);
@@ -79,6 +73,3 @@ index da61ee0..e66045f 100644
  
    UNLOCK;
  
--- 
-2.7.4
-
diff --git a/packages/glibc/2.14.1/102-fix-signed-shift-overlow.patch b/packages/glibc-linaro/2.20-2014.11/0002-fix-signed-shift-overlow.patch
similarity index 84%
rename from packages/glibc/2.14.1/102-fix-signed-shift-overlow.patch
rename to packages/glibc-linaro/2.20-2014.11/0002-fix-signed-shift-overlow.patch
index ef49f831..c7cc3302 100644
--- a/packages/glibc/2.14.1/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0002-fix-signed-shift-overlow.patch
@@ -12,11 +12,16 @@ Date:   Tue Jul 21 22:50:29 2015 -0700
     * string/strchrnul.c (STRCHRNUL):
     Rewrite code to avoid issues with signed shift overflow.
 
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
 --- a/string/memrchr.c
 +++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
+@@ -96,15 +96,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -34,11 +39,9 @@ index 0c8fd84..86cd5b9 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
 --- a/string/rawmemchr.c
 +++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
+@@ -86,15 +86,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -56,11 +59,9 @@ index 05b22be..228ca9d 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
 --- a/string/strchr.c
 +++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
+@@ -60,13 +60,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -76,11 +77,9 @@ index 5f90075..f13b2b3 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
 --- a/string/strchrnul.c
 +++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
+@@ -66,13 +66,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
diff --git a/packages/glibc/2.15/103-dl-openat64-variadic.patch b/packages/glibc-linaro/2.20-2014.11/0003-dl-openat64-variadic.patch
similarity index 98%
rename from packages/glibc/2.15/103-dl-openat64-variadic.patch
rename to packages/glibc-linaro/2.20-2014.11/0003-dl-openat64-variadic.patch
index fe94b96d..552db126 100644
--- a/packages/glibc/2.15/103-dl-openat64-variadic.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0003-dl-openat64-variadic.patch
@@ -177,8 +177,10 @@ Date:   Tue Oct 20 11:54:09 2015 +0000
             * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
             * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
 
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
 --- a/sysdeps/unix/sysv/linux/dl-openat64.c
 +++ b/sysdeps/unix/sysv/linux/dl-openat64.c
 @@ -23,10 +23,7 @@
diff --git a/packages/glibc/2.18/104-unused-variables.patch b/packages/glibc-linaro/2.20-2014.11/0004-unused-variables.patch
similarity index 81%
rename from packages/glibc/2.18/104-unused-variables.patch
rename to packages/glibc-linaro/2.20-2014.11/0004-unused-variables.patch
index 642edb14..694bc612 100644
--- a/packages/glibc/2.18/104-unused-variables.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0004-unused-variables.patch
@@ -19,8 +19,19 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    2 --
+ sysdeps/ieee754/flt-32/s_cosf.c        |    2 --
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ timezone/private.h                     |   10 ----------
+ 10 files changed, 1 insertion(+), 28 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,8 +45,6 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
 @@ -65,10 +65,8 @@
@@ -60,8 +69,6 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
 @@ -29,7 +29,7 @@
@@ -73,8 +80,6 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
 @@ -34,7 +34,6 @@
@@ -93,11 +98,9 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,8 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
+@@ -22,8 +22,6 @@
  log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
@@ -106,11 +109,9 @@ index 96f0e81..1daeef7 100644
  float
  __ieee754_log10f(float x)
  {
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,8 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
+@@ -21,8 +21,6 @@
  #include <math.h>
  #include <math_private.h>
  
@@ -119,11 +120,9 @@ index 864ab27..0affd40 100644
  #ifndef COSF
  # define COSF_FUNC __cosf
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -74,7 +74,6 @@
  static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  static const long double one = 1.0L;
@@ -131,11 +130,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = 1.0e4000L;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -140,7 +140,6 @@
  
  static const long double
  tiny = 1e-4931L,
@@ -143,11 +140,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
@@ -155,3 +150,22 @@ index ff759bc..9609550 100644
  static const long double zero = 0.0L;
  
  long double
+--- a/timezone/private.h
++++ b/timezone/private.h
+@@ -326,16 +326,6 @@
+ #define TYPE_SIGNED(type) (((type) -1) < 0)
+ #endif /* !defined TYPE_SIGNED */
+ 
+-/* The minimum and maximum finite time values.  */
+-static time_t const time_t_min =
+-  (TYPE_SIGNED(time_t)
+-   ? (time_t) -1 << (CHAR_BIT * sizeof (time_t) - 1)
+-   : 0);
+-static time_t const time_t_max =
+-  (TYPE_SIGNED(time_t)
+-   ? - (~ 0 < 0) - ((time_t) -1 << (CHAR_BIT * sizeof (time_t) - 1))
+-   : -1);
+-
+ #ifndef INT_STRLEN_MAXIMUM
+ /*
+ ** 302 / 1000 is log10(2.0) rounded up.
diff --git a/packages/glibc-linaro/2.20-2014.11/105-misleading-indentation.patch b/packages/glibc-linaro/2.20-2014.11/0005-misleading-indentation.patch
similarity index 72%
rename from packages/glibc-linaro/2.20-2014.11/105-misleading-indentation.patch
rename to packages/glibc-linaro/2.20-2014.11/0005-misleading-indentation.patch
index 1dd8d851..8e08259e 100644
--- a/packages/glibc-linaro/2.20-2014.11/105-misleading-indentation.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0005-misleading-indentation.patch
@@ -7,11 +7,13 @@ Date:   Fri Dec 11 09:19:37 2015 -0800
             * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
             Fix indentation.
 
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
 --- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
 +++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
+@@ -65,7 +65,9 @@
  
      /* compute q[0],q[1],...q[jk] */
  	for (i=0;i<=jk;i++) {
diff --git a/packages/glibc/2.19/106-dl-open-array-bounds.patch b/packages/glibc-linaro/2.20-2014.11/0006-dl-open-array-bounds.patch
similarity index 87%
rename from packages/glibc/2.19/106-dl-open-array-bounds.patch
rename to packages/glibc-linaro/2.20-2014.11/0006-dl-open-array-bounds.patch
index 08a90765..83eb0b3c 100644
--- a/packages/glibc/2.19/106-dl-open-array-bounds.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0006-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -211,7 +211,7 @@ dl_open_worker (void *a)
+@@ -211,7 +211,7 @@
        struct link_map *l = _dl_find_dso_for_object ((ElfW(Addr)) caller_dlopen);
  
        if (l)
@@ -17,7 +19,7 @@ index 0dbe07f..2d0e082 100644
  
        if (args->nsid == __LM_ID_CALLER)
  	args->nsid = call_map->l_ns;
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -627,8 +627,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc-linaro/2.20-2014.11/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc-linaro/2.20-2014.11/0007-Fix-combreloc-test-BSD-grep.patch
similarity index 77%
rename from packages/glibc-linaro/2.20-2014.11/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc-linaro/2.20-2014.11/0007-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..f56a4ca6 100644
--- a/packages/glibc-linaro/2.20-2014.11/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0007-Fix-combreloc-test-BSD-grep.patch
@@ -13,16 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
 --- a/configure
 +++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+@@ -6025,7 +6025,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
  then
@@ -31,11 +28,9 @@ index eecd0ac..0118bd1 100755
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
+@@ -1397,7 +1397,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
@@ -44,6 +39,3 @@ index 4a77411..19f6d87 100644
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc-linaro/2.20-2014.11/920-fix-rpc_parse-format.patch b/packages/glibc-linaro/2.20-2014.11/0008-fix-rpc_parse-format.patch
similarity index 95%
rename from packages/glibc-linaro/2.20-2014.11/920-fix-rpc_parse-format.patch
rename to packages/glibc-linaro/2.20-2014.11/0008-fix-rpc_parse-format.patch
index 37e58dac..341d5413 100644
--- a/packages/glibc-linaro/2.20-2014.11/920-fix-rpc_parse-format.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0008-fix-rpc_parse-format.patch
@@ -45,11 +45,13 @@ Date:   Tue Nov 8 23:44:51 2016 +0000
             [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
             [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
 
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/sunrpc/rpc_parse.c
 +++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
+@@ -521,7 +521,7 @@
  get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
  {
    token tok;
diff --git a/packages/glibc-linaro/2.20-2014.11/930-explicit-boolean.patch b/packages/glibc-linaro/2.20-2014.11/0009-explicit-boolean.patch
similarity index 85%
rename from packages/glibc-linaro/2.20-2014.11/930-explicit-boolean.patch
rename to packages/glibc-linaro/2.20-2014.11/0009-explicit-boolean.patch
index 780fae63..ff7cd879 100644
--- a/packages/glibc-linaro/2.20-2014.11/930-explicit-boolean.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0009-explicit-boolean.patch
@@ -7,11 +7,13 @@ Date:   Fri Oct 14 12:53:27 2016 -0700
             * sysdeps/ieee754/dbl-64/e_pow.c (checkint) Make conditions explicitly
             boolean.
 
-diff --git a/sysdeps/ieee754/dbl-64/e_pow.c b/sysdeps/ieee754/dbl-64/e_pow.c
-index 663fa392c2..bd758b5979 100644
+---
+ sysdeps/ieee754/dbl-64/e_pow.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 --- a/sysdeps/ieee754/dbl-64/e_pow.c
 +++ b/sysdeps/ieee754/dbl-64/e_pow.c
-@@ -466,15 +466,15 @@ checkint (double x)
+@@ -462,15 +462,15 @@
      return (n & 1) ? -1 : 1;	/* odd or even */
    if (k > 20)
      {
diff --git a/packages/glibc/2.12.2/940-nis-bogus-conditional.patch b/packages/glibc-linaro/2.20-2014.11/0010-nis-bogus-conditional.patch
similarity index 91%
rename from packages/glibc/2.12.2/940-nis-bogus-conditional.patch
rename to packages/glibc-linaro/2.20-2014.11/0010-nis-bogus-conditional.patch
index 09b38cf1..e7283681 100644
--- a/packages/glibc/2.12.2/940-nis-bogus-conditional.patch
+++ b/packages/glibc-linaro/2.20-2014.11/0010-nis-bogus-conditional.patch
@@ -47,11 +47,13 @@ Date:   Wed Dec 21 23:44:01 2016 +0000
             * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
             Compare name == NULL, not name != NULL.
 
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/nis/nss_nisplus/nisplus-alias.c
 +++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
+@@ -291,7 +291,7 @@
  	return status;
      }
  
diff --git a/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.12.1/0000-Fix-ARM-build-with-GCC-trunk.patch
similarity index 88%
rename from packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch
rename to packages/glibc-ports/2.12.1/0000-Fix-ARM-build-with-GCC-trunk.patch
index 259b2854..af8d28af 100644
--- a/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.12.1/0000-Fix-ARM-build-with-GCC-trunk.patch
@@ -17,14 +17,16 @@ Tested that this fixes the build for ARM.
 	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
 	Likewise.
 ---
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
+ sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c |    3 ++-
+ sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c       |    3 ++-
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c      |    3 ++-
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c            |    3 ++-
+ 4 files changed, 8 insertions(+), 4 deletions(-)
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
-
+ 
  static void *libgcc_s_handle;
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
@@ -32,15 +34,12 @@ Tested that this fixes the build for ARM.
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
-
+ 
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
 +  __attribute_used__;
@@ -51,7 +50,7 @@ index bff3e2b..1f1eb71 100644
 +++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
-
+ 
  static void *libgcc_s_handle;
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
@@ -64,9 +63,10 @@ index bff3e2b..1f1eb71 100644
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
-
+ 
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
 +  __attribute_used__;
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
+ 
diff --git a/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch b/packages/glibc-ports/2.12.1/0001-m68k-sys-user.patch
similarity index 92%
rename from packages/glibc-ports/2.12.1/330-m68k-sys-user.patch
rename to packages/glibc-ports/2.12.1/0001-m68k-sys-user.patch
index c3a9c67c..efb2ca50 100644
--- a/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.12.1/0001-m68k-sys-user.patch
@@ -1,8 +1,11 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/m68k/sys/user.h |   87 ++++++++++++++++++++++++++++++++
+ 1 file changed, 87 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/m68k/sys/user.h
++++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
diff --git a/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch b/packages/glibc-ports/2.12.1/0002-alpha-cache-shape.patch
similarity index 56%
rename from packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
rename to packages/glibc-ports/2.12.1/0002-alpha-cache-shape.patch
index 76128723..ca608bc1 100644
--- a/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.12.1/0002-alpha-cache-shape.patch
@@ -5,9 +5,12 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
+---
+ sysdeps/unix/sysv/linux/alpha/dl-support.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/alpha/dl-support.c
++++ b/sysdeps/unix/sysv/linux/alpha/dl-support.c
+@@ -1,2 +1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.12.1/0003-alpha-fix-gcc-4.1-warnings.patch
similarity index 81%
rename from packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch
rename to packages/glibc-ports/2.12.1/0003-alpha-fix-gcc-4.1-warnings.patch
index d23ecf96..fef37a52 100644
--- a/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.12.1/0003-alpha-fix-gcc-4.1-warnings.patch
@@ -13,12 +13,11 @@ make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error
 Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
 I cannot really think of anything better than
 
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
+ sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c
++++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
diff --git a/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.12.1/0004-alpha-fix-rtld-fPIC.patch
similarity index 62%
rename from packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch
rename to packages/glibc-ports/2.12.1/0004-alpha-fix-rtld-fPIC.patch
index 38562b6f..53a0992e 100644
--- a/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.12.1/0004-alpha-fix-rtld-fPIC.patch
@@ -2,12 +2,11 @@
 
 	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
 
- ports/sysdeps/alpha/Makefile |    3 ++-
+ sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-ports-2.13.orig/sysdeps/alpha/Makefile glibc-ports-2.13/sysdeps/alpha/Makefile
---- glibc-ports-2.13.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+--- a/sysdeps/alpha/Makefile
++++ b/sysdeps/alpha/Makefile
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
diff --git a/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.12.1/0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
similarity index 71%
rename from packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
rename to packages/glibc-ports/2.12.1/0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 427fb032..855dde26 100644
--- a/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.12.1/0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,22 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/bits/endian.h glibc-ports-2.15/sysdeps/arm/bits/endian.h
---- glibc-ports-2.15.orig/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+---
+ sysdeps/arm/bits/endian.h        |    2 -
+ sysdeps/arm/fpu/__longjmp.S      |   26 +++++++++++++
+ sysdeps/arm/fpu/bits/fenv.h      |   41 ++++++++++++++++++++
+ sysdeps/arm/fpu/bits/setjmp.h    |    4 ++
+ sysdeps/arm/fpu/fegetround.c     |   12 ++++++
+ sysdeps/arm/fpu/fesetround.c     |   16 ++++++++
+ sysdeps/arm/fpu/fpu_control.h    |   78 ++++++++++++++++++++++++++++++++++++++-
+ sysdeps/arm/fpu/jmpbuf-offsets.h |    4 ++
+ sysdeps/arm/fpu/setjmp.S         |   30 +++++++++++++++
+ sysdeps/arm/gccframe.h           |    4 ++
+ sysdeps/arm/gmp-mparam.h         |    2 -
+ 11 files changed, 216 insertions(+), 3 deletions(-)
+
+--- a/sysdeps/arm/bits/endian.h
++++ b/sysdeps/arm/bits/endian.h
 @@ -12,7 +12,7 @@
  /* FPA floating point units are always big-endian, irrespective of the
     CPU endianness.  VFP floating point units use the same endianness
@@ -13,9 +26,8 @@ diff -durN glibc-ports-2.15.orig/sysdeps/arm/bits/endian.h glibc-ports-2.15/sysd
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S
---- glibc-ports-2.15.orig/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/__longjmp.S
++++ b/sysdeps/arm/fpu/__longjmp.S
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +62,8 @@ diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.15/sy
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h
---- glibc-ports-2.15.orig/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/bits/fenv.h
++++ b/sysdeps/arm/fpu/bits/fenv.h
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +119,8 @@ diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.15/sy
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-ports-2.15.orig/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/bits/setjmp.h
++++ b/sysdeps/arm/fpu/bits/setjmp.h
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +133,8 @@ diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.15/
 +#endif
  
  #endif
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c
---- glibc-ports-2.15.orig/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fegetround.c
++++ b/sysdeps/arm/fpu/fegetround.c
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +157,8 @@ diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.15/s
 +
 +#endif
  }
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c
---- glibc-ports-2.15.orig/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fesetround.c
++++ b/sysdeps/arm/fpu/fesetround.c
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +188,8 @@ diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.15/s
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h
---- glibc-ports-2.15.orig/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fpu_control.h
++++ b/sysdeps/arm/fpu/fpu_control.h
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +285,8 @@ diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.15/
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-ports-2.15.orig/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/jmpbuf-offsets.h
++++ b/sysdeps/arm/fpu/jmpbuf-offsets.h
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +296,8 @@ diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S
---- glibc-ports-2.15.orig/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/setjmp.S
++++ b/sysdeps/arm/fpu/setjmp.S
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +340,8 @@ diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.15/sysde
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/gccframe.h glibc-ports-2.15/sysdeps/arm/gccframe.h
---- glibc-ports-2.15.orig/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/gccframe.h
++++ b/sysdeps/arm/gccframe.h
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +353,8 @@ diff -durN glibc-ports-2.15.orig/sysdeps/arm/gccframe.h glibc-ports-2.15/sysdeps
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-ports-2.15.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.15/sysdeps/arm/gmp-mparam.h
---- glibc-ports-2.15.orig/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/gmp-mparam.h
++++ b/sysdeps/arm/gmp-mparam.h
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
diff --git a/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.12.1/0006-nptl-lowlevellock.patch
similarity index 89%
rename from packages/glibc-ports/2.13/580-nptl-lowlevellock.patch
rename to packages/glibc-ports/2.12.1/0006-nptl-lowlevellock.patch
index 9f3fb764..55fc78ff 100644
--- a/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.12.1/0006-nptl-lowlevellock.patch
@@ -9,9 +9,12 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
++++ b/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
diff --git a/packages/glibc-ports/2.13/610-fpu-cw-mips.patch b/packages/glibc-ports/2.12.1/0007-fpu-cw-mips.patch
similarity index 54%
rename from packages/glibc-ports/2.13/610-fpu-cw-mips.patch
rename to packages/glibc-ports/2.12.1/0007-fpu-cw-mips.patch
index c6345b36..5cb8d71a 100644
--- a/packages/glibc-ports/2.13/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.12.1/0007-fpu-cw-mips.patch
@@ -1,8 +1,11 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-ports-2.13.orig/sysdeps/mips/fpu_control.h glibc-ports-2.13/sysdeps/mips/fpu_control.h
---- glibc-ports-2.13.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+---
+ sysdeps/mips/fpu_control.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sysdeps/mips/fpu_control.h
++++ b/sysdeps/mips/fpu_control.h
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
diff --git a/packages/glibc-ports/2.12.1/0008-support-hard-float-eabi.patch b/packages/glibc-ports/2.12.1/0008-support-hard-float-eabi.patch
new file mode 100644
index 00000000..06c46a31
--- /dev/null
+++ b/packages/glibc-ports/2.12.1/0008-support-hard-float-eabi.patch
@@ -0,0 +1,25 @@
+---
+ sysdeps/arm/preconfigure   |    2 +-
+ sysdeps/arm/shlib-versions |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/sysdeps/arm/preconfigure
++++ b/sysdeps/arm/preconfigure
+@@ -2,7 +2,7 @@
+ arm*)
+ 	base_machine=arm
+ 	case $config_os in
+-	linux-gnueabi)
++	linux-gnueabi*)
+ 		machine=arm/eabi/$machine
+ 		;;
+ 	*)
+--- a/sysdeps/arm/shlib-versions
++++ b/sysdeps/arm/shlib-versions
+@@ -1,4 +1,4 @@
+-arm.*-.*-linux-gnueabi	DEFAULT			GLIBC_2.4
++arm.*-.*-linux-gnueabi.*	DEFAULT			GLIBC_2.4
+ 
+-arm.*-.*-linux-gnueabi	ld=ld-linux.so.3
++arm.*-.*-linux-gnueabi.*	ld=ld-linux.so.3
+ arm.*-.*-linux.*	ld=ld-linux.so.2
diff --git a/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch b/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch
deleted file mode 100644
index 879f8db4..00000000
--- a/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-older verisons of glibc would build dl-sysdep as shared-only and dl-support as
-static-only.  alpha hooks in a cache variable via dl-auxv.h.  newer versions of
-glibc build dl-sysdep as both shared and static which means we now have symbol
-duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
-is both shared/static, there is no point in hooking dl-support anymore, so we
-can punt it.
-
-diff -durN glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
--#include "dl-auxv.h"
- #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch b/packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch
deleted file mode 100644
index af5dd390..00000000
--- a/packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur glibc-2.12.1/sysdeps/arm/preconfigure glibc-2.12.1-patched/sysdeps/arm/preconfigure
---- glibc-2.12.1/sysdeps/arm/preconfigure	2017-03-07 15:33:56.410265000 -0700
-+++ glibc-2.12.1-patched/sysdeps/arm/preconfigure	2017-03-07 15:34:42.016840000 -0700
-@@ -2,7 +2,7 @@
- arm*)
- 	base_machine=arm
- 	case $config_os in
--	linux-gnueabi)
-+	linux-gnueabi*)
- 		machine=arm/eabi/$machine
- 		;;
- 	*)
-diff -ur glibc-2.12.1/sysdeps/arm/shlib-versions glibc-2.12.1-patched/sysdeps/arm/shlib-versions
---- glibc-2.12.1/sysdeps/arm/shlib-versions	2017-03-07 15:33:56.439267000 -0700
-+++ glibc-2.12.1-patched/sysdeps/arm/shlib-versions	2017-03-07 15:34:42.018837000 -0700
-@@ -1,4 +1,4 @@
--arm.*-.*-linux-gnueabi	DEFAULT			GLIBC_2.4
-+arm.*-.*-linux-gnueabi.*	DEFAULT			GLIBC_2.4
- 
--arm.*-.*-linux-gnueabi	ld=ld-linux.so.3
-+arm.*-.*-linux-gnueabi.*	ld=ld-linux.so.3
- arm.*-.*-linux.*	ld=ld-linux.so.2
diff --git a/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.13/0000-Fix-ARM-build-with-GCC-trunk.patch
similarity index 88%
rename from packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
rename to packages/glibc-ports/2.13/0000-Fix-ARM-build-with-GCC-trunk.patch
index 259b2854..af8d28af 100644
--- a/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.13/0000-Fix-ARM-build-with-GCC-trunk.patch
@@ -17,14 +17,16 @@ Tested that this fixes the build for ARM.
 	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
 	Likewise.
 ---
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
+ sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c |    3 ++-
+ sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c       |    3 ++-
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c      |    3 ++-
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c            |    3 ++-
+ 4 files changed, 8 insertions(+), 4 deletions(-)
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
-
+ 
  static void *libgcc_s_handle;
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
@@ -32,15 +34,12 @@ Tested that this fixes the build for ARM.
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
-
+ 
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
 +  __attribute_used__;
@@ -51,7 +50,7 @@ index bff3e2b..1f1eb71 100644
 +++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
-
+ 
  static void *libgcc_s_handle;
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
@@ -64,9 +63,10 @@ index bff3e2b..1f1eb71 100644
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
-
+ 
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
 +  __attribute_used__;
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
+ 
diff --git a/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch b/packages/glibc-ports/2.13/0001-m68k-sys-user.patch
similarity index 92%
rename from packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
rename to packages/glibc-ports/2.13/0001-m68k-sys-user.patch
index 932d917a..a03b08dc 100644
--- a/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.13/0001-m68k-sys-user.patch
@@ -1,8 +1,11 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/m68k/sys/user.h |   87 ++++++++++++++++++++++++++++++++
+ 1 file changed, 87 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/m68k/sys/user.h
++++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
diff --git a/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch b/packages/glibc-ports/2.13/0002-alpha-SETPIPE-GETPIPE.patch
similarity index 65%
rename from packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch
rename to packages/glibc-ports/2.13/0002-alpha-SETPIPE-GETPIPE.patch
index 580c16d0..e806e95f 100644
--- a/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch
+++ b/packages/glibc-ports/2.13/0002-alpha-SETPIPE-GETPIPE.patch
@@ -3,10 +3,12 @@
 	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (F_SETPIPE_SZ,
 	F_GETPIPE_SZ): Define.
 
-diff --git glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-index 860e9ac..e5e726b 100644
---- glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-+++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
+---
+ sysdeps/unix/sysv/linux/alpha/bits/fcntl.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
++++ b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
 @@ -97,6 +97,8 @@
  # define F_SETLEASE	1024	/* Set a lease.	 */
  # define F_GETLEASE	1025	/* Enquire what lease is active.  */
@@ -16,4 +18,3 @@ index 860e9ac..e5e726b 100644
  #endif
  #ifdef __USE_XOPEN2K8
  # define F_DUPFD_CLOEXEC 1030	/* Duplicate file descriptor with
-
diff --git a/packages/glibc-ports/2.13/420-alpha-statfs.patch b/packages/glibc-ports/2.13/0003-alpha-statfs.patch
similarity index 55%
rename from packages/glibc-ports/2.13/420-alpha-statfs.patch
rename to packages/glibc-ports/2.13/0003-alpha-statfs.patch
index accb5afe..d9659ebc 100644
--- a/packages/glibc-ports/2.13/420-alpha-statfs.patch
+++ b/packages/glibc-ports/2.13/0003-alpha-statfs.patch
@@ -3,11 +3,13 @@
 	* sysdeps/unix/sysv/linux/mips/bits/statfs.h (struct statfs,
 	struct statfs64): Add f_flags field.
 
-diff --git glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
-index d838e6b..157591d 100644
---- glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
-+++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
-@@ -42,7 +42,8 @@ struct statfs
+---
+ sysdeps/unix/sysv/linux/alpha/bits/statfs.h |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
++++ b/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
+@@ -42,7 +42,8 @@
      __fsid_t f_fsid;
      int f_namelen;
      int f_frsize;
@@ -17,7 +19,7 @@ index d838e6b..157591d 100644
    };
  
  #ifdef __USE_LARGEFILE64
-@@ -58,7 +59,8 @@ struct statfs64
+@@ -58,7 +59,8 @@
      __fsid_t f_fsid;
      int f_namelen;
      int f_frsize;
@@ -26,4 +28,4 @@ index d838e6b..157591d 100644
 +    int f_spare[4];
    };
  #endif
-
+ 
diff --git a/packages/glibc-ports/2.15/440-alpha-cache-shape.patch b/packages/glibc-ports/2.13/0004-alpha-cache-shape.patch
similarity index 56%
rename from packages/glibc-ports/2.15/440-alpha-cache-shape.patch
rename to packages/glibc-ports/2.13/0004-alpha-cache-shape.patch
index a9c9db0c..ca608bc1 100644
--- a/packages/glibc-ports/2.15/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.13/0004-alpha-cache-shape.patch
@@ -5,9 +5,12 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
+---
+ sysdeps/unix/sysv/linux/alpha/dl-support.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/alpha/dl-support.c
++++ b/sysdeps/unix/sysv/linux/alpha/dl-support.c
+@@ -1,2 +1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch b/packages/glibc-ports/2.13/0005-alpha-DEFAULT_STACK_PERMS.patch
similarity index 68%
rename from packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch
rename to packages/glibc-ports/2.13/0005-alpha-DEFAULT_STACK_PERMS.patch
index 0d85ce59..a5a9615d 100644
--- a/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch
+++ b/packages/glibc-ports/2.13/0005-alpha-DEFAULT_STACK_PERMS.patch
@@ -2,10 +2,12 @@
 
 	* sysdeps/alpha/stackinfo.h: Define DEFAULT_STACK_PERMS with PF_X.
 
-diff --git glibc-ports-2.13/sysdeps/alpha/stackinfo.h glibc-ports-2.13/sysdeps/alpha/stackinfo.h
-index 0a281bd..d9dbc35 100644
---- glibc-ports-2.13/sysdeps/alpha/stackinfo.h
-+++ glibc-ports-2.13/sysdeps/alpha/stackinfo.h
+---
+ sysdeps/alpha/stackinfo.h |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/sysdeps/alpha/stackinfo.h
++++ b/sysdeps/alpha/stackinfo.h
 @@ -22,7 +22,13 @@
  #ifndef _STACKINFO_H
  #define _STACKINFO_H	1
@@ -20,4 +22,3 @@ index 0a281bd..d9dbc35 100644
 +#define DEFAULT_STACK_PERMS (PF_R|PF_W|PF_X)
 +
  #endif	/* stackinfo.h */
-
diff --git a/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.13/0006-alpha-fix-gcc-4.1-warnings.patch
similarity index 81%
rename from packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch
rename to packages/glibc-ports/2.13/0006-alpha-fix-gcc-4.1-warnings.patch
index 05a197e5..fef37a52 100644
--- a/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.13/0006-alpha-fix-gcc-4.1-warnings.patch
@@ -13,12 +13,11 @@ make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error
 Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
 I cannot really think of anything better than
 
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
+ sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c
++++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
diff --git a/packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch b/packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch
new file mode 100644
index 00000000..164276f3
--- /dev/null
+++ b/packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch
@@ -0,0 +1,26 @@
+2011-03-01  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/alpha/fpu/feupdateenv.c (feupdateenv): Add
+	libm_hidden_def.
+	* sysdeps/alpha/fpu/ftestexcept.c (fetestexcept): Likewise.
+
+---
+ sysdeps/alpha/fpu/feupdateenv.c |    1 +
+ sysdeps/alpha/fpu/ftestexcept.c |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/sysdeps/alpha/fpu/feupdateenv.c
++++ b/sysdeps/alpha/fpu/feupdateenv.c
+@@ -46,4 +46,5 @@
+ compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1);
+ #endif
+ 
++libm_hidden_ver (__feupdateenv, feupdateenv)
+ versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2);
+--- a/sysdeps/alpha/fpu/ftestexcept.c
++++ b/sysdeps/alpha/fpu/ftestexcept.c
+@@ -30,3 +30,4 @@
+ 
+   return tmp & excepts & SWCR_STATUS_MASK;
+ }
++libm_hidden_def (fetestexcept)
diff --git a/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.13/0008-alpha-fix-rtld-fPIC.patch
similarity index 62%
rename from packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch
rename to packages/glibc-ports/2.13/0008-alpha-fix-rtld-fPIC.patch
index 8f9ce0db..53a0992e 100644
--- a/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.13/0008-alpha-fix-rtld-fPIC.patch
@@ -2,12 +2,11 @@
 
 	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
 
- ports/sysdeps/alpha/Makefile |    3 ++-
+ sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-ports-2.15.orig/sysdeps/alpha/Makefile glibc-ports-2.15/sysdeps/alpha/Makefile
---- glibc-ports-2.15.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+--- a/sysdeps/alpha/Makefile
++++ b/sysdeps/alpha/Makefile
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
diff --git a/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.13/0009-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
similarity index 71%
rename from packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
rename to packages/glibc-ports/2.13/0009-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index b7d54ac6..855dde26 100644
--- a/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.13/0009-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,22 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/bits/endian.h glibc-ports-2.13/sysdeps/arm/bits/endian.h
---- glibc-ports-2.13.orig/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+---
+ sysdeps/arm/bits/endian.h        |    2 -
+ sysdeps/arm/fpu/__longjmp.S      |   26 +++++++++++++
+ sysdeps/arm/fpu/bits/fenv.h      |   41 ++++++++++++++++++++
+ sysdeps/arm/fpu/bits/setjmp.h    |    4 ++
+ sysdeps/arm/fpu/fegetround.c     |   12 ++++++
+ sysdeps/arm/fpu/fesetround.c     |   16 ++++++++
+ sysdeps/arm/fpu/fpu_control.h    |   78 ++++++++++++++++++++++++++++++++++++++-
+ sysdeps/arm/fpu/jmpbuf-offsets.h |    4 ++
+ sysdeps/arm/fpu/setjmp.S         |   30 +++++++++++++++
+ sysdeps/arm/gccframe.h           |    4 ++
+ sysdeps/arm/gmp-mparam.h         |    2 -
+ 11 files changed, 216 insertions(+), 3 deletions(-)
+
+--- a/sysdeps/arm/bits/endian.h
++++ b/sysdeps/arm/bits/endian.h
 @@ -12,7 +12,7 @@
  /* FPA floating point units are always big-endian, irrespective of the
     CPU endianness.  VFP floating point units use the same endianness
@@ -13,9 +26,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/bits/endian.h glibc-ports-2.13/sysd
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S
---- glibc-ports-2.13.orig/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/__longjmp.S
++++ b/sysdeps/arm/fpu/__longjmp.S
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +62,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.13/sy
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h
---- glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/bits/fenv.h
++++ b/sysdeps/arm/fpu/bits/fenv.h
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +119,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.13/sy
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/bits/setjmp.h
++++ b/sysdeps/arm/fpu/bits/setjmp.h
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +133,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.13/
 +#endif
  
  #endif
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c
---- glibc-ports-2.13.orig/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fegetround.c
++++ b/sysdeps/arm/fpu/fegetround.c
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +157,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.13/s
 +
 +#endif
  }
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c
---- glibc-ports-2.13.orig/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fesetround.c
++++ b/sysdeps/arm/fpu/fesetround.c
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +188,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.13/s
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h
---- glibc-ports-2.13.orig/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fpu_control.h
++++ b/sysdeps/arm/fpu/fpu_control.h
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +285,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.13/
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-ports-2.13.orig/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/jmpbuf-offsets.h
++++ b/sysdeps/arm/fpu/jmpbuf-offsets.h
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +296,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S
---- glibc-ports-2.13.orig/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/setjmp.S
++++ b/sysdeps/arm/fpu/setjmp.S
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +340,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.13/sysde
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/gccframe.h glibc-ports-2.13/sysdeps/arm/gccframe.h
---- glibc-ports-2.13.orig/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/gccframe.h
++++ b/sysdeps/arm/gccframe.h
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +353,8 @@ diff -durN glibc-ports-2.13.orig/sysdeps/arm/gccframe.h glibc-ports-2.13/sysdeps
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-ports-2.13.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.13/sysdeps/arm/gmp-mparam.h
---- glibc-ports-2.13.orig/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/gmp-mparam.h
++++ b/sysdeps/arm/gmp-mparam.h
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
diff --git a/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.13/0010-nptl-lowlevellock.patch
similarity index 89%
rename from packages/glibc-ports/2.15/580-nptl-lowlevellock.patch
rename to packages/glibc-ports/2.13/0010-nptl-lowlevellock.patch
index 8a841be0..55fc78ff 100644
--- a/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.13/0010-nptl-lowlevellock.patch
@@ -9,9 +9,12 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
++++ b/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
diff --git a/packages/glibc-ports/2.15/610-fpu-cw-mips.patch b/packages/glibc-ports/2.13/0011-fpu-cw-mips.patch
similarity index 54%
rename from packages/glibc-ports/2.15/610-fpu-cw-mips.patch
rename to packages/glibc-ports/2.13/0011-fpu-cw-mips.patch
index 388e4d67..5cb8d71a 100644
--- a/packages/glibc-ports/2.15/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.13/0011-fpu-cw-mips.patch
@@ -1,8 +1,11 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-ports-2.15.orig/sysdeps/mips/fpu_control.h glibc-ports-2.15/sysdeps/mips/fpu_control.h
---- glibc-ports-2.15.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+---
+ sysdeps/mips/fpu_control.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sysdeps/mips/fpu_control.h
++++ b/sysdeps/mips/fpu_control.h
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
diff --git a/packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch b/packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch
new file mode 100644
index 00000000..9391e88b
--- /dev/null
+++ b/packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch
@@ -0,0 +1,25 @@
+---
+ sysdeps/arm/preconfigure   |    2 +-
+ sysdeps/arm/shlib-versions |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/sysdeps/arm/preconfigure
++++ b/sysdeps/arm/preconfigure
+@@ -2,7 +2,7 @@
+ arm*)
+ 	base_machine=arm
+ 	case $config_os in
+-	linux-gnueabi)
++	linux-gnueabi*)
+ 		machine=arm/eabi/$machine
+ 		if [ "${CFLAGS+set}" != "set" ]; then
+ 		  CFLAGS="-g -O2"
+--- a/sysdeps/arm/shlib-versions
++++ b/sysdeps/arm/shlib-versions
+@@ -1,4 +1,4 @@
+-arm.*-.*-linux-gnueabi	DEFAULT			GLIBC_2.4
++arm.*-.*-linux-gnueabi.*	DEFAULT			GLIBC_2.4
+ 
+-arm.*-.*-linux-gnueabi	ld=ld-linux.so.3
++arm.*-.*-linux-gnueabi.*	ld=ld-linux.so.3
+ arm.*-.*-linux.*	ld=ld-linux.so.2
diff --git a/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch b/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
deleted file mode 100644
index ea1e0562..00000000
--- a/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-2011-03-01  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/fpu/feupdateenv.c (feupdateenv): Add
-	libm_hidden_def.
-	* sysdeps/alpha/fpu/ftestexcept.c (fetestexcept): Likewise.
-
-diff --git glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
-index c798070..9abbf11 100644
---- glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
-+++ glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
-@@ -46,4 +46,5 @@ strong_alias (__feupdateenv, __old_feupdateenv)
- compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1);
- #endif
- 
-+libm_hidden_ver (__feupdateenv, feupdateenv)
- versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2);
-diff --git glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
-index a4b3081..34d8113 100644
---- glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
-+++ glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
-@@ -30,3 +30,4 @@ fetestexcept (int excepts)
- 
-   return tmp & excepts & SWCR_STATUS_MASK;
- }
-+libm_hidden_def (fetestexcept)
-
diff --git a/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch b/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch
deleted file mode 100644
index ec004056..00000000
--- a/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur glibc-2.13/sysdeps/arm/preconfigure glibc-2.13-patched/sysdeps/arm/preconfigure
---- glibc-2.13/sysdeps/arm/preconfigure	2011-01-25 14:00:16.000000000 -0700
-+++ glibc-2.13-patched/sysdeps/arm/preconfigure	2017-03-07 15:36:50.310454000 -0700
-@@ -2,7 +2,7 @@
- arm*)
- 	base_machine=arm
- 	case $config_os in
--	linux-gnueabi)
-+	linux-gnueabi*)
- 		machine=arm/eabi/$machine
- 		if [ "${CFLAGS+set}" != "set" ]; then
- 		  CFLAGS="-g -O2"
-diff -ur glibc-2.13/sysdeps/arm/shlib-versions glibc-2.13-patched/sysdeps/arm/shlib-versions
---- glibc-2.13/sysdeps/arm/shlib-versions	2011-01-25 14:00:16.000000000 -0700
-+++ glibc-2.13-patched/sysdeps/arm/shlib-versions	2017-03-07 15:36:50.312457000 -0700
-@@ -1,4 +1,4 @@
--arm.*-.*-linux-gnueabi	DEFAULT			GLIBC_2.4
-+arm.*-.*-linux-gnueabi.*	DEFAULT			GLIBC_2.4
- 
--arm.*-.*-linux-gnueabi	ld=ld-linux.so.3
-+arm.*-.*-linux-gnueabi.*	ld=ld-linux.so.3
- arm.*-.*-linux.*	ld=ld-linux.so.2
diff --git a/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.14.1/0000-Fix-ARM-build-with-GCC-trunk.patch
similarity index 88%
rename from packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch
rename to packages/glibc-ports/2.14.1/0000-Fix-ARM-build-with-GCC-trunk.patch
index 259b2854..af8d28af 100644
--- a/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.14.1/0000-Fix-ARM-build-with-GCC-trunk.patch
@@ -17,14 +17,16 @@ Tested that this fixes the build for ARM.
 	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
 	Likewise.
 ---
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
+ sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c |    3 ++-
+ sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c       |    3 ++-
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c      |    3 ++-
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c            |    3 ++-
+ 4 files changed, 8 insertions(+), 4 deletions(-)
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
-
+ 
  static void *libgcc_s_handle;
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
@@ -32,15 +34,12 @@ Tested that this fixes the build for ARM.
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
-
+ 
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
 +  __attribute_used__;
@@ -51,7 +50,7 @@ index bff3e2b..1f1eb71 100644
 +++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
-
+ 
  static void *libgcc_s_handle;
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
@@ -64,9 +63,10 @@ index bff3e2b..1f1eb71 100644
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
-
+ 
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
 +  __attribute_used__;
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
+ 
diff --git a/packages/glibc-ports/2.13/330-m68k-sys-user.patch b/packages/glibc-ports/2.14.1/0001-m68k-sys-user.patch
similarity index 92%
rename from packages/glibc-ports/2.13/330-m68k-sys-user.patch
rename to packages/glibc-ports/2.14.1/0001-m68k-sys-user.patch
index a2b4528a..a03b08dc 100644
--- a/packages/glibc-ports/2.13/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.14.1/0001-m68k-sys-user.patch
@@ -1,8 +1,11 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/m68k/sys/user.h |   87 ++++++++++++++++++++++++++++++++
+ 1 file changed, 87 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/m68k/sys/user.h
++++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
diff --git a/packages/glibc-ports/2.13/440-alpha-cache-shape.patch b/packages/glibc-ports/2.14.1/0002-alpha-cache-shape.patch
similarity index 56%
rename from packages/glibc-ports/2.13/440-alpha-cache-shape.patch
rename to packages/glibc-ports/2.14.1/0002-alpha-cache-shape.patch
index 602c80d4..ca608bc1 100644
--- a/packages/glibc-ports/2.13/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.14.1/0002-alpha-cache-shape.patch
@@ -5,9 +5,12 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
+---
+ sysdeps/unix/sysv/linux/alpha/dl-support.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/alpha/dl-support.c
++++ b/sysdeps/unix/sysv/linux/alpha/dl-support.c
+@@ -1,2 +1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.14.1/0003-alpha-fix-gcc-4.1-warnings.patch
similarity index 80%
rename from packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
rename to packages/glibc-ports/2.14.1/0003-alpha-fix-gcc-4.1-warnings.patch
index 65781b41..fef37a52 100644
--- a/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.14.1/0003-alpha-fix-gcc-4.1-warnings.patch
@@ -13,12 +13,11 @@ make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error
 Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
 I cannot really think of anything better than
 
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
+ sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c
++++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
diff --git a/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.14.1/0004-alpha-fix-rtld-fPIC.patch
similarity index 61%
rename from packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch
rename to packages/glibc-ports/2.14.1/0004-alpha-fix-rtld-fPIC.patch
index 20b2e32e..53a0992e 100644
--- a/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.14.1/0004-alpha-fix-rtld-fPIC.patch
@@ -2,12 +2,11 @@
 
 	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
 
- ports/sysdeps/alpha/Makefile |    3 ++-
+ sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-ports-2.12.1.orig/sysdeps/alpha/Makefile glibc-ports-2.12.1/sysdeps/alpha/Makefile
---- glibc-ports-2.12.1.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+--- a/sysdeps/alpha/Makefile
++++ b/sysdeps/alpha/Makefile
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
diff --git a/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.14.1/0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
similarity index 70%
rename from packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
rename to packages/glibc-ports/2.14.1/0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 80032edc..855dde26 100644
--- a/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.14.1/0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,22 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/bits/endian.h glibc-ports-2.14.1/sysdeps/arm/bits/endian.h
---- glibc-ports-2.14.1.orig/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+---
+ sysdeps/arm/bits/endian.h        |    2 -
+ sysdeps/arm/fpu/__longjmp.S      |   26 +++++++++++++
+ sysdeps/arm/fpu/bits/fenv.h      |   41 ++++++++++++++++++++
+ sysdeps/arm/fpu/bits/setjmp.h    |    4 ++
+ sysdeps/arm/fpu/fegetround.c     |   12 ++++++
+ sysdeps/arm/fpu/fesetround.c     |   16 ++++++++
+ sysdeps/arm/fpu/fpu_control.h    |   78 ++++++++++++++++++++++++++++++++++++++-
+ sysdeps/arm/fpu/jmpbuf-offsets.h |    4 ++
+ sysdeps/arm/fpu/setjmp.S         |   30 +++++++++++++++
+ sysdeps/arm/gccframe.h           |    4 ++
+ sysdeps/arm/gmp-mparam.h         |    2 -
+ 11 files changed, 216 insertions(+), 3 deletions(-)
+
+--- a/sysdeps/arm/bits/endian.h
++++ b/sysdeps/arm/bits/endian.h
 @@ -12,7 +12,7 @@
  /* FPA floating point units are always big-endian, irrespective of the
     CPU endianness.  VFP floating point units use the same endianness
@@ -13,9 +26,8 @@ diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/bits/endian.h glibc-ports-2.14.1/
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S
---- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/__longjmp.S
++++ b/sysdeps/arm/fpu/__longjmp.S
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +62,8 @@ diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.14.
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h
---- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/bits/fenv.h
++++ b/sysdeps/arm/fpu/bits/fenv.h
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +119,8 @@ diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.14.
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/bits/setjmp.h
++++ b/sysdeps/arm/fpu/bits/setjmp.h
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +133,8 @@ diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.1
 +#endif
  
  #endif
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c
---- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fegetround.c
++++ b/sysdeps/arm/fpu/fegetround.c
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +157,8 @@ diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.14
 +
 +#endif
  }
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c
---- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fesetround.c
++++ b/sysdeps/arm/fpu/fesetround.c
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +188,8 @@ diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.14
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h
---- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fpu_control.h
++++ b/sysdeps/arm/fpu/fpu_control.h
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +285,8 @@ diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.1
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/jmpbuf-offsets.h
++++ b/sysdeps/arm/fpu/jmpbuf-offsets.h
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +296,8 @@ diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S
---- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/setjmp.S
++++ b/sysdeps/arm/fpu/setjmp.S
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +340,8 @@ diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.14.1/s
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/gccframe.h glibc-ports-2.14.1/sysdeps/arm/gccframe.h
---- glibc-ports-2.14.1.orig/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/gccframe.h
++++ b/sysdeps/arm/gccframe.h
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +353,8 @@ diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/gccframe.h glibc-ports-2.14.1/sys
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h
---- glibc-ports-2.14.1.orig/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/gmp-mparam.h
++++ b/sysdeps/arm/gmp-mparam.h
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
diff --git a/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.14.1/0006-nptl-lowlevellock.patch
similarity index 88%
rename from packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch
rename to packages/glibc-ports/2.14.1/0006-nptl-lowlevellock.patch
index 62b74d84..55fc78ff 100644
--- a/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.14.1/0006-nptl-lowlevellock.patch
@@ -9,9 +9,12 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
++++ b/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
diff --git a/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch b/packages/glibc-ports/2.14.1/0007-fpu-cw-mips.patch
similarity index 53%
rename from packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch
rename to packages/glibc-ports/2.14.1/0007-fpu-cw-mips.patch
index deab4195..5cb8d71a 100644
--- a/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.14.1/0007-fpu-cw-mips.patch
@@ -1,8 +1,11 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-ports-2.12.1.orig/sysdeps/mips/fpu_control.h glibc-ports-2.12.1/sysdeps/mips/fpu_control.h
---- glibc-ports-2.12.1.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+---
+ sysdeps/mips/fpu_control.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sysdeps/mips/fpu_control.h
++++ b/sysdeps/mips/fpu_control.h
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
diff --git a/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.15/0000-Fix-ARM-build-with-GCC-trunk.patch
similarity index 88%
rename from packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
rename to packages/glibc-ports/2.15/0000-Fix-ARM-build-with-GCC-trunk.patch
index 259b2854..af8d28af 100644
--- a/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.15/0000-Fix-ARM-build-with-GCC-trunk.patch
@@ -17,14 +17,16 @@ Tested that this fixes the build for ARM.
 	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
 	Likewise.
 ---
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
+ sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c |    3 ++-
+ sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c       |    3 ++-
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c      |    3 ++-
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c            |    3 ++-
+ 4 files changed, 8 insertions(+), 4 deletions(-)
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
-
+ 
  static void *libgcc_s_handle;
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
@@ -32,15 +34,12 @@ Tested that this fixes the build for ARM.
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
-
+ 
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
 +  __attribute_used__;
@@ -51,7 +50,7 @@ index bff3e2b..1f1eb71 100644
 +++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
-
+ 
  static void *libgcc_s_handle;
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
@@ -64,9 +63,10 @@ index bff3e2b..1f1eb71 100644
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
-
+ 
 -static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 +static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
 +  __attribute_used__;
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
+ 
diff --git a/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch b/packages/glibc-ports/2.15/0001-libmemusage-link-failure.patch
similarity index 80%
rename from packages/glibc-ports/2.15/091-libmemusage-link-failure.patch
rename to packages/glibc-ports/2.15/0001-libmemusage-link-failure.patch
index 23d88138..6e35f5a6 100644
--- a/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch
+++ b/packages/glibc-ports/2.15/0001-libmemusage-link-failure.patch
@@ -4,11 +4,13 @@ Date:   Fri Jan 6 20:14:44 2012 +0000
 
     Add ARM dependency of libmemusage.so on libc_nonshared.a.
 
-diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile
-index 5651161..1a88430 100644
+---
+ sysdeps/arm/Makefile |    5 +++++
+ 1 file changed, 5 insertions(+)
+
 --- a/sysdeps/arm/Makefile
 +++ b/sysdeps/arm/Makefile
-@@ -7,3 +7,8 @@ endif
+@@ -7,3 +7,8 @@
  ifeq ($(subdir),csu)
  gen-as-const-headers += tlsdesc.sym
  endif
diff --git a/packages/glibc-ports/2.15/330-m68k-sys-user.patch b/packages/glibc-ports/2.15/0002-m68k-sys-user.patch
similarity index 92%
rename from packages/glibc-ports/2.15/330-m68k-sys-user.patch
rename to packages/glibc-ports/2.15/0002-m68k-sys-user.patch
index 388bc624..a03b08dc 100644
--- a/packages/glibc-ports/2.15/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.15/0002-m68k-sys-user.patch
@@ -1,8 +1,11 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/m68k/sys/user.h |   87 ++++++++++++++++++++++++++++++++
+ 1 file changed, 87 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/m68k/sys/user.h
++++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
diff --git a/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch b/packages/glibc-ports/2.15/0003-alpha-cache-shape.patch
similarity index 55%
rename from packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch
rename to packages/glibc-ports/2.15/0003-alpha-cache-shape.patch
index 989bfd73..ca608bc1 100644
--- a/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.15/0003-alpha-cache-shape.patch
@@ -5,9 +5,12 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
+---
+ sysdeps/unix/sysv/linux/alpha/dl-support.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/alpha/dl-support.c
++++ b/sysdeps/unix/sysv/linux/alpha/dl-support.c
+@@ -1,2 +1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.15/0004-alpha-fix-gcc-4.1-warnings.patch
similarity index 80%
rename from packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
rename to packages/glibc-ports/2.15/0004-alpha-fix-gcc-4.1-warnings.patch
index 2ed4118b..fef37a52 100644
--- a/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.15/0004-alpha-fix-gcc-4.1-warnings.patch
@@ -13,12 +13,11 @@ make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error
 Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
 I cannot really think of anything better than
 
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
+ sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c
++++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
diff --git a/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.15/0005-alpha-fix-rtld-fPIC.patch
similarity index 61%
rename from packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch
rename to packages/glibc-ports/2.15/0005-alpha-fix-rtld-fPIC.patch
index 56bc5321..53a0992e 100644
--- a/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.15/0005-alpha-fix-rtld-fPIC.patch
@@ -2,12 +2,11 @@
 
 	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
 
- ports/sysdeps/alpha/Makefile |    3 ++-
+ sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-ports-2.14.1.orig/sysdeps/alpha/Makefile glibc-ports-2.14.1/sysdeps/alpha/Makefile
---- glibc-ports-2.14.1.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+--- a/sysdeps/alpha/Makefile
++++ b/sysdeps/alpha/Makefile
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
diff --git a/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.15/0006-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
similarity index 70%
rename from packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
rename to packages/glibc-ports/2.15/0006-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 7878ab45..855dde26 100644
--- a/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.15/0006-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,22 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/bits/endian.h glibc-ports-2.12.1/sysdeps/arm/bits/endian.h
---- glibc-ports-2.12.1.orig/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+---
+ sysdeps/arm/bits/endian.h        |    2 -
+ sysdeps/arm/fpu/__longjmp.S      |   26 +++++++++++++
+ sysdeps/arm/fpu/bits/fenv.h      |   41 ++++++++++++++++++++
+ sysdeps/arm/fpu/bits/setjmp.h    |    4 ++
+ sysdeps/arm/fpu/fegetround.c     |   12 ++++++
+ sysdeps/arm/fpu/fesetround.c     |   16 ++++++++
+ sysdeps/arm/fpu/fpu_control.h    |   78 ++++++++++++++++++++++++++++++++++++++-
+ sysdeps/arm/fpu/jmpbuf-offsets.h |    4 ++
+ sysdeps/arm/fpu/setjmp.S         |   30 +++++++++++++++
+ sysdeps/arm/gccframe.h           |    4 ++
+ sysdeps/arm/gmp-mparam.h         |    2 -
+ 11 files changed, 216 insertions(+), 3 deletions(-)
+
+--- a/sysdeps/arm/bits/endian.h
++++ b/sysdeps/arm/bits/endian.h
 @@ -12,7 +12,7 @@
  /* FPA floating point units are always big-endian, irrespective of the
     CPU endianness.  VFP floating point units use the same endianness
@@ -13,9 +26,8 @@ diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/bits/endian.h glibc-ports-2.12.1/
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S
---- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/__longjmp.S
++++ b/sysdeps/arm/fpu/__longjmp.S
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +62,8 @@ diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.12.
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h
---- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/bits/fenv.h
++++ b/sysdeps/arm/fpu/bits/fenv.h
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +119,8 @@ diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.12.
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/bits/setjmp.h
++++ b/sysdeps/arm/fpu/bits/setjmp.h
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +133,8 @@ diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.1
 +#endif
  
  #endif
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c
---- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fegetround.c
++++ b/sysdeps/arm/fpu/fegetround.c
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +157,8 @@ diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.12
 +
 +#endif
  }
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c
---- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fesetround.c
++++ b/sysdeps/arm/fpu/fesetround.c
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +188,8 @@ diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.12
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h
---- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/fpu_control.h
++++ b/sysdeps/arm/fpu/fpu_control.h
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +285,8 @@ diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.1
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/jmpbuf-offsets.h
++++ b/sysdeps/arm/fpu/jmpbuf-offsets.h
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +296,8 @@ diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S
---- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/fpu/setjmp.S
++++ b/sysdeps/arm/fpu/setjmp.S
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +340,8 @@ diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.12.1/s
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/gccframe.h glibc-ports-2.12.1/sysdeps/arm/gccframe.h
---- glibc-ports-2.12.1.orig/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/gccframe.h
++++ b/sysdeps/arm/gccframe.h
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +353,8 @@ diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/gccframe.h glibc-ports-2.12.1/sys
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h
---- glibc-ports-2.12.1.orig/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+--- a/sysdeps/arm/gmp-mparam.h
++++ b/sysdeps/arm/gmp-mparam.h
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
diff --git a/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.15/0007-nptl-lowlevellock.patch
similarity index 88%
rename from packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch
rename to packages/glibc-ports/2.15/0007-nptl-lowlevellock.patch
index 4d1a51a4..55fc78ff 100644
--- a/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.15/0007-nptl-lowlevellock.patch
@@ -9,9 +9,12 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
++++ b/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
diff --git a/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch b/packages/glibc-ports/2.15/0008-fpu-cw-mips.patch
similarity index 53%
rename from packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch
rename to packages/glibc-ports/2.15/0008-fpu-cw-mips.patch
index 4b8365a2..5cb8d71a 100644
--- a/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.15/0008-fpu-cw-mips.patch
@@ -1,8 +1,11 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-ports-2.14.1.orig/sysdeps/mips/fpu_control.h glibc-ports-2.14.1/sysdeps/mips/fpu_control.h
---- glibc-ports-2.14.1.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+---
+ sysdeps/mips/fpu_control.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sysdeps/mips/fpu_control.h
++++ b/sysdeps/mips/fpu_control.h
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
diff --git a/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.16.0/0000-Fix-ARM-build-with-GCC-trunk.patch
similarity index 79%
rename from packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
rename to packages/glibc-ports/2.16.0/0000-Fix-ARM-build-with-GCC-trunk.patch
index 1f08ba16..2b560755 100644
--- a/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.16.0/0000-Fix-ARM-build-with-GCC-trunk.patch
@@ -17,12 +17,10 @@ Tested that this fixes the build for ARM.
 	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
 	Likewise.
 ---
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c |    3 ++-
+ sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c       |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-index 6ccd9b4..660d148 100644
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -22,7 +22,8 @@
@@ -35,8 +33,6 @@ index 6ccd9b4..660d148 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
 --- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 +++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -20,7 +20,8 @@
@@ -49,6 +45,3 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  
--- 
-1.9.4
-
diff --git a/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch b/packages/glibc-ports/2.16.0/0001-m68k-sys-user.patch
similarity index 92%
rename from packages/glibc-ports/2.14.1/330-m68k-sys-user.patch
rename to packages/glibc-ports/2.16.0/0001-m68k-sys-user.patch
index 6476b5c0..a03b08dc 100644
--- a/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.16.0/0001-m68k-sys-user.patch
@@ -1,8 +1,11 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/m68k/sys/user.h |   87 ++++++++++++++++++++++++++++++++
+ 1 file changed, 87 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/m68k/sys/user.h
++++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
diff --git a/packages/glibc-ports/2.16.0/0002-alpha-cache-shape.patch b/packages/glibc-ports/2.16.0/0002-alpha-cache-shape.patch
new file mode 100644
index 00000000..ca608bc1
--- /dev/null
+++ b/packages/glibc-ports/2.16.0/0002-alpha-cache-shape.patch
@@ -0,0 +1,16 @@
+older verisons of glibc would build dl-sysdep as shared-only and dl-support as
+static-only.  alpha hooks in a cache variable via dl-auxv.h.  newer versions of
+glibc build dl-sysdep as both shared and static which means we now have symbol
+duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
+is both shared/static, there is no point in hooking dl-support anymore, so we
+can punt it.
+
+---
+ sysdeps/unix/sysv/linux/alpha/dl-support.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/alpha/dl-support.c
++++ b/sysdeps/unix/sysv/linux/alpha/dl-support.c
+@@ -1,2 +1 @@
+-#include "dl-auxv.h"
+ #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.16.0/0003-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.16.0/0003-alpha-fix-gcc-4.1-warnings.patch
new file mode 100644
index 00000000..0e1d5929
--- /dev/null
+++ b/packages/glibc-ports/2.16.0/0003-alpha-fix-gcc-4.1-warnings.patch
@@ -0,0 +1,54 @@
+2006-05-30  Falk Hueffner <falk@debian.org>
+
+	* sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture
+	  to ev6 in assembly code.
+
+{standard input}: Assembler messages:
+{standard input}:341: Error: macro requires $at register while noat in effect
+{standard input}:374: Error: macro requires $at register while noat in effect
+{standard input}:438: Error: macro requires $at register while noat in effect
+{standard input}:471: Error: macro requires $at register while noat in effect
+make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1
+
+Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
+I cannot really think of anything better than
+
+ sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c
++++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c
+@@ -177,13 +177,13 @@
+ static inline void
+ stb_mb(unsigned char val, unsigned long addr)
+ {
+-  __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
++  __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
+ }
+ 
+ static inline void
+ stw_mb(unsigned short val, unsigned long addr)
+ {
+-  __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
++  __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
+ }
+ 
+ static inline void
+@@ -355,7 +355,7 @@
+   unsigned long int addr = dense_port_to_cpu_addr (port);
+   unsigned char r;
+ 
+-  __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
++  __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
+   return r;
+ }
+ 
+@@ -365,7 +365,7 @@
+   unsigned long int addr = dense_port_to_cpu_addr (port);
+   unsigned short r;
+ 
+-  __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
++  __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
+   return r;
+ }
+ 
diff --git a/packages/glibc-ports/2.16.0/0004-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.16.0/0004-alpha-fix-rtld-fPIC.patch
new file mode 100644
index 00000000..bc2ae458
--- /dev/null
+++ b/packages/glibc-ports/2.16.0/0004-alpha-fix-rtld-fPIC.patch
@@ -0,0 +1,19 @@
+2009-05-26  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
+
+ sysdeps/alpha/Makefile |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/alpha/Makefile
++++ b/sysdeps/alpha/Makefile
+@@ -34,7 +34,8 @@
+ 
+ ifeq ($(subdir),elf)
+ # The ld.so startup code cannot use literals until it self-relocates.
+-CFLAGS-rtld.c = -mbuild-constants
++# It uses more than 64k for the small data area.
++CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag)
+ endif
+ 
+ ifeq ($(subdir),math)
diff --git a/packages/glibc-ports/2.16.0/0005-nptl-lowlevellock.patch b/packages/glibc-ports/2.16.0/0005-nptl-lowlevellock.patch
new file mode 100644
index 00000000..3899a0a8
--- /dev/null
+++ b/packages/glibc-ports/2.16.0/0005-nptl-lowlevellock.patch
@@ -0,0 +1,25 @@
+fix build error on arm like on hppa:
+
+arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes   -fPIC    -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports  -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h  -DPIC -DSHARED      -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1
+In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM'
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
+
+---
+ sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
++++ b/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+@@ -24,6 +24,7 @@
+ #include <atomic.h>
+ #include <sysdep.h>
+ #include <kernel-features.h>
++#include <tls.h>		/* Need THREAD_*, and header.*.  */
+ 
+ #define FUTEX_WAIT		0
+ #define FUTEX_WAKE		1
diff --git a/packages/glibc-ports/2.16.0/0006-fpu-cw-mips.patch b/packages/glibc-ports/2.16.0/0006-fpu-cw-mips.patch
new file mode 100644
index 00000000..87d56f5b
--- /dev/null
+++ b/packages/glibc-ports/2.16.0/0006-fpu-cw-mips.patch
@@ -0,0 +1,17 @@
+http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
+
+---
+ sysdeps/mips/fpu_control.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sysdeps/mips/fpu_control.h
++++ b/sysdeps/mips/fpu_control.h
+@@ -85,7 +85,7 @@
+ #define _FPU_RC_UP      0x2
+ #define _FPU_RC_DOWN    0x3
+ 
+-#define _FPU_RESERVED 0xfe3c0000  /* Reserved bits in cw */
++#define _FPU_RESERVED 0xfebc0000  /* Reserved bits in cw */
+ 
+ 
+ /* The fdlibm code requires strict IEEE double precision arithmetic,
diff --git a/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
deleted file mode 100644
index 96f1646b..00000000
--- a/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-2006-05-30  Falk Hueffner <falk@debian.org>
-
-	* sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture
-	  to ev6 in assembly code.
-
-{standard input}: Assembler messages:
-{standard input}:341: Error: macro requires $at register while noat in effect
-{standard input}:374: Error: macro requires $at register while noat in effect
-{standard input}:438: Error: macro requires $at register while noat in effect
-{standard input}:471: Error: macro requires $at register while noat in effect
-make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1
-
-Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
-I cannot really think of anything better than
-
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
-@@ -178,13 +178,13 @@
- static inline void
- stb_mb(unsigned char val, unsigned long addr)
- {
--  __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
-+  __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
- }
- 
- static inline void
- stw_mb(unsigned short val, unsigned long addr)
- {
--  __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
-+  __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
- }
- 
- static inline void
-@@ -356,7 +356,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned char r;
- 
--  __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-+  __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-   return r;
- }
- 
-@@ -366,7 +366,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned short r;
- 
--  __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-+  __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-   return r;
- }
- 
diff --git a/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch
deleted file mode 100644
index db9c8900..00000000
--- a/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-2009-05-26  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
-
- ports/sysdeps/alpha/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff -durN glibc-ports-2.16.0.orig/sysdeps/alpha/Makefile glibc-ports-2.16.0/sysdeps/alpha/Makefile
---- glibc-ports-2.16.0.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
-@@ -35,7 +35,8 @@
- 
- ifeq ($(subdir),elf)
- # The ld.so startup code cannot use literals until it self-relocates.
--CFLAGS-rtld.c = -mbuild-constants
-+# It uses more than 64k for the small data area.
-+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag)
- endif
- 
- # Build everything with full IEEE math support, and with dynamic rounding;
diff --git a/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
deleted file mode 100644
index a1c6c7ab..00000000
--- a/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix build error on arm like on hppa:
-
-arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes   -fPIC    -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports  -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h  -DPIC -DSHARED      -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1
-In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM'
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
-
-diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>		/* Need THREAD_*, and header.*.  */
- 
- #define FUTEX_WAIT		0
- #define FUTEX_WAKE		1
diff --git a/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch b/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
deleted file mode 100644
index ef42c8fd..00000000
--- a/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
-
-diff -durN glibc-ports-2.16.0.orig/sysdeps/mips/fpu_control.h glibc-ports-2.16.0/sysdeps/mips/fpu_control.h
---- glibc-ports-2.16.0.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
-@@ -86,7 +86,7 @@
- #define _FPU_RC_UP      0x2
- #define _FPU_RC_DOWN    0x3
- 
--#define _FPU_RESERVED 0xfe3c0000  /* Reserved bits in cw */
-+#define _FPU_RESERVED 0xfebc0000  /* Reserved bits in cw */
- 
- 
- /* The fdlibm code requires strict IEEE double precision arithmetic,
diff --git a/packages/glibc/2.12.1/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.12.1/0000-respect-env-CPPFLAGS.patch
similarity index 63%
rename from packages/glibc/2.12.1/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.12.1/0000-respect-env-CPPFLAGS.patch
index ed022beb..ddeb71be 100644
--- a/packages/glibc/2.12.1/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.12.1/0000-respect-env-CPPFLAGS.patch
@@ -1,9 +1,13 @@
 Respect environment CPPFLAGS when we run ./configure so we can inject
 random -D things without having to set CFLAGS/ASFLAGS
 
-diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
---- glibc-2.12.1.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.12.1/Makeconfig	2009-11-13 00:49:41.000000000 +0100
+---
+ Makeconfig     |    1 +
+ config.make.in |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/Makeconfig
++++ b/Makeconfig
 @@ -697,6 +697,7 @@
  	   $(foreach lib,$(libof-$(basename $(@F))) \
  		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
@@ -12,9 +16,8 @@ diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
  override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
  		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
  		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
-diff -durN glibc-2.12.1.orig/config.make.in glibc-2.12.1/config.make.in
---- glibc-2.12.1.orig/config.make.in	2009-05-09 17:59:38.000000000 +0200
-+++ glibc-2.12.1/config.make.in	2009-11-13 00:49:41.000000000 +0100
+--- a/config.make.in
++++ b/config.make.in
 @@ -107,6 +107,7 @@
  CXX = @CXX@
  BUILD_CC = @BUILD_CC@
diff --git a/packages/glibc/2.13/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.12.1/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
similarity index 78%
rename from packages/glibc/2.13/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
rename to packages/glibc/2.12.1/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..30a70a2f 100644
--- a/packages/glibc/2.13/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.12.1/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -5,16 +5,13 @@ Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
  -Wparentheses
 
 ---
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
 
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
 --- a/nis/nis_call.c
 +++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
+@@ -682,16 +682,18 @@
    /* Choose which entry should be evicted from the cache.  */
    loc = &nis_server_cache[0];
    if (*loc != NULL)
@@ -42,11 +39,9 @@ index 3fa37e4..cb7839a 100644
    old = *loc;
    *loc = new;
  
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
 --- a/stdlib/setenv.c
 +++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
+@@ -328,18 +328,20 @@
    ep = __environ;
    if (ep != NULL)
      while (*ep != NULL)
@@ -54,7 +49,12 @@ index da61ee0..e66045f 100644
 -	{
 -	  /* Found it.  Remove this pointer by moving later ones back.  */
 -	  char **dp = ep;
--
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
 -	  do
 -	    dp[0] = dp[1];
 -	  while (*dp++);
@@ -62,12 +62,6 @@ index da61ee0..e66045f 100644
 -	}
 -      else
 -	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
 +	    do
 +		dp[0] = dp[1];
 +	    while (*dp++);
@@ -79,6 +73,3 @@ index da61ee0..e66045f 100644
  
    UNLOCK;
  
--- 
-2.7.4
-
diff --git a/packages/glibc-linaro/2.20-2014.11/102-fix-signed-shift-overlow.patch b/packages/glibc/2.12.1/0002-fix-signed-shift-overlow.patch
similarity index 84%
rename from packages/glibc-linaro/2.20-2014.11/102-fix-signed-shift-overlow.patch
rename to packages/glibc/2.12.1/0002-fix-signed-shift-overlow.patch
index ef49f831..5f76afe9 100644
--- a/packages/glibc-linaro/2.20-2014.11/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.12.1/0002-fix-signed-shift-overlow.patch
@@ -12,11 +12,16 @@ Date:   Tue Jul 21 22:50:29 2015 -0700
     * string/strchrnul.c (STRCHRNUL):
     Rewrite code to avoid issues with signed shift overflow.
 
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
 --- a/string/memrchr.c
 +++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
+@@ -98,15 +98,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -34,11 +39,9 @@ index 0c8fd84..86cd5b9 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
 --- a/string/rawmemchr.c
 +++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
+@@ -90,15 +90,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -56,11 +59,9 @@ index 05b22be..228ca9d 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
 --- a/string/strchr.c
 +++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
+@@ -65,13 +65,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -76,11 +77,9 @@ index 5f90075..f13b2b3 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
 --- a/string/strchrnul.c
 +++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
+@@ -63,13 +63,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
diff --git a/packages/glibc/2.13/104-unused-variables.patch b/packages/glibc/2.12.1/0003-unused-variables.patch
similarity index 79%
rename from packages/glibc/2.13/104-unused-variables.patch
rename to packages/glibc/2.12.1/0003-unused-variables.patch
index e063675a..18adb17f 100644
--- a/packages/glibc/2.13/104-unused-variables.patch
+++ b/packages/glibc/2.12.1/0003-unused-variables.patch
@@ -19,8 +19,18 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    6 ------
+ sysdeps/ieee754/flt-32/s_cosf.c        |    6 ------
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ 9 files changed, 1 insertion(+), 26 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,11 +44,9 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
-@@ -65,10 +65,8 @@
+@@ -69,10 +69,8 @@
  /**/ hpi1           = {{0x3c91a626, 0x33145c07} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0xbff921fb, 0x54442d18} }, /* -pi/2         */
  /**/ qpi            = {{0x3fe921fb, 0x54442d18} }, /*  pi/4         */
@@ -49,7 +57,7 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0xc002d97c, 0x7f3321d2} }, /* -3pi/4        */
  /**/ u1             = {{0x3c314c2a, 0x00000000} }, /*  9.377e-19    */
  /**/ u2             = {{0x3bf955e4, 0x00000000} }, /*  8.584e-20    */
-@@ -129,10 +127,8 @@
+@@ -139,10 +137,8 @@
  /**/ hpi1           = {{0x33145c07, 0x3c91a626} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0x54442d18, 0xbff921fb} }, /* -pi/2         */
  /**/ qpi            = {{0x54442d18, 0x3fe921fb} }, /*  pi/4         */
@@ -60,11 +68,9 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  
  #include "mydefs.h"
  
@@ -73,11 +79,9 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
-@@ -34,7 +34,6 @@
+@@ -36,7 +36,6 @@
  /**/ INF            = {{0x7ff00000, 0x00000000}}, /* INF           */
  /**/ nINF           = {{0xfff00000, 0x00000000}}, /* -INF          */
  /**/ NaNQ           = {{0x7ff80000, 0x00000000}}, /* NaNQ          */
@@ -85,7 +89,7 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0x3fe62e42, 0xfefa3800}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x3d2ef357, 0x93c76730}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0x4297ffff, 0xfffffd2c}}, /* 1.5*2**42 -724*2**-10  */
-@@ -48,7 +47,6 @@
+@@ -51,7 +50,6 @@
  /**/ INF            = {{0x00000000, 0x7ff00000}}, /* INF           */
  /**/ nINF           = {{0x00000000, 0xfff00000}}, /* -INF           */
  /**/ NaNQ           = {{0x00000000, 0x7ff80000}}, /* NaNQ          */
@@ -93,45 +97,39 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,12 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
- log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
+@@ -31,12 +31,6 @@
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
--#ifdef __STDC__
+ #ifdef __STDC__
 -static const float zero   =  0.0;
 -#else
 -static float zero   =  0.0;
 -#endif
 -
- #ifdef __STDC__
+-#ifdef __STDC__
  	float __ieee754_log10f(float x)
  #else
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
+ 	float __ieee754_log10f(x)
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,12 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
- #include "math.h"
+@@ -22,12 +22,6 @@
  #include "math_private.h"
  
--#ifdef __STDC__
+ #ifdef __STDC__
 -static const float one=1.0;
 -#else
 -static float one=1.0;
 -#endif
 -
- #ifdef __STDC__
+-#ifdef __STDC__
  	float __cosf(float x)
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
+ 	float __cosf(x)
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -74,7 +74,6 @@
  static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  static const long double one = 1.0L;
@@ -139,11 +137,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = 1.0e4000L;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -142,7 +142,6 @@
  static long double
  #endif
  tiny = 1e-4931L,
@@ -151,11 +147,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
diff --git a/packages/glibc/2.12.1/105-misleading-indentation.patch b/packages/glibc/2.12.1/0004-misleading-indentation.patch
similarity index 72%
rename from packages/glibc/2.12.1/105-misleading-indentation.patch
rename to packages/glibc/2.12.1/0004-misleading-indentation.patch
index 1dd8d851..35bcb1b8 100644
--- a/packages/glibc/2.12.1/105-misleading-indentation.patch
+++ b/packages/glibc/2.12.1/0004-misleading-indentation.patch
@@ -7,11 +7,13 @@ Date:   Fri Dec 11 09:19:37 2015 -0800
             * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
             Fix indentation.
 
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
 --- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
 +++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
+@@ -82,7 +82,9 @@
  
      /* compute q[0],q[1],...q[jk] */
  	for (i=0;i<=jk;i++) {
diff --git a/packages/glibc/2.12.1/106-dl-open-array-bounds.patch b/packages/glibc/2.12.1/0005-dl-open-array-bounds.patch
similarity index 88%
rename from packages/glibc/2.12.1/106-dl-open-array-bounds.patch
rename to packages/glibc/2.12.1/0005-dl-open-array-bounds.patch
index bdb5c19f..d1d3fb7f 100644
--- a/packages/glibc/2.12.1/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.12.1/0005-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -555,8 +555,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc/2.14.1/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.12.1/0006-i386-x86_64-revert-clone-cfi.patch
similarity index 56%
rename from packages/glibc/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
rename to packages/glibc/2.12.1/0006-i386-x86_64-revert-clone-cfi.patch
index c7f6182d..f872bac4 100644
--- a/packages/glibc/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.12.1/0006-i386-x86_64-revert-clone-cfi.patch
@@ -4,16 +4,13 @@ elsewhere.  this cfi code does not gain us a whole lot anyways.
 
 http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
 
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
+---
+ sysdeps/unix/sysv/linux/i386/clone.S   |    4 ----
+ sysdeps/unix/sysv/linux/x86_64/clone.S |    4 ----
+ 2 files changed, 8 deletions(-)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/i386/clone.S
++++ b/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@
  	ret
  
@@ -32,9 +29,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysde
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ b/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@
  	ret
  
diff --git a/packages/glibc/2.16.0/140-disable-ldconfig.patch b/packages/glibc/2.12.1/0007-disable-ldconfig.patch
similarity index 73%
rename from packages/glibc/2.16.0/140-disable-ldconfig.patch
rename to packages/glibc/2.12.1/0007-disable-ldconfig.patch
index 378e1df5..d60cb409 100644
--- a/packages/glibc/2.16.0/140-disable-ldconfig.patch
+++ b/packages/glibc/2.12.1/0007-disable-ldconfig.patch
@@ -3,9 +3,12 @@ file outside of the chroot.  doesnt matter anyways as we wont use the cache
 results (portage will rebuild cache), so running ldconfig is simply a waste
 of time.
 
-diff -durN glibc-2.13.orig/Makefile glibc-2.13/Makefile
---- glibc-2.13.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.13/Makefile	2009-11-13 00:49:49.000000000 +0100
+---
+ Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makefile
++++ b/Makefile
 @@ -116,6 +116,7 @@
  	rm -f $(symbolic-link-list)
  
diff --git a/packages/glibc/2.12.1/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.12.1/0008-Fix-combreloc-test-BSD-grep.patch
similarity index 69%
rename from packages/glibc/2.12.1/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.12.1/0008-Fix-combreloc-test-BSD-grep.patch
index 530d4ff1..35bb601b 100644
--- a/packages/glibc/2.12.1/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.12.1/0008-Fix-combreloc-test-BSD-grep.patch
@@ -13,15 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
---- glibc-2.12.2.orig/configure	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure	2017-03-08 21:18:07.000000000 -0800
-@@ -6710,7 +6710,7 @@ EOF
+--- a/configure
++++ b/configure
+@@ -6732,7 +6732,7 @@
    $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }
    then
@@ -30,10 +28,9 @@ diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
        libc_cv_z_combreloc=yes
      else
        libc_cv_z_combreloc=no
-diff -urpN glibc-2.12.2.orig/configure.in glibc-2.12.2/configure.in
---- glibc-2.12.2.orig/configure.in	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure.in	2017-03-08 21:18:17.000000000 -0800
-@@ -1671,7 +1671,7 @@ dnl cross-platform since the gcc used ca
+--- a/configure.in
++++ b/configure.in
+@@ -1687,7 +1687,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
diff --git a/packages/glibc/2.14.1/150-queue-header-updates.patch b/packages/glibc/2.12.1/0009-queue-header-updates.patch
similarity index 90%
rename from packages/glibc/2.14.1/150-queue-header-updates.patch
rename to packages/glibc/2.12.1/0009-queue-header-updates.patch
index 7cbe70ef..f6515e2b 100644
--- a/packages/glibc/2.14.1/150-queue-header-updates.patch
+++ b/packages/glibc/2.12.1/0009-queue-header-updates.patch
@@ -2,11 +2,12 @@ grab some updates from FreeBSD
 
 http://bugs.gentoo.org/201979
 
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
+---
+ misc/sys/queue.h |   36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
 
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
---- glibc-2.13.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.13/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
+--- a/misc/sys/queue.h
++++ b/misc/sys/queue.h
 @@ -136,6 +136,11 @@
  		(var);							\
  		(var) = ((var)->field.le_next))
diff --git a/packages/glibc/2.14.1/160-manual-no-perl.patch b/packages/glibc/2.12.1/0010-manual-no-perl.patch
similarity index 76%
rename from packages/glibc/2.14.1/160-manual-no-perl.patch
rename to packages/glibc/2.12.1/0010-manual-no-perl.patch
index 5e2b807d..14ddc6d5 100644
--- a/packages/glibc/2.14.1/160-manual-no-perl.patch
+++ b/packages/glibc/2.12.1/0010-manual-no-perl.patch
@@ -4,9 +4,12 @@ deal, so just whine a little and continue on our merry way.
 
 http://bugs.gentoo.org/60132
 
-diff -durN glibc-2.13.orig/manual/Makefile glibc-2.13/manual/Makefile
---- glibc-2.13.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
-+++ glibc-2.13/manual/Makefile	2009-11-13 00:49:54.000000000 +0100
+---
+ manual/Makefile |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/manual/Makefile
++++ b/manual/Makefile
 @@ -104,9 +104,14 @@
  libm-err.texi: stamp-libm-err
  stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
diff --git a/packages/glibc/2.15/170-localedef-fix-trampoline.patch b/packages/glibc/2.12.1/0011-localedef-fix-trampoline.patch
similarity index 87%
rename from packages/glibc/2.15/170-localedef-fix-trampoline.patch
rename to packages/glibc/2.12.1/0011-localedef-fix-trampoline.patch
index 3cc65597..3b8fd6e8 100644
--- a/packages/glibc/2.15/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.12.1/0011-localedef-fix-trampoline.patch
@@ -5,9 +5,12 @@
 # DP: Upstream status: Unknown
 # DP: Status Details: Unknown
 # DP: Date: 2004-03-16
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
+---
+# locale/programs/3level.h |   36 ++++++++++++++++++++++++++++++++++++
+# 1 file changed, 36 insertions(+)
+#
+--- a/locale/programs/3level.h
++++ b/locale/programs/3level.h
 @@ -203,6 +203,42 @@
  	}
      }
diff --git a/packages/glibc/2.16.0/180-resolv-dynamic.patch b/packages/glibc/2.12.1/0012-resolv-dynamic.patch
similarity index 81%
rename from packages/glibc/2.16.0/180-resolv-dynamic.patch
rename to packages/glibc/2.12.1/0012-resolv-dynamic.patch
index e916bce3..fcc2f80a 100644
--- a/packages/glibc/2.16.0/180-resolv-dynamic.patch
+++ b/packages/glibc/2.12.1/0012-resolv-dynamic.patch
@@ -5,9 +5,12 @@ already running get the updated information.
 
 http://bugs.gentoo.org/177416
 
-diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c
---- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
+---
+ resolv/res_libc.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+--- a/resolv/res_libc.c
++++ b/resolv/res_libc.c
 @@ -22,6 +22,7 @@
  #include <arpa/nameser.h>
  #include <resolv.h>
diff --git a/packages/glibc/2.14.1/190-localedef-mmap.patch b/packages/glibc/2.12.1/0013-localedef-mmap.patch
similarity index 82%
rename from packages/glibc/2.14.1/190-localedef-mmap.patch
rename to packages/glibc/2.12.1/0013-localedef-mmap.patch
index f3914cd1..74e586ee 100644
--- a/packages/glibc/2.14.1/190-localedef-mmap.patch
+++ b/packages/glibc/2.12.1/0013-localedef-mmap.patch
@@ -7,9 +7,12 @@ http://bugs.gentoo.org/289615
 	used later with MMAP_FIXED | MMAP_SHARED to cope with different
 	alignment restrictions.
 
-diff -durN glibc-2.13.orig/locale/programs/locarchive.c glibc-2.13/locale/programs/locarchive.c
---- glibc-2.13.orig/locale/programs/locarchive.c	2009-04-27 16:07:47.000000000 +0200
-+++ glibc-2.13/locale/programs/locarchive.c	2009-11-13 00:50:01.000000000 +0100
+---
+ locale/programs/locarchive.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/locale/programs/locarchive.c
++++ b/locale/programs/locarchive.c
 @@ -134,7 +134,7 @@
    size_t reserved = RESERVE_MMAP_SIZE;
    int xflags = 0;
diff --git a/packages/glibc/2.16.0/200-fadvise64_64.patch b/packages/glibc/2.12.1/0014-fadvise64_64.patch
similarity index 67%
rename from packages/glibc/2.16.0/200-fadvise64_64.patch
rename to packages/glibc/2.12.1/0014-fadvise64_64.patch
index 71bca381..191d8330 100644
--- a/packages/glibc/2.16.0/200-fadvise64_64.patch
+++ b/packages/glibc/2.12.1/0014-fadvise64_64.patch
@@ -3,9 +3,8 @@ ripped from Debian
  sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/posix_fadvise.c
++++ b/sysdeps/unix/sysv/linux/posix_fadvise.c
 @@ -35,6 +35,19 @@
      return INTERNAL_SYSCALL_ERRNO (ret, err);
    return 0;
diff --git a/packages/glibc/2.13/220-section-comments.patch b/packages/glibc/2.12.1/0015-section-comments.patch
similarity index 76%
rename from packages/glibc/2.13/220-section-comments.patch
rename to packages/glibc/2.12.1/0015-section-comments.patch
index d717829e..5960ed05 100644
--- a/packages/glibc/2.13/220-section-comments.patch
+++ b/packages/glibc/2.12.1/0015-section-comments.patch
@@ -3,9 +3,12 @@ http://sources.redhat.com/ml/binutils/2004-04/msg00665.html
 fixes building on some architectures (like m68k/arm/cris/etc...) because
 it does the right thing
 
-diff -durN glibc-2.13.orig/include/libc-symbols.h glibc-2.13/include/libc-symbols.h
---- glibc-2.13.orig/include/libc-symbols.h	2009-03-14 00:51:46.000000000 +0100
-+++ glibc-2.13/include/libc-symbols.h	2009-11-13 00:50:07.000000000 +0100
+---
+ include/libc-symbols.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/include/libc-symbols.h
++++ b/include/libc-symbols.h
 @@ -239,12 +239,12 @@
  #  define __make_section_unallocated(section_string)
  # endif
diff --git a/packages/glibc/2.13/230-no-inline-gmon.patch b/packages/glibc/2.12.1/0016-no-inline-gmon.patch
similarity index 71%
rename from packages/glibc/2.13/230-no-inline-gmon.patch
rename to packages/glibc/2.12.1/0016-no-inline-gmon.patch
index fa33c2b4..ed027040 100644
--- a/packages/glibc/2.13/230-no-inline-gmon.patch
+++ b/packages/glibc/2.12.1/0016-no-inline-gmon.patch
@@ -19,12 +19,12 @@ Kazu Hirata
 	* sysdeps/generic/initfini.c (call_gmon_start): Add
 	__attribute__ ((noinline)).
 
-Index: sysdeps/generic/initfini.c
-===================================================================
+---
+ sysdeps/generic/initfini.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/sysdeps/generic/initfini.c glibc-2.13/sysdeps/generic/initfini.c
---- glibc-2.13.orig/sysdeps/generic/initfini.c	2007-06-17 20:02:40.000000000 +0200
-+++ glibc-2.13/sysdeps/generic/initfini.c	2009-11-13 00:50:09.000000000 +0100
+--- a/sysdeps/generic/initfini.c
++++ b/sysdeps/generic/initfini.c
 @@ -70,7 +70,7 @@
  /* The beginning of _init:  */
  asm ("\n/*@_init_PROLOG_BEGINS*/");
diff --git a/packages/glibc/2.13/240-check_native-headers.patch b/packages/glibc/2.12.1/0017-check_native-headers.patch
similarity index 57%
rename from packages/glibc/2.13/240-check_native-headers.patch
rename to packages/glibc/2.12.1/0017-check_native-headers.patch
index c936f71e..2b1b6198 100644
--- a/packages/glibc/2.13/240-check_native-headers.patch
+++ b/packages/glibc/2.12.1/0017-check_native-headers.patch
@@ -4,9 +4,12 @@ many ports hit this warning:
 
 snipped from suse
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/check_native.c glibc-2.13/sysdeps/unix/sysv/linux/check_native.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/check_native.c	2007-11-24 04:12:17.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/check_native.c	2009-11-13 00:50:11.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/check_native.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sysdeps/unix/sysv/linux/check_native.c
++++ b/sysdeps/unix/sysv/linux/check_native.c
 @@ -23,6 +23,7 @@
  #include <stddef.h>
  #include <stdint.h>
diff --git a/packages/glibc/2.13/250-fix-pr631.patch b/packages/glibc/2.12.1/0018-fix-pr631.patch
similarity index 77%
rename from packages/glibc/2.13/250-fix-pr631.patch
rename to packages/glibc/2.12.1/0018-fix-pr631.patch
index a48912e1..636c45de 100644
--- a/packages/glibc/2.13/250-fix-pr631.patch
+++ b/packages/glibc/2.12.1/0018-fix-pr631.patch
@@ -14,9 +14,13 @@ when building glibc with --enable-static-nss.
 
 See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:13.000000000 +0100
+---
+ Makeconfig   |    2 +-
+ elf/Makefile |    7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+--- a/Makeconfig
++++ b/Makeconfig
 @@ -531,7 +531,7 @@
  
  # The static libraries.
@@ -26,9 +30,8 @@ diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
  else
  ifeq (yes,$(build-shared))
  # We can try to link the programs with lib*_pic.a...
-diff -durN glibc-2.13.orig/elf/Makefile glibc-2.13/elf/Makefile
---- glibc-2.13.orig/elf/Makefile	2009-01-31 01:20:55.000000000 +0100
-+++ glibc-2.13/elf/Makefile	2009-11-13 00:50:13.000000000 +0100
+--- a/elf/Makefile
++++ b/elf/Makefile
 @@ -146,6 +146,13 @@
  install-bin-script = ldd
  endif
diff --git a/packages/glibc/2.15/260-assume-pipe2.patch b/packages/glibc/2.12.1/0019-assume-pipe2.patch
similarity index 82%
rename from packages/glibc/2.15/260-assume-pipe2.patch
rename to packages/glibc/2.12.1/0019-assume-pipe2.patch
index 42e8f4ed..0074ea65 100644
--- a/packages/glibc/2.15/260-assume-pipe2.patch
+++ b/packages/glibc/2.12.1/0019-assume-pipe2.patch
@@ -20,9 +20,12 @@ __have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
 older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
 stub for it.  so popen() will always fail as glibc assumes pipe2() works.
 
-diff -durN glibc-2.13.orig/socket/have_sock_cloexec.c glibc-2.13/socket/have_sock_cloexec.c
---- glibc-2.13.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.13/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
+---
+ socket/have_sock_cloexec.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/socket/have_sock_cloexec.c
++++ b/socket/have_sock_cloexec.c
 @@ -16,9 +16,14 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
diff --git a/packages/glibc/2.16.0/270-china.patch b/packages/glibc/2.12.1/0020-china.patch
similarity index 70%
rename from packages/glibc/2.16.0/270-china.patch
rename to packages/glibc/2.12.1/0020-china.patch
index 41d77590..b323cf67 100644
--- a/packages/glibc/2.16.0/270-china.patch
+++ b/packages/glibc/2.12.1/0020-china.patch
@@ -1,8 +1,11 @@
 
 
-diff -durN glibc-2.13.orig/localedata/locales/zh_TW glibc-2.13/localedata/locales/zh_TW
---- glibc-2.13.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.13/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
+---
+ localedata/locales/zh_TW |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/localedata/locales/zh_TW
++++ b/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
diff --git a/packages/glibc/2.14.1/280-new-valencian-locale.patch b/packages/glibc/2.12.1/0021-new-valencian-locale.patch
similarity index 81%
rename from packages/glibc/2.14.1/280-new-valencian-locale.patch
rename to packages/glibc/2.12.1/0021-new-valencian-locale.patch
index 4cdd108e..bddc4c79 100644
--- a/packages/glibc/2.14.1/280-new-valencian-locale.patch
+++ b/packages/glibc/2.12.1/0021-new-valencian-locale.patch
@@ -1,9 +1,13 @@
 http://bugs.gentoo.org/show_bug.cgi?id=131815
 http://sourceware.org/bugzilla/show_bug.cgi?id=2522
 
-diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
---- glibc-2.13.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.13/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
+---
+ localedata/SUPPORTED              |    2 
+ localedata/locales/ca_ES@valencia |   96 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 98 insertions(+)
+
+--- a/localedata/SUPPORTED
++++ b/localedata/SUPPORTED
 @@ -72,6 +72,8 @@
  ca_ES.UTF-8/UTF-8 \
  ca_ES/ISO-8859-1 \
@@ -13,9 +17,8 @@ diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
  ca_FR.UTF-8/UTF-8 \
  ca_FR/ISO-8859-15 \
  ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.13.orig/localedata/locales/ca_ES@valencia glibc-2.13/localedata/locales/ca_ES@valencia
---- glibc-2.13.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
+--- /dev/null
++++ b/localedata/locales/ca_ES@valencia
 @@ -0,0 +1,96 @@
 +comment_char %
 +escape_char  /
diff --git a/packages/glibc/2.12.2/300-macos-cross-rpcgen.patch b/packages/glibc/2.12.1/0022-macos-cross-rpcgen.patch
similarity index 87%
rename from packages/glibc/2.12.2/300-macos-cross-rpcgen.patch
rename to packages/glibc/2.12.1/0022-macos-cross-rpcgen.patch
index e654644c..155b4f59 100644
--- a/packages/glibc/2.12.2/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.12.1/0022-macos-cross-rpcgen.patch
@@ -14,11 +14,13 @@ Date:   Sat Sep 7 00:01:08 2013 +0800
     Signed-off-by: Jia Liu <proljc@gmail.com>
     Signed-off-by: Mike Frysinger <vapier@gentoo.org>
 
-diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
-index 3dca5c4..beded52 100644
+---
+ sunrpc/rpc/types.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
 --- a/sunrpc/rpc/types.h
 +++ b/sunrpc/rpc/types.h
-@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t;
+@@ -68,6 +68,11 @@
  #include <sys/types.h>
  #endif
  
diff --git a/packages/glibc/2.13/300-nscd-one-fork.patch b/packages/glibc/2.12.1/0023-nscd-one-fork.patch
similarity index 81%
rename from packages/glibc/2.13/300-nscd-one-fork.patch
rename to packages/glibc/2.12.1/0023-nscd-one-fork.patch
index adc9b3f1..47217b3b 100644
--- a/packages/glibc/2.13/300-nscd-one-fork.patch
+++ b/packages/glibc/2.12.1/0023-nscd-one-fork.patch
@@ -2,9 +2,12 @@ only fork one to assist in stop-start-daemon assumptions about daemon behavior
 
 http://bugs.gentoo.org/190785
 
-diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
---- glibc-2.13.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.13/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
+---
+ nscd/nscd.c |   12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+--- a/nscd/nscd.c
++++ b/nscd/nscd.c
 @@ -182,6 +182,9 @@
        if (pid != 0)
  	exit (0);
diff --git a/packages/glibc/2.12.1/310-hppa-nptl-carlos.patch b/packages/glibc/2.12.1/0024-hppa-nptl-carlos.patch
similarity index 84%
rename from packages/glibc/2.12.1/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.12.1/0024-hppa-nptl-carlos.patch
index 947bb584..a01ac9b5 100644
--- a/packages/glibc/2.12.1/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.12.1/0024-hppa-nptl-carlos.patch
@@ -1,8 +1,17 @@
 
 
-diff -durN glibc-2.12.1.orig/elf/rtld.c glibc-2.12.1/elf/rtld.c
---- glibc-2.12.1.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.12.1/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
+---
+ elf/rtld.c                    |   10 +++++-----
+ include/atomic.h              |   26 +++++++++++++-------------
+ nptl/Makefile                 |   35 ++++++++++++++++++++++++++++++++---
+ nptl/pthread_barrier_wait.c   |    2 +-
+ nptl/sysdeps/pthread/Makefile |    2 ++
+ stdio-common/Makefile         |    2 +-
+ sunrpc/clnt_udp.c             |    2 +-
+ 7 files changed, 55 insertions(+), 24 deletions(-)
+
+--- a/elf/rtld.c
++++ b/elf/rtld.c
 @@ -390,14 +390,14 @@
       know it is available.  We do not have to clear the memory if we
       do not have to use the temporary bootstrap_map.  Global variables
@@ -23,9 +32,8 @@ diff -durN glibc-2.12.1.orig/elf/rtld.c glibc-2.12.1/elf/rtld.c
  # endif
  # if USE___THREAD
    bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.12.1.orig/include/atomic.h glibc-2.12.1/include/atomic.h
---- glibc-2.12.1.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.12.1/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
+--- a/include/atomic.h
++++ b/include/atomic.h
 @@ -185,7 +185,7 @@
       __typeof (*(mem)) __atg5_value = (newvalue);			      \
  									      \
@@ -143,9 +151,8 @@ diff -durN glibc-2.12.1.orig/include/atomic.h glibc-2.12.1/include/atomic.h
       while (__builtin_expect						      \
  	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
  						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.12.1.orig/nptl/Makefile glibc-2.12.1/nptl/Makefile
---- glibc-2.12.1.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.12.1/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/Makefile
++++ b/nptl/Makefile
 @@ -264,9 +264,9 @@
  # Files which must not be linked with libpthread.
  tests-nolibpthread = tst-unload
@@ -195,9 +202,8 @@ diff -durN glibc-2.12.1.orig/nptl/Makefile glibc-2.12.1/nptl/Makefile
  CFLAGS-tst-align.c += $(stack-align-test-flags)
  CFLAGS-tst-align3.c += $(stack-align-test-flags)
  CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.12.1.orig/nptl/pthread_barrier_wait.c glibc-2.12.1/nptl/pthread_barrier_wait.c
---- glibc-2.12.1.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.12.1/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/pthread_barrier_wait.c
++++ b/nptl/pthread_barrier_wait.c
 @@ -64,7 +64,7 @@
        do
  	lll_futex_wait (&ibarrier->curr_event, event,
@@ -207,9 +213,8 @@ diff -durN glibc-2.12.1.orig/nptl/pthread_barrier_wait.c glibc-2.12.1/nptl/pthre
      }
  
    /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.12.1.orig/nptl/sysdeps/pthread/Makefile glibc-2.12.1/nptl/sysdeps/pthread/Makefile
---- glibc-2.12.1.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.12.1/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/sysdeps/pthread/Makefile
++++ b/nptl/sysdeps/pthread/Makefile
 @@ -33,7 +33,9 @@
  
  ifeq ($(have-forced-unwind),yes)
@@ -220,9 +225,8 @@ diff -durN glibc-2.12.1.orig/nptl/sysdeps/pthread/Makefile glibc-2.12.1/nptl/sys
  endif
  endif
  
-diff -durN glibc-2.12.1.orig/stdio-common/Makefile glibc-2.12.1/stdio-common/Makefile
---- glibc-2.12.1.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.12.1/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
 @@ -82,7 +82,7 @@
  	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
  endif
@@ -232,9 +236,8 @@ diff -durN glibc-2.12.1.orig/stdio-common/Makefile glibc-2.12.1/stdio-common/Mak
  CFLAGS-vfwprintf.c = -Wno-uninitialized
  CFLAGS-tst-printf.c = -Wno-format
  CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.12.1.orig/sunrpc/clnt_udp.c glibc-2.12.1/sunrpc/clnt_udp.c
---- glibc-2.12.1.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.12.1/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
+--- a/sunrpc/clnt_udp.c
++++ b/sunrpc/clnt_udp.c
 @@ -456,7 +456,7 @@
        while (inlen < 0 && errno == EINTR);
        if (inlen < 0)
diff --git a/packages/glibc/2.16.0/340-dl_execstack-PaX-support.patch b/packages/glibc/2.12.1/0025-dl_execstack-PaX-support.patch
similarity index 74%
rename from packages/glibc/2.16.0/340-dl_execstack-PaX-support.patch
rename to packages/glibc/2.12.1/0025-dl_execstack-PaX-support.patch
index 2402af07..bfd75579 100644
--- a/packages/glibc/2.16.0/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.12.1/0025-dl_execstack-PaX-support.patch
@@ -8,9 +8,13 @@
 
 	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
 
-diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
---- glibc-2.13.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.13/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
+---
+ nptl/allocatestack.c                   |    3 ++-
+ sysdeps/unix/sysv/linux/dl-execstack.c |   19 ++++++++++++++++---
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+--- a/nptl/allocatestack.c
++++ b/nptl/allocatestack.c
 @@ -329,7 +329,8 @@
  # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
  #endif
@@ -21,9 +25,8 @@ diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
  
    return 0;
  }
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/dl-execstack.c
++++ b/sysdeps/unix/sysv/linux/dl-execstack.c
 @@ -63,7 +63,10 @@
        else
  # endif
diff --git a/packages/glibc/2.14.1/350-pre20040117-pt_pax.patch b/packages/glibc/2.12.1/0026-pre20040117-pt_pax.patch
similarity index 88%
rename from packages/glibc/2.14.1/350-pre20040117-pt_pax.patch
rename to packages/glibc/2.12.1/0026-pre20040117-pt_pax.patch
index f8f6b834..ec17d24a 100644
--- a/packages/glibc/2.14.1/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.12.1/0026-pre20040117-pt_pax.patch
@@ -1,8 +1,11 @@
 
 
-diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
---- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
+---
+ elf/elf.h |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/elf/elf.h
++++ b/elf/elf.h
 @@ -580,6 +580,7 @@
  #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
  #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
diff --git a/packages/glibc/2.13/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.12.1/0027-tests-sandbox-libdl-paths.patch
similarity index 67%
rename from packages/glibc/2.13/360-tests-sandbox-libdl-paths.patch
rename to packages/glibc/2.12.1/0027-tests-sandbox-libdl-paths.patch
index 9f78c52f..1c4ee594 100644
--- a/packages/glibc/2.13/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.12.1/0027-tests-sandbox-libdl-paths.patch
@@ -15,9 +15,23 @@ Fix by Wormo
 
 http://bugs.gentoo.org/56898
 
-diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
---- glibc-2.13.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.13/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
+---
+ grp/tst_fgetgrent.sh        |    3 ++-
+ iconvdata/run-iconv-test.sh |    2 +-
+ iconvdata/tst-table.sh      |    5 ++++-
+ intl/tst-codeset.sh         |    3 +++
+ intl/tst-gettext.sh         |    5 ++++-
+ intl/tst-gettext2.sh        |    5 ++++-
+ intl/tst-translit.sh        |    5 ++++-
+ malloc/tst-mtrace.sh        |    5 ++++-
+ nptl/tst-tls6.sh            |    4 ++--
+ posix/globtest.sh           |    2 +-
+ posix/tst-getconf.sh        |    5 ++++-
+ posix/wordexp-tst.sh        |    5 ++++-
+ 12 files changed, 37 insertions(+), 12 deletions(-)
+
+--- a/grp/tst_fgetgrent.sh
++++ b/grp/tst_fgetgrent.sh
 @@ -24,7 +24,8 @@
  rtld_installed_name=$1; shift
  
@@ -28,9 +42,8 @@ diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
  
  result=0
  
-diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-iconv-test.sh
---- glibc-2.13.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.13/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/iconvdata/run-iconv-test.sh
++++ b/iconvdata/run-iconv-test.sh
 @@ -34,7 +34,7 @@
  export GCONV_PATH
  
@@ -40,9 +53,8 @@ diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-
  
  # How the start the iconv(1) program.
  ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table.sh
---- glibc-2.13.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.13/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/iconvdata/tst-table.sh
++++ b/iconvdata/tst-table.sh
 @@ -59,8 +59,11 @@
    irreversible=${charset}.irreversible
  fi
@@ -56,9 +68,8 @@ diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table
  ${objpfx}tst-table-from ${charset} \
    > ${objpfx}tst-${charset}.table
  
-diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
---- glibc-2.13.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.13/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-codeset.sh
++++ b/intl/tst-codeset.sh
 @@ -37,6 +37,9 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -69,9 +80,8 @@ diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
  ${common_objpfx}elf/ld.so --library-path $common_objpfx \
  ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
  
-diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
---- glibc-2.13.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-gettext.sh
++++ b/intl/tst-gettext.sh
 @@ -51,9 +51,12 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -86,9 +96,8 @@ diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
  ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
  
  exit $?
-diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
---- glibc-2.13.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-gettext2.sh
++++ b/intl/tst-gettext2.sh
 @@ -65,8 +65,11 @@
  LOCPATH=${objpfx}domaindir
  export LOCPATH
@@ -102,9 +111,8 @@ diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
  ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
  cmp ${objpfx}tst-gettext2.out - <<EOF
  String1 - Lang1: 1st string
-diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
---- glibc-2.13.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.13/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-translit.sh
++++ b/intl/tst-translit.sh
 @@ -36,7 +36,10 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -117,9 +125,8 @@ diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
  ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
  
  exit $?
-diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
---- glibc-2.13.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.13/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/malloc/tst-mtrace.sh
++++ b/malloc/tst-mtrace.sh
 @@ -24,9 +24,12 @@
  status=0
  trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
@@ -134,9 +141,8 @@ diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
    ${common_objpfx}malloc/tst-mtrace || status=1
  
  if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
---- glibc-2.13.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.13/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/nptl/tst-tls6.sh
++++ b/nptl/tst-tls6.sh
 @@ -5,8 +5,8 @@
  rtld_installed_name=$1; shift
  logfile=$common_objpfx/nptl/tst-tls6.out
@@ -148,9 +154,8 @@ diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
  tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
  	  ${common_objpfx}/nptl/tst-tls5"
  
-diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
---- glibc-2.13.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.13/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/globtest.sh
++++ b/posix/globtest.sh
 @@ -18,7 +18,7 @@
  esac
  
@@ -160,9 +165,8 @@ diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
  
  # Since we use `sort' we must make sure to use the same locale everywhere.
  LC_ALL=C
-diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
---- glibc-2.13.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.13/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/tst-getconf.sh
++++ b/posix/tst-getconf.sh
 @@ -10,7 +10,10 @@
  else
    rtld_installed_name=$1; shift
@@ -175,9 +179,8 @@ diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
    }
  fi
  
-diff -durN glibc-2.13.orig/posix/wordexp-tst.sh glibc-2.13/posix/wordexp-tst.sh
---- glibc-2.13.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.13/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/wordexp-tst.sh
++++ b/posix/wordexp-tst.sh
 @@ -19,8 +19,11 @@
  "
  export IFS
diff --git a/packages/glibc/2.12.1/370-fnmatch.patch b/packages/glibc/2.12.1/0028-fnmatch.patch
similarity index 85%
rename from packages/glibc/2.12.1/370-fnmatch.patch
rename to packages/glibc/2.12.1/0028-fnmatch.patch
index f345b35c..992645a9 100644
--- a/packages/glibc/2.12.1/370-fnmatch.patch
+++ b/packages/glibc/2.12.1/0028-fnmatch.patch
@@ -10,12 +10,12 @@ Andreas.
 	* posix/fnmatch.c (fnmatch): If conversion to wide character
 	fails fall back to single byte matching.
 
-Index: posix/fnmatch.c
-===================================================================
+---
+ posix/fnmatch.c |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
-diff -durN glibc-2.12.1.orig/posix/fnmatch.c glibc-2.12.1/posix/fnmatch.c
---- glibc-2.12.1.orig/posix/fnmatch.c	2007-07-28 22:35:00.000000000 +0200
-+++ glibc-2.12.1/posix/fnmatch.c	2009-11-13 00:50:39.000000000 +0100
+--- a/posix/fnmatch.c
++++ b/posix/fnmatch.c
 @@ -327,6 +327,7 @@
  # if HANDLE_MULTIBYTE
    if (__builtin_expect (MB_CUR_MAX, 1) != 1)
diff --git a/packages/glibc/2.16.0/380-dont-build-timezone.patch b/packages/glibc/2.12.1/0029-dont-build-timezone.patch
similarity index 72%
rename from packages/glibc/2.16.0/380-dont-build-timezone.patch
rename to packages/glibc/2.12.1/0029-dont-build-timezone.patch
index 11c358ea..b0fb8fc0 100644
--- a/packages/glibc/2.16.0/380-dont-build-timezone.patch
+++ b/packages/glibc/2.12.1/0029-dont-build-timezone.patch
@@ -1,8 +1,11 @@
 timezone data has been split into the package sys-libs/timezone-data
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:41.000000000 +0100
+---
+ Makeconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makeconfig
++++ b/Makeconfig
 @@ -944,7 +944,7 @@
  	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
  	      grp pwd posix io termios resource misc socket sysvipc gmon    \
diff --git a/packages/glibc/2.16.0/400-alpha-xstat.patch b/packages/glibc/2.12.1/0030-alpha-xstat.patch
similarity index 57%
rename from packages/glibc/2.16.0/400-alpha-xstat.patch
rename to packages/glibc/2.12.1/0030-alpha-xstat.patch
index 6e4ab8fe..4fa9517e 100644
--- a/packages/glibc/2.16.0/400-alpha-xstat.patch
+++ b/packages/glibc/2.12.1/0030-alpha-xstat.patch
@@ -1,6 +1,9 @@
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -386,6 +386,11 @@
  # define __ASSUME_GETDENTS32_D_TYPE	1
  #endif
diff --git a/packages/glibc/2.12.1/0031-alpha-creat.patch b/packages/glibc/2.12.1/0031-alpha-creat.patch
new file mode 100644
index 00000000..6ef52782
--- /dev/null
+++ b/packages/glibc/2.12.1/0031-alpha-creat.patch
@@ -0,0 +1,17 @@
+alpha does not have a __NR_creat
+
+http://bugs.gentoo.org/227275
+http://sourceware.org/bugzilla/show_bug.cgi?id=6650
+
+---
+ sysdeps/unix/sysv/linux/wordsize-64/creat64.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
++++ b/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
+@@ -1 +1,5 @@
+ /* Defined as alias for the syscall.  */
++#include <sysdep.h>
++#ifndef __NR_creat
++#include "../../../../../io/creat64.c"
++#endif
diff --git a/packages/glibc/2.12.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.12.1/0032-alpha_alpha-add-fdatasync-support.patch
similarity index 74%
rename from packages/glibc/2.12.1/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.12.1/0032-alpha_alpha-add-fdatasync-support.patch
index 9d35ebdd..df9f1b20 100644
--- a/packages/glibc/2.12.1/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.12.1/0032-alpha_alpha-add-fdatasync-support.patch
@@ -13,9 +13,8 @@
  sysdeps/unix/sysv/linux/syscalls.list     |    1 
  4 files changed, 76 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.12.1/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/Makefile
++++ b/sysdeps/unix/sysv/linux/Makefile
 @@ -20,6 +20,7 @@
  		   setfsuid setfsgid makedev epoll_pwait signalfd \
  		   eventfd eventfd_read eventfd_write
@@ -24,9 +23,8 @@ diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.12.1/sysde
  CFLAGS-gethostid.c = -fexceptions
  
  sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.12.1/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/fdatasync.c
 @@ -0,0 +1,69 @@
 +/* fdatasync -- synchronize at least the data part of a file with 
 +   the underlying media. Linux version. 
@@ -97,9 +95,8 @@ diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.12.1/sy
 +
 +weak_alias (__fdatasync, fdatasync)
 +
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -459,6 +459,12 @@
  # define __ASSUME_FUTEX_LOCK_PI	1
  #endif
@@ -113,9 +110,8 @@ diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.1
  /* Support for utimensat syscall was added in 2.6.22, on SH
     only after 2.6.22-rc1.  */
  #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.12.1/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/syscalls.list
++++ b/sysdeps/unix/sysv/linux/syscalls.list
 @@ -11,7 +11,6 @@
  epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
  epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
diff --git a/packages/glibc/2.13/560-ppc-atomic.patch b/packages/glibc/2.12.1/0033-ppc-atomic.patch
similarity index 93%
rename from packages/glibc/2.13/560-ppc-atomic.patch
rename to packages/glibc/2.12.1/0033-ppc-atomic.patch
index ee1cb909..a38c1c53 100644
--- a/packages/glibc/2.13/560-ppc-atomic.patch
+++ b/packages/glibc/2.12.1/0033-ppc-atomic.patch
@@ -1,14 +1,13 @@
 sniped from suse
 
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
+---
+ sysdeps/powerpc/bits/atomic.h           |   66 ++++++++++-----------
+ sysdeps/powerpc/powerpc32/bits/atomic.h |   16 ++---
+ sysdeps/powerpc/powerpc64/bits/atomic.h |   98 ++++++++++++++++----------------
+ 3 files changed, 90 insertions(+), 90 deletions(-)
 
-diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powerpc/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/bits/atomic.h
++++ b/sysdeps/powerpc/bits/atomic.h
 @@ -85,14 +85,14 @@
        __typeof (*(mem)) __tmp;						      \
        __typeof (mem)  __memp = (mem);					      \
@@ -151,9 +150,8 @@ diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powe
  		       : "cr0", "memory");				      \
       __val;								      \
    })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/powerpc32/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc32/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp;							      \
@@ -192,9 +190,8 @@ diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sy
  		    : "cr0", "memory");					      \
    __tmp != 0;								      \
  })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/powerpc64/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc64/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp, __tmp2;						      \
diff --git a/packages/glibc/2.14.1/630-mips_shn_undef-hack.patch b/packages/glibc/2.12.1/0034-mips_shn_undef-hack.patch
similarity index 62%
rename from packages/glibc/2.14.1/630-mips_shn_undef-hack.patch
rename to packages/glibc/2.12.1/0034-mips_shn_undef-hack.patch
index 791d76cf..2f9d6568 100644
--- a/packages/glibc/2.14.1/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.12.1/0034-mips_shn_undef-hack.patch
@@ -1,10 +1,13 @@
-diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
---- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
+---
+ elf/dl-lookup.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/elf/dl-lookup.c
++++ b/elf/dl-lookup.c
 @@ -301,6 +301,12 @@
  	      /* FALLTHROUGH */
  	    case STB_GLOBAL:
-	    success:
+ 	    success:
 +#ifdef __mips__
 +	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
 +		 symbols, we skip them. */
diff --git a/packages/glibc/2.14.1/640-alpha-atfcts.patch b/packages/glibc/2.12.1/0035-alpha-atfcts.patch
similarity index 63%
rename from packages/glibc/2.14.1/640-alpha-atfcts.patch
rename to packages/glibc/2.12.1/0035-alpha-atfcts.patch
index 7a8a94a5..2eff9188 100644
--- a/packages/glibc/2.14.1/640-alpha-atfcts.patch
+++ b/packages/glibc/2.12.1/0035-alpha-atfcts.patch
@@ -1,5 +1,9 @@
---- glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -437,7 +437,8 @@
     the code.  On PPC they were introduced in 2.6.17-rc1,
     on SH in 2.6.19-rc1.  */
diff --git a/packages/glibc/2.12.1/650-syslog.patch b/packages/glibc/2.12.1/0036-syslog.patch
similarity index 57%
rename from packages/glibc/2.12.1/650-syslog.patch
rename to packages/glibc/2.12.1/0036-syslog.patch
index c20cafc8..a2d9722a 100644
--- a/packages/glibc/2.12.1/650-syslog.patch
+++ b/packages/glibc/2.12.1/0036-syslog.patch
@@ -1,6 +1,9 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
+---
+ misc/syslog.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/misc/syslog.c
++++ b/misc/syslog.c
 @@ -152,7 +152,7 @@
  #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
  	/* Check for invalid bits. */
diff --git a/packages/glibc/2.12.1/0037-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.12.1/0037-debug-readlink_chk-readklinkat_chk.patch
new file mode 100644
index 00000000..0b930f38
--- /dev/null
+++ b/packages/glibc/2.12.1/0037-debug-readlink_chk-readklinkat_chk.patch
@@ -0,0 +1,27 @@
+---
+ debug/readlink_chk.c   |    2 +-
+ debug/readlinkat_chk.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/debug/readlink_chk.c
++++ b/debug/readlink_chk.c
+@@ -25,7 +25,7 @@
+ 
+ 
+ ssize_t
+-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
++__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
+ {
+   if (len > buflen)
+     __chk_fail ();
+--- a/debug/readlinkat_chk.c
++++ b/debug/readlinkat_chk.c
+@@ -21,7 +21,7 @@
+ 
+ 
+ ssize_t
+-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
++__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
+ 		  size_t buflen)
+ {
+   if (len > buflen)
diff --git a/packages/glibc/2.12.1/900-march-i686.patch b/packages/glibc/2.12.1/0038-march-i686.patch
similarity index 55%
rename from packages/glibc/2.12.1/900-march-i686.patch
rename to packages/glibc/2.12.1/0038-march-i686.patch
index 7f5b1cee..e5ad2e07 100644
--- a/packages/glibc/2.12.1/900-march-i686.patch
+++ b/packages/glibc/2.12.1/0038-march-i686.patch
@@ -3,9 +3,13 @@
        * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
        * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
 
-diff -urN glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:36:19.858708534 +0100
+---
+ nptl/sysdeps/pthread/pt-initfini.c    |    5 +++++
+ sysdeps/unix/sysv/linux/i386/sysdep.h |    4 ++++
+ 2 files changed, 9 insertions(+)
+
+--- a/nptl/sysdeps/pthread/pt-initfini.c
++++ b/nptl/sysdeps/pthread/pt-initfini.c
 @@ -45,6 +45,11 @@
  /* Embed an #include to pull in the alignment and .end directives. */
  asm ("\n#include \"defs.h\"");
@@ -18,9 +22,8 @@ diff -urN glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.1/nptl
  /* The initial common code ends here. */
  asm ("\n/*@HEADER_ENDS*/");
  
-diff -urN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:36:19.858708534 +0100
+--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
++++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
 @@ -29,6 +29,10 @@
  #include <dl-sysdep.h>
  #include <tls.h>
diff --git a/packages/glibc/2.12.2/910-typedef-caddr.patch b/packages/glibc/2.12.1/0039-typedef-caddr.patch
similarity index 51%
rename from packages/glibc/2.12.2/910-typedef-caddr.patch
rename to packages/glibc/2.12.1/0039-typedef-caddr.patch
index 4bc75cbd..5139bbd5 100644
--- a/packages/glibc/2.12.2/910-typedef-caddr.patch
+++ b/packages/glibc/2.12.1/0039-typedef-caddr.patch
@@ -1,6 +1,10 @@
-diff -urN glibc-2.12.2-orig/posix/sys/types.h glibc-2.12.2/posix/sys/types.h
---- glibc-2.12.2-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.2/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+---
+ posix/sys/types.h  |    3 +++
+ sunrpc/rpc/types.h |    3 +++
+ 2 files changed, 6 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
 @@ -114,7 +114,10 @@
  #ifdef	__USE_BSD
  # ifndef __daddr_t_defined
@@ -12,10 +16,9 @@ diff -urN glibc-2.12.2-orig/posix/sys/types.h glibc-2.12.2/posix/sys/types.h
  #  define __daddr_t_defined
  # endif
  #endif
-diff -urN glibc-2.12.2-orig/sunrpc/rpc/types.h glibc-2.12.2/sunrpc/rpc/types.h
---- glibc-2.12.2-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.2/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
-@@ -80,7 +80,10 @@
+--- a/sunrpc/rpc/types.h
++++ b/sunrpc/rpc/types.h
+@@ -85,7 +85,10 @@
  #endif
  #ifndef __daddr_t_defined
  typedef __daddr_t daddr_t;
diff --git a/packages/glibc/2.12.2/920-fix-rpc_parse-format.patch b/packages/glibc/2.12.1/0040-fix-rpc_parse-format.patch
similarity index 95%
rename from packages/glibc/2.12.2/920-fix-rpc_parse-format.patch
rename to packages/glibc/2.12.1/0040-fix-rpc_parse-format.patch
index 37e58dac..906fb706 100644
--- a/packages/glibc/2.12.2/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.12.1/0040-fix-rpc_parse-format.patch
@@ -45,11 +45,13 @@ Date:   Tue Nov 8 23:44:51 2016 +0000
             [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
             [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
 
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/sunrpc/rpc_parse.c
 +++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
+@@ -520,7 +520,7 @@
  get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
  {
    token tok;
diff --git a/packages/glibc/2.12.1/920-make-382.patch b/packages/glibc/2.12.1/0041-make-382.patch
similarity index 71%
rename from packages/glibc/2.12.1/920-make-382.patch
rename to packages/glibc/2.12.1/0041-make-382.patch
index 28be2fed..9ce2d882 100644
--- a/packages/glibc/2.12.1/920-make-382.patch
+++ b/packages/glibc/2.12.1/0041-make-382.patch
@@ -1,8 +1,12 @@
 http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=blob_plain;f=source/base/glibc/make-3.82-fix.patch;hb=8217c32ecc2e14962847ba3d8a272eb64a3dba4f
 
---- glibc-2.10.1.OLD/manual/Makefile
-+++ glibc-2.10.1.NEW/manual/Makefile
-@@ -232,7 +232,9 @@
+---
+ manual/Makefile |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/manual/Makefile
++++ b/manual/Makefile
+@@ -237,7 +237,9 @@
  .PHONY: stubs
  stubs: $(objpfx)stubs
  endif
diff --git a/packages/glibc-linaro/2.20-2014.11/940-nis-bogus-conditional.patch b/packages/glibc/2.12.1/0042-nis-bogus-conditional.patch
similarity index 91%
rename from packages/glibc-linaro/2.20-2014.11/940-nis-bogus-conditional.patch
rename to packages/glibc/2.12.1/0042-nis-bogus-conditional.patch
index 09b38cf1..732b859b 100644
--- a/packages/glibc-linaro/2.20-2014.11/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.12.1/0042-nis-bogus-conditional.patch
@@ -47,11 +47,13 @@ Date:   Wed Dec 21 23:44:01 2016 +0000
             * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
             Compare name == NULL, not name != NULL.
 
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/nis/nss_nisplus/nisplus-alias.c
 +++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
+@@ -293,7 +293,7 @@
  	return status;
      }
  
diff --git a/packages/glibc/2.12.1/998-obstack-common.patch b/packages/glibc/2.12.1/0043-obstack-common.patch
similarity index 87%
rename from packages/glibc/2.12.1/998-obstack-common.patch
rename to packages/glibc/2.12.1/0043-obstack-common.patch
index 4b95f062..1993be24 100644
--- a/packages/glibc/2.12.1/998-obstack-common.patch
+++ b/packages/glibc/2.12.1/0043-obstack-common.patch
@@ -15,11 +15,13 @@ Date:   Wed May 15 20:28:08 2013 +0200
             * malloc/obstack.c (_obstack_compat): Add initializer.
     -
 
-diff --git a/malloc/obstack.c b/malloc/obstack.c
-index 25a90514f7..c3c7db4a96 100644
+---
+ malloc/obstack.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/malloc/obstack.c
 +++ b/malloc/obstack.c
-@@ -115,7 +115,7 @@ int obstack_exit_failure = EXIT_FAILURE;
+@@ -117,7 +117,7 @@
  /* A looong time ago (before 1994, anyway; we're not sure) this global variable
     was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
     library still exports it because somebody might use it.  */
diff --git a/packages/glibc/2.12.1/999-new-tools.patch b/packages/glibc/2.12.1/0044-new-tools.patch
similarity index 78%
rename from packages/glibc/2.12.1/999-new-tools.patch
rename to packages/glibc/2.12.1/0044-new-tools.patch
index d600b58a..2ff427e9 100644
--- a/packages/glibc/2.12.1/999-new-tools.patch
+++ b/packages/glibc/2.12.1/0044-new-tools.patch
@@ -1,7 +1,11 @@
-diff -urpN glibc-2.12.1.orig/configure glibc-2.12.1/configure
---- glibc-2.12.1.orig/configure	2010-07-27 04:34:39.000000000 -0700
-+++ glibc-2.12.1/configure	2017-02-08 00:37:58.117495908 -0800
-@@ -5079,7 +5079,7 @@ $as_echo_n "checking version of $CC... "
+---
+ configure    |    8 ++++----
+ configure.in |    8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -5079,7 +5079,7 @@
    ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -10,7 +14,7 @@ diff -urpN glibc-2.12.1.orig/configure glibc-2.12.1/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5142,7 +5142,7 @@ $as_echo_n "checking version of $MAKE...
+@@ -5142,7 +5142,7 @@
    ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -19,7 +23,7 @@ diff -urpN glibc-2.12.1.orig/configure glibc-2.12.1/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5269,7 +5269,7 @@ $as_echo_n "checking version of $MAKEINF
+@@ -5269,7 +5269,7 @@
    ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -28,7 +32,7 @@ diff -urpN glibc-2.12.1.orig/configure glibc-2.12.1/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5329,7 +5329,7 @@ else
+@@ -5329,7 +5329,7 @@
    # Found it, now check the version.
    { $as_echo "$as_me:$LINENO: checking version of $SED" >&5
  $as_echo_n "checking version of $SED... " >&6; }
@@ -37,10 +41,9 @@ diff -urpN glibc-2.12.1.orig/configure glibc-2.12.1/configure
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
      3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.12.1.orig/configure.in glibc-2.12.1/configure.in
---- glibc-2.12.1.orig/configure.in	2010-07-27 04:34:39.000000000 -0700
-+++ glibc-2.12.1/configure.in	2017-02-08 00:28:47.131374866 -0800
-@@ -960,11 +960,11 @@ fi
+--- a/configure.in
++++ b/configure.in
+@@ -960,11 +960,11 @@
  # These programs are version sensitive.
  AC_CHECK_TOOL_PREFIX
  AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
@@ -54,7 +57,7 @@ diff -urpN glibc-2.12.1.orig/configure.in glibc-2.12.1/configure.in
  
  AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
    [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -972,10 +972,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
+@@ -972,10 +972,10 @@
    MSGFMT=: aux_missing="$aux_missing msgfmt")
  AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
    [GNU texinfo.* \([0-9][0-9.]*\)],
diff --git a/packages/glibc/2.12.1/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.12.1/120-i386-x86_64-revert-clone-cfi.patch
deleted file mode 100644
index 95f5aced..00000000
--- a/packages/glibc/2.12.1/120-i386-x86_64-revert-clone-cfi.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-revert cfi additions to clone on i386/x86_64 to workaround problems in
-gcc's unwinder code.  this is not a bug in glibc, it triggers problems
-elsewhere.  this cfi code does not gain us a whole lot anyways.
-
-http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
-
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
-
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.12.1/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.12.1/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/packages/glibc/2.12.1/140-disable-ldconfig.patch b/packages/glibc/2.12.1/140-disable-ldconfig.patch
deleted file mode 100644
index 43330b87..00000000
--- a/packages/glibc/2.12.1/140-disable-ldconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-do not bother running ldconfig on DESTDIR.  it wants to write the temp cache
-file outside of the chroot.  doesnt matter anyways as we wont use the cache
-results (portage will rebuild cache), so running ldconfig is simply a waste
-of time.
-
-diff -durN glibc-2.12.1.orig/Makefile glibc-2.12.1/Makefile
---- glibc-2.12.1.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.12.1/Makefile	2009-11-13 00:49:49.000000000 +0100
-@@ -116,6 +116,7 @@
- 	rm -f $(symbolic-link-list)
- 
- install:
-+dont-bother-with-destdir:
- 	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
- 	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
- 				       $(slibdir) $(libdir)
diff --git a/packages/glibc/2.12.1/150-queue-header-updates.patch b/packages/glibc/2.12.1/150-queue-header-updates.patch
deleted file mode 100644
index fe625e17..00000000
--- a/packages/glibc/2.12.1/150-queue-header-updates.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-grab some updates from FreeBSD
-
-http://bugs.gentoo.org/201979
-
-diff -durN glibc-2.12.1.orig/misc/sys/queue.h glibc-2.12.1/misc/sys/queue.h
-
-diff -durN glibc-2.12.1.orig/misc/sys/queue.h glibc-2.12.1/misc/sys/queue.h
---- glibc-2.12.1.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.12.1/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
-@@ -136,6 +136,11 @@
- 		(var);							\
- 		(var) = ((var)->field.le_next))
- 
-+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = LIST_FIRST((head));				\
-+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
- /*
-  * List access methods.
-  */
-@@ -197,6 +202,16 @@
- #define	SLIST_FOREACH(var, head, field)					\
- 	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
- 
-+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = SLIST_FIRST((head));				\
-+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
-+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-+	for ((varp) = &SLIST_FIRST((head));				\
-+	    ((var) = *(varp)) != NULL;					\
-+	    (varp) = &SLIST_NEXT((var), field))
-+
- /*
-  * Singly-linked List access methods.
-  */
-@@ -242,6 +257,12 @@
- 	(head)->stqh_last = &(elm)->field.stqe_next;			\
- } while (/*CONSTCOND*/0)
- 
-+#define	STAILQ_LAST(head, type, field)					\
-+	(STAILQ_EMPTY((head)) ?						\
-+		NULL :							\
-+	        ((struct type *)(void *)				\
-+		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-+
- #define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
- 	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
- 		(head)->stqh_last = &(elm)->field.stqe_next;		\
-@@ -271,6 +292,11 @@
- 		(var);							\
- 		(var) = ((var)->field.stqe_next))
- 
-+#define STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = STAILQ_FIRST((head));				\
-+		(var) && ((tvar) = STAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	STAILQ_CONCAT(head1, head2) do {				\
- 	if (!STAILQ_EMPTY((head2))) {					\
- 		*(head1)->stqh_last = (head2)->stqh_first;		\
-@@ -437,11 +463,21 @@
- 		(var);							\
- 		(var) = ((var)->field.tqe_next))
- 
-+#define TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = TAILQ_FIRST((head));				\
-+		(var) && ((tvar) = TAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
- 	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
- 		(var);							\
- 		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
- 
-+#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-+	for ((var) = TAILQ_LAST((head), headname);			\
-+		(var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_CONCAT(head1, head2, field) do {				\
- 	if (!TAILQ_EMPTY(head2)) {					\
- 		*(head1)->tqh_last = (head2)->tqh_first;		\
diff --git a/packages/glibc/2.12.1/170-localedef-fix-trampoline.patch b/packages/glibc/2.12.1/170-localedef-fix-trampoline.patch
deleted file mode 100644
index fb0881d2..00000000
--- a/packages/glibc/2.12.1/170-localedef-fix-trampoline.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# DP: Description: Fix localedef segfault when run under exec-shield,
-#        PaX or similar. (#231438, #198099)
-# DP: Dpatch Author: James Troup <james@nocrew.org>
-# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
-# DP: Upstream status: Unknown
-# DP: Status Details: Unknown
-# DP: Date: 2004-03-16
-diff -durN glibc-2.12.1.orig/locale/programs/3level.h glibc-2.12.1/locale/programs/3level.h
---- glibc-2.12.1.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.12.1/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
-@@ -203,6 +203,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE
diff --git a/packages/glibc/2.12.1/180-resolv-dynamic.patch b/packages/glibc/2.12.1/180-resolv-dynamic.patch
deleted file mode 100644
index 8f74a537..00000000
--- a/packages/glibc/2.12.1/180-resolv-dynamic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from SuSE
-
-if /etc/resolv.conf is updated, then make sure applications
-already running get the updated information.
-
-http://bugs.gentoo.org/177416
-
-diff -durN glibc-2.12.1.orig/resolv/res_libc.c glibc-2.12.1/resolv/res_libc.c
---- glibc-2.12.1.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.12.1/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <bits/libc-lock.h>
-+#include <sys/stat.h>
- 
- 
- /* The following bit is copied from res_data.c (where it is #ifdef'ed
-@@ -95,6 +96,20 @@
- __res_maybe_init (res_state resp, int preinit)
- {
- 	if (resp->options & RES_INIT) {
-+		static time_t last_mtime, last_check;
-+		time_t now;
-+		struct stat statbuf;
-+		
-+		time (&now);
-+		if (now != last_check) {
-+			last_check = now;
-+			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
-+				last_mtime = statbuf.st_mtime;
-+				atomicinclock (lock);
-+				atomicinc (__res_initstamp);
-+				atomicincunlock (lock);
-+			}
-+		}
- 		if (__res_initstamp != resp->_u._ext.initstamp) {
- 			if (resp->nscount > 0)
- 				__res_iclose (resp, true);
diff --git a/packages/glibc/2.12.1/200-fadvise64_64.patch b/packages/glibc/2.12.1/200-fadvise64_64.patch
deleted file mode 100644
index a9f10cd9..00000000
--- a/packages/glibc/2.12.1/200-fadvise64_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-ripped from Debian
-
- sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.12.1/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
-@@ -35,6 +35,19 @@
-     return INTERNAL_SYSCALL_ERRNO (ret, err);
-   return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+  INTERNAL_SYSCALL_DECL (err);  
-+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+			      __LONG_LONG_PAIR ((long) (offset >> 31),
-+						(long) offset),
-+			      __LONG_LONG_PAIR ((long) (len >> 31),
-+						(long) len),
-+			      advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+# else
-   return ENOSYS;
-+# endif
- #endif
- }
diff --git a/packages/glibc/2.12.1/270-china.patch b/packages/glibc/2.12.1/270-china.patch
deleted file mode 100644
index 4cde1cfe..00000000
--- a/packages/glibc/2.12.1/270-china.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.12.1.orig/localedata/locales/zh_TW glibc-2.12.1/localedata/locales/zh_TW
---- glibc-2.12.1.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.12.1/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
-@@ -1,7 +1,7 @@
- comment_char %
- escape_char /
- %
--% Chinese language locale for Taiwan R.O.C.
-+% Chinese language locale for Taiwan
- % charmap: BIG5-CP950
- %
- % Original Author:
-@@ -17,7 +17,7 @@
- % Reference:	http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
- 
- LC_IDENTIFICATION
--title      "Chinese locale for Taiwan R.O.C."
-+title      "Chinese locale for Taiwan"
- source     ""
- address    ""
- contact    ""
-@@ -25,7 +25,7 @@
- tel        ""
- fax        ""
- language   "Chinese"
--territory  "Taiwan R.O.C."
-+territory  "Taiwan"
- revision   "0.2"
- date       "2000-08-02"
- %
diff --git a/packages/glibc/2.12.1/280-new-valencian-locale.patch b/packages/glibc/2.12.1/280-new-valencian-locale.patch
deleted file mode 100644
index 6b46b44d..00000000
--- a/packages/glibc/2.12.1/280-new-valencian-locale.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=131815
-http://sourceware.org/bugzilla/show_bug.cgi?id=2522
-
-diff -durN glibc-2.12.1.orig/localedata/SUPPORTED glibc-2.12.1/localedata/SUPPORTED
---- glibc-2.12.1.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.12.1/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
-@@ -72,6 +72,8 @@
- ca_ES.UTF-8/UTF-8 \
- ca_ES/ISO-8859-1 \
- ca_ES@euro/ISO-8859-15 \
-+ca_ES.UTF-8@valencia/UTF-8 \
-+ca_ES@valencia/ISO-8859-15 \
- ca_FR.UTF-8/UTF-8 \
- ca_FR/ISO-8859-15 \
- ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.12.1.orig/localedata/locales/ca_ES@valencia glibc-2.12.1/localedata/locales/ca_ES@valencia
---- glibc-2.12.1.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.12.1/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
-@@ -0,0 +1,96 @@
-+comment_char %
-+escape_char  /
-+%
-+% Valencian (southern Catalan) locale for Spain with Euro
-+%
-+% Note that this locale is almost the same as ca_ES@euro.  The point of having
-+% a separate locale is only for PO translations, which have a lot of social
-+% support and are very appreciated by the Valencian-speaking community.
-+%
-+% Contact: Jordi Mallach
-+% Email: jordi@gnu.org
-+% Tel:
-+% Fax:
-+% Language: ca
-+% Territory: ES
-+% Option: euro
-+% Revision: 1.0
-+% Date: 2006-04-06
-+% Application: general
-+% Users: general
-+% Repertoiremap: mnemonic,ds
-+% Charset: ISO-8859-15
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+LC_IDENTIFICATION
-+title      "Valencian (southern Catalan) locale for Spain with Euro"
-+source     ""
-+address    ""
-+contact    "Jordi Mallach"
-+email      "jordi@gnu.org"
-+tel        ""
-+fax        ""
-+language   "Catalan"
-+territory  "Spain"
-+revision   "1.0"
-+date       "2006-04-06"
-+%
-+category  "ca_ES@valencia:2006";LC_IDENTIFICATION
-+category  "ca_ES@valencia:2006";LC_CTYPE
-+category  "ca_ES@valencia:2006";LC_COLLATE
-+category  "ca_ES@valencia:2006";LC_MONETARY
-+category  "ca_ES@valencia:2006";LC_NUMERIC
-+category  "ca_ES@valencia:2006";LC_TIME
-+category  "ca_ES@valencia:2006";LC_MESSAGES
-+category  "ca_ES@valencia:2006";LC_PAPER
-+category  "ca_ES@valencia:2006";LC_NAME
-+category  "ca_ES@valencia:2006";LC_ADDRESS
-+category  "ca_ES@valencia:2006";LC_TELEPHONE
-+category  "ca_ES@valencia:2006";LC_MEASUREMENT
-+
-+END LC_IDENTIFICATION
-+
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
-+LC_COLLATE
-+copy "ca_ES"
-+END LC_COLLATE
-+
-+LC_MONETARY
-+copy "ca_ES"
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+copy "ca_ES"
-+END LC_NUMERIC
-+
-+LC_TIME
-+copy "ca_ES"
-+END LC_TIME
-+
-+LC_MESSAGES
-+copy "ca_ES"
-+END LC_MESSAGES
-+
-+LC_PAPER
-+copy "ca_ES"
-+END LC_PAPER
-+
-+LC_NAME
-+copy "ca_ES"
-+END LC_NAME
-+
-+LC_ADDRESS
-+copy "ca_ES"
-+END LC_ADDRESS
-+
-+LC_TELEPHONE
-+copy "ca_ES"
-+END LC_TELEPHONE
-+
-+LC_MEASUREMENT
-+copy "ca_ES"
-+END LC_MEASUREMENT
diff --git a/packages/glibc/2.12.1/340-dl_execstack-PaX-support.patch b/packages/glibc/2.12.1/340-dl_execstack-PaX-support.patch
deleted file mode 100644
index afdb39c4..00000000
--- a/packages/glibc/2.12.1/340-dl_execstack-PaX-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-	With latest versions of glibc, a lot of apps failed on a PaX enabled
-	system with:
-		 cannot enable executable stack as shared object requires: Permission denied
-	
-	This is due to PaX 'exec-protecting' the stack, and ld.so then trying
-	to make the stack executable due to some libraries not containing the
-	PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
-
-	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
-
-diff -durN glibc-2.12.1.orig/nptl/allocatestack.c glibc-2.12.1/nptl/allocatestack.c
---- glibc-2.12.1.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.12.1/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -329,7 +329,8 @@
- # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
- #endif
-   if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
--    return errno;
-+    if (errno != EACCES) /* PAX is enabled */
-+    	return errno;
- 
-   return 0;
- }
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.12.1/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -63,7 +63,10 @@
-       else
- # endif
- 	{
--	  result = errno;
-+	  if (errno == EACCES)  /* PAX is enabled */
-+	    result = 0;
-+	  else
-+	    result = errno;
- 	  goto out;
- 	}
-     }
-@@ -89,7 +92,12 @@
- 	page -= size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
-@@ -115,7 +123,12 @@
- 	page += size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
diff --git a/packages/glibc/2.12.1/350-pre20040117-pt_pax.patch b/packages/glibc/2.12.1/350-pre20040117-pt_pax.patch
deleted file mode 100644
index 3f031694..00000000
--- a/packages/glibc/2.12.1/350-pre20040117-pt_pax.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.12.1.orig/elf/elf.h glibc-2.12.1/elf/elf.h
---- glibc-2.12.1.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.12.1/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
-@@ -580,6 +580,7 @@
- #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-+#define PT_PAX_FLAGS	0x65041580	/* Indicates PaX flag markings */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-@@ -593,6 +594,18 @@
- #define PF_X		(1 << 0)	/* Segment is executable */
- #define PF_W		(1 << 1)	/* Segment is writable */
- #define PF_R		(1 << 2)	/* Segment is readable */
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
- #define PF_MASKOS	0x0ff00000	/* OS-specific */
- #define PF_MASKPROC	0xf0000000	/* Processor-specific */
- 
diff --git a/packages/glibc/2.12.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.12.1/360-tests-sandbox-libdl-paths.patch
deleted file mode 100644
index a847cdba..00000000
--- a/packages/glibc/2.12.1/360-tests-sandbox-libdl-paths.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-when glibc runs its tests, it does so by invoking the local library loader.
-in Gentoo, we build/run inside of our "sandbox" which itself is linked against
-libdl (so that it can load libraries and pull out symbols).  the trouble
-is that when you upgrade from an older glibc to the new one, often times
-internal symbols change name or abi.  this is normally OK as you cannot use
-libc.so from say version 2.3.6 but libpthread.so from say version 2.5, so
-we always say "keep all of the glibc libraries from the same build".  but
-when glibc runs its tests, it uses dynamic paths to point to its new local
-copies of libraries.  if the test doesnt use libdl, then glibc doesnt add
-its path, and when sandbox triggers the loading of libdl, glibc does so
-from the host system system.  this gets us into the case of all libraries
-are from the locally compiled version of glibc except for libdl.so.
-
-Fix by Wormo
-
-http://bugs.gentoo.org/56898
-
-diff -durN glibc-2.12.1.orig/grp/tst_fgetgrent.sh glibc-2.12.1/grp/tst_fgetgrent.sh
---- glibc-2.12.1.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.12.1/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,7 +24,8 @@
- rtld_installed_name=$1; shift
- 
- testout=${common_objpfx}/grp/tst_fgetgrent.out
--library_path=${common_objpfx}
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
- 
- result=0
- 
-diff -durN glibc-2.12.1.orig/iconvdata/run-iconv-test.sh glibc-2.12.1/iconvdata/run-iconv-test.sh
---- glibc-2.12.1.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.12.1/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -34,7 +34,7 @@
- export GCONV_PATH
- 
- # We have to have some directories in the library path.
--LIBPATH=$codir:$codir/iconvdata
-+LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn
- 
- # How the start the iconv(1) program.
- ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.12.1.orig/iconvdata/tst-table.sh glibc-2.12.1/iconvdata/tst-table.sh
---- glibc-2.12.1.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.12.1/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -59,8 +59,11 @@
-   irreversible=${charset}.irreversible
- fi
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # iconv in one direction.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-table-from ${charset} \
-   > ${objpfx}tst-${charset}.table
- 
-diff -durN glibc-2.12.1.orig/intl/tst-codeset.sh glibc-2.12.1/intl/tst-codeset.sh
---- glibc-2.12.1.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.12.1/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -37,6 +37,9 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- ${common_objpfx}elf/ld.so --library-path $common_objpfx \
- ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
- 
-diff -durN glibc-2.12.1.orig/intl/tst-gettext.sh glibc-2.12.1/intl/tst-gettext.sh
---- glibc-2.12.1.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.12.1/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -51,9 +51,12 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
- MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.12.1.orig/intl/tst-gettext2.sh glibc-2.12.1/intl/tst-gettext2.sh
---- glibc-2.12.1.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.12.1/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -65,8 +65,11 @@
- LOCPATH=${objpfx}domaindir
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
- cmp ${objpfx}tst-gettext2.out - <<EOF
- String1 - Lang1: 1st string
-diff -durN glibc-2.12.1.orig/intl/tst-translit.sh glibc-2.12.1/intl/tst-translit.sh
---- glibc-2.12.1.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.12.1/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -36,7 +36,10 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.12.1.orig/malloc/tst-mtrace.sh glibc-2.12.1/malloc/tst-mtrace.sh
---- glibc-2.12.1.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.12.1/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,9 +24,12 @@
- status=0
- trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
- LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
-   ${common_objpfx}malloc/tst-mtrace || status=1
- 
- if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.12.1.orig/nptl/tst-tls6.sh glibc-2.12.1/nptl/tst-tls6.sh
---- glibc-2.12.1.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.12.1/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -5,8 +5,8 @@
- rtld_installed_name=$1; shift
- logfile=$common_objpfx/nptl/tst-tls6.out
- 
--# We have to find libc and nptl
--library_path=${common_objpfx}:${common_objpfx}nptl
-+# We have to find libc and nptl (also libdl in case sandbox is in use)
-+library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn
- tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- 	  ${common_objpfx}/nptl/tst-tls5"
- 
-diff -durN glibc-2.12.1.orig/posix/globtest.sh glibc-2.12.1/posix/globtest.sh
---- glibc-2.12.1.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.12.1/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -18,7 +18,7 @@
- esac
- 
- # We have to find the libc and the NSS modules.
--library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod
-+library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod:${common_objpfx}/dlfcn
- 
- # Since we use `sort' we must make sure to use the same locale everywhere.
- LC_ALL=C
-diff -durN glibc-2.12.1.orig/posix/tst-getconf.sh glibc-2.12.1/posix/tst-getconf.sh
---- glibc-2.12.1.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.12.1/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -10,7 +10,10 @@
- else
-   rtld_installed_name=$1; shift
-   runit() {
--    ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"
-+    
-+  # make sure libdl is also in path in case sandbox is in use
-+  library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+    ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} "$@"
-   }
- fi
- 
-diff -durN glibc-2.12.1.orig/posix/wordexp-tst.sh glibc-2.12.1/posix/wordexp-tst.sh
---- glibc-2.12.1.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.12.1/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -19,8 +19,11 @@
- "
- export IFS
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- failed=0
--${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
-+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- ${common_objpfx}posix/wordexp-test '$*' > ${testout}1
- cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
- wordexp returned 0
diff --git a/packages/glibc/2.12.1/380-dont-build-timezone.patch b/packages/glibc/2.12.1/380-dont-build-timezone.patch
deleted file mode 100644
index 0a304363..00000000
--- a/packages/glibc/2.12.1/380-dont-build-timezone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
-diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
---- glibc-2.12.1.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.12.1/Makeconfig	2009-11-13 00:50:41.000000000 +0100
-@@ -944,7 +944,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/packages/glibc/2.12.1/400-alpha-xstat.patch b/packages/glibc/2.12.1/400-alpha-xstat.patch
deleted file mode 100644
index 97bea98e..00000000
--- a/packages/glibc/2.12.1/400-alpha-xstat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-@@ -386,6 +386,11 @@
- # define __ASSUME_GETDENTS32_D_TYPE	1
- #endif
- 
-+/* Starting with version 2.6.4, alpha stat64 syscalls are available.  */
-+#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
-+# define __ASSUME_STAT64_SYSCALL	1
-+#endif
-+
- /* Starting with version 2.5.3, the initial location returned by `brk'
-    after exec is always rounded up to the next page.  */
- #if __LINUX_KERNEL_VERSION >= 132355
diff --git a/packages/glibc/2.12.1/430-alpha-creat.patch b/packages/glibc/2.12.1/430-alpha-creat.patch
deleted file mode 100644
index bfb72d06..00000000
--- a/packages/glibc/2.12.1/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.12.1/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/packages/glibc/2.12.1/560-ppc-atomic.patch b/packages/glibc/2.12.1/560-ppc-atomic.patch
deleted file mode 100644
index 679ef183..00000000
--- a/packages/glibc/2.12.1/560-ppc-atomic.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-sniped from suse
-
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
-
-diff -durN glibc-2.12.1.orig/sysdeps/powerpc/bits/atomic.h glibc-2.12.1/sysdeps/powerpc/bits/atomic.h
---- glibc-2.12.1.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.12.1/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -85,14 +85,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -102,14 +102,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -118,12 +118,12 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (							      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b\n"				      \
- 		      "   " __ARCH_ACQ_INSTR				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -132,11 +132,11 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -144,12 +144,12 @@
- #define __arch_atomic_exchange_and_add_32(mem, value) \
-   ({									      \
-     __typeof (*mem) __val, __tmp;					      \
--    __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
--		      "		add	%1,%0,%4\n"			      \
--		      "		stwcx.	%1,0,%3\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
-+		      "		add	%1,%0,%3\n"			      \
-+		      "		stwcx.	%1,%y2\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -157,12 +157,12 @@
- #define __arch_atomic_increment_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		addi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -170,27 +170,27 @@
- #define __arch_atomic_decrement_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		subi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
- 
- #define __arch_atomic_decrement_if_positive_32(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
- 		       "	cmpwi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stwcx.	%1,0,%3\n"			      \
-+		       "	stwcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
-diff -durN glibc-2.12.1.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.12.1/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.12.1.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.12.1/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (							      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -60,14 +60,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-diff -durN glibc-2.12.1.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.12.1/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.12.1.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.12.1/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile ("   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	 	      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_ACQ "\n"	 	      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -61,14 +61,14 @@
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
- 		    "   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -82,14 +82,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (							      \
--		    "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -98,14 +98,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -115,14 +115,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -132,14 +132,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -148,12 +148,12 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b\n"				      \
- 		  " " __ARCH_ACQ_INSTR					      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -162,11 +162,11 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -174,12 +174,12 @@
- #define __arch_atomic_exchange_and_add_64(mem, value) \
-     ({									      \
-       __typeof (*mem) __val, __tmp;					      \
--      __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
--			"	add	%1,%0,%4\n"			      \
--			"	stdcx.	%1,0,%3\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
-+			"	add	%1,%0,%3\n"			      \
-+			"	stdcx.	%1,%y2\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -187,12 +187,12 @@
- #define __arch_atomic_increment_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	addi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -200,27 +200,27 @@
- #define __arch_atomic_decrement_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	subi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
- 
- #define __arch_atomic_decrement_if_positive_64(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
- 		       "	cmpdi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stdcx.	%1,0,%3\n"			      \
-+		       "	stdcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
diff --git a/packages/glibc/2.12.1/630-mips_shn_undef-hack.patch b/packages/glibc/2.12.1/630-mips_shn_undef-hack.patch
deleted file mode 100644
index f6a5eb6e..00000000
--- a/packages/glibc/2.12.1/630-mips_shn_undef-hack.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -durN glibc-2.12.1.orig/elf/dl-lookup.c glibc-2.12.1/elf/dl-lookup.c
---- glibc-2.12.1.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.12.1/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
-@@ -301,6 +301,12 @@
- 	      /* FALLTHROUGH */
- 	    case STB_GLOBAL:
-	    success:
-+#ifdef __mips__
-+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
-+		 symbols, we skip them. */
-+	      if (sym->st_shndx == SHN_UNDEF)
-+		break;
-+#endif
- 	      /* Global definition.  Just what we need.  */
- 	      result->s = sym;
- 	      result->m = (struct link_map *) map;
diff --git a/packages/glibc/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a70528..00000000
--- a/packages/glibc/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/packages/glibc/2.12.1/910-typedef-caddr.patch b/packages/glibc/2.12.1/910-typedef-caddr.patch
deleted file mode 100644
index e29e8101..00000000
--- a/packages/glibc/2.12.1/910-typedef-caddr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
---- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
-@@ -114,7 +114,10 @@
- #ifdef	__USE_BSD
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
---- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
-@@ -80,7 +80,10 @@
- #endif
- #ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#  define __caddr_t_defined
-+# endif
- # define __daddr_t_defined
- #endif
- 
diff --git a/packages/glibc/2.12.2/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.12.2/0000-Fix-combreloc-test-BSD-grep.patch
similarity index 69%
rename from packages/glibc/2.12.2/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.12.2/0000-Fix-combreloc-test-BSD-grep.patch
index 530d4ff1..0f85a50a 100644
--- a/packages/glibc/2.12.2/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.12.2/0000-Fix-combreloc-test-BSD-grep.patch
@@ -13,15 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
---- glibc-2.12.2.orig/configure	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure	2017-03-08 21:18:07.000000000 -0800
-@@ -6710,7 +6710,7 @@ EOF
+--- a/configure
++++ b/configure
+@@ -6710,7 +6710,7 @@
    $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }
    then
@@ -30,10 +28,9 @@ diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
        libc_cv_z_combreloc=yes
      else
        libc_cv_z_combreloc=no
-diff -urpN glibc-2.12.2.orig/configure.in glibc-2.12.2/configure.in
---- glibc-2.12.2.orig/configure.in	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure.in	2017-03-08 21:18:17.000000000 -0800
-@@ -1671,7 +1671,7 @@ dnl cross-platform since the gcc used ca
+--- a/configure.in
++++ b/configure.in
+@@ -1671,7 +1671,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
diff --git a/packages/glibc/2.14.1/300-macos-cross-rpcgen.patch b/packages/glibc/2.12.2/0001-macos-cross-rpcgen.patch
similarity index 87%
rename from packages/glibc/2.14.1/300-macos-cross-rpcgen.patch
rename to packages/glibc/2.12.2/0001-macos-cross-rpcgen.patch
index e654644c..155b4f59 100644
--- a/packages/glibc/2.14.1/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.12.2/0001-macos-cross-rpcgen.patch
@@ -14,11 +14,13 @@ Date:   Sat Sep 7 00:01:08 2013 +0800
     Signed-off-by: Jia Liu <proljc@gmail.com>
     Signed-off-by: Mike Frysinger <vapier@gentoo.org>
 
-diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
-index 3dca5c4..beded52 100644
+---
+ sunrpc/rpc/types.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
 --- a/sunrpc/rpc/types.h
 +++ b/sunrpc/rpc/types.h
-@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t;
+@@ -68,6 +68,11 @@
  #include <sys/types.h>
  #endif
  
diff --git a/packages/glibc/2.12.2/900-march-i686.patch b/packages/glibc/2.12.2/0002-march-i686.patch
similarity index 55%
rename from packages/glibc/2.12.2/900-march-i686.patch
rename to packages/glibc/2.12.2/0002-march-i686.patch
index 6030de9e..e5ad2e07 100644
--- a/packages/glibc/2.12.2/900-march-i686.patch
+++ b/packages/glibc/2.12.2/0002-march-i686.patch
@@ -3,9 +3,13 @@
        * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
        * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
 
-diff -urN glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.2/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.2/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:36:19.858708534 +0100
+---
+ nptl/sysdeps/pthread/pt-initfini.c    |    5 +++++
+ sysdeps/unix/sysv/linux/i386/sysdep.h |    4 ++++
+ 2 files changed, 9 insertions(+)
+
+--- a/nptl/sysdeps/pthread/pt-initfini.c
++++ b/nptl/sysdeps/pthread/pt-initfini.c
 @@ -45,6 +45,11 @@
  /* Embed an #include to pull in the alignment and .end directives. */
  asm ("\n#include \"defs.h\"");
@@ -18,9 +22,8 @@ diff -urN glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.2/nptl
  /* The initial common code ends here. */
  asm ("\n/*@HEADER_ENDS*/");
  
-diff -urN glibc-2.12.2.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.2/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.12.2.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.2/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:36:19.858708534 +0100
+--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
++++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
 @@ -29,6 +29,10 @@
  #include <dl-sysdep.h>
  #include <tls.h>
diff --git a/packages/glibc/2.13/910-typedef-caddr.patch b/packages/glibc/2.12.2/0003-typedef-caddr.patch
similarity index 51%
rename from packages/glibc/2.13/910-typedef-caddr.patch
rename to packages/glibc/2.12.2/0003-typedef-caddr.patch
index e29e8101..5139bbd5 100644
--- a/packages/glibc/2.13/910-typedef-caddr.patch
+++ b/packages/glibc/2.12.2/0003-typedef-caddr.patch
@@ -1,6 +1,10 @@
-diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
---- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+---
+ posix/sys/types.h  |    3 +++
+ sunrpc/rpc/types.h |    3 +++
+ 2 files changed, 6 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
 @@ -114,7 +114,10 @@
  #ifdef	__USE_BSD
  # ifndef __daddr_t_defined
@@ -12,10 +16,9 @@ diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
  #  define __daddr_t_defined
  # endif
  #endif
-diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
---- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
-@@ -80,7 +80,10 @@
+--- a/sunrpc/rpc/types.h
++++ b/sunrpc/rpc/types.h
+@@ -85,7 +85,10 @@
  #endif
  #ifndef __daddr_t_defined
  typedef __daddr_t daddr_t;
diff --git a/packages/glibc/2.12.1/920-fix-rpc_parse-format.patch b/packages/glibc/2.12.2/0004-fix-rpc_parse-format.patch
similarity index 95%
rename from packages/glibc/2.12.1/920-fix-rpc_parse-format.patch
rename to packages/glibc/2.12.2/0004-fix-rpc_parse-format.patch
index 37e58dac..906fb706 100644
--- a/packages/glibc/2.12.1/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.12.2/0004-fix-rpc_parse-format.patch
@@ -45,11 +45,13 @@ Date:   Tue Nov 8 23:44:51 2016 +0000
             [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
             [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
 
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/sunrpc/rpc_parse.c
 +++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
+@@ -520,7 +520,7 @@
  get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
  {
    token tok;
diff --git a/packages/glibc/2.13/940-nis-bogus-conditional.patch b/packages/glibc/2.12.2/0005-nis-bogus-conditional.patch
similarity index 91%
rename from packages/glibc/2.13/940-nis-bogus-conditional.patch
rename to packages/glibc/2.12.2/0005-nis-bogus-conditional.patch
index 09b38cf1..732b859b 100644
--- a/packages/glibc/2.13/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.12.2/0005-nis-bogus-conditional.patch
@@ -47,11 +47,13 @@ Date:   Wed Dec 21 23:44:01 2016 +0000
             * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
             Compare name == NULL, not name != NULL.
 
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/nis/nss_nisplus/nisplus-alias.c
 +++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
+@@ -293,7 +293,7 @@
  	return status;
      }
  
diff --git a/packages/glibc/2.12.2/998-obstack-common.patch b/packages/glibc/2.12.2/0006-obstack-common.patch
similarity index 87%
rename from packages/glibc/2.12.2/998-obstack-common.patch
rename to packages/glibc/2.12.2/0006-obstack-common.patch
index 4b95f062..1993be24 100644
--- a/packages/glibc/2.12.2/998-obstack-common.patch
+++ b/packages/glibc/2.12.2/0006-obstack-common.patch
@@ -15,11 +15,13 @@ Date:   Wed May 15 20:28:08 2013 +0200
             * malloc/obstack.c (_obstack_compat): Add initializer.
     -
 
-diff --git a/malloc/obstack.c b/malloc/obstack.c
-index 25a90514f7..c3c7db4a96 100644
+---
+ malloc/obstack.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/malloc/obstack.c
 +++ b/malloc/obstack.c
-@@ -115,7 +115,7 @@ int obstack_exit_failure = EXIT_FAILURE;
+@@ -117,7 +117,7 @@
  /* A looong time ago (before 1994, anyway; we're not sure) this global variable
     was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
     library still exports it because somebody might use it.  */
diff --git a/packages/glibc/2.12.2/999-new-tools.patch b/packages/glibc/2.12.2/0007-new-tools.patch
similarity index 78%
rename from packages/glibc/2.12.2/999-new-tools.patch
rename to packages/glibc/2.12.2/0007-new-tools.patch
index e2f7b1de..816a01cd 100644
--- a/packages/glibc/2.12.2/999-new-tools.patch
+++ b/packages/glibc/2.12.2/0007-new-tools.patch
@@ -1,7 +1,11 @@
-diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
---- glibc-2.12.2.orig/configure	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure	2017-02-08 00:38:10.249617723 -0800
-@@ -5189,7 +5189,7 @@ $as_echo_n "checking version of $CC... "
+---
+ configure    |    8 ++++----
+ configure.in |    8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -5189,7 +5189,7 @@
    ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -10,7 +14,7 @@ diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5252,7 +5252,7 @@ $as_echo_n "checking version of $MAKE...
+@@ -5252,7 +5252,7 @@
    ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -19,7 +23,7 @@ diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5379,7 +5379,7 @@ $as_echo_n "checking version of $MAKEINF
+@@ -5379,7 +5379,7 @@
    ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -28,7 +32,7 @@ diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5439,7 +5439,7 @@ else
+@@ -5439,7 +5439,7 @@
    # Found it, now check the version.
    { $as_echo "$as_me:$LINENO: checking version of $SED" >&5
  $as_echo_n "checking version of $SED... " >&6; }
@@ -37,10 +41,9 @@ diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
      3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.12.2.orig/configure.in glibc-2.12.2/configure.in
---- glibc-2.12.2.orig/configure.in	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure.in	2017-02-08 00:29:52.484183611 -0800
-@@ -1026,11 +1026,11 @@ fi
+--- a/configure.in
++++ b/configure.in
+@@ -1026,11 +1026,11 @@
  # These programs are version sensitive.
  AC_CHECK_TOOL_PREFIX
  AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
@@ -54,7 +57,7 @@ diff -urpN glibc-2.12.2.orig/configure.in glibc-2.12.2/configure.in
  
  AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
    [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -1038,10 +1038,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
+@@ -1038,10 +1038,10 @@
    MSGFMT=: aux_missing="$aux_missing msgfmt")
  AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
    [GNU texinfo.* \([0-9][0-9.]*\)],
diff --git a/packages/glibc/2.13/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.13/0000-respect-env-CPPFLAGS.patch
similarity index 73%
rename from packages/glibc/2.13/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.13/0000-respect-env-CPPFLAGS.patch
index 3798cb21..9966a277 100644
--- a/packages/glibc/2.13/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.13/0000-respect-env-CPPFLAGS.patch
@@ -1,9 +1,12 @@
 Respect environment CPPFLAGS when we run ./configure so we can inject
 random -D things without having to set CFLAGS/ASFLAGS
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.13/Makeconfig	2009-11-13 00:49:41.000000000 +0100
+---
+ Makeconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makeconfig
++++ b/Makeconfig
 @@ -697,6 +697,7 @@
  	   $(foreach lib,$(libof-$(basename $(@F))) \
  			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
diff --git a/packages/glibc/2.14.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.13/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
similarity index 78%
rename from packages/glibc/2.14.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
rename to packages/glibc/2.13/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..30a70a2f 100644
--- a/packages/glibc/2.14.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.13/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -5,16 +5,13 @@ Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
  -Wparentheses
 
 ---
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
 
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
 --- a/nis/nis_call.c
 +++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
+@@ -682,16 +682,18 @@
    /* Choose which entry should be evicted from the cache.  */
    loc = &nis_server_cache[0];
    if (*loc != NULL)
@@ -42,11 +39,9 @@ index 3fa37e4..cb7839a 100644
    old = *loc;
    *loc = new;
  
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
 --- a/stdlib/setenv.c
 +++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
+@@ -328,18 +328,20 @@
    ep = __environ;
    if (ep != NULL)
      while (*ep != NULL)
@@ -54,7 +49,12 @@ index da61ee0..e66045f 100644
 -	{
 -	  /* Found it.  Remove this pointer by moving later ones back.  */
 -	  char **dp = ep;
--
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
 -	  do
 -	    dp[0] = dp[1];
 -	  while (*dp++);
@@ -62,12 +62,6 @@ index da61ee0..e66045f 100644
 -	}
 -      else
 -	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
 +	    do
 +		dp[0] = dp[1];
 +	    while (*dp++);
@@ -79,6 +73,3 @@ index da61ee0..e66045f 100644
  
    UNLOCK;
  
--- 
-2.7.4
-
diff --git a/packages/glibc/2.12.1/102-fix-signed-shift-overlow.patch b/packages/glibc/2.13/0002-fix-signed-shift-overlow.patch
similarity index 84%
rename from packages/glibc/2.12.1/102-fix-signed-shift-overlow.patch
rename to packages/glibc/2.13/0002-fix-signed-shift-overlow.patch
index ef49f831..5f76afe9 100644
--- a/packages/glibc/2.12.1/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.13/0002-fix-signed-shift-overlow.patch
@@ -12,11 +12,16 @@ Date:   Tue Jul 21 22:50:29 2015 -0700
     * string/strchrnul.c (STRCHRNUL):
     Rewrite code to avoid issues with signed shift overflow.
 
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
 --- a/string/memrchr.c
 +++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
+@@ -98,15 +98,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -34,11 +39,9 @@ index 0c8fd84..86cd5b9 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
 --- a/string/rawmemchr.c
 +++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
+@@ -90,15 +90,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -56,11 +59,9 @@ index 05b22be..228ca9d 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
 --- a/string/strchr.c
 +++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
+@@ -65,13 +65,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -76,11 +77,9 @@ index 5f90075..f13b2b3 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
 --- a/string/strchrnul.c
 +++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
+@@ -63,13 +63,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
diff --git a/packages/glibc/2.14.1/104-unused-variables.patch b/packages/glibc/2.13/0003-unused-variables.patch
similarity index 79%
rename from packages/glibc/2.14.1/104-unused-variables.patch
rename to packages/glibc/2.13/0003-unused-variables.patch
index e063675a..18adb17f 100644
--- a/packages/glibc/2.14.1/104-unused-variables.patch
+++ b/packages/glibc/2.13/0003-unused-variables.patch
@@ -19,8 +19,18 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    6 ------
+ sysdeps/ieee754/flt-32/s_cosf.c        |    6 ------
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ 9 files changed, 1 insertion(+), 26 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,11 +44,9 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
-@@ -65,10 +65,8 @@
+@@ -69,10 +69,8 @@
  /**/ hpi1           = {{0x3c91a626, 0x33145c07} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0xbff921fb, 0x54442d18} }, /* -pi/2         */
  /**/ qpi            = {{0x3fe921fb, 0x54442d18} }, /*  pi/4         */
@@ -49,7 +57,7 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0xc002d97c, 0x7f3321d2} }, /* -3pi/4        */
  /**/ u1             = {{0x3c314c2a, 0x00000000} }, /*  9.377e-19    */
  /**/ u2             = {{0x3bf955e4, 0x00000000} }, /*  8.584e-20    */
-@@ -129,10 +127,8 @@
+@@ -139,10 +137,8 @@
  /**/ hpi1           = {{0x33145c07, 0x3c91a626} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0x54442d18, 0xbff921fb} }, /* -pi/2         */
  /**/ qpi            = {{0x54442d18, 0x3fe921fb} }, /*  pi/4         */
@@ -60,11 +68,9 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  
  #include "mydefs.h"
  
@@ -73,11 +79,9 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
-@@ -34,7 +34,6 @@
+@@ -36,7 +36,6 @@
  /**/ INF            = {{0x7ff00000, 0x00000000}}, /* INF           */
  /**/ nINF           = {{0xfff00000, 0x00000000}}, /* -INF          */
  /**/ NaNQ           = {{0x7ff80000, 0x00000000}}, /* NaNQ          */
@@ -85,7 +89,7 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0x3fe62e42, 0xfefa3800}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x3d2ef357, 0x93c76730}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0x4297ffff, 0xfffffd2c}}, /* 1.5*2**42 -724*2**-10  */
-@@ -48,7 +47,6 @@
+@@ -51,7 +50,6 @@
  /**/ INF            = {{0x00000000, 0x7ff00000}}, /* INF           */
  /**/ nINF           = {{0x00000000, 0xfff00000}}, /* -INF           */
  /**/ NaNQ           = {{0x00000000, 0x7ff80000}}, /* NaNQ          */
@@ -93,45 +97,39 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,12 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
- log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
+@@ -31,12 +31,6 @@
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
--#ifdef __STDC__
+ #ifdef __STDC__
 -static const float zero   =  0.0;
 -#else
 -static float zero   =  0.0;
 -#endif
 -
- #ifdef __STDC__
+-#ifdef __STDC__
  	float __ieee754_log10f(float x)
  #else
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
+ 	float __ieee754_log10f(x)
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,12 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
- #include "math.h"
+@@ -22,12 +22,6 @@
  #include "math_private.h"
  
--#ifdef __STDC__
+ #ifdef __STDC__
 -static const float one=1.0;
 -#else
 -static float one=1.0;
 -#endif
 -
- #ifdef __STDC__
+-#ifdef __STDC__
  	float __cosf(float x)
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
+ 	float __cosf(x)
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -74,7 +74,6 @@
  static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  static const long double one = 1.0L;
@@ -139,11 +137,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = 1.0e4000L;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -142,7 +142,6 @@
  static long double
  #endif
  tiny = 1e-4931L,
@@ -151,11 +147,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
diff --git a/packages/glibc/2.13/105-misleading-indentation.patch b/packages/glibc/2.13/0004-misleading-indentation.patch
similarity index 72%
rename from packages/glibc/2.13/105-misleading-indentation.patch
rename to packages/glibc/2.13/0004-misleading-indentation.patch
index 1dd8d851..35bcb1b8 100644
--- a/packages/glibc/2.13/105-misleading-indentation.patch
+++ b/packages/glibc/2.13/0004-misleading-indentation.patch
@@ -7,11 +7,13 @@ Date:   Fri Dec 11 09:19:37 2015 -0800
             * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
             Fix indentation.
 
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
 --- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
 +++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
+@@ -82,7 +82,9 @@
  
      /* compute q[0],q[1],...q[jk] */
  	for (i=0;i<=jk;i++) {
diff --git a/packages/glibc/2.13/106-dl-open-array-bounds.patch b/packages/glibc/2.13/0005-dl-open-array-bounds.patch
similarity index 88%
rename from packages/glibc/2.13/106-dl-open-array-bounds.patch
rename to packages/glibc/2.13/0005-dl-open-array-bounds.patch
index bdb5c19f..0bedbc06 100644
--- a/packages/glibc/2.13/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.13/0005-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -526,8 +526,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc/2.16.0/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.13/0006-i386-x86_64-revert-clone-cfi.patch
similarity index 56%
rename from packages/glibc/2.16.0/120-i386-x86_64-revert-clone-cfi.patch
rename to packages/glibc/2.13/0006-i386-x86_64-revert-clone-cfi.patch
index c7f6182d..f872bac4 100644
--- a/packages/glibc/2.16.0/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.13/0006-i386-x86_64-revert-clone-cfi.patch
@@ -4,16 +4,13 @@ elsewhere.  this cfi code does not gain us a whole lot anyways.
 
 http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
 
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
+---
+ sysdeps/unix/sysv/linux/i386/clone.S   |    4 ----
+ sysdeps/unix/sysv/linux/x86_64/clone.S |    4 ----
+ 2 files changed, 8 deletions(-)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/i386/clone.S
++++ b/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@
  	ret
  
@@ -32,9 +29,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysde
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ b/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@
  	ret
  
diff --git a/packages/glibc/2.13/140-disable-ldconfig.patch b/packages/glibc/2.13/0007-disable-ldconfig.patch
similarity index 73%
rename from packages/glibc/2.13/140-disable-ldconfig.patch
rename to packages/glibc/2.13/0007-disable-ldconfig.patch
index 378e1df5..d60cb409 100644
--- a/packages/glibc/2.13/140-disable-ldconfig.patch
+++ b/packages/glibc/2.13/0007-disable-ldconfig.patch
@@ -3,9 +3,12 @@ file outside of the chroot.  doesnt matter anyways as we wont use the cache
 results (portage will rebuild cache), so running ldconfig is simply a waste
 of time.
 
-diff -durN glibc-2.13.orig/Makefile glibc-2.13/Makefile
---- glibc-2.13.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.13/Makefile	2009-11-13 00:49:49.000000000 +0100
+---
+ Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makefile
++++ b/Makefile
 @@ -116,6 +116,7 @@
  	rm -f $(symbolic-link-list)
  
diff --git a/packages/glibc/2.13/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.13/0008-Fix-combreloc-test-BSD-grep.patch
similarity index 70%
rename from packages/glibc/2.13/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.13/0008-Fix-combreloc-test-BSD-grep.patch
index da21d9e6..1fdd59f1 100644
--- a/packages/glibc/2.13/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.13/0008-Fix-combreloc-test-BSD-grep.patch
@@ -13,15 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff -urpN glibc-2.13.orig/configure glibc-2.13/configure
---- glibc-2.13.orig/configure	2011-01-17 20:34:07.000000000 -0800
-+++ glibc-2.13/configure	2017-03-08 21:11:09.000000000 -0800
-@@ -6504,7 +6504,7 @@ EOF
+--- a/configure
++++ b/configure
+@@ -6504,7 +6504,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
    then
@@ -30,10 +28,9 @@ diff -urpN glibc-2.13.orig/configure glibc-2.13/configure
        libc_cv_z_combreloc=yes
      else
        libc_cv_z_combreloc=no
-diff -urpN glibc-2.13.orig/configure.in glibc-2.13/configure.in
---- glibc-2.13.orig/configure.in	2011-01-17 20:34:07.000000000 -0800
-+++ glibc-2.13/configure.in	2017-03-08 21:11:22.000000000 -0800
-@@ -1673,7 +1673,7 @@ dnl cross-platform since the gcc used ca
+--- a/configure.in
++++ b/configure.in
+@@ -1673,7 +1673,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
diff --git a/packages/glibc/2.15/150-queue-header-updates.patch b/packages/glibc/2.13/0009-queue-header-updates.patch
similarity index 90%
rename from packages/glibc/2.15/150-queue-header-updates.patch
rename to packages/glibc/2.13/0009-queue-header-updates.patch
index 7cbe70ef..f6515e2b 100644
--- a/packages/glibc/2.15/150-queue-header-updates.patch
+++ b/packages/glibc/2.13/0009-queue-header-updates.patch
@@ -2,11 +2,12 @@ grab some updates from FreeBSD
 
 http://bugs.gentoo.org/201979
 
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
+---
+ misc/sys/queue.h |   36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
 
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
---- glibc-2.13.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.13/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
+--- a/misc/sys/queue.h
++++ b/misc/sys/queue.h
 @@ -136,6 +136,11 @@
  		(var);							\
  		(var) = ((var)->field.le_next))
diff --git a/packages/glibc/2.15/160-manual-no-perl.patch b/packages/glibc/2.13/0010-manual-no-perl.patch
similarity index 76%
rename from packages/glibc/2.15/160-manual-no-perl.patch
rename to packages/glibc/2.13/0010-manual-no-perl.patch
index 5e2b807d..14ddc6d5 100644
--- a/packages/glibc/2.15/160-manual-no-perl.patch
+++ b/packages/glibc/2.13/0010-manual-no-perl.patch
@@ -4,9 +4,12 @@ deal, so just whine a little and continue on our merry way.
 
 http://bugs.gentoo.org/60132
 
-diff -durN glibc-2.13.orig/manual/Makefile glibc-2.13/manual/Makefile
---- glibc-2.13.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
-+++ glibc-2.13/manual/Makefile	2009-11-13 00:49:54.000000000 +0100
+---
+ manual/Makefile |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/manual/Makefile
++++ b/manual/Makefile
 @@ -104,9 +104,14 @@
  libm-err.texi: stamp-libm-err
  stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
diff --git a/packages/glibc/2.13/170-localedef-fix-trampoline.patch b/packages/glibc/2.13/0011-localedef-fix-trampoline.patch
similarity index 87%
rename from packages/glibc/2.13/170-localedef-fix-trampoline.patch
rename to packages/glibc/2.13/0011-localedef-fix-trampoline.patch
index 3cc65597..3b8fd6e8 100644
--- a/packages/glibc/2.13/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.13/0011-localedef-fix-trampoline.patch
@@ -5,9 +5,12 @@
 # DP: Upstream status: Unknown
 # DP: Status Details: Unknown
 # DP: Date: 2004-03-16
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
+---
+# locale/programs/3level.h |   36 ++++++++++++++++++++++++++++++++++++
+# 1 file changed, 36 insertions(+)
+#
+--- a/locale/programs/3level.h
++++ b/locale/programs/3level.h
 @@ -203,6 +203,42 @@
  	}
      }
diff --git a/packages/glibc/2.15/180-resolv-dynamic.patch b/packages/glibc/2.13/0012-resolv-dynamic.patch
similarity index 81%
rename from packages/glibc/2.15/180-resolv-dynamic.patch
rename to packages/glibc/2.13/0012-resolv-dynamic.patch
index e916bce3..fcc2f80a 100644
--- a/packages/glibc/2.15/180-resolv-dynamic.patch
+++ b/packages/glibc/2.13/0012-resolv-dynamic.patch
@@ -5,9 +5,12 @@ already running get the updated information.
 
 http://bugs.gentoo.org/177416
 
-diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c
---- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
+---
+ resolv/res_libc.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+--- a/resolv/res_libc.c
++++ b/resolv/res_libc.c
 @@ -22,6 +22,7 @@
  #include <arpa/nameser.h>
  #include <resolv.h>
diff --git a/packages/glibc/2.13/190-localedef-mmap.patch b/packages/glibc/2.13/0013-localedef-mmap.patch
similarity index 82%
rename from packages/glibc/2.13/190-localedef-mmap.patch
rename to packages/glibc/2.13/0013-localedef-mmap.patch
index f3914cd1..74e586ee 100644
--- a/packages/glibc/2.13/190-localedef-mmap.patch
+++ b/packages/glibc/2.13/0013-localedef-mmap.patch
@@ -7,9 +7,12 @@ http://bugs.gentoo.org/289615
 	used later with MMAP_FIXED | MMAP_SHARED to cope with different
 	alignment restrictions.
 
-diff -durN glibc-2.13.orig/locale/programs/locarchive.c glibc-2.13/locale/programs/locarchive.c
---- glibc-2.13.orig/locale/programs/locarchive.c	2009-04-27 16:07:47.000000000 +0200
-+++ glibc-2.13/locale/programs/locarchive.c	2009-11-13 00:50:01.000000000 +0100
+---
+ locale/programs/locarchive.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/locale/programs/locarchive.c
++++ b/locale/programs/locarchive.c
 @@ -134,7 +134,7 @@
    size_t reserved = RESERVE_MMAP_SIZE;
    int xflags = 0;
diff --git a/packages/glibc/2.13/200-fadvise64_64.patch b/packages/glibc/2.13/0014-fadvise64_64.patch
similarity index 67%
rename from packages/glibc/2.13/200-fadvise64_64.patch
rename to packages/glibc/2.13/0014-fadvise64_64.patch
index 71bca381..191d8330 100644
--- a/packages/glibc/2.13/200-fadvise64_64.patch
+++ b/packages/glibc/2.13/0014-fadvise64_64.patch
@@ -3,9 +3,8 @@ ripped from Debian
  sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/posix_fadvise.c
++++ b/sysdeps/unix/sysv/linux/posix_fadvise.c
 @@ -35,6 +35,19 @@
      return INTERNAL_SYSCALL_ERRNO (ret, err);
    return 0;
diff --git a/packages/glibc/2.15/220-section-comments.patch b/packages/glibc/2.13/0015-section-comments.patch
similarity index 76%
rename from packages/glibc/2.15/220-section-comments.patch
rename to packages/glibc/2.13/0015-section-comments.patch
index d717829e..5960ed05 100644
--- a/packages/glibc/2.15/220-section-comments.patch
+++ b/packages/glibc/2.13/0015-section-comments.patch
@@ -3,9 +3,12 @@ http://sources.redhat.com/ml/binutils/2004-04/msg00665.html
 fixes building on some architectures (like m68k/arm/cris/etc...) because
 it does the right thing
 
-diff -durN glibc-2.13.orig/include/libc-symbols.h glibc-2.13/include/libc-symbols.h
---- glibc-2.13.orig/include/libc-symbols.h	2009-03-14 00:51:46.000000000 +0100
-+++ glibc-2.13/include/libc-symbols.h	2009-11-13 00:50:07.000000000 +0100
+---
+ include/libc-symbols.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/include/libc-symbols.h
++++ b/include/libc-symbols.h
 @@ -239,12 +239,12 @@
  #  define __make_section_unallocated(section_string)
  # endif
diff --git a/packages/glibc/2.14.1/230-no-inline-gmon.patch b/packages/glibc/2.13/0016-no-inline-gmon.patch
similarity index 71%
rename from packages/glibc/2.14.1/230-no-inline-gmon.patch
rename to packages/glibc/2.13/0016-no-inline-gmon.patch
index fa33c2b4..ed027040 100644
--- a/packages/glibc/2.14.1/230-no-inline-gmon.patch
+++ b/packages/glibc/2.13/0016-no-inline-gmon.patch
@@ -19,12 +19,12 @@ Kazu Hirata
 	* sysdeps/generic/initfini.c (call_gmon_start): Add
 	__attribute__ ((noinline)).
 
-Index: sysdeps/generic/initfini.c
-===================================================================
+---
+ sysdeps/generic/initfini.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/sysdeps/generic/initfini.c glibc-2.13/sysdeps/generic/initfini.c
---- glibc-2.13.orig/sysdeps/generic/initfini.c	2007-06-17 20:02:40.000000000 +0200
-+++ glibc-2.13/sysdeps/generic/initfini.c	2009-11-13 00:50:09.000000000 +0100
+--- a/sysdeps/generic/initfini.c
++++ b/sysdeps/generic/initfini.c
 @@ -70,7 +70,7 @@
  /* The beginning of _init:  */
  asm ("\n/*@_init_PROLOG_BEGINS*/");
diff --git a/packages/glibc/2.12.1/240-check_native-headers.patch b/packages/glibc/2.13/0017-check_native-headers.patch
similarity index 56%
rename from packages/glibc/2.12.1/240-check_native-headers.patch
rename to packages/glibc/2.13/0017-check_native-headers.patch
index de0cb5b6..2b1b6198 100644
--- a/packages/glibc/2.12.1/240-check_native-headers.patch
+++ b/packages/glibc/2.13/0017-check_native-headers.patch
@@ -4,9 +4,12 @@ many ports hit this warning:
 
 snipped from suse
 
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/check_native.c glibc-2.12.1/sysdeps/unix/sysv/linux/check_native.c
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/check_native.c	2007-11-24 04:12:17.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/check_native.c	2009-11-13 00:50:11.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/check_native.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sysdeps/unix/sysv/linux/check_native.c
++++ b/sysdeps/unix/sysv/linux/check_native.c
 @@ -23,6 +23,7 @@
  #include <stddef.h>
  #include <stdint.h>
diff --git a/packages/glibc/2.12.1/250-fix-pr631.patch b/packages/glibc/2.13/0018-fix-pr631.patch
similarity index 77%
rename from packages/glibc/2.12.1/250-fix-pr631.patch
rename to packages/glibc/2.13/0018-fix-pr631.patch
index af5b3477..636c45de 100644
--- a/packages/glibc/2.12.1/250-fix-pr631.patch
+++ b/packages/glibc/2.13/0018-fix-pr631.patch
@@ -14,9 +14,13 @@ when building glibc with --enable-static-nss.
 
 See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
 
-diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
---- glibc-2.12.1.orig/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-+++ glibc-2.12.1/Makeconfig	2009-11-13 00:50:13.000000000 +0100
+---
+ Makeconfig   |    2 +-
+ elf/Makefile |    7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+--- a/Makeconfig
++++ b/Makeconfig
 @@ -531,7 +531,7 @@
  
  # The static libraries.
@@ -26,9 +30,8 @@ diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
  else
  ifeq (yes,$(build-shared))
  # We can try to link the programs with lib*_pic.a...
-diff -durN glibc-2.12.1.orig/elf/Makefile glibc-2.12.1/elf/Makefile
---- glibc-2.12.1.orig/elf/Makefile	2009-01-31 01:20:55.000000000 +0100
-+++ glibc-2.12.1/elf/Makefile	2009-11-13 00:50:13.000000000 +0100
+--- a/elf/Makefile
++++ b/elf/Makefile
 @@ -146,6 +146,13 @@
  install-bin-script = ldd
  endif
diff --git a/packages/glibc/2.13/260-assume-pipe2.patch b/packages/glibc/2.13/0019-assume-pipe2.patch
similarity index 82%
rename from packages/glibc/2.13/260-assume-pipe2.patch
rename to packages/glibc/2.13/0019-assume-pipe2.patch
index 42e8f4ed..0074ea65 100644
--- a/packages/glibc/2.13/260-assume-pipe2.patch
+++ b/packages/glibc/2.13/0019-assume-pipe2.patch
@@ -20,9 +20,12 @@ __have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
 older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
 stub for it.  so popen() will always fail as glibc assumes pipe2() works.
 
-diff -durN glibc-2.13.orig/socket/have_sock_cloexec.c glibc-2.13/socket/have_sock_cloexec.c
---- glibc-2.13.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.13/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
+---
+ socket/have_sock_cloexec.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/socket/have_sock_cloexec.c
++++ b/socket/have_sock_cloexec.c
 @@ -16,9 +16,14 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
diff --git a/packages/glibc/2.13/270-china.patch b/packages/glibc/2.13/0020-china.patch
similarity index 70%
rename from packages/glibc/2.13/270-china.patch
rename to packages/glibc/2.13/0020-china.patch
index 41d77590..b323cf67 100644
--- a/packages/glibc/2.13/270-china.patch
+++ b/packages/glibc/2.13/0020-china.patch
@@ -1,8 +1,11 @@
 
 
-diff -durN glibc-2.13.orig/localedata/locales/zh_TW glibc-2.13/localedata/locales/zh_TW
---- glibc-2.13.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.13/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
+---
+ localedata/locales/zh_TW |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/localedata/locales/zh_TW
++++ b/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
diff --git a/packages/glibc/2.15/280-new-valencian-locale.patch b/packages/glibc/2.13/0021-new-valencian-locale.patch
similarity index 81%
rename from packages/glibc/2.15/280-new-valencian-locale.patch
rename to packages/glibc/2.13/0021-new-valencian-locale.patch
index 4cdd108e..bddc4c79 100644
--- a/packages/glibc/2.15/280-new-valencian-locale.patch
+++ b/packages/glibc/2.13/0021-new-valencian-locale.patch
@@ -1,9 +1,13 @@
 http://bugs.gentoo.org/show_bug.cgi?id=131815
 http://sourceware.org/bugzilla/show_bug.cgi?id=2522
 
-diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
---- glibc-2.13.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.13/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
+---
+ localedata/SUPPORTED              |    2 
+ localedata/locales/ca_ES@valencia |   96 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 98 insertions(+)
+
+--- a/localedata/SUPPORTED
++++ b/localedata/SUPPORTED
 @@ -72,6 +72,8 @@
  ca_ES.UTF-8/UTF-8 \
  ca_ES/ISO-8859-1 \
@@ -13,9 +17,8 @@ diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
  ca_FR.UTF-8/UTF-8 \
  ca_FR/ISO-8859-15 \
  ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.13.orig/localedata/locales/ca_ES@valencia glibc-2.13/localedata/locales/ca_ES@valencia
---- glibc-2.13.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
+--- /dev/null
++++ b/localedata/locales/ca_ES@valencia
 @@ -0,0 +1,96 @@
 +comment_char %
 +escape_char  /
diff --git a/packages/glibc/2.12.1/300-macos-cross-rpcgen.patch b/packages/glibc/2.13/0022-macos-cross-rpcgen.patch
similarity index 87%
rename from packages/glibc/2.12.1/300-macos-cross-rpcgen.patch
rename to packages/glibc/2.13/0022-macos-cross-rpcgen.patch
index e654644c..b439b0f6 100644
--- a/packages/glibc/2.12.1/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.13/0022-macos-cross-rpcgen.patch
@@ -14,11 +14,13 @@ Date:   Sat Sep 7 00:01:08 2013 +0800
     Signed-off-by: Jia Liu <proljc@gmail.com>
     Signed-off-by: Mike Frysinger <vapier@gentoo.org>
 
-diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
-index 3dca5c4..beded52 100644
+---
+ sunrpc/rpc/types.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
 --- a/sunrpc/rpc/types.h
 +++ b/sunrpc/rpc/types.h
-@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t;
+@@ -69,6 +69,11 @@
  #include <sys/types.h>
  #endif
  
diff --git a/packages/glibc/2.14.1/300-nscd-one-fork.patch b/packages/glibc/2.13/0023-nscd-one-fork.patch
similarity index 81%
rename from packages/glibc/2.14.1/300-nscd-one-fork.patch
rename to packages/glibc/2.13/0023-nscd-one-fork.patch
index adc9b3f1..47217b3b 100644
--- a/packages/glibc/2.14.1/300-nscd-one-fork.patch
+++ b/packages/glibc/2.13/0023-nscd-one-fork.patch
@@ -2,9 +2,12 @@ only fork one to assist in stop-start-daemon assumptions about daemon behavior
 
 http://bugs.gentoo.org/190785
 
-diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
---- glibc-2.13.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.13/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
+---
+ nscd/nscd.c |   12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+--- a/nscd/nscd.c
++++ b/nscd/nscd.c
 @@ -182,6 +182,9 @@
        if (pid != 0)
  	exit (0);
diff --git a/packages/glibc/2.14.1/310-hppa-nptl-carlos.patch b/packages/glibc/2.13/0024-hppa-nptl-carlos.patch
similarity index 85%
rename from packages/glibc/2.14.1/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.13/0024-hppa-nptl-carlos.patch
index 4c028b27..43c4b688 100644
--- a/packages/glibc/2.14.1/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.13/0024-hppa-nptl-carlos.patch
@@ -1,8 +1,17 @@
 
 
-diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
---- glibc-2.13.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.13/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
+---
+ elf/rtld.c                    |   10 +++++-----
+ include/atomic.h              |   26 +++++++++++++-------------
+ nptl/Makefile                 |   35 ++++++++++++++++++++++++++++++++---
+ nptl/pthread_barrier_wait.c   |    2 +-
+ nptl/sysdeps/pthread/Makefile |    2 ++
+ stdio-common/Makefile         |    2 +-
+ sunrpc/clnt_udp.c             |    2 +-
+ 7 files changed, 55 insertions(+), 24 deletions(-)
+
+--- a/elf/rtld.c
++++ b/elf/rtld.c
 @@ -392,14 +392,14 @@
       know it is available.  We do not have to clear the memory if we
       do not have to use the temporary bootstrap_map.  Global variables
@@ -23,9 +32,8 @@ diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
  # endif
  # if USE___THREAD
    bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
---- glibc-2.13.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.13/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
+--- a/include/atomic.h
++++ b/include/atomic.h
 @@ -185,7 +185,7 @@
       __typeof (*(mem)) __atg5_value = (newvalue);			      \
  									      \
@@ -143,9 +151,8 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
       while (__builtin_expect						      \
  	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
  						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
---- glibc-2.13.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.13/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/Makefile
++++ b/nptl/Makefile
 @@ -265,9 +265,9 @@
  # Files which must not be linked with libpthread.
  tests-nolibpthread = tst-unload
@@ -195,9 +202,8 @@ diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
  CFLAGS-tst-align.c += $(stack-align-test-flags)
  CFLAGS-tst-align3.c += $(stack-align-test-flags)
  CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_barrier_wait.c
---- glibc-2.13.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.13/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/pthread_barrier_wait.c
++++ b/nptl/pthread_barrier_wait.c
 @@ -64,7 +64,7 @@
        do
  	lll_futex_wait (&ibarrier->curr_event, event,
@@ -207,9 +213,8 @@ diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_b
      }
  
    /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps/pthread/Makefile
---- glibc-2.13.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.13/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/sysdeps/pthread/Makefile
++++ b/nptl/sysdeps/pthread/Makefile
 @@ -33,7 +33,9 @@
  
  ifeq ($(have-forced-unwind),yes)
@@ -220,9 +225,8 @@ diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps
  endif
  endif
  
-diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefile
---- glibc-2.13.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.13/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
 @@ -82,7 +82,7 @@
  	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
  endif
@@ -232,9 +236,8 @@ diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefil
  CFLAGS-vfwprintf.c = -Wno-uninitialized
  CFLAGS-tst-printf.c = -Wno-format
  CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.13.orig/sunrpc/clnt_udp.c glibc-2.13/sunrpc/clnt_udp.c
---- glibc-2.13.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.13/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
+--- a/sunrpc/clnt_udp.c
++++ b/sunrpc/clnt_udp.c
 @@ -456,7 +456,7 @@
        while (inlen < 0 && errno == EINTR);
        if (inlen < 0)
diff --git a/packages/glibc/2.13/340-dl_execstack-PaX-support.patch b/packages/glibc/2.13/0025-dl_execstack-PaX-support.patch
similarity index 74%
rename from packages/glibc/2.13/340-dl_execstack-PaX-support.patch
rename to packages/glibc/2.13/0025-dl_execstack-PaX-support.patch
index 2402af07..bfd75579 100644
--- a/packages/glibc/2.13/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.13/0025-dl_execstack-PaX-support.patch
@@ -8,9 +8,13 @@
 
 	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
 
-diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
---- glibc-2.13.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.13/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
+---
+ nptl/allocatestack.c                   |    3 ++-
+ sysdeps/unix/sysv/linux/dl-execstack.c |   19 ++++++++++++++++---
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+--- a/nptl/allocatestack.c
++++ b/nptl/allocatestack.c
 @@ -329,7 +329,8 @@
  # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
  #endif
@@ -21,9 +25,8 @@ diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
  
    return 0;
  }
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/dl-execstack.c
++++ b/sysdeps/unix/sysv/linux/dl-execstack.c
 @@ -63,7 +63,10 @@
        else
  # endif
diff --git a/packages/glibc/2.13/350-pre20040117-pt_pax.patch b/packages/glibc/2.13/0026-pre20040117-pt_pax.patch
similarity index 88%
rename from packages/glibc/2.13/350-pre20040117-pt_pax.patch
rename to packages/glibc/2.13/0026-pre20040117-pt_pax.patch
index f8f6b834..ec17d24a 100644
--- a/packages/glibc/2.13/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.13/0026-pre20040117-pt_pax.patch
@@ -1,8 +1,11 @@
 
 
-diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
---- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
+---
+ elf/elf.h |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/elf/elf.h
++++ b/elf/elf.h
 @@ -580,6 +580,7 @@
  #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
  #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
diff --git a/packages/glibc/2.14.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.13/0027-tests-sandbox-libdl-paths.patch
similarity index 67%
rename from packages/glibc/2.14.1/360-tests-sandbox-libdl-paths.patch
rename to packages/glibc/2.13/0027-tests-sandbox-libdl-paths.patch
index 9f78c52f..1c4ee594 100644
--- a/packages/glibc/2.14.1/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.13/0027-tests-sandbox-libdl-paths.patch
@@ -15,9 +15,23 @@ Fix by Wormo
 
 http://bugs.gentoo.org/56898
 
-diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
---- glibc-2.13.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.13/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
+---
+ grp/tst_fgetgrent.sh        |    3 ++-
+ iconvdata/run-iconv-test.sh |    2 +-
+ iconvdata/tst-table.sh      |    5 ++++-
+ intl/tst-codeset.sh         |    3 +++
+ intl/tst-gettext.sh         |    5 ++++-
+ intl/tst-gettext2.sh        |    5 ++++-
+ intl/tst-translit.sh        |    5 ++++-
+ malloc/tst-mtrace.sh        |    5 ++++-
+ nptl/tst-tls6.sh            |    4 ++--
+ posix/globtest.sh           |    2 +-
+ posix/tst-getconf.sh        |    5 ++++-
+ posix/wordexp-tst.sh        |    5 ++++-
+ 12 files changed, 37 insertions(+), 12 deletions(-)
+
+--- a/grp/tst_fgetgrent.sh
++++ b/grp/tst_fgetgrent.sh
 @@ -24,7 +24,8 @@
  rtld_installed_name=$1; shift
  
@@ -28,9 +42,8 @@ diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
  
  result=0
  
-diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-iconv-test.sh
---- glibc-2.13.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.13/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/iconvdata/run-iconv-test.sh
++++ b/iconvdata/run-iconv-test.sh
 @@ -34,7 +34,7 @@
  export GCONV_PATH
  
@@ -40,9 +53,8 @@ diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-
  
  # How the start the iconv(1) program.
  ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table.sh
---- glibc-2.13.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.13/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/iconvdata/tst-table.sh
++++ b/iconvdata/tst-table.sh
 @@ -59,8 +59,11 @@
    irreversible=${charset}.irreversible
  fi
@@ -56,9 +68,8 @@ diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table
  ${objpfx}tst-table-from ${charset} \
    > ${objpfx}tst-${charset}.table
  
-diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
---- glibc-2.13.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.13/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-codeset.sh
++++ b/intl/tst-codeset.sh
 @@ -37,6 +37,9 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -69,9 +80,8 @@ diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
  ${common_objpfx}elf/ld.so --library-path $common_objpfx \
  ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
  
-diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
---- glibc-2.13.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-gettext.sh
++++ b/intl/tst-gettext.sh
 @@ -51,9 +51,12 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -86,9 +96,8 @@ diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
  ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
  
  exit $?
-diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
---- glibc-2.13.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-gettext2.sh
++++ b/intl/tst-gettext2.sh
 @@ -65,8 +65,11 @@
  LOCPATH=${objpfx}domaindir
  export LOCPATH
@@ -102,9 +111,8 @@ diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
  ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
  cmp ${objpfx}tst-gettext2.out - <<EOF
  String1 - Lang1: 1st string
-diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
---- glibc-2.13.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.13/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-translit.sh
++++ b/intl/tst-translit.sh
 @@ -36,7 +36,10 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -117,9 +125,8 @@ diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
  ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
  
  exit $?
-diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
---- glibc-2.13.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.13/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/malloc/tst-mtrace.sh
++++ b/malloc/tst-mtrace.sh
 @@ -24,9 +24,12 @@
  status=0
  trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
@@ -134,9 +141,8 @@ diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
    ${common_objpfx}malloc/tst-mtrace || status=1
  
  if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
---- glibc-2.13.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.13/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/nptl/tst-tls6.sh
++++ b/nptl/tst-tls6.sh
 @@ -5,8 +5,8 @@
  rtld_installed_name=$1; shift
  logfile=$common_objpfx/nptl/tst-tls6.out
@@ -148,9 +154,8 @@ diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
  tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
  	  ${common_objpfx}/nptl/tst-tls5"
  
-diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
---- glibc-2.13.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.13/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/globtest.sh
++++ b/posix/globtest.sh
 @@ -18,7 +18,7 @@
  esac
  
@@ -160,9 +165,8 @@ diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
  
  # Since we use `sort' we must make sure to use the same locale everywhere.
  LC_ALL=C
-diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
---- glibc-2.13.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.13/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/tst-getconf.sh
++++ b/posix/tst-getconf.sh
 @@ -10,7 +10,10 @@
  else
    rtld_installed_name=$1; shift
@@ -175,9 +179,8 @@ diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
    }
  fi
  
-diff -durN glibc-2.13.orig/posix/wordexp-tst.sh glibc-2.13/posix/wordexp-tst.sh
---- glibc-2.13.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.13/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/wordexp-tst.sh
++++ b/posix/wordexp-tst.sh
 @@ -19,8 +19,11 @@
  "
  export IFS
diff --git a/packages/glibc/2.13/380-dont-build-timezone.patch b/packages/glibc/2.13/0028-dont-build-timezone.patch
similarity index 72%
rename from packages/glibc/2.13/380-dont-build-timezone.patch
rename to packages/glibc/2.13/0028-dont-build-timezone.patch
index 11c358ea..b0fb8fc0 100644
--- a/packages/glibc/2.13/380-dont-build-timezone.patch
+++ b/packages/glibc/2.13/0028-dont-build-timezone.patch
@@ -1,8 +1,11 @@
 timezone data has been split into the package sys-libs/timezone-data
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:41.000000000 +0100
+---
+ Makeconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makeconfig
++++ b/Makeconfig
 @@ -944,7 +944,7 @@
  	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
  	      grp pwd posix io termios resource misc socket sysvipc gmon    \
diff --git a/packages/glibc/2.13/400-alpha-xstat.patch b/packages/glibc/2.13/0029-alpha-xstat.patch
similarity index 57%
rename from packages/glibc/2.13/400-alpha-xstat.patch
rename to packages/glibc/2.13/0029-alpha-xstat.patch
index 6e4ab8fe..4fa9517e 100644
--- a/packages/glibc/2.13/400-alpha-xstat.patch
+++ b/packages/glibc/2.13/0029-alpha-xstat.patch
@@ -1,6 +1,9 @@
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -386,6 +386,11 @@
  # define __ASSUME_GETDENTS32_D_TYPE	1
  #endif
diff --git a/packages/glibc/2.13/0030-alpha-creat.patch b/packages/glibc/2.13/0030-alpha-creat.patch
new file mode 100644
index 00000000..6ef52782
--- /dev/null
+++ b/packages/glibc/2.13/0030-alpha-creat.patch
@@ -0,0 +1,17 @@
+alpha does not have a __NR_creat
+
+http://bugs.gentoo.org/227275
+http://sourceware.org/bugzilla/show_bug.cgi?id=6650
+
+---
+ sysdeps/unix/sysv/linux/wordsize-64/creat64.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
++++ b/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
+@@ -1 +1,5 @@
+ /* Defined as alias for the syscall.  */
++#include <sysdep.h>
++#ifndef __NR_creat
++#include "../../../../../io/creat64.c"
++#endif
diff --git a/packages/glibc/2.13/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.13/0031-alpha_alpha-add-fdatasync-support.patch
similarity index 75%
rename from packages/glibc/2.13/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.13/0031-alpha_alpha-add-fdatasync-support.patch
index 372f34c5..b248cc6f 100644
--- a/packages/glibc/2.13/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.13/0031-alpha_alpha-add-fdatasync-support.patch
@@ -13,9 +13,8 @@
  sysdeps/unix/sysv/linux/syscalls.list     |    1 
  4 files changed, 76 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/Makefile
++++ b/sysdeps/unix/sysv/linux/Makefile
 @@ -20,6 +20,7 @@
  		   setfsuid setfsgid makedev epoll_pwait signalfd \
  		   eventfd eventfd_read eventfd_write prlimit
@@ -24,9 +23,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/u
  CFLAGS-gethostid.c = -fexceptions
  
  sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/fdatasync.c
 @@ -0,0 +1,69 @@
 +/* fdatasync -- synchronize at least the data part of a file with 
 +   the underlying media. Linux version. 
@@ -97,9 +95,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdep
 +
 +weak_alias (__fdatasync, fdatasync)
 +
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -459,6 +459,12 @@
  # define __ASSUME_FUTEX_LOCK_PI	1
  #endif
@@ -113,9 +110,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/
  /* Support for utimensat syscall was added in 2.6.22, on SH
     only after 2.6.22-rc1.  */
  #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/syscalls.list
++++ b/sysdeps/unix/sysv/linux/syscalls.list
 @@ -11,7 +11,6 @@
  epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
  epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
diff --git a/packages/glibc/2.15/560-ppc-atomic.patch b/packages/glibc/2.13/0032-ppc-atomic.patch
similarity index 93%
rename from packages/glibc/2.15/560-ppc-atomic.patch
rename to packages/glibc/2.13/0032-ppc-atomic.patch
index ee1cb909..a38c1c53 100644
--- a/packages/glibc/2.15/560-ppc-atomic.patch
+++ b/packages/glibc/2.13/0032-ppc-atomic.patch
@@ -1,14 +1,13 @@
 sniped from suse
 
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
+---
+ sysdeps/powerpc/bits/atomic.h           |   66 ++++++++++-----------
+ sysdeps/powerpc/powerpc32/bits/atomic.h |   16 ++---
+ sysdeps/powerpc/powerpc64/bits/atomic.h |   98 ++++++++++++++++----------------
+ 3 files changed, 90 insertions(+), 90 deletions(-)
 
-diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powerpc/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/bits/atomic.h
++++ b/sysdeps/powerpc/bits/atomic.h
 @@ -85,14 +85,14 @@
        __typeof (*(mem)) __tmp;						      \
        __typeof (mem)  __memp = (mem);					      \
@@ -151,9 +150,8 @@ diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powe
  		       : "cr0", "memory");				      \
       __val;								      \
    })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/powerpc32/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc32/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp;							      \
@@ -192,9 +190,8 @@ diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sy
  		    : "cr0", "memory");					      \
    __tmp != 0;								      \
  })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/powerpc64/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc64/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp, __tmp2;						      \
diff --git a/packages/glibc/2.16.0/630-mips_shn_undef-hack.patch b/packages/glibc/2.13/0033-mips_shn_undef-hack.patch
similarity index 62%
rename from packages/glibc/2.16.0/630-mips_shn_undef-hack.patch
rename to packages/glibc/2.13/0033-mips_shn_undef-hack.patch
index 791d76cf..2f9d6568 100644
--- a/packages/glibc/2.16.0/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.13/0033-mips_shn_undef-hack.patch
@@ -1,10 +1,13 @@
-diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
---- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
+---
+ elf/dl-lookup.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/elf/dl-lookup.c
++++ b/elf/dl-lookup.c
 @@ -301,6 +301,12 @@
  	      /* FALLTHROUGH */
  	    case STB_GLOBAL:
-	    success:
+ 	    success:
 +#ifdef __mips__
 +	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
 +		 symbols, we skip them. */
diff --git a/packages/glibc/2.12.1/640-alpha-atfcts.patch b/packages/glibc/2.13/0034-alpha-atfcts.patch
similarity index 63%
rename from packages/glibc/2.12.1/640-alpha-atfcts.patch
rename to packages/glibc/2.13/0034-alpha-atfcts.patch
index 90a9d0df..2eff9188 100644
--- a/packages/glibc/2.12.1/640-alpha-atfcts.patch
+++ b/packages/glibc/2.13/0034-alpha-atfcts.patch
@@ -1,5 +1,9 @@
---- glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -437,7 +437,8 @@
     the code.  On PPC they were introduced in 2.6.17-rc1,
     on SH in 2.6.19-rc1.  */
diff --git a/packages/glibc/2.13/650-syslog.patch b/packages/glibc/2.13/0035-syslog.patch
similarity index 57%
rename from packages/glibc/2.13/650-syslog.patch
rename to packages/glibc/2.13/0035-syslog.patch
index c20cafc8..a2d9722a 100644
--- a/packages/glibc/2.13/650-syslog.patch
+++ b/packages/glibc/2.13/0035-syslog.patch
@@ -1,6 +1,9 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
+---
+ misc/syslog.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/misc/syslog.c
++++ b/misc/syslog.c
 @@ -152,7 +152,7 @@
  #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
  	/* Check for invalid bits. */
diff --git a/packages/glibc/2.13/0036-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.13/0036-debug-readlink_chk-readklinkat_chk.patch
new file mode 100644
index 00000000..0b930f38
--- /dev/null
+++ b/packages/glibc/2.13/0036-debug-readlink_chk-readklinkat_chk.patch
@@ -0,0 +1,27 @@
+---
+ debug/readlink_chk.c   |    2 +-
+ debug/readlinkat_chk.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/debug/readlink_chk.c
++++ b/debug/readlink_chk.c
+@@ -25,7 +25,7 @@
+ 
+ 
+ ssize_t
+-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
++__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
+ {
+   if (len > buflen)
+     __chk_fail ();
+--- a/debug/readlinkat_chk.c
++++ b/debug/readlinkat_chk.c
+@@ -21,7 +21,7 @@
+ 
+ 
+ ssize_t
+-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
++__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
+ 		  size_t buflen)
+ {
+   if (len > buflen)
diff --git a/packages/glibc/2.13/900-march-i686.patch b/packages/glibc/2.13/0037-march-i686.patch
similarity index 55%
rename from packages/glibc/2.13/900-march-i686.patch
rename to packages/glibc/2.13/0037-march-i686.patch
index 7f5b1cee..e5ad2e07 100644
--- a/packages/glibc/2.13/900-march-i686.patch
+++ b/packages/glibc/2.13/0037-march-i686.patch
@@ -3,9 +3,13 @@
        * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
        * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
 
-diff -urN glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:36:19.858708534 +0100
+---
+ nptl/sysdeps/pthread/pt-initfini.c    |    5 +++++
+ sysdeps/unix/sysv/linux/i386/sysdep.h |    4 ++++
+ 2 files changed, 9 insertions(+)
+
+--- a/nptl/sysdeps/pthread/pt-initfini.c
++++ b/nptl/sysdeps/pthread/pt-initfini.c
 @@ -45,6 +45,11 @@
  /* Embed an #include to pull in the alignment and .end directives. */
  asm ("\n#include \"defs.h\"");
@@ -18,9 +22,8 @@ diff -urN glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.1/nptl
  /* The initial common code ends here. */
  asm ("\n/*@HEADER_ENDS*/");
  
-diff -urN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:36:19.858708534 +0100
+--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
++++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
 @@ -29,6 +29,10 @@
  #include <dl-sysdep.h>
  #include <tls.h>
diff --git a/packages/glibc/2.19/910-typedef-caddr.patch b/packages/glibc/2.13/0038-typedef-caddr.patch
similarity index 51%
rename from packages/glibc/2.19/910-typedef-caddr.patch
rename to packages/glibc/2.13/0038-typedef-caddr.patch
index e29e8101..384338a6 100644
--- a/packages/glibc/2.19/910-typedef-caddr.patch
+++ b/packages/glibc/2.13/0038-typedef-caddr.patch
@@ -1,6 +1,10 @@
-diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
---- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+---
+ posix/sys/types.h  |    3 +++
+ sunrpc/rpc/types.h |    3 +++
+ 2 files changed, 6 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
 @@ -114,7 +114,10 @@
  #ifdef	__USE_BSD
  # ifndef __daddr_t_defined
@@ -12,10 +16,9 @@ diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
  #  define __daddr_t_defined
  # endif
  #endif
-diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
---- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
-@@ -80,7 +80,10 @@
+--- a/sunrpc/rpc/types.h
++++ b/sunrpc/rpc/types.h
+@@ -86,7 +86,10 @@
  #endif
  #ifndef __daddr_t_defined
  typedef __daddr_t daddr_t;
diff --git a/packages/glibc/2.13/920-fix-rpc_parse-format.patch b/packages/glibc/2.13/0039-fix-rpc_parse-format.patch
similarity index 95%
rename from packages/glibc/2.13/920-fix-rpc_parse-format.patch
rename to packages/glibc/2.13/0039-fix-rpc_parse-format.patch
index 37e58dac..341d5413 100644
--- a/packages/glibc/2.13/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.13/0039-fix-rpc_parse-format.patch
@@ -45,11 +45,13 @@ Date:   Tue Nov 8 23:44:51 2016 +0000
             [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
             [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
 
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/sunrpc/rpc_parse.c
 +++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
+@@ -521,7 +521,7 @@
  get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
  {
    token tok;
diff --git a/packages/glibc/2.12.1/940-nis-bogus-conditional.patch b/packages/glibc/2.13/0040-nis-bogus-conditional.patch
similarity index 91%
rename from packages/glibc/2.12.1/940-nis-bogus-conditional.patch
rename to packages/glibc/2.13/0040-nis-bogus-conditional.patch
index 09b38cf1..732b859b 100644
--- a/packages/glibc/2.12.1/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.13/0040-nis-bogus-conditional.patch
@@ -47,11 +47,13 @@ Date:   Wed Dec 21 23:44:01 2016 +0000
             * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
             Compare name == NULL, not name != NULL.
 
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/nis/nss_nisplus/nisplus-alias.c
 +++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
+@@ -293,7 +293,7 @@
  	return status;
      }
  
diff --git a/packages/glibc/2.14.1/950-initfini-ppc64.patch b/packages/glibc/2.13/0041-initfini-ppc64.patch
similarity index 73%
rename from packages/glibc/2.14.1/950-initfini-ppc64.patch
rename to packages/glibc/2.13/0041-initfini-ppc64.patch
index 87f8d236..c63c654e 100644
--- a/packages/glibc/2.14.1/950-initfini-ppc64.patch
+++ b/packages/glibc/2.13/0041-initfini-ppc64.patch
@@ -7,9 +7,13 @@ commit 1fe05ea95e1460e5e1cf1568a8ce3982f0f02de6
 Author: Ryan S. Arnold <rsa@us.ibm.com>
 Date: Tue May 3 17:26:17 2011 -0500
 
---- glibc.orig/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:06.713568781 -0800
-+++ glibc/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:50.318605517 -0800
-@@ -31,7 +31,7 @@
+---
+ sysdeps/powerpc/powerpc64/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sysdeps/powerpc/powerpc64/Makefile
++++ b/sysdeps/powerpc/powerpc64/Makefile
+@@ -28,7 +28,7 @@
  ifneq ($(elf),no)
  # The initfini generation code doesn't work in the presence of -fPIC, so
  # we use -fpic instead which is much better.
diff --git a/packages/glibc/2.13/998-obstack-common.patch b/packages/glibc/2.13/0042-obstack-common.patch
similarity index 87%
rename from packages/glibc/2.13/998-obstack-common.patch
rename to packages/glibc/2.13/0042-obstack-common.patch
index 4b95f062..1993be24 100644
--- a/packages/glibc/2.13/998-obstack-common.patch
+++ b/packages/glibc/2.13/0042-obstack-common.patch
@@ -15,11 +15,13 @@ Date:   Wed May 15 20:28:08 2013 +0200
             * malloc/obstack.c (_obstack_compat): Add initializer.
     -
 
-diff --git a/malloc/obstack.c b/malloc/obstack.c
-index 25a90514f7..c3c7db4a96 100644
+---
+ malloc/obstack.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/malloc/obstack.c
 +++ b/malloc/obstack.c
-@@ -115,7 +115,7 @@ int obstack_exit_failure = EXIT_FAILURE;
+@@ -117,7 +117,7 @@
  /* A looong time ago (before 1994, anyway; we're not sure) this global variable
     was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
     library still exports it because somebody might use it.  */
diff --git a/packages/glibc/2.15/999-new-tools.patch b/packages/glibc/2.13/0043-new-tools.patch
similarity index 79%
rename from packages/glibc/2.15/999-new-tools.patch
rename to packages/glibc/2.13/0043-new-tools.patch
index e0632a3a..4408ffee 100644
--- a/packages/glibc/2.15/999-new-tools.patch
+++ b/packages/glibc/2.13/0043-new-tools.patch
@@ -1,7 +1,11 @@
-diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
---- glibc-2.15.orig/configure	2012-03-19 07:56:58.000000000 -0700
-+++ glibc-2.15/configure	2017-02-08 00:38:53.578049806 -0800
-@@ -4922,7 +4922,7 @@ $as_echo_n "checking version of $CC... "
+---
+ configure    |    8 ++++----
+ configure.in |    8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -5041,7 +5041,7 @@
    ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -10,7 +14,7 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -4985,7 +4985,7 @@ $as_echo_n "checking version of $MAKE...
+@@ -5104,7 +5104,7 @@
    ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -19,7 +23,7 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5112,7 +5112,7 @@ $as_echo_n "checking version of $MAKEINF
+@@ -5231,7 +5231,7 @@
    ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -28,7 +32,7 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5172,7 +5172,7 @@ else
+@@ -5291,7 +5291,7 @@
    # Found it, now check the version.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
  $as_echo_n "checking version of $SED... " >&6; }
@@ -37,10 +41,9 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
      3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
---- glibc-2.15.orig/configure.in	2012-01-01 04:16:32.000000000 -0800
-+++ glibc-2.15/configure.in	2017-02-08 00:30:47.440841480 -0800
-@@ -1000,11 +1000,11 @@ fi
+--- a/configure.in
++++ b/configure.in
+@@ -1026,11 +1026,11 @@
  # These programs are version sensitive.
  AC_CHECK_TOOL_PREFIX
  AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
@@ -54,7 +57,7 @@ diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
  
  AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
    [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -1012,10 +1012,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
+@@ -1038,10 +1038,10 @@
    MSGFMT=: aux_missing="$aux_missing msgfmt")
  AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
    [GNU texinfo.* \([0-9][0-9.]*\)],
diff --git a/packages/glibc/2.13/430-alpha-creat.patch b/packages/glibc/2.13/430-alpha-creat.patch
deleted file mode 100644
index da6dddad..00000000
--- a/packages/glibc/2.13/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/packages/glibc/2.13/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.13/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a70528..00000000
--- a/packages/glibc/2.13/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/packages/glibc/2.14.1/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.14.1/0000-respect-env-CPPFLAGS.patch
similarity index 71%
rename from packages/glibc/2.14.1/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.14.1/0000-respect-env-CPPFLAGS.patch
index 3798cb21..8bb86793 100644
--- a/packages/glibc/2.14.1/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.14.1/0000-respect-env-CPPFLAGS.patch
@@ -1,10 +1,13 @@
 Respect environment CPPFLAGS when we run ./configure so we can inject
 random -D things without having to set CFLAGS/ASFLAGS
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.13/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-@@ -697,6 +697,7 @@
+---
+ Makeconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -699,6 +699,7 @@
  	   $(foreach lib,$(libof-$(basename $(@F))) \
  			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
  	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
diff --git a/packages/glibc/2.12.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.14.1/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
similarity index 78%
rename from packages/glibc/2.12.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
rename to packages/glibc/2.14.1/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..30a70a2f 100644
--- a/packages/glibc/2.12.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.14.1/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -5,16 +5,13 @@ Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
  -Wparentheses
 
 ---
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
 
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
 --- a/nis/nis_call.c
 +++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
+@@ -682,16 +682,18 @@
    /* Choose which entry should be evicted from the cache.  */
    loc = &nis_server_cache[0];
    if (*loc != NULL)
@@ -42,11 +39,9 @@ index 3fa37e4..cb7839a 100644
    old = *loc;
    *loc = new;
  
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
 --- a/stdlib/setenv.c
 +++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
+@@ -328,18 +328,20 @@
    ep = __environ;
    if (ep != NULL)
      while (*ep != NULL)
@@ -54,7 +49,12 @@ index da61ee0..e66045f 100644
 -	{
 -	  /* Found it.  Remove this pointer by moving later ones back.  */
 -	  char **dp = ep;
--
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
 -	  do
 -	    dp[0] = dp[1];
 -	  while (*dp++);
@@ -62,12 +62,6 @@ index da61ee0..e66045f 100644
 -	}
 -      else
 -	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
 +	    do
 +		dp[0] = dp[1];
 +	    while (*dp++);
@@ -79,6 +73,3 @@ index da61ee0..e66045f 100644
  
    UNLOCK;
  
--- 
-2.7.4
-
diff --git a/packages/glibc/2.13/102-fix-signed-shift-overlow.patch b/packages/glibc/2.14.1/0002-fix-signed-shift-overlow.patch
similarity index 84%
rename from packages/glibc/2.13/102-fix-signed-shift-overlow.patch
rename to packages/glibc/2.14.1/0002-fix-signed-shift-overlow.patch
index ef49f831..5f76afe9 100644
--- a/packages/glibc/2.13/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.14.1/0002-fix-signed-shift-overlow.patch
@@ -12,11 +12,16 @@ Date:   Tue Jul 21 22:50:29 2015 -0700
     * string/strchrnul.c (STRCHRNUL):
     Rewrite code to avoid issues with signed shift overflow.
 
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
 --- a/string/memrchr.c
 +++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
+@@ -98,15 +98,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -34,11 +39,9 @@ index 0c8fd84..86cd5b9 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
 --- a/string/rawmemchr.c
 +++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
+@@ -90,15 +90,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -56,11 +59,9 @@ index 05b22be..228ca9d 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
 --- a/string/strchr.c
 +++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
+@@ -65,13 +65,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -76,11 +77,9 @@ index 5f90075..f13b2b3 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
 --- a/string/strchrnul.c
 +++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
+@@ -63,13 +63,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
diff --git a/packages/glibc/2.14.1/0003-dl-openat64-variadic.patch b/packages/glibc/2.14.1/0003-dl-openat64-variadic.patch
new file mode 100644
index 00000000..e69bb173
--- /dev/null
+++ b/packages/glibc/2.14.1/0003-dl-openat64-variadic.patch
@@ -0,0 +1,197 @@
+commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Oct 20 11:54:09 2015 +0000
+
+    Convert 113 more function definitions to prototype style (files with assertions).
+    
+    This mostly automatically-generated patch converts 113 function
+    definitions in glibc from old-style K&R to prototype-style.  Following
+    my other recent such patches, this one deals with the case of function
+    definitions in files that either contain assertions or where grep
+    suggested they might contain assertions - and thus where it isn't
+    possible to use a simple object code comparison as a sanity check on
+    the correctness of the patch, because line numbers are changed.
+    
+    A few such automatically-generated changes needed to be supplemented
+    by manual changes for the result to compile.  openat64 had a prototype
+    declaration with "..." but an old-style definition in
+    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
+    generated prototype in the definition (I've filed
+    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
+    such cases in GCC; the old state was undefined behavior not requiring
+    a diagnostic, but one seems a good idea).  In addition, as Florian has
+    noted regparm attribute mismatches between declaration and definition
+    are only diagnosed for prototype definitions, and five functions
+    needed internal_function added to their definitions (in the case of
+    __pthread_mutex_cond_lock, via the macro definition of
+    __pthread_mutex_lock) to compile on i386.
+    
+    After this patch is in, remaining old-style definitions are probably
+    most readily fixed manually before we can turn on
+    -Wold-style-definition for all builds.
+    
+    Tested for x86_64 and x86 (testsuite).
+    
+            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
+            function definition.
+            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
+            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
+            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
+            * elf/dl-minimal.c (_itoa): Likewise.
+            * hurd/hurdmalloc.c (malloc): Likewise.
+            (free): Likewise.
+            (realloc): Likewise.
+            * inet/inet6_option.c (inet6_option_space): Likewise.
+            (inet6_option_init): Likewise.
+            (inet6_option_append): Likewise.
+            (inet6_option_alloc): Likewise.
+            (inet6_option_next): Likewise.
+            (inet6_option_find): Likewise.
+            * io/ftw.c (FTW_NAME): Likewise.
+            (NFTW_NAME): Likewise.
+            (NFTW_NEW_NAME): Likewise.
+            (NFTW_OLD_NAME): Likewise.
+            * libio/iofwide.c (_IO_fwide): Likewise.
+            * libio/strops.c (_IO_str_init_static_internal): Likewise.
+            (_IO_str_init_static): Likewise.
+            (_IO_str_init_readonly): Likewise.
+            (_IO_str_overflow): Likewise.
+            (_IO_str_underflow): Likewise.
+            (_IO_str_count): Likewise.
+            (_IO_str_seekoff): Likewise.
+            (_IO_str_pbackfail): Likewise.
+            (_IO_str_finish): Likewise.
+            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
+            (_IO_wstr_overflow): Likewise.
+            (_IO_wstr_underflow): Likewise.
+            (_IO_wstr_count): Likewise.
+            (_IO_wstr_seekoff): Likewise.
+            (_IO_wstr_pbackfail): Likewise.
+            (_IO_wstr_finish): Likewise.
+            * locale/programs/localedef.c (normalize_codeset): Likewise.
+            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
+            (add_locales_to_archive): Likewise.
+            (delete_locales_from_archive): Likewise.
+            * malloc/malloc.c (__libc_mallinfo): Likewise.
+            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
+            * misc/tsearch.c (__tfind): Likewise.
+            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
+            * nptl/pthread_attr_getdetachstate.c
+            (__pthread_attr_getdetachstate): Likewise.
+            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
+            Likewise.
+            * nptl/pthread_attr_getinheritsched.c
+            (__pthread_attr_getinheritsched): Likewise.
+            * nptl/pthread_attr_getschedparam.c
+            (__pthread_attr_getschedparam): Likewise.
+            * nptl/pthread_attr_getschedpolicy.c
+            (__pthread_attr_getschedpolicy): Likewise.
+            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
+            Likewise.
+            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
+            Likewise.
+            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
+            Likewise.
+            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
+            Likewise.
+            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
+            (__pthread_attr_init_2_0): Likewise.
+            * nptl/pthread_attr_setdetachstate.c
+            (__pthread_attr_setdetachstate): Likewise.
+            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
+            Likewise.
+            * nptl/pthread_attr_setinheritsched.c
+            (__pthread_attr_setinheritsched): Likewise.
+            * nptl/pthread_attr_setschedparam.c
+            (__pthread_attr_setschedparam): Likewise.
+            * nptl/pthread_attr_setschedpolicy.c
+            (__pthread_attr_setschedpolicy): Likewise.
+            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
+            Likewise.
+            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
+            Likewise.
+            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
+            Likewise.
+            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
+            Likewise.
+            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
+            Likewise.
+            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
+            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
+            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
+            use internal_function.
+            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
+            prototype-style function definition.
+            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
+            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
+            internal_function.
+            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
+            Convert to prototype-style function definition.
+            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
+            Likewise.
+            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
+            Likewise.
+            (__pthread_mutex_unlock): Likewise.
+            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
+            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
+            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
+            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
+            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
+            * nss/makedb.c (process_input): Likewise.
+            * posix/fnmatch.c (__strchrnul): Likewise.
+            (__wcschrnul): Likewise.
+            (fnmatch): Likewise.
+            * posix/fnmatch_loop.c (FCT): Likewise.
+            * posix/glob.c (globfree): Likewise.
+            (__glob_pattern_type): Likewise.
+            (__glob_pattern_p): Likewise.
+            * posix/regcomp.c (re_compile_pattern): Likewise.
+            (re_set_syntax): Likewise.
+            (re_compile_fastmap): Likewise.
+            (regcomp): Likewise.
+            (regerror): Likewise.
+            (regfree): Likewise.
+            * posix/regexec.c (regexec): Likewise.
+            (re_match): Likewise.
+            (re_search): Likewise.
+            (re_match_2): Likewise.
+            (re_search_2): Likewise.
+            (re_search_stub): Likewise.  Use internal_function
+            (re_copy_regs): Likewise.
+            (re_set_registers): Convert to prototype-style function
+            definition.
+            (prune_impossible_nodes): Likewise.  Use internal_function.
+            * resolv/inet_net_pton.c (inet_net_pton): Convert to
+            prototype-style function definition.
+            (inet_net_pton_ipv4): Likewise.
+            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
+            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
+            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
+            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
+            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
+            Make variadic.
+            * time/strptime_l.c (localtime_r): Convert to prototype-style
+            function definition.
+            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
+            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
+            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
+            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
+
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/sysdeps/unix/sysv/linux/dl-openat64.c
++++ b/sysdeps/unix/sysv/linux/dl-openat64.c
+@@ -24,10 +24,7 @@
+ 
+ 
+ int
+-openat64 (dfd, file, oflag)
+-     int dfd;
+-     const char *file;
+-     int oflag;
++openat64 (int dfd, const char *file, int oflag, ...)
+ {
+   assert ((oflag & O_CREAT) == 0);
+ 
diff --git a/packages/glibc/2.12.1/104-unused-variables.patch b/packages/glibc/2.14.1/0004-unused-variables.patch
similarity index 79%
rename from packages/glibc/2.12.1/104-unused-variables.patch
rename to packages/glibc/2.14.1/0004-unused-variables.patch
index e063675a..18adb17f 100644
--- a/packages/glibc/2.12.1/104-unused-variables.patch
+++ b/packages/glibc/2.14.1/0004-unused-variables.patch
@@ -19,8 +19,18 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    6 ------
+ sysdeps/ieee754/flt-32/s_cosf.c        |    6 ------
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ 9 files changed, 1 insertion(+), 26 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,11 +44,9 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
-@@ -65,10 +65,8 @@
+@@ -69,10 +69,8 @@
  /**/ hpi1           = {{0x3c91a626, 0x33145c07} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0xbff921fb, 0x54442d18} }, /* -pi/2         */
  /**/ qpi            = {{0x3fe921fb, 0x54442d18} }, /*  pi/4         */
@@ -49,7 +57,7 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0xc002d97c, 0x7f3321d2} }, /* -3pi/4        */
  /**/ u1             = {{0x3c314c2a, 0x00000000} }, /*  9.377e-19    */
  /**/ u2             = {{0x3bf955e4, 0x00000000} }, /*  8.584e-20    */
-@@ -129,10 +127,8 @@
+@@ -139,10 +137,8 @@
  /**/ hpi1           = {{0x33145c07, 0x3c91a626} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0x54442d18, 0xbff921fb} }, /* -pi/2         */
  /**/ qpi            = {{0x54442d18, 0x3fe921fb} }, /*  pi/4         */
@@ -60,11 +68,9 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  
  #include "mydefs.h"
  
@@ -73,11 +79,9 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
-@@ -34,7 +34,6 @@
+@@ -36,7 +36,6 @@
  /**/ INF            = {{0x7ff00000, 0x00000000}}, /* INF           */
  /**/ nINF           = {{0xfff00000, 0x00000000}}, /* -INF          */
  /**/ NaNQ           = {{0x7ff80000, 0x00000000}}, /* NaNQ          */
@@ -85,7 +89,7 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0x3fe62e42, 0xfefa3800}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x3d2ef357, 0x93c76730}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0x4297ffff, 0xfffffd2c}}, /* 1.5*2**42 -724*2**-10  */
-@@ -48,7 +47,6 @@
+@@ -51,7 +50,6 @@
  /**/ INF            = {{0x00000000, 0x7ff00000}}, /* INF           */
  /**/ nINF           = {{0x00000000, 0xfff00000}}, /* -INF           */
  /**/ NaNQ           = {{0x00000000, 0x7ff80000}}, /* NaNQ          */
@@ -93,45 +97,39 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,12 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
- log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
+@@ -31,12 +31,6 @@
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
--#ifdef __STDC__
+ #ifdef __STDC__
 -static const float zero   =  0.0;
 -#else
 -static float zero   =  0.0;
 -#endif
 -
- #ifdef __STDC__
+-#ifdef __STDC__
  	float __ieee754_log10f(float x)
  #else
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
+ 	float __ieee754_log10f(x)
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,12 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
- #include "math.h"
+@@ -22,12 +22,6 @@
  #include "math_private.h"
  
--#ifdef __STDC__
+ #ifdef __STDC__
 -static const float one=1.0;
 -#else
 -static float one=1.0;
 -#endif
 -
- #ifdef __STDC__
+-#ifdef __STDC__
  	float __cosf(float x)
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
+ 	float __cosf(x)
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -74,7 +74,6 @@
  static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  static const long double one = 1.0L;
@@ -139,11 +137,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = 1.0e4000L;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -142,7 +142,6 @@
  static long double
  #endif
  tiny = 1e-4931L,
@@ -151,11 +147,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
diff --git a/packages/glibc/2.14.1/105-misleading-indentation.patch b/packages/glibc/2.14.1/0005-misleading-indentation.patch
similarity index 72%
rename from packages/glibc/2.14.1/105-misleading-indentation.patch
rename to packages/glibc/2.14.1/0005-misleading-indentation.patch
index 1dd8d851..35bcb1b8 100644
--- a/packages/glibc/2.14.1/105-misleading-indentation.patch
+++ b/packages/glibc/2.14.1/0005-misleading-indentation.patch
@@ -7,11 +7,13 @@ Date:   Fri Dec 11 09:19:37 2015 -0800
             * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
             Fix indentation.
 
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
 --- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
 +++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
+@@ -82,7 +82,9 @@
  
      /* compute q[0],q[1],...q[jk] */
  	for (i=0;i<=jk;i++) {
diff --git a/packages/glibc/2.14.1/106-dl-open-array-bounds.patch b/packages/glibc/2.14.1/0006-dl-open-array-bounds.patch
similarity index 88%
rename from packages/glibc/2.14.1/106-dl-open-array-bounds.patch
rename to packages/glibc/2.14.1/0006-dl-open-array-bounds.patch
index bdb5c19f..a61f1a58 100644
--- a/packages/glibc/2.14.1/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.14.1/0006-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -540,8 +540,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc/2.13/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.14.1/0007-i386-x86_64-revert-clone-cfi.patch
similarity index 56%
rename from packages/glibc/2.13/120-i386-x86_64-revert-clone-cfi.patch
rename to packages/glibc/2.14.1/0007-i386-x86_64-revert-clone-cfi.patch
index c7f6182d..f872bac4 100644
--- a/packages/glibc/2.13/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.14.1/0007-i386-x86_64-revert-clone-cfi.patch
@@ -4,16 +4,13 @@ elsewhere.  this cfi code does not gain us a whole lot anyways.
 
 http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
 
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
+---
+ sysdeps/unix/sysv/linux/i386/clone.S   |    4 ----
+ sysdeps/unix/sysv/linux/x86_64/clone.S |    4 ----
+ 2 files changed, 8 deletions(-)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/i386/clone.S
++++ b/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@
  	ret
  
@@ -32,9 +29,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysde
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ b/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@
  	ret
  
diff --git a/packages/glibc/2.14.1/140-disable-ldconfig.patch b/packages/glibc/2.14.1/0008-disable-ldconfig.patch
similarity index 73%
rename from packages/glibc/2.14.1/140-disable-ldconfig.patch
rename to packages/glibc/2.14.1/0008-disable-ldconfig.patch
index 378e1df5..d60cb409 100644
--- a/packages/glibc/2.14.1/140-disable-ldconfig.patch
+++ b/packages/glibc/2.14.1/0008-disable-ldconfig.patch
@@ -3,9 +3,12 @@ file outside of the chroot.  doesnt matter anyways as we wont use the cache
 results (portage will rebuild cache), so running ldconfig is simply a waste
 of time.
 
-diff -durN glibc-2.13.orig/Makefile glibc-2.13/Makefile
---- glibc-2.13.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.13/Makefile	2009-11-13 00:49:49.000000000 +0100
+---
+ Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makefile
++++ b/Makefile
 @@ -116,6 +116,7 @@
  	rm -f $(symbolic-link-list)
  
diff --git a/packages/glibc/2.14.1/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.14.1/0009-Fix-combreloc-test-BSD-grep.patch
similarity index 69%
rename from packages/glibc/2.14.1/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.14.1/0009-Fix-combreloc-test-BSD-grep.patch
index d720d391..5e68aa38 100644
--- a/packages/glibc/2.14.1/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.14.1/0009-Fix-combreloc-test-BSD-grep.patch
@@ -13,15 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
---- glibc-2.14.1.orig/configure	2011-10-07 02:48:55.000000000 -0700
-+++ glibc-2.14.1/configure	2017-03-08 21:06:36.000000000 -0800
-@@ -6377,7 +6377,7 @@ EOF
+--- a/configure
++++ b/configure
+@@ -6377,7 +6377,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
    then
@@ -30,10 +28,9 @@ diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
        libc_cv_z_combreloc=yes
      else
        libc_cv_z_combreloc=no
-diff -urpN glibc-2.14.1.orig/configure.in glibc-2.14.1/configure.in
---- glibc-2.14.1.orig/configure.in	2011-10-07 02:48:55.000000000 -0700
-+++ glibc-2.14.1/configure.in	2017-03-08 21:06:50.000000000 -0800
-@@ -1655,7 +1655,7 @@ dnl cross-platform since the gcc used ca
+--- a/configure.in
++++ b/configure.in
+@@ -1655,7 +1655,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
diff --git a/packages/glibc/2.13/150-queue-header-updates.patch b/packages/glibc/2.14.1/0010-queue-header-updates.patch
similarity index 90%
rename from packages/glibc/2.13/150-queue-header-updates.patch
rename to packages/glibc/2.14.1/0010-queue-header-updates.patch
index 7cbe70ef..f6515e2b 100644
--- a/packages/glibc/2.13/150-queue-header-updates.patch
+++ b/packages/glibc/2.14.1/0010-queue-header-updates.patch
@@ -2,11 +2,12 @@ grab some updates from FreeBSD
 
 http://bugs.gentoo.org/201979
 
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
+---
+ misc/sys/queue.h |   36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
 
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
---- glibc-2.13.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.13/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
+--- a/misc/sys/queue.h
++++ b/misc/sys/queue.h
 @@ -136,6 +136,11 @@
  		(var);							\
  		(var) = ((var)->field.le_next))
diff --git a/packages/glibc/2.13/160-manual-no-perl.patch b/packages/glibc/2.14.1/0011-manual-no-perl.patch
similarity index 74%
rename from packages/glibc/2.13/160-manual-no-perl.patch
rename to packages/glibc/2.14.1/0011-manual-no-perl.patch
index 5e2b807d..7e232aa0 100644
--- a/packages/glibc/2.13/160-manual-no-perl.patch
+++ b/packages/glibc/2.14.1/0011-manual-no-perl.patch
@@ -4,10 +4,13 @@ deal, so just whine a little and continue on our merry way.
 
 http://bugs.gentoo.org/60132
 
-diff -durN glibc-2.13.orig/manual/Makefile glibc-2.13/manual/Makefile
---- glibc-2.13.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
-+++ glibc-2.13/manual/Makefile	2009-11-13 00:49:54.000000000 +0100
-@@ -104,9 +104,14 @@
+---
+ manual/Makefile |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/manual/Makefile
++++ b/manual/Makefile
+@@ -106,9 +106,14 @@
  libm-err.texi: stamp-libm-err
  stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
  						     $(dir)/libm-test-ulps))
diff --git a/packages/glibc/2.16.0/170-localedef-fix-trampoline.patch b/packages/glibc/2.14.1/0012-localedef-fix-trampoline.patch
similarity index 87%
rename from packages/glibc/2.16.0/170-localedef-fix-trampoline.patch
rename to packages/glibc/2.14.1/0012-localedef-fix-trampoline.patch
index 3cc65597..3b8fd6e8 100644
--- a/packages/glibc/2.16.0/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.14.1/0012-localedef-fix-trampoline.patch
@@ -5,9 +5,12 @@
 # DP: Upstream status: Unknown
 # DP: Status Details: Unknown
 # DP: Date: 2004-03-16
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
+---
+# locale/programs/3level.h |   36 ++++++++++++++++++++++++++++++++++++
+# 1 file changed, 36 insertions(+)
+#
+--- a/locale/programs/3level.h
++++ b/locale/programs/3level.h
 @@ -203,6 +203,42 @@
  	}
      }
diff --git a/packages/glibc/2.13/180-resolv-dynamic.patch b/packages/glibc/2.14.1/0013-resolv-dynamic.patch
similarity index 81%
rename from packages/glibc/2.13/180-resolv-dynamic.patch
rename to packages/glibc/2.14.1/0013-resolv-dynamic.patch
index e916bce3..fcc2f80a 100644
--- a/packages/glibc/2.13/180-resolv-dynamic.patch
+++ b/packages/glibc/2.14.1/0013-resolv-dynamic.patch
@@ -5,9 +5,12 @@ already running get the updated information.
 
 http://bugs.gentoo.org/177416
 
-diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c
---- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
+---
+ resolv/res_libc.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+--- a/resolv/res_libc.c
++++ b/resolv/res_libc.c
 @@ -22,6 +22,7 @@
  #include <arpa/nameser.h>
  #include <resolv.h>
diff --git a/packages/glibc/2.12.1/190-localedef-mmap.patch b/packages/glibc/2.14.1/0014-localedef-mmap.patch
similarity index 81%
rename from packages/glibc/2.12.1/190-localedef-mmap.patch
rename to packages/glibc/2.14.1/0014-localedef-mmap.patch
index b24ed802..74e586ee 100644
--- a/packages/glibc/2.12.1/190-localedef-mmap.patch
+++ b/packages/glibc/2.14.1/0014-localedef-mmap.patch
@@ -7,9 +7,12 @@ http://bugs.gentoo.org/289615
 	used later with MMAP_FIXED | MMAP_SHARED to cope with different
 	alignment restrictions.
 
-diff -durN glibc-2.12.1.orig/locale/programs/locarchive.c glibc-2.12.1/locale/programs/locarchive.c
---- glibc-2.12.1.orig/locale/programs/locarchive.c	2009-04-27 16:07:47.000000000 +0200
-+++ glibc-2.12.1/locale/programs/locarchive.c	2009-11-13 00:50:01.000000000 +0100
+---
+ locale/programs/locarchive.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/locale/programs/locarchive.c
++++ b/locale/programs/locarchive.c
 @@ -134,7 +134,7 @@
    size_t reserved = RESERVE_MMAP_SIZE;
    int xflags = 0;
diff --git a/packages/glibc/2.14.1/200-fadvise64_64.patch b/packages/glibc/2.14.1/0015-fadvise64_64.patch
similarity index 67%
rename from packages/glibc/2.14.1/200-fadvise64_64.patch
rename to packages/glibc/2.14.1/0015-fadvise64_64.patch
index 71bca381..191d8330 100644
--- a/packages/glibc/2.14.1/200-fadvise64_64.patch
+++ b/packages/glibc/2.14.1/0015-fadvise64_64.patch
@@ -3,9 +3,8 @@ ripped from Debian
  sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/posix_fadvise.c
++++ b/sysdeps/unix/sysv/linux/posix_fadvise.c
 @@ -35,6 +35,19 @@
      return INTERNAL_SYSCALL_ERRNO (ret, err);
    return 0;
diff --git a/packages/glibc/2.14.1/220-section-comments.patch b/packages/glibc/2.14.1/0016-section-comments.patch
similarity index 73%
rename from packages/glibc/2.14.1/220-section-comments.patch
rename to packages/glibc/2.14.1/0016-section-comments.patch
index d717829e..4718f227 100644
--- a/packages/glibc/2.14.1/220-section-comments.patch
+++ b/packages/glibc/2.14.1/0016-section-comments.patch
@@ -3,10 +3,13 @@ http://sources.redhat.com/ml/binutils/2004-04/msg00665.html
 fixes building on some architectures (like m68k/arm/cris/etc...) because
 it does the right thing
 
-diff -durN glibc-2.13.orig/include/libc-symbols.h glibc-2.13/include/libc-symbols.h
---- glibc-2.13.orig/include/libc-symbols.h	2009-03-14 00:51:46.000000000 +0100
-+++ glibc-2.13/include/libc-symbols.h	2009-11-13 00:50:07.000000000 +0100
-@@ -239,12 +239,12 @@
+---
+ include/libc-symbols.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/include/libc-symbols.h
++++ b/include/libc-symbols.h
+@@ -240,12 +240,12 @@
  #  define __make_section_unallocated(section_string)
  # endif
  
diff --git a/packages/glibc/2.15/230-no-inline-gmon.patch b/packages/glibc/2.14.1/0017-no-inline-gmon.patch
similarity index 71%
rename from packages/glibc/2.15/230-no-inline-gmon.patch
rename to packages/glibc/2.14.1/0017-no-inline-gmon.patch
index fa33c2b4..ed027040 100644
--- a/packages/glibc/2.15/230-no-inline-gmon.patch
+++ b/packages/glibc/2.14.1/0017-no-inline-gmon.patch
@@ -19,12 +19,12 @@ Kazu Hirata
 	* sysdeps/generic/initfini.c (call_gmon_start): Add
 	__attribute__ ((noinline)).
 
-Index: sysdeps/generic/initfini.c
-===================================================================
+---
+ sysdeps/generic/initfini.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/sysdeps/generic/initfini.c glibc-2.13/sysdeps/generic/initfini.c
---- glibc-2.13.orig/sysdeps/generic/initfini.c	2007-06-17 20:02:40.000000000 +0200
-+++ glibc-2.13/sysdeps/generic/initfini.c	2009-11-13 00:50:09.000000000 +0100
+--- a/sysdeps/generic/initfini.c
++++ b/sysdeps/generic/initfini.c
 @@ -70,7 +70,7 @@
  /* The beginning of _init:  */
  asm ("\n/*@_init_PROLOG_BEGINS*/");
diff --git a/packages/glibc/2.14.1/260-assume-pipe2.patch b/packages/glibc/2.14.1/0018-assume-pipe2.patch
similarity index 82%
rename from packages/glibc/2.14.1/260-assume-pipe2.patch
rename to packages/glibc/2.14.1/0018-assume-pipe2.patch
index 42e8f4ed..0074ea65 100644
--- a/packages/glibc/2.14.1/260-assume-pipe2.patch
+++ b/packages/glibc/2.14.1/0018-assume-pipe2.patch
@@ -20,9 +20,12 @@ __have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
 older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
 stub for it.  so popen() will always fail as glibc assumes pipe2() works.
 
-diff -durN glibc-2.13.orig/socket/have_sock_cloexec.c glibc-2.13/socket/have_sock_cloexec.c
---- glibc-2.13.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.13/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
+---
+ socket/have_sock_cloexec.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/socket/have_sock_cloexec.c
++++ b/socket/have_sock_cloexec.c
 @@ -16,9 +16,14 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
diff --git a/packages/glibc/2.14.1/270-china.patch b/packages/glibc/2.14.1/0019-china.patch
similarity index 70%
rename from packages/glibc/2.14.1/270-china.patch
rename to packages/glibc/2.14.1/0019-china.patch
index 41d77590..b323cf67 100644
--- a/packages/glibc/2.14.1/270-china.patch
+++ b/packages/glibc/2.14.1/0019-china.patch
@@ -1,8 +1,11 @@
 
 
-diff -durN glibc-2.13.orig/localedata/locales/zh_TW glibc-2.13/localedata/locales/zh_TW
---- glibc-2.13.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.13/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
+---
+ localedata/locales/zh_TW |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/localedata/locales/zh_TW
++++ b/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
diff --git a/packages/glibc/2.13/280-new-valencian-locale.patch b/packages/glibc/2.14.1/0020-new-valencian-locale.patch
similarity index 81%
rename from packages/glibc/2.13/280-new-valencian-locale.patch
rename to packages/glibc/2.14.1/0020-new-valencian-locale.patch
index 4cdd108e..fab1ee3f 100644
--- a/packages/glibc/2.13/280-new-valencian-locale.patch
+++ b/packages/glibc/2.14.1/0020-new-valencian-locale.patch
@@ -1,10 +1,14 @@
 http://bugs.gentoo.org/show_bug.cgi?id=131815
 http://sourceware.org/bugzilla/show_bug.cgi?id=2522
 
-diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
---- glibc-2.13.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.13/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
-@@ -72,6 +72,8 @@
+---
+ localedata/SUPPORTED              |    2 
+ localedata/locales/ca_ES@valencia |   96 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 98 insertions(+)
+
+--- a/localedata/SUPPORTED
++++ b/localedata/SUPPORTED
+@@ -73,6 +73,8 @@
  ca_ES.UTF-8/UTF-8 \
  ca_ES/ISO-8859-1 \
  ca_ES@euro/ISO-8859-15 \
@@ -13,9 +17,8 @@ diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
  ca_FR.UTF-8/UTF-8 \
  ca_FR/ISO-8859-15 \
  ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.13.orig/localedata/locales/ca_ES@valencia glibc-2.13/localedata/locales/ca_ES@valencia
---- glibc-2.13.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
+--- /dev/null
++++ b/localedata/locales/ca_ES@valencia
 @@ -0,0 +1,96 @@
 +comment_char %
 +escape_char  /
diff --git a/packages/glibc/2.13/300-macos-cross-rpcgen.patch b/packages/glibc/2.14.1/0021-macos-cross-rpcgen.patch
similarity index 87%
rename from packages/glibc/2.13/300-macos-cross-rpcgen.patch
rename to packages/glibc/2.14.1/0021-macos-cross-rpcgen.patch
index e654644c..b439b0f6 100644
--- a/packages/glibc/2.13/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.14.1/0021-macos-cross-rpcgen.patch
@@ -14,11 +14,13 @@ Date:   Sat Sep 7 00:01:08 2013 +0800
     Signed-off-by: Jia Liu <proljc@gmail.com>
     Signed-off-by: Mike Frysinger <vapier@gentoo.org>
 
-diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
-index 3dca5c4..beded52 100644
+---
+ sunrpc/rpc/types.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
 --- a/sunrpc/rpc/types.h
 +++ b/sunrpc/rpc/types.h
-@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t;
+@@ -69,6 +69,11 @@
  #include <sys/types.h>
  #endif
  
diff --git a/packages/glibc/2.15/300-nscd-one-fork.patch b/packages/glibc/2.14.1/0022-nscd-one-fork.patch
similarity index 81%
rename from packages/glibc/2.15/300-nscd-one-fork.patch
rename to packages/glibc/2.14.1/0022-nscd-one-fork.patch
index adc9b3f1..47217b3b 100644
--- a/packages/glibc/2.15/300-nscd-one-fork.patch
+++ b/packages/glibc/2.14.1/0022-nscd-one-fork.patch
@@ -2,9 +2,12 @@ only fork one to assist in stop-start-daemon assumptions about daemon behavior
 
 http://bugs.gentoo.org/190785
 
-diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
---- glibc-2.13.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.13/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
+---
+ nscd/nscd.c |   12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+--- a/nscd/nscd.c
++++ b/nscd/nscd.c
 @@ -182,6 +182,9 @@
        if (pid != 0)
  	exit (0);
diff --git a/packages/glibc/2.13/310-hppa-nptl-carlos.patch b/packages/glibc/2.14.1/0023-hppa-nptl-carlos.patch
similarity index 84%
rename from packages/glibc/2.13/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.14.1/0023-hppa-nptl-carlos.patch
index 4c028b27..a385a6b0 100644
--- a/packages/glibc/2.13/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.14.1/0023-hppa-nptl-carlos.patch
@@ -1,8 +1,17 @@
 
 
-diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
---- glibc-2.13.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.13/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
+---
+ elf/rtld.c                    |   10 +++++-----
+ include/atomic.h              |   26 +++++++++++++-------------
+ nptl/Makefile                 |   35 ++++++++++++++++++++++++++++++++---
+ nptl/pthread_barrier_wait.c   |    2 +-
+ nptl/sysdeps/pthread/Makefile |    2 ++
+ stdio-common/Makefile         |    2 +-
+ sunrpc/clnt_udp.c             |    2 +-
+ 7 files changed, 55 insertions(+), 24 deletions(-)
+
+--- a/elf/rtld.c
++++ b/elf/rtld.c
 @@ -392,14 +392,14 @@
       know it is available.  We do not have to clear the memory if we
       do not have to use the temporary bootstrap_map.  Global variables
@@ -23,9 +32,8 @@ diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
  # endif
  # if USE___THREAD
    bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
---- glibc-2.13.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.13/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
+--- a/include/atomic.h
++++ b/include/atomic.h
 @@ -185,7 +185,7 @@
       __typeof (*(mem)) __atg5_value = (newvalue);			      \
  									      \
@@ -143,9 +151,8 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
       while (__builtin_expect						      \
  	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
  						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
---- glibc-2.13.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.13/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/Makefile
++++ b/nptl/Makefile
 @@ -265,9 +265,9 @@
  # Files which must not be linked with libpthread.
  tests-nolibpthread = tst-unload
@@ -195,9 +202,8 @@ diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
  CFLAGS-tst-align.c += $(stack-align-test-flags)
  CFLAGS-tst-align3.c += $(stack-align-test-flags)
  CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_barrier_wait.c
---- glibc-2.13.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.13/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/pthread_barrier_wait.c
++++ b/nptl/pthread_barrier_wait.c
 @@ -64,7 +64,7 @@
        do
  	lll_futex_wait (&ibarrier->curr_event, event,
@@ -207,9 +213,8 @@ diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_b
      }
  
    /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps/pthread/Makefile
---- glibc-2.13.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.13/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/sysdeps/pthread/Makefile
++++ b/nptl/sysdeps/pthread/Makefile
 @@ -33,7 +33,9 @@
  
  ifeq ($(have-forced-unwind),yes)
@@ -220,9 +225,8 @@ diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps
  endif
  endif
  
-diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefile
---- glibc-2.13.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.13/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
 @@ -82,7 +82,7 @@
  	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
  endif
@@ -232,10 +236,9 @@ diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefil
  CFLAGS-vfwprintf.c = -Wno-uninitialized
  CFLAGS-tst-printf.c = -Wno-format
  CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.13.orig/sunrpc/clnt_udp.c glibc-2.13/sunrpc/clnt_udp.c
---- glibc-2.13.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.13/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
-@@ -456,7 +456,7 @@
+--- a/sunrpc/clnt_udp.c
++++ b/sunrpc/clnt_udp.c
+@@ -463,7 +463,7 @@
        while (inlen < 0 && errno == EINTR);
        if (inlen < 0)
  	{
diff --git a/packages/glibc/2.14.1/340-dl_execstack-PaX-support.patch b/packages/glibc/2.14.1/0024-dl_execstack-PaX-support.patch
similarity index 73%
rename from packages/glibc/2.14.1/340-dl_execstack-PaX-support.patch
rename to packages/glibc/2.14.1/0024-dl_execstack-PaX-support.patch
index 2402af07..7b565493 100644
--- a/packages/glibc/2.14.1/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.14.1/0024-dl_execstack-PaX-support.patch
@@ -8,10 +8,14 @@
 
 	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
 
-diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
---- glibc-2.13.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.13/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -329,7 +329,8 @@
+---
+ nptl/allocatestack.c                   |    3 ++-
+ sysdeps/unix/sysv/linux/dl-execstack.c |   19 ++++++++++++++++---
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+--- a/nptl/allocatestack.c
++++ b/nptl/allocatestack.c
+@@ -335,7 +335,8 @@
  # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
  #endif
    if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
@@ -21,9 +25,8 @@ diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
  
    return 0;
  }
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/dl-execstack.c
++++ b/sysdeps/unix/sysv/linux/dl-execstack.c
 @@ -63,7 +63,10 @@
        else
  # endif
diff --git a/packages/glibc/2.15/350-pre20040117-pt_pax.patch b/packages/glibc/2.14.1/0025-pre20040117-pt_pax.patch
similarity index 88%
rename from packages/glibc/2.15/350-pre20040117-pt_pax.patch
rename to packages/glibc/2.14.1/0025-pre20040117-pt_pax.patch
index f8f6b834..ec17d24a 100644
--- a/packages/glibc/2.15/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.14.1/0025-pre20040117-pt_pax.patch
@@ -1,8 +1,11 @@
 
 
-diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
---- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
+---
+ elf/elf.h |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/elf/elf.h
++++ b/elf/elf.h
 @@ -580,6 +580,7 @@
  #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
  #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
diff --git a/packages/glibc/2.15/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.14.1/0026-tests-sandbox-libdl-paths.patch
similarity index 67%
rename from packages/glibc/2.15/360-tests-sandbox-libdl-paths.patch
rename to packages/glibc/2.14.1/0026-tests-sandbox-libdl-paths.patch
index 9f78c52f..1c4ee594 100644
--- a/packages/glibc/2.15/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.14.1/0026-tests-sandbox-libdl-paths.patch
@@ -15,9 +15,23 @@ Fix by Wormo
 
 http://bugs.gentoo.org/56898
 
-diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
---- glibc-2.13.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.13/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
+---
+ grp/tst_fgetgrent.sh        |    3 ++-
+ iconvdata/run-iconv-test.sh |    2 +-
+ iconvdata/tst-table.sh      |    5 ++++-
+ intl/tst-codeset.sh         |    3 +++
+ intl/tst-gettext.sh         |    5 ++++-
+ intl/tst-gettext2.sh        |    5 ++++-
+ intl/tst-translit.sh        |    5 ++++-
+ malloc/tst-mtrace.sh        |    5 ++++-
+ nptl/tst-tls6.sh            |    4 ++--
+ posix/globtest.sh           |    2 +-
+ posix/tst-getconf.sh        |    5 ++++-
+ posix/wordexp-tst.sh        |    5 ++++-
+ 12 files changed, 37 insertions(+), 12 deletions(-)
+
+--- a/grp/tst_fgetgrent.sh
++++ b/grp/tst_fgetgrent.sh
 @@ -24,7 +24,8 @@
  rtld_installed_name=$1; shift
  
@@ -28,9 +42,8 @@ diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
  
  result=0
  
-diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-iconv-test.sh
---- glibc-2.13.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.13/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/iconvdata/run-iconv-test.sh
++++ b/iconvdata/run-iconv-test.sh
 @@ -34,7 +34,7 @@
  export GCONV_PATH
  
@@ -40,9 +53,8 @@ diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-
  
  # How the start the iconv(1) program.
  ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table.sh
---- glibc-2.13.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.13/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/iconvdata/tst-table.sh
++++ b/iconvdata/tst-table.sh
 @@ -59,8 +59,11 @@
    irreversible=${charset}.irreversible
  fi
@@ -56,9 +68,8 @@ diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table
  ${objpfx}tst-table-from ${charset} \
    > ${objpfx}tst-${charset}.table
  
-diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
---- glibc-2.13.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.13/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-codeset.sh
++++ b/intl/tst-codeset.sh
 @@ -37,6 +37,9 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -69,9 +80,8 @@ diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
  ${common_objpfx}elf/ld.so --library-path $common_objpfx \
  ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
  
-diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
---- glibc-2.13.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-gettext.sh
++++ b/intl/tst-gettext.sh
 @@ -51,9 +51,12 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -86,9 +96,8 @@ diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
  ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
  
  exit $?
-diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
---- glibc-2.13.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-gettext2.sh
++++ b/intl/tst-gettext2.sh
 @@ -65,8 +65,11 @@
  LOCPATH=${objpfx}domaindir
  export LOCPATH
@@ -102,9 +111,8 @@ diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
  ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
  cmp ${objpfx}tst-gettext2.out - <<EOF
  String1 - Lang1: 1st string
-diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
---- glibc-2.13.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.13/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-translit.sh
++++ b/intl/tst-translit.sh
 @@ -36,7 +36,10 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -117,9 +125,8 @@ diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
  ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
  
  exit $?
-diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
---- glibc-2.13.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.13/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/malloc/tst-mtrace.sh
++++ b/malloc/tst-mtrace.sh
 @@ -24,9 +24,12 @@
  status=0
  trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
@@ -134,9 +141,8 @@ diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
    ${common_objpfx}malloc/tst-mtrace || status=1
  
  if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
---- glibc-2.13.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.13/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/nptl/tst-tls6.sh
++++ b/nptl/tst-tls6.sh
 @@ -5,8 +5,8 @@
  rtld_installed_name=$1; shift
  logfile=$common_objpfx/nptl/tst-tls6.out
@@ -148,9 +154,8 @@ diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
  tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
  	  ${common_objpfx}/nptl/tst-tls5"
  
-diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
---- glibc-2.13.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.13/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/globtest.sh
++++ b/posix/globtest.sh
 @@ -18,7 +18,7 @@
  esac
  
@@ -160,9 +165,8 @@ diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
  
  # Since we use `sort' we must make sure to use the same locale everywhere.
  LC_ALL=C
-diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
---- glibc-2.13.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.13/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/tst-getconf.sh
++++ b/posix/tst-getconf.sh
 @@ -10,7 +10,10 @@
  else
    rtld_installed_name=$1; shift
@@ -175,9 +179,8 @@ diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
    }
  fi
  
-diff -durN glibc-2.13.orig/posix/wordexp-tst.sh glibc-2.13/posix/wordexp-tst.sh
---- glibc-2.13.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.13/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/wordexp-tst.sh
++++ b/posix/wordexp-tst.sh
 @@ -19,8 +19,11 @@
  "
  export IFS
diff --git a/packages/glibc/2.14.1/380-dont-build-timezone.patch b/packages/glibc/2.14.1/0027-dont-build-timezone.patch
similarity index 69%
rename from packages/glibc/2.14.1/380-dont-build-timezone.patch
rename to packages/glibc/2.14.1/0027-dont-build-timezone.patch
index 11c358ea..9bbcde32 100644
--- a/packages/glibc/2.14.1/380-dont-build-timezone.patch
+++ b/packages/glibc/2.14.1/0027-dont-build-timezone.patch
@@ -1,9 +1,12 @@
 timezone data has been split into the package sys-libs/timezone-data
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:41.000000000 +0100
-@@ -944,7 +944,7 @@
+---
+ Makeconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -946,7 +946,7 @@
  	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
  	      grp pwd posix io termios resource misc socket sysvipc gmon    \
  	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
diff --git a/packages/glibc/2.14.1/400-alpha-xstat.patch b/packages/glibc/2.14.1/0028-alpha-xstat.patch
similarity index 57%
rename from packages/glibc/2.14.1/400-alpha-xstat.patch
rename to packages/glibc/2.14.1/0028-alpha-xstat.patch
index 6e4ab8fe..4fa9517e 100644
--- a/packages/glibc/2.14.1/400-alpha-xstat.patch
+++ b/packages/glibc/2.14.1/0028-alpha-xstat.patch
@@ -1,6 +1,9 @@
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -386,6 +386,11 @@
  # define __ASSUME_GETDENTS32_D_TYPE	1
  #endif
diff --git a/packages/glibc/2.14.1/0029-alpha-creat.patch b/packages/glibc/2.14.1/0029-alpha-creat.patch
new file mode 100644
index 00000000..6ef52782
--- /dev/null
+++ b/packages/glibc/2.14.1/0029-alpha-creat.patch
@@ -0,0 +1,17 @@
+alpha does not have a __NR_creat
+
+http://bugs.gentoo.org/227275
+http://sourceware.org/bugzilla/show_bug.cgi?id=6650
+
+---
+ sysdeps/unix/sysv/linux/wordsize-64/creat64.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
++++ b/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
+@@ -1 +1,5 @@
+ /* Defined as alias for the syscall.  */
++#include <sysdep.h>
++#ifndef __NR_creat
++#include "../../../../../io/creat64.c"
++#endif
diff --git a/packages/glibc/2.14.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.14.1/0030-alpha_alpha-add-fdatasync-support.patch
similarity index 74%
rename from packages/glibc/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.14.1/0030-alpha_alpha-add-fdatasync-support.patch
index 372f34c5..eeef22a4 100644
--- a/packages/glibc/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.14.1/0030-alpha_alpha-add-fdatasync-support.patch
@@ -13,10 +13,9 @@
  sysdeps/unix/sysv/linux/syscalls.list     |    1 
  4 files changed, 76 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
-@@ -20,6 +20,7 @@
+--- a/sysdeps/unix/sysv/linux/Makefile
++++ b/sysdeps/unix/sysv/linux/Makefile
+@@ -21,6 +21,7 @@
  		   setfsuid setfsgid makedev epoll_pwait signalfd \
  		   eventfd eventfd_read eventfd_write prlimit
  
@@ -24,9 +23,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/u
  CFLAGS-gethostid.c = -fexceptions
  
  sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/fdatasync.c
 @@ -0,0 +1,69 @@
 +/* fdatasync -- synchronize at least the data part of a file with 
 +   the underlying media. Linux version. 
@@ -97,9 +95,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdep
 +
 +weak_alias (__fdatasync, fdatasync)
 +
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -459,6 +459,12 @@
  # define __ASSUME_FUTEX_LOCK_PI	1
  #endif
@@ -113,10 +110,9 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/
  /* Support for utimensat syscall was added in 2.6.22, on SH
     only after 2.6.22-rc1.  */
  #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
-@@ -11,7 +11,6 @@
+--- a/sysdeps/unix/sysv/linux/syscalls.list
++++ b/sysdeps/unix/sysv/linux/syscalls.list
+@@ -12,7 +12,6 @@
  epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
  epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
  epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
diff --git a/packages/glibc/2.14.1/560-ppc-atomic.patch b/packages/glibc/2.14.1/0031-ppc-atomic.patch
similarity index 93%
rename from packages/glibc/2.14.1/560-ppc-atomic.patch
rename to packages/glibc/2.14.1/0031-ppc-atomic.patch
index ee1cb909..a38c1c53 100644
--- a/packages/glibc/2.14.1/560-ppc-atomic.patch
+++ b/packages/glibc/2.14.1/0031-ppc-atomic.patch
@@ -1,14 +1,13 @@
 sniped from suse
 
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
+---
+ sysdeps/powerpc/bits/atomic.h           |   66 ++++++++++-----------
+ sysdeps/powerpc/powerpc32/bits/atomic.h |   16 ++---
+ sysdeps/powerpc/powerpc64/bits/atomic.h |   98 ++++++++++++++++----------------
+ 3 files changed, 90 insertions(+), 90 deletions(-)
 
-diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powerpc/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/bits/atomic.h
++++ b/sysdeps/powerpc/bits/atomic.h
 @@ -85,14 +85,14 @@
        __typeof (*(mem)) __tmp;						      \
        __typeof (mem)  __memp = (mem);					      \
@@ -151,9 +150,8 @@ diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powe
  		       : "cr0", "memory");				      \
       __val;								      \
    })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/powerpc32/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc32/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp;							      \
@@ -192,9 +190,8 @@ diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sy
  		    : "cr0", "memory");					      \
    __tmp != 0;								      \
  })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/powerpc64/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc64/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp, __tmp2;						      \
diff --git a/packages/glibc/2.15/630-mips_shn_undef-hack.patch b/packages/glibc/2.14.1/0032-mips_shn_undef-hack.patch
similarity index 58%
rename from packages/glibc/2.15/630-mips_shn_undef-hack.patch
rename to packages/glibc/2.14.1/0032-mips_shn_undef-hack.patch
index 791d76cf..a12c977c 100644
--- a/packages/glibc/2.15/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.14.1/0032-mips_shn_undef-hack.patch
@@ -1,10 +1,13 @@
-diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
---- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
-@@ -301,6 +301,12 @@
+---
+ elf/dl-lookup.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/elf/dl-lookup.c
++++ b/elf/dl-lookup.c
+@@ -300,6 +300,12 @@
  	      /* FALLTHROUGH */
  	    case STB_GLOBAL:
-	    success:
+ 	    success:
 +#ifdef __mips__
 +	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
 +		 symbols, we skip them. */
diff --git a/packages/glibc/2.15/640-alpha-atfcts.patch b/packages/glibc/2.14.1/0033-alpha-atfcts.patch
similarity index 63%
rename from packages/glibc/2.15/640-alpha-atfcts.patch
rename to packages/glibc/2.14.1/0033-alpha-atfcts.patch
index 7a8a94a5..2eff9188 100644
--- a/packages/glibc/2.15/640-alpha-atfcts.patch
+++ b/packages/glibc/2.14.1/0033-alpha-atfcts.patch
@@ -1,5 +1,9 @@
---- glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -437,7 +437,8 @@
     the code.  On PPC they were introduced in 2.6.17-rc1,
     on SH in 2.6.19-rc1.  */
diff --git a/packages/glibc/2.14.1/650-syslog.patch b/packages/glibc/2.14.1/0034-syslog.patch
similarity index 57%
rename from packages/glibc/2.14.1/650-syslog.patch
rename to packages/glibc/2.14.1/0034-syslog.patch
index c20cafc8..a2d9722a 100644
--- a/packages/glibc/2.14.1/650-syslog.patch
+++ b/packages/glibc/2.14.1/0034-syslog.patch
@@ -1,6 +1,9 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
+---
+ misc/syslog.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/misc/syslog.c
++++ b/misc/syslog.c
 @@ -152,7 +152,7 @@
  #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
  	/* Check for invalid bits. */
diff --git a/packages/glibc/2.14.1/0035-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.14.1/0035-debug-readlink_chk-readklinkat_chk.patch
new file mode 100644
index 00000000..0b930f38
--- /dev/null
+++ b/packages/glibc/2.14.1/0035-debug-readlink_chk-readklinkat_chk.patch
@@ -0,0 +1,27 @@
+---
+ debug/readlink_chk.c   |    2 +-
+ debug/readlinkat_chk.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/debug/readlink_chk.c
++++ b/debug/readlink_chk.c
+@@ -25,7 +25,7 @@
+ 
+ 
+ ssize_t
+-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
++__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
+ {
+   if (len > buflen)
+     __chk_fail ();
+--- a/debug/readlinkat_chk.c
++++ b/debug/readlinkat_chk.c
+@@ -21,7 +21,7 @@
+ 
+ 
+ ssize_t
+-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
++__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
+ 		  size_t buflen)
+ {
+   if (len > buflen)
diff --git a/packages/glibc/2.14.1/900-cpuid-include.patch b/packages/glibc/2.14.1/0036-cpuid-include.patch
similarity index 97%
rename from packages/glibc/2.14.1/900-cpuid-include.patch
rename to packages/glibc/2.14.1/0036-cpuid-include.patch
index 0b8db71e..ac5c153d 100644
--- a/packages/glibc/2.14.1/900-cpuid-include.patch
+++ b/packages/glibc/2.14.1/0036-cpuid-include.patch
@@ -17,9 +17,13 @@ Tested x86_64 (native).
 
 Origin: http://sourceware.org/ml/libc-alpha/2012-03/msg00177.html
 
-diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure glibc-2.14.1/sysdeps/i386/configure
---- glibc-2.14.1.orig/sysdeps/i386/configure	2011-10-07 20:48:55.000000000 +1100
-+++ glibc-2.14.1/sysdeps/i386/configure	2012-07-25 01:23:11.799118927 +1000
+---
+ sysdeps/i386/configure    |  502 +---------------------------------------------
+ sysdeps/i386/configure.in |    5 
+ 2 files changed, 17 insertions(+), 490 deletions(-)
+
+--- a/sysdeps/i386/configure
++++ b/sysdeps/i386/configure
 @@ -16,23 +16,6 @@
    as_fn_set_status $1
    exit $1
@@ -610,9 +614,8 @@ diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure glibc-2.14.1/sysdeps/i386/con
    $as_echo_n "(cached) " >&6
  else
    if { ac_try='${CC-cc} -mno-vzeroupper -xc /dev/null -S -o /dev/null'
-diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure.in glibc-2.14.1/sysdeps/i386/configure.in
---- glibc-2.14.1.orig/sysdeps/i386/configure.in	2011-10-07 20:48:55.000000000 +1100
-+++ glibc-2.14.1/sysdeps/i386/configure.in	2012-07-25 01:00:49.345025022 +1000
+--- a/sysdeps/i386/configure.in
++++ b/sysdeps/i386/configure.in
 @@ -1,8 +1,9 @@
  GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
  # Local configure fragment for sysdeps/i386.
@@ -625,4 +628,3 @@ diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure.in glibc-2.14.1/sysdeps/i386/
  
  AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
  	       libc_cv_cpp_asm_debuginfo, [dnl
-
diff --git a/packages/glibc/2.15/910-asm-i686.patch b/packages/glibc/2.14.1/0037-asm-i686.patch
similarity index 76%
rename from packages/glibc/2.15/910-asm-i686.patch
rename to packages/glibc/2.14.1/0037-asm-i686.patch
index b0498876..ea3c88a2 100644
--- a/packages/glibc/2.15/910-asm-i686.patch
+++ b/packages/glibc/2.14.1/0037-asm-i686.patch
@@ -18,9 +18,13 @@ Description:             Fixes the following build problem with GCC-4.5.0:
 ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression
 make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
 
-diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 20:10:20.000000000 +0000
-+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c	2010-04-17 11:34:06.882681001 +0000
+---
+ nptl/sysdeps/pthread/pt-initfini.c    |    5 +++++
+ sysdeps/unix/sysv/linux/i386/sysdep.h |    4 ++++
+ 2 files changed, 9 insertions(+)
+
+--- a/nptl/sysdeps/pthread/pt-initfini.c
++++ b/nptl/sysdeps/pthread/pt-initfini.c
 @@ -45,6 +45,11 @@
  /* Embed an #include to pull in the alignment and .end directives. */
  asm ("\n#include \"defs.h\"");
@@ -33,9 +37,8 @@ diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/npt
  /* The initial common code ends here. */
  asm ("\n/*@HEADER_ENDS*/");
  
-diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 20:10:20.000000000 +0000
-+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-04-17 11:34:06.882681001 +0000
+--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
++++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
 @@ -29,6 +29,10 @@
  #include <dl-sysdep.h>
  #include <tls.h>
@@ -47,4 +50,3 @@ diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/
  
  /* For Linux we can use the system call table in the header file
  	/usr/include/asm/unistd.h
-
diff --git a/packages/glibc/2.14.1/0038-fix-rpc_parse-format.patch b/packages/glibc/2.14.1/0038-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.14.1/0038-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.14.1/0039-nis-bogus-conditional.patch b/packages/glibc/2.14.1/0039-nis-bogus-conditional.patch
new file mode 100644
index 00000000..732b859b
--- /dev/null
+++ b/packages/glibc/2.14.1/0039-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -293,7 +293,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.13/950-initfini-ppc64.patch b/packages/glibc/2.14.1/0040-initfini-ppc64.patch
similarity index 75%
rename from packages/glibc/2.13/950-initfini-ppc64.patch
rename to packages/glibc/2.14.1/0040-initfini-ppc64.patch
index 87f8d236..247c1037 100644
--- a/packages/glibc/2.13/950-initfini-ppc64.patch
+++ b/packages/glibc/2.14.1/0040-initfini-ppc64.patch
@@ -7,8 +7,12 @@ commit 1fe05ea95e1460e5e1cf1568a8ce3982f0f02de6
 Author: Ryan S. Arnold <rsa@us.ibm.com>
 Date: Tue May 3 17:26:17 2011 -0500
 
---- glibc.orig/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:06.713568781 -0800
-+++ glibc/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:50.318605517 -0800
+---
+ sysdeps/powerpc/powerpc64/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sysdeps/powerpc/powerpc64/Makefile
++++ b/sysdeps/powerpc/powerpc64/Makefile
 @@ -31,7 +31,7 @@
  ifneq ($(elf),no)
  # The initfini generation code doesn't work in the presence of -fPIC, so
diff --git a/packages/glibc/2.14.1/996-obsolete-rpc.patch b/packages/glibc/2.14.1/0041-obsolete-rpc.patch
similarity index 71%
rename from packages/glibc/2.14.1/996-obsolete-rpc.patch
rename to packages/glibc/2.14.1/0041-obsolete-rpc.patch
index 38cb521d..eef16c78 100644
--- a/packages/glibc/2.14.1/996-obsolete-rpc.patch
+++ b/packages/glibc/2.14.1/0041-obsolete-rpc.patch
@@ -10,11 +10,68 @@ Date:   Thu May 10 20:16:53 2012 +0200
       after the TI-RPC library becomes fully sufficient for the needs of
       existing applications.
 
-diff --git a/config.h.in b/config.h.in
-index 787873b4c0..54952609ef 100644
+---
+ config.h.in            |    3 +++
+ config.make.in         |    1 +
+ configure              |   18 ++++++++++++++++++
+ configure.in           |   11 +++++++++++
+ include/libc-symbols.h |    7 ++++++-
+ nis/Makefile           |    6 ++++++
+ sunrpc/Makefile        |    6 ++++++
+ sunrpc/auth_des.c      |    4 ++--
+ sunrpc/auth_none.c     |    2 +-
+ sunrpc/auth_unix.c     |    4 ++--
+ sunrpc/authdes_prot.c  |    4 ++--
+ sunrpc/authuxprot.c    |    2 +-
+ sunrpc/clnt_gen.c      |    2 +-
+ sunrpc/clnt_perr.c     |   10 +++++-----
+ sunrpc/clnt_raw.c      |    2 +-
+ sunrpc/clnt_simp.c     |    2 +-
+ sunrpc/clnt_tcp.c      |    2 +-
+ sunrpc/clnt_udp.c      |    6 +++---
+ sunrpc/clnt_unix.c     |    2 +-
+ sunrpc/des_crypt.c     |    4 ++--
+ sunrpc/des_soft.c      |    2 +-
+ sunrpc/get_myaddr.c    |    2 +-
+ sunrpc/key_call.c      |   18 +++++++++---------
+ sunrpc/key_prot.c      |   20 ++++++++++----------
+ sunrpc/netname.c       |   10 +++++-----
+ sunrpc/pm_getmaps.c    |    2 +-
+ sunrpc/pm_getport.c    |    4 ++--
+ sunrpc/pmap_clnt.c     |    4 ++--
+ sunrpc/pmap_prot.c     |    2 +-
+ sunrpc/pmap_prot2.c    |    2 +-
+ sunrpc/pmap_rmt.c      |    8 ++++----
+ sunrpc/publickey.c     |    4 ++--
+ sunrpc/rpc_cmsg.c      |    2 +-
+ sunrpc/rpc_common.c    |    2 +-
+ sunrpc/rpc_dtable.c    |    2 +-
+ sunrpc/rpc_prot.c      |   14 +++++++-------
+ sunrpc/rpc_thread.c    |    8 ++++----
+ sunrpc/rtime.c         |    2 +-
+ sunrpc/svc.c           |   32 ++++++++++++++++----------------
+ sunrpc/svc_auth.c      |    2 +-
+ sunrpc/svc_raw.c       |    2 +-
+ sunrpc/svc_run.c       |    4 ++--
+ sunrpc/svc_tcp.c       |    4 ++--
+ sunrpc/svc_udp.c       |    6 +++---
+ sunrpc/svc_unix.c      |    4 ++--
+ sunrpc/svcauth_des.c   |    2 +-
+ sunrpc/xcrypt.c        |    4 ++--
+ sunrpc/xdr.c           |   44 ++++++++++++++++++++++----------------------
+ sunrpc/xdr_array.c     |    4 ++--
+ sunrpc/xdr_float.c     |    4 ++--
+ sunrpc/xdr_intXX_t.c   |   20 ++++++++++----------
+ sunrpc/xdr_mem.c       |    2 +-
+ sunrpc/xdr_rec.c       |    8 ++++----
+ sunrpc/xdr_ref.c       |    4 ++--
+ sunrpc/xdr_sizeof.c    |    2 +-
+ sunrpc/xdr_stdio.c     |    2 +-
+ 56 files changed, 203 insertions(+), 153 deletions(-)
+
 --- a/config.h.in
 +++ b/config.h.in
-@@ -178,6 +178,9 @@
+@@ -204,6 +204,9 @@
  /* Define if `.ctors' and `.dtors' sections shouldn't be used.  */
  #undef	NO_CTORS_DTORS_SECTIONS
  
@@ -24,11 +81,9 @@ index 787873b4c0..54952609ef 100644
  /*
   */
  
-diff --git a/config.make.in b/config.make.in
-index 5f6f9e281d..6c4d04ee33 100644
 --- a/config.make.in
 +++ b/config.make.in
-@@ -96,6 +96,7 @@ add-on-subdirs = @add_on_subdirs@
+@@ -102,6 +102,7 @@
  sysdeps-add-ons = @sysdeps_add_ons@
  cross-compiling = @cross_compiling@
  force-install = @force_install@
@@ -36,11 +91,9 @@ index 5f6f9e281d..6c4d04ee33 100644
  
  # Build tools.
  CC = @CC@
-diff --git a/configure b/configure
-index 1c5f4adbea..c7cb47d0c2 100755
 --- a/configure
 +++ b/configure
-@@ -687,6 +687,7 @@ multi_arch
+@@ -682,6 +682,7 @@
  base_machine
  add_on_subdirs
  add_ons
@@ -48,7 +101,7 @@ index 1c5f4adbea..c7cb47d0c2 100755
  libc_cv_nss_crypt
  experimental_malloc
  all_warnings
-@@ -779,6 +780,7 @@ enable_kernel
+@@ -784,6 +785,7 @@
  enable_multi_arch
  enable_experimental_malloc
  enable_nss_crypt
@@ -56,7 +109,7 @@ index 1c5f4adbea..c7cb47d0c2 100755
  with_cpu
  '
        ac_precious_vars='build_alias
-@@ -1434,6 +1436,8 @@ Optional Features:
+@@ -1444,6 +1446,8 @@
    --enable-experimental-malloc
                            enable experimental malloc features
    --enable-nss-crypt      enable libcrypt to use nss
@@ -65,7 +118,7 @@ index 1c5f4adbea..c7cb47d0c2 100755
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -3746,6 +3750,20 @@ else
+@@ -3823,6 +3827,20 @@
  fi
  
  
@@ -86,11 +139,9 @@ index 1c5f4adbea..c7cb47d0c2 100755
  # The way shlib-versions is used to generate soversions.mk uses a
  # fairly simplistic model for name recognition that can't distinguish
  # i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a $host_os
-diff --git a/configure.in b/configure.in
-index 19a2c1a0f0..4eb9277e8c 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -252,6 +252,17 @@ else
+@@ -316,6 +316,17 @@
  fi
  AC_SUBST(libc_cv_nss_crypt)
  
@@ -108,11 +159,9 @@ index 19a2c1a0f0..4eb9277e8c 100644
  # The way shlib-versions is used to generate soversions.mk uses a
  # fairly simplistic model for name recognition that can't distinguish
  # i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a $host_os
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 951e46a6e3..0c3274e253 100644
 --- a/include/libc-symbols.h
 +++ b/include/libc-symbols.h
-@@ -556,7 +556,12 @@ for linking")
+@@ -635,7 +635,12 @@
  # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
  # define libc_hidden_def(name) hidden_def (name)
  # define libc_hidden_weak(name) hidden_weak (name)
@@ -126,11 +175,9 @@ index 951e46a6e3..0c3274e253 100644
  # define libc_hidden_ver(local, name) hidden_ver (local, name)
  # define libc_hidden_data_def(name) hidden_data_def (name)
  # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/nis/Makefile b/nis/Makefile
-index a48753f7a9..b412cee304 100644
 --- a/nis/Makefile
 +++ b/nis/Makefile
-@@ -23,6 +23,12 @@ subdir	:= nis
+@@ -23,6 +23,12 @@
  
  aux			:= nis_hash
  
@@ -143,11 +190,9 @@ index a48753f7a9..b412cee304 100644
  distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
  			   nisplus-parser.h nis_xdr.h nss \
  			   $(wildcard rpcsvc/*.[hx])
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index e61efd02b3..3b79dcdb72 100644
 --- a/sunrpc/Makefile
 +++ b/sunrpc/Makefile
-@@ -60,6 +60,10 @@ generated-dirs := rpcsvc
+@@ -61,6 +61,10 @@
  
  include ../Makeconfig
  
@@ -158,7 +203,7 @@ index e61efd02b3..3b79dcdb72 100644
  ifeq ($(versioning),yes)
  need-export-routines := auth_des auth_unix clnt_gen clnt_perr clnt_tcp \
  			clnt_udp get_myaddr key_call netname pm_getport \
-@@ -73,9 +77,11 @@ routines := auth_none authuxprot bindrsvprt clnt_raw clnt_simp \
+@@ -74,9 +78,11 @@
  	    svc_simple xdr_float xdr_rec publickey authdes_prot \
  	    des_crypt des_impl des_soft key_prot openchild rtime svcauth_des \
  	    clnt_unix svc_unix create_xid $(need-export-routines)
@@ -170,11 +215,9 @@ index e61efd02b3..3b79dcdb72 100644
  
  # We do not build rpcinfo anymore.  It is not needed for a bootstrap
  # and not wanted on complete systems.
-diff --git a/sunrpc/auth_des.c b/sunrpc/auth_des.c
-index 96bbcfc328..0408d60826 100644
 --- a/sunrpc/auth_des.c
 +++ b/sunrpc/auth_des.c
-@@ -117,7 +117,7 @@ authdes_create (const char *servername, u_int window,
+@@ -117,7 +117,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (authdes_create)
  #else
@@ -183,7 +226,7 @@ index 96bbcfc328..0408d60826 100644
  #endif
  
  AUTH *
-@@ -211,7 +211,7 @@ failed:
+@@ -211,7 +211,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (authdes_pk_create)
  #else
@@ -192,11 +235,9 @@ index 96bbcfc328..0408d60826 100644
  #endif
  
  /*
-diff --git a/sunrpc/auth_none.c b/sunrpc/auth_none.c
-index 5f252a9544..3af5966794 100644
 --- a/sunrpc/auth_none.c
 +++ b/sunrpc/auth_none.c
-@@ -95,7 +95,7 @@ authnone_create (void)
+@@ -95,7 +95,7 @@
    __libc_once (authnone_private_guard, authnone_create_once);
    return &authnone_private.no_client;
  }
@@ -205,11 +246,9 @@ index 5f252a9544..3af5966794 100644
  
  static bool_t
  authnone_marshal (AUTH *client, XDR *xdrs)
-diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
-index d3b5dc7dee..68b42d7b1f 100644
 --- a/sunrpc/auth_unix.c
 +++ b/sunrpc/auth_unix.c
-@@ -149,7 +149,7 @@ no_memory:
+@@ -151,7 +151,7 @@
    marshal_new_auth (auth);
    return auth;
  }
@@ -218,7 +257,7 @@ index d3b5dc7dee..68b42d7b1f 100644
  
  /*
   * Returns an auth handle with parameters determined by doing lots of
-@@ -216,7 +216,7 @@ authunix_create_default (void)
+@@ -218,7 +218,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (authunix_create_default)
  #else
@@ -227,11 +266,9 @@ index d3b5dc7dee..68b42d7b1f 100644
  #endif
  
  /*
-diff --git a/sunrpc/authdes_prot.c b/sunrpc/authdes_prot.c
-index 0a25bac143..164c1223ca 100644
 --- a/sunrpc/authdes_prot.c
 +++ b/sunrpc/authdes_prot.c
-@@ -63,7 +63,7 @@ xdr_authdes_cred (XDR *xdrs, struct authdes_cred *cred)
+@@ -63,7 +63,7 @@
        return FALSE;
      }
  }
@@ -240,38 +277,32 @@ index 0a25bac143..164c1223ca 100644
  
  
  bool_t
-@@ -78,4 +78,4 @@ xdr_authdes_verf (register XDR *xdrs, register struct authdes_verf *verf)
+@@ -78,4 +78,4 @@
  		       sizeof (verf->adv_int_u)));
    return TRUE;
  }
 -libc_hidden_nolink (xdr_authdes_verf, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (xdr_authdes_verf, GLIBC_2_1)
-diff --git a/sunrpc/authuxprot.c b/sunrpc/authuxprot.c
-index 64da1799e0..d37faee0c7 100644
 --- a/sunrpc/authuxprot.c
 +++ b/sunrpc/authuxprot.c
-@@ -63,4 +63,4 @@ xdr_authunix_parms (XDR * xdrs, struct authunix_parms *p)
+@@ -63,4 +63,4 @@
      }
    return FALSE;
  }
 -libc_hidden_nolink (xdr_authunix_parms, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_authunix_parms, GLIBC_2_0)
-diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c
-index 2b7096cf20..df34672d72 100644
 --- a/sunrpc/clnt_gen.c
 +++ b/sunrpc/clnt_gen.c
-@@ -175,5 +175,5 @@ clnt_create (const char *hostname, u_long prog, u_long vers,
+@@ -175,5 +175,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_create)
  #else
 -libc_hidden_nolink (clnt_create, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (clnt_create, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c
-index 175370ebfc..b4f84c92e8 100644
 --- a/sunrpc/clnt_perr.c
 +++ b/sunrpc/clnt_perr.c
-@@ -127,7 +127,7 @@ clnt_sperror (CLIENT * rpch, const char *msg)
+@@ -130,7 +130,7 @@
  
    return str;
  }
@@ -280,7 +311,7 @@ index 175370ebfc..b4f84c92e8 100644
  
  void
  clnt_perror (CLIENT * rpch, const char *msg)
-@@ -137,7 +137,7 @@ clnt_perror (CLIENT * rpch, const char *msg)
+@@ -140,7 +140,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_perror)
  #else
@@ -289,7 +320,7 @@ index 175370ebfc..b4f84c92e8 100644
  #endif
  
  
-@@ -270,7 +270,7 @@ clnt_perrno (enum clnt_stat num)
+@@ -273,7 +273,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_perrno)
  #else
@@ -298,7 +329,7 @@ index 175370ebfc..b4f84c92e8 100644
  #endif
  
  char *
-@@ -308,7 +308,7 @@ clnt_spcreateerror (const char *msg)
+@@ -311,7 +311,7 @@
  
    return str;
  }
@@ -307,7 +338,7 @@ index 175370ebfc..b4f84c92e8 100644
  
  void
  clnt_pcreateerror (const char *msg)
-@@ -318,7 +318,7 @@ clnt_pcreateerror (const char *msg)
+@@ -321,7 +321,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_pcreateerror)
  #else
@@ -316,11 +347,9 @@ index 175370ebfc..b4f84c92e8 100644
  #endif
  
  struct auth_errtab
-diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c
-index 95e3eae988..4004c6b6a8 100644
 --- a/sunrpc/clnt_raw.c
 +++ b/sunrpc/clnt_raw.c
-@@ -129,7 +129,7 @@ clntraw_create (u_long prog, u_long vers)
+@@ -129,7 +129,7 @@
    client->cl_auth = authnone_create ();
    return client;
  }
@@ -329,11 +358,9 @@ index 95e3eae988..4004c6b6a8 100644
  
  static enum clnt_stat
  clntraw_call (h, proc, xargs, argsp, xresults, resultsp, timeout)
-diff --git a/sunrpc/clnt_simp.c b/sunrpc/clnt_simp.c
-index d2dd3b307a..d612df09a0 100644
 --- a/sunrpc/clnt_simp.c
 +++ b/sunrpc/clnt_simp.c
-@@ -139,7 +139,7 @@ callrpc (const char *host, u_long prognum, u_long versnum, u_long procnum,
+@@ -139,7 +139,7 @@
      crp->valid = 0;
    return (int) clnt_stat;
  }
@@ -342,11 +369,9 @@ index d2dd3b307a..d612df09a0 100644
  
  #ifdef _RPC_THREAD_SAFE_
  void
-diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c
-index d1fc43dbfd..6bd4c8c0cd 100644
 --- a/sunrpc/clnt_tcp.c
 +++ b/sunrpc/clnt_tcp.c
-@@ -220,7 +220,7 @@ fooy:
+@@ -222,7 +222,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnttcp_create)
  #else
@@ -355,11 +380,9 @@ index d1fc43dbfd..6bd4c8c0cd 100644
  #endif
  
  static enum clnt_stat
-diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
-index 294e13a58c..7ecf2ef5a5 100644
 --- a/sunrpc/clnt_udp.c
 +++ b/sunrpc/clnt_udp.c
-@@ -239,7 +239,7 @@ fooy:
+@@ -240,7 +240,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__libc_clntudp_bufcreate)
  #else
@@ -368,7 +391,7 @@ index 294e13a58c..7ecf2ef5a5 100644
  #endif
  
  CLIENT *
-@@ -250,7 +250,7 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
+@@ -251,7 +251,7 @@
    return __libc_clntudp_bufcreate (raddr, program, version, wait,
  				   sockp, sendsz, recvsz, 0);
  }
@@ -377,7 +400,7 @@ index 294e13a58c..7ecf2ef5a5 100644
  
  CLIENT *
  clntudp_create (raddr, program, version, wait, sockp)
-@@ -266,7 +266,7 @@ clntudp_create (raddr, program, version, wait, sockp)
+@@ -267,7 +267,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clntudp_create)
  #else
@@ -386,11 +409,9 @@ index 294e13a58c..7ecf2ef5a5 100644
  #endif
  
  static int
-diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c
-index 282127bb8b..776ceab484 100644
 --- a/sunrpc/clnt_unix.c
 +++ b/sunrpc/clnt_unix.c
-@@ -200,7 +200,7 @@ fooy:
+@@ -202,7 +202,7 @@
    mem_free ((caddr_t) h, sizeof (CLIENT));
    return (CLIENT *) NULL;
  }
@@ -399,11 +420,9 @@ index 282127bb8b..776ceab484 100644
  
  static enum clnt_stat
  clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
-diff --git a/sunrpc/des_crypt.c b/sunrpc/des_crypt.c
-index 8745900b82..22a34b7f3a 100644
 --- a/sunrpc/des_crypt.c
 +++ b/sunrpc/des_crypt.c
-@@ -102,7 +102,7 @@ cbc_crypt (char *key, char *buf, unsigned int len, unsigned int mode,
+@@ -102,7 +102,7 @@
    COPY8 (dp.des_ivec, ivec);
    return err;
  }
@@ -412,38 +431,32 @@ index 8745900b82..22a34b7f3a 100644
  
  /*
   * ECB mode encryption
-@@ -115,4 +115,4 @@ ecb_crypt (char *key, char *buf, unsigned int len, unsigned int mode)
+@@ -115,4 +115,4 @@
    dp.des_mode = ECB;
    return common_crypt (key, buf, len, mode, &dp);
  }
 -libc_hidden_nolink (ecb_crypt, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (ecb_crypt, GLIBC_2_1)
-diff --git a/sunrpc/des_soft.c b/sunrpc/des_soft.c
-index 27d918c64d..cddef5d76b 100644
 --- a/sunrpc/des_soft.c
 +++ b/sunrpc/des_soft.c
-@@ -70,4 +70,4 @@ des_setparity (char *p)
+@@ -70,4 +70,4 @@
        p++;
      }
  }
 -libc_hidden_nolink (des_setparity, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (des_setparity, GLIBC_2_1)
-diff --git a/sunrpc/get_myaddr.c b/sunrpc/get_myaddr.c
-index def5b7a74a..24407b53ec 100644
 --- a/sunrpc/get_myaddr.c
 +++ b/sunrpc/get_myaddr.c
-@@ -99,5 +99,5 @@ get_myaddress (struct sockaddr_in *addr)
+@@ -99,5 +99,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (get_myaddress)
  #else
 -libc_hidden_nolink (get_myaddress, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (get_myaddress, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
-index 6d08bf8e80..e0a076b47f 100644
 --- a/sunrpc/key_call.c
 +++ b/sunrpc/key_call.c
-@@ -80,7 +80,7 @@ key_setsecret (char *secretkey)
+@@ -80,7 +80,7 @@
      }
    return 0;
  }
@@ -452,7 +465,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  /* key_secretkey_is_set() returns 1 if the keyserver has a secret key
   * stored for the caller's effective uid; it returns 0 otherwise
-@@ -109,7 +109,7 @@ key_secretkey_is_set (void)
+@@ -109,7 +109,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (key_secretkey_is_set)
  #else
@@ -461,7 +474,7 @@ index 6d08bf8e80..e0a076b47f 100644
  #endif
  
  int
-@@ -133,7 +133,7 @@ key_encryptsession (char *remotename, des_block *deskey)
+@@ -133,7 +133,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -470,7 +483,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_decryptsession (char *remotename, des_block *deskey)
-@@ -155,7 +155,7 @@ key_decryptsession (char *remotename, des_block *deskey)
+@@ -155,7 +155,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -479,7 +492,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_encryptsession_pk (char *remotename, netobj *remotekey,
-@@ -180,7 +180,7 @@ key_encryptsession_pk (char *remotename, netobj *remotekey,
+@@ -180,7 +180,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -488,7 +501,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_decryptsession_pk (char *remotename, netobj *remotekey,
-@@ -205,7 +205,7 @@ key_decryptsession_pk (char *remotename, netobj *remotekey,
+@@ -205,7 +205,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -497,7 +510,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_gendes (des_block *key)
-@@ -239,7 +239,7 @@ key_gendes (des_block *key)
+@@ -239,7 +239,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (key_gendes)
  #else
@@ -506,7 +519,7 @@ index 6d08bf8e80..e0a076b47f 100644
  #endif
  
  int
-@@ -259,7 +259,7 @@ key_setnet (struct key_netstarg *arg)
+@@ -259,7 +259,7 @@
      }
    return 1;
  }
@@ -515,7 +528,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_get_conv (char *pkey, des_block *deskey)
-@@ -278,7 +278,7 @@ key_get_conv (char *pkey, des_block *deskey)
+@@ -278,7 +278,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -524,11 +537,9 @@ index 6d08bf8e80..e0a076b47f 100644
  
  /*
   * Hack to allow the keyserver to use AUTH_DES (for authenticated
-diff --git a/sunrpc/key_prot.c b/sunrpc/key_prot.c
-index dd73f5e3cb..2899c9a448 100644
 --- a/sunrpc/key_prot.c
 +++ b/sunrpc/key_prot.c
-@@ -38,7 +38,7 @@ xdr_keystatus (XDR * xdrs, keystatus * objp)
+@@ -38,7 +38,7 @@
  
    return TRUE;
  }
@@ -537,7 +548,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_keybuf (XDR * xdrs, keybuf objp)
-@@ -48,7 +48,7 @@ xdr_keybuf (XDR * xdrs, keybuf objp)
+@@ -48,7 +48,7 @@
  
    return TRUE;
  }
@@ -546,7 +557,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_netnamestr (XDR * xdrs, netnamestr * objp)
-@@ -58,7 +58,7 @@ xdr_netnamestr (XDR * xdrs, netnamestr * objp)
+@@ -58,7 +58,7 @@
  
    return TRUE;
  }
@@ -555,7 +566,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_cryptkeyarg (XDR * xdrs, cryptkeyarg * objp)
-@@ -71,7 +71,7 @@ xdr_cryptkeyarg (XDR * xdrs, cryptkeyarg * objp)
+@@ -71,7 +71,7 @@
  
    return TRUE;
  }
@@ -564,7 +575,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_cryptkeyarg2 (XDR * xdrs, cryptkeyarg2 * objp)
-@@ -84,7 +84,7 @@ xdr_cryptkeyarg2 (XDR * xdrs, cryptkeyarg2 * objp)
+@@ -84,7 +84,7 @@
      return FALSE;
    return TRUE;
  }
@@ -573,7 +584,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_cryptkeyres (XDR * xdrs, cryptkeyres * objp)
-@@ -102,7 +102,7 @@ xdr_cryptkeyres (XDR * xdrs, cryptkeyres * objp)
+@@ -102,7 +102,7 @@
      }
    return TRUE;
  }
@@ -582,7 +593,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_unixcred (XDR * xdrs, unixcred * objp)
-@@ -117,7 +117,7 @@ xdr_unixcred (XDR * xdrs, unixcred * objp)
+@@ -117,7 +117,7 @@
      return FALSE;
    return TRUE;
  }
@@ -591,7 +602,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_getcredres (XDR * xdrs, getcredres * objp)
-@@ -135,7 +135,7 @@ xdr_getcredres (XDR * xdrs, getcredres * objp)
+@@ -135,7 +135,7 @@
      }
    return TRUE;
  }
@@ -600,7 +611,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_key_netstarg (XDR * xdrs, key_netstarg * objp)
-@@ -148,7 +148,7 @@ xdr_key_netstarg (XDR * xdrs, key_netstarg * objp)
+@@ -148,7 +148,7 @@
      return FALSE;
    return TRUE;
  }
@@ -609,17 +620,15 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_key_netstres (XDR * xdrs, key_netstres * objp)
-@@ -166,4 +166,4 @@ xdr_key_netstres (XDR * xdrs, key_netstres * objp)
+@@ -166,4 +166,4 @@
      }
    return TRUE;
  }
 -libc_hidden_nolink (xdr_key_netstres, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_key_netstres, GLIBC_2_0)
-diff --git a/sunrpc/netname.c b/sunrpc/netname.c
-index 0b4980074c..197d503eae 100644
 --- a/sunrpc/netname.c
 +++ b/sunrpc/netname.c
-@@ -54,7 +54,7 @@ user2netname (char netname[MAXNETNAMELEN + 1], const uid_t uid,
+@@ -55,7 +55,7 @@
      netname[i - 1] = '\0';
    return 1;
  }
@@ -628,7 +637,7 @@ index 0b4980074c..197d503eae 100644
  
  int
  host2netname (char netname[MAXNETNAMELEN + 1], const char *host,
-@@ -118,7 +118,7 @@ host2netname (char netname[MAXNETNAMELEN + 1], const char *host,
+@@ -119,7 +119,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (host2netname)
  #else
@@ -637,7 +646,7 @@ index 0b4980074c..197d503eae 100644
  #endif
  
  int
-@@ -134,7 +134,7 @@ getnetname (char name[MAXNETNAMELEN + 1])
+@@ -135,7 +135,7 @@
      dummy = user2netname (name, uid, NULL);
    return (dummy);
  }
@@ -646,7 +655,7 @@ index 0b4980074c..197d503eae 100644
  
  /* Type of the lookup function for netname2user.  */
  typedef int (*netname2user_function) (const char netname[MAXNETNAMELEN + 1],
-@@ -187,7 +187,7 @@ netname2user (const char netname[MAXNETNAMELEN + 1], uid_t * uidp, gid_t * gidp,
+@@ -188,7 +188,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (netname2user)
  #else
@@ -655,27 +664,23 @@ index 0b4980074c..197d503eae 100644
  #endif
  
  int
-@@ -214,4 +214,4 @@ netname2host (const char netname[MAXNETNAMELEN + 1], char *hostname,
+@@ -216,4 +216,4 @@
  
    return 1;
  }
 -libc_hidden_nolink (netname2host, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (netname2host, GLIBC_2_1)
-diff --git a/sunrpc/pm_getmaps.c b/sunrpc/pm_getmaps.c
-index 6b61d324f9..6f7ad10ef6 100644
 --- a/sunrpc/pm_getmaps.c
 +++ b/sunrpc/pm_getmaps.c
-@@ -84,4 +84,4 @@ pmap_getmaps (struct sockaddr_in *address)
+@@ -84,4 +84,4 @@
    address->sin_port = 0;
    return head;
  }
 -libc_hidden_nolink (pmap_getmaps, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (pmap_getmaps, GLIBC_2_0)
-diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
-index 58974a5661..f10f87250d 100644
 --- a/sunrpc/pm_getport.c
 +++ b/sunrpc/pm_getport.c
-@@ -142,7 +142,7 @@ __libc_rpc_getport (address, program, version, protocol, timeout_sec,
+@@ -142,7 +142,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__libc_rpc_getport)
  #else
@@ -684,17 +689,15 @@ index 58974a5661..f10f87250d 100644
  #endif
  
  
-@@ -160,4 +160,4 @@ pmap_getport (address, program, version, protocol)
+@@ -160,4 +160,4 @@
  {
    return __libc_rpc_getport (address, program, version, protocol, 5, 60);
  }
 -libc_hidden_nolink (pmap_getport, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (pmap_getport, GLIBC_2_0)
-diff --git a/sunrpc/pmap_clnt.c b/sunrpc/pmap_clnt.c
-index 36479f0e5c..5d7d185766 100644
 --- a/sunrpc/pmap_clnt.c
 +++ b/sunrpc/pmap_clnt.c
-@@ -131,7 +131,7 @@ pmap_set (u_long program, u_long version, int protocol, u_short port)
+@@ -131,7 +131,7 @@
    /* (void)close(socket); CLNT_DESTROY closes it */
    return rslt;
  }
@@ -703,37 +706,31 @@ index 36479f0e5c..5d7d185766 100644
  
  /*
   * Remove the mapping between program,version and port.
-@@ -162,4 +162,4 @@ pmap_unset (u_long program, u_long version)
+@@ -162,4 +162,4 @@
    /* (void)close(socket); CLNT_DESTROY already closed it */
    return rslt;
  }
 -libc_hidden_nolink (pmap_unset, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (pmap_unset, GLIBC_2_0)
-diff --git a/sunrpc/pmap_prot.c b/sunrpc/pmap_prot.c
-index 5a2e052728..8df41dc5f2 100644
 --- a/sunrpc/pmap_prot.c
 +++ b/sunrpc/pmap_prot.c
-@@ -49,4 +49,4 @@ xdr_pmap (xdrs, regs)
+@@ -49,4 +49,4 @@
      return xdr_u_long (xdrs, &regs->pm_port);
    return FALSE;
  }
 -libc_hidden_nolink (xdr_pmap, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_pmap, GLIBC_2_0)
-diff --git a/sunrpc/pmap_prot2.c b/sunrpc/pmap_prot2.c
-index 3213898ce8..57b0800178 100644
 --- a/sunrpc/pmap_prot2.c
 +++ b/sunrpc/pmap_prot2.c
-@@ -110,4 +110,4 @@ xdr_pmaplist (xdrs, rp)
+@@ -110,4 +110,4 @@
        rp = freeing ? &next : &((*rp)->pml_next);
      }
  }
 -libc_hidden_nolink (xdr_pmaplist, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_pmaplist, GLIBC_2_0)
-diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c
-index 16f322773e..fd8de85589 100644
 --- a/sunrpc/pmap_rmt.c
 +++ b/sunrpc/pmap_rmt.c
-@@ -104,7 +104,7 @@ pmap_rmtcall (addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_p
+@@ -104,7 +104,7 @@
    addr->sin_port = 0;
    return stat;
  }
@@ -742,7 +739,7 @@ index 16f322773e..fd8de85589 100644
  
  
  /*
-@@ -137,7 +137,7 @@ xdr_rmtcall_args (XDR *xdrs, struct rmtcallargs *cap)
+@@ -137,7 +137,7 @@
      }
    return FALSE;
  }
@@ -751,7 +748,7 @@ index 16f322773e..fd8de85589 100644
  
  /*
   * XDR remote call results
-@@ -160,7 +160,7 @@ xdr_rmtcallres (xdrs, crp)
+@@ -160,7 +160,7 @@
      }
    return FALSE;
  }
@@ -760,17 +757,15 @@ index 16f322773e..fd8de85589 100644
  
  
  /*
-@@ -388,4 +388,4 @@ done_broad:
+@@ -388,4 +388,4 @@
    AUTH_DESTROY (unix_auth);
    return stat;
  }
 -libc_hidden_nolink (clnt_broadcast, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (clnt_broadcast, GLIBC_2_0)
-diff --git a/sunrpc/publickey.c b/sunrpc/publickey.c
-index 4d0b09874c..089b544953 100644
 --- a/sunrpc/publickey.c
 +++ b/sunrpc/publickey.c
-@@ -75,7 +75,7 @@ getpublickey (const char *name, char *key)
+@@ -76,7 +76,7 @@
  
    return status == NSS_STATUS_SUCCESS;
  }
@@ -779,24 +774,20 @@ index 4d0b09874c..089b544953 100644
  
  
  int
-@@ -118,4 +118,4 @@ getsecretkey (const char *name, char *key, const char *passwd)
+@@ -119,4 +119,4 @@
  
    return status == NSS_STATUS_SUCCESS;
  }
 -libc_hidden_nolink (getsecretkey, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (getsecretkey, GLIBC_2_0)
-diff --git a/sunrpc/rpc_cmsg.c b/sunrpc/rpc_cmsg.c
-index ed70104b68..62d95fcc83 100644
 --- a/sunrpc/rpc_cmsg.c
 +++ b/sunrpc/rpc_cmsg.c
-@@ -194,4 +194,4 @@ xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg)
+@@ -194,4 +194,4 @@
      return xdr_opaque_auth (xdrs, &(cmsg->rm_call.cb_verf));
    return FALSE;
  }
 -libc_hidden_nolink (xdr_callmsg, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_callmsg, GLIBC_2_0)
-diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c
-index 44b4b38f4d..710191163c 100644
 --- a/sunrpc/rpc_common.c
 +++ b/sunrpc/rpc_common.c
 @@ -45,7 +45,7 @@
@@ -808,21 +799,17 @@ index 44b4b38f4d..710191163c 100644
  fd_set svc_fdset;
  struct rpc_createerr rpc_createerr;
  struct pollfd *svc_pollfd;
-diff --git a/sunrpc/rpc_dtable.c b/sunrpc/rpc_dtable.c
-index 9bee215496..81ddf8f55a 100644
 --- a/sunrpc/rpc_dtable.c
 +++ b/sunrpc/rpc_dtable.c
-@@ -46,4 +46,4 @@ _rpc_dtablesize (void)
+@@ -46,4 +46,4 @@
  
    return size;
  }
 -libc_hidden_nolink (_rpc_dtablesize, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (_rpc_dtablesize, GLIBC_2_0)
-diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c
-index 9a23cc1b02..dc24f3673b 100644
 --- a/sunrpc/rpc_prot.c
 +++ b/sunrpc/rpc_prot.c
-@@ -57,7 +57,7 @@ xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap)
+@@ -57,7 +57,7 @@
  		      &ap->oa_length, MAX_AUTH_BYTES);
    return FALSE;
  }
@@ -831,7 +818,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /*
   * XDR a DES block
-@@ -67,7 +67,7 @@ xdr_des_block (XDR *xdrs, des_block *blkp)
+@@ -67,7 +67,7 @@
  {
    return xdr_opaque (xdrs, (caddr_t) blkp, sizeof (des_block));
  }
@@ -840,7 +827,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /* * * * * * * * * * * * * * XDR RPC MESSAGE * * * * * * * * * * * * * * * */
  
-@@ -95,7 +95,7 @@ xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar)
+@@ -95,7 +95,7 @@
      }
    return TRUE;		/* TRUE => open ended set of problems */
  }
@@ -849,7 +836,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /*
   * XDR the MSG_DENIED part of a reply message union
-@@ -118,7 +118,7 @@ xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr)
+@@ -118,7 +118,7 @@
      }
    return FALSE;
  }
@@ -858,7 +845,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  static const struct xdr_discrim reply_dscrm[3] =
  {
-@@ -142,7 +142,7 @@ xdr_replymsg (xdrs, rmsg)
+@@ -142,7 +142,7 @@
  		      NULL_xdrproc_t);
    return FALSE;
  }
@@ -867,7 +854,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  
  /*
-@@ -167,7 +167,7 @@ xdr_callhdr (xdrs, cmsg)
+@@ -167,7 +167,7 @@
      return xdr_u_long (xdrs, &(cmsg->rm_call.cb_vers));
    return FALSE;
  }
@@ -876,17 +863,15 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /* ************************** Client utility routine ************* */
  
-@@ -277,4 +277,4 @@ _seterr_reply (struct rpc_msg *msg,
+@@ -277,4 +277,4 @@
        break;
      }
  }
 -libc_hidden_nolink (_seterr_reply, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (_seterr_reply, GLIBC_2_0)
-diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
-index ac4c18fcee..94d9f1fd80 100644
 --- a/sunrpc/rpc_thread.c
 +++ b/sunrpc/rpc_thread.c
-@@ -97,7 +97,7 @@ __rpc_thread_svc_fdset (void)
+@@ -97,7 +97,7 @@
  		return &svc_fdset;
  	return &tvp->svc_fdset_s;
  }
@@ -895,7 +880,7 @@ index ac4c18fcee..94d9f1fd80 100644
  
  struct rpc_createerr *
  __rpc_thread_createerr (void)
-@@ -109,7 +109,7 @@ __rpc_thread_createerr (void)
+@@ -109,7 +109,7 @@
  		return &rpc_createerr;
  	return &tvp->rpc_createerr_s;
  }
@@ -904,7 +889,7 @@ index ac4c18fcee..94d9f1fd80 100644
  
  struct pollfd **
  __rpc_thread_svc_pollfd (void)
-@@ -124,7 +124,7 @@ __rpc_thread_svc_pollfd (void)
+@@ -124,7 +124,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__rpc_thread_svc_pollfd)
  #else
@@ -913,7 +898,7 @@ index ac4c18fcee..94d9f1fd80 100644
  #endif
  
  int *
-@@ -140,7 +140,7 @@ __rpc_thread_svc_max_pollfd (void)
+@@ -140,7 +140,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__rpc_thread_svc_max_pollfd)
  #else
@@ -922,21 +907,17 @@ index ac4c18fcee..94d9f1fd80 100644
  #endif
  
  #endif /* _RPC_THREAD_SAFE_ */
-diff --git a/sunrpc/rtime.c b/sunrpc/rtime.c
-index 8506df554c..bcb280b48f 100644
 --- a/sunrpc/rtime.c
 +++ b/sunrpc/rtime.c
-@@ -140,4 +140,4 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep,
+@@ -140,4 +140,4 @@
    timep->tv_usec = 0;
    return 0;
  }
 -libc_hidden_nolink (rtime, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (rtime, GLIBC_2_1)
-diff --git a/sunrpc/svc.c b/sunrpc/svc.c
-index e1f4a322e8..103770a42c 100644
 --- a/sunrpc/svc.c
 +++ b/sunrpc/svc.c
-@@ -115,7 +115,7 @@ xprt_register (SVCXPRT *xprt)
+@@ -115,7 +115,7 @@
  					       POLLRDNORM | POLLRDBAND);
      }
  }
@@ -945,7 +926,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* De-activate a transport handle. */
  void
-@@ -139,7 +139,7 @@ xprt_unregister (SVCXPRT *xprt)
+@@ -139,7 +139,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xprt_unregister)
  #else
@@ -954,7 +935,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  
-@@ -218,7 +218,7 @@ pmap_it:
+@@ -218,7 +218,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_register)
  #else
@@ -963,7 +944,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Remove a service program from the callout list. */
-@@ -242,7 +242,7 @@ svc_unregister (rpcprog_t prog, rpcvers_t vers)
+@@ -242,7 +242,7 @@
    if (! svc_is_mapped (prog, vers))
      pmap_unset (prog, vers);
  }
@@ -972,7 +953,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* ******************* REPLY GENERATION ROUTINES  ************ */
  
-@@ -264,7 +264,7 @@ svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
+@@ -264,7 +264,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_sendreply)
  #else
@@ -981,7 +962,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* No procedure error reply */
-@@ -282,7 +282,7 @@ svcerr_noproc (register SVCXPRT *xprt)
+@@ -282,7 +282,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcerr_noproc)
  #else
@@ -990,7 +971,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Can't decode args error reply */
-@@ -300,7 +300,7 @@ svcerr_decode (register SVCXPRT *xprt)
+@@ -300,7 +300,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcerr_decode)
  #else
@@ -999,7 +980,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Some system error */
-@@ -318,7 +318,7 @@ svcerr_systemerr (register SVCXPRT *xprt)
+@@ -318,7 +318,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcerr_systemerr)
  #else
@@ -1008,7 +989,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Authentication error reply */
-@@ -333,7 +333,7 @@ svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
+@@ -333,7 +333,7 @@
    rply.rjcted_rply.rj_why = why;
    SVC_REPLY (xprt, &rply);
  }
@@ -1017,7 +998,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* Auth too weak error reply */
  void
-@@ -341,7 +341,7 @@ svcerr_weakauth (SVCXPRT *xprt)
+@@ -341,7 +341,7 @@
  {
    svcerr_auth (xprt, AUTH_TOOWEAK);
  }
@@ -1026,7 +1007,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* Program unavailable error reply */
  void
-@@ -355,7 +355,7 @@ svcerr_noprog (register SVCXPRT *xprt)
+@@ -355,7 +355,7 @@
    rply.acpted_rply.ar_stat = PROG_UNAVAIL;
    SVC_REPLY (xprt, &rply);
  }
@@ -1035,7 +1016,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* Program version mismatch error reply */
  void
-@@ -372,7 +372,7 @@ svcerr_progvers (register SVCXPRT *xprt, rpcvers_t low_vers,
+@@ -372,7 +372,7 @@
    rply.acpted_rply.ar_vers.high = high_vers;
    SVC_REPLY (xprt, &rply);
  }
@@ -1044,7 +1025,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* ******************* SERVER INPUT STUFF ******************* */
  
-@@ -401,7 +401,7 @@ svc_getreq (int rdfds)
+@@ -401,7 +401,7 @@
    readfds.fds_bits[0] = rdfds;
    svc_getreqset (&readfds);
  }
@@ -1053,7 +1034,7 @@ index e1f4a322e8..103770a42c 100644
  
  void
  svc_getreqset (fd_set *readfds)
-@@ -420,7 +420,7 @@ svc_getreqset (fd_set *readfds)
+@@ -420,7 +420,7 @@
      for (mask = *maskp++; (bit = ffsl (mask)); mask ^= (1L << (bit - 1)))
        svc_getreq_common (sock + bit - 1);
  }
@@ -1062,7 +1043,7 @@ index e1f4a322e8..103770a42c 100644
  
  void
  svc_getreq_poll (struct pollfd *pfdp, int pollretval)
-@@ -449,7 +449,7 @@ svc_getreq_poll (struct pollfd *pfdp, int pollretval)
+@@ -449,7 +449,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_getreq_poll)
  #else
@@ -1071,7 +1052,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  
-@@ -542,7 +542,7 @@ svc_getreq_common (const int fd)
+@@ -542,7 +542,7 @@
      }
    while (stat == XPRT_MOREREQS);
  }
@@ -1080,11 +1061,9 @@ index e1f4a322e8..103770a42c 100644
  
  #ifdef _RPC_THREAD_SAFE_
  
-diff --git a/sunrpc/svc_auth.c b/sunrpc/svc_auth.c
-index facbb13982..f33bda2f20 100644
 --- a/sunrpc/svc_auth.c
 +++ b/sunrpc/svc_auth.c
-@@ -105,7 +105,7 @@ _authenticate (register struct svc_req *rqst, struct rpc_msg *msg)
+@@ -105,7 +105,7 @@
  
    return AUTH_REJECTEDCRED;
  }
@@ -1093,11 +1072,9 @@ index facbb13982..f33bda2f20 100644
  
  static enum auth_stat
  _svcauth_null (struct svc_req *rqst, struct rpc_msg *msg)
-diff --git a/sunrpc/svc_raw.c b/sunrpc/svc_raw.c
-index 90f5d96e63..7d885574af 100644
 --- a/sunrpc/svc_raw.c
 +++ b/sunrpc/svc_raw.c
-@@ -88,7 +88,7 @@ svcraw_create (void)
+@@ -88,7 +88,7 @@
    xdrmem_create (&srp->xdr_stream, srp->_raw_buf, UDPMSGSIZE, XDR_FREE);
    return &srp->server;
  }
@@ -1106,11 +1083,9 @@ index 90f5d96e63..7d885574af 100644
  
  static enum xprt_stat
  svcraw_stat (SVCXPRT *xprt)
-diff --git a/sunrpc/svc_run.c b/sunrpc/svc_run.c
-index 09f40dd188..90dfc94056 100644
 --- a/sunrpc/svc_run.c
 +++ b/sunrpc/svc_run.c
-@@ -46,7 +46,7 @@ svc_exit (void)
+@@ -46,7 +46,7 @@
    svc_pollfd = NULL;
    svc_max_pollfd = 0;
  }
@@ -1119,18 +1094,16 @@ index 09f40dd188..90dfc94056 100644
  
  void
  svc_run (void)
-@@ -104,5 +104,5 @@ svc_run (void)
+@@ -104,5 +104,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_run)
  #else
 -libc_hidden_nolink (svc_run, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (svc_run, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c
-index e0515322a5..eb615494d8 100644
 --- a/sunrpc/svc_tcp.c
 +++ b/sunrpc/svc_tcp.c
-@@ -187,7 +187,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize)
+@@ -189,7 +189,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svctcp_create)
  #else
@@ -1139,7 +1112,7 @@ index e0515322a5..eb615494d8 100644
  #endif
  
  /*
-@@ -199,7 +199,7 @@ svcfd_create (int fd, u_int sendsize, u_int recvsize)
+@@ -201,7 +201,7 @@
  {
    return makefd_xprt (fd, sendsize, recvsize);
  }
@@ -1148,11 +1121,9 @@ index e0515322a5..eb615494d8 100644
  
  static SVCXPRT *
  internal_function
-diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
-index 04c8407e64..6c4d75a814 100644
 --- a/sunrpc/svc_udp.c
 +++ b/sunrpc/svc_udp.c
-@@ -184,7 +184,7 @@ svcudp_create: xp_pad is too small for IP_PKTINFO\n"));
+@@ -186,7 +186,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcudp_bufcreate)
  #else
@@ -1161,7 +1132,7 @@ index 04c8407e64..6c4d75a814 100644
  #endif
  
  SVCXPRT *
-@@ -196,7 +196,7 @@ svcudp_create (sock)
+@@ -198,7 +198,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcudp_create)
  #else
@@ -1170,7 +1141,7 @@ index 04c8407e64..6c4d75a814 100644
  #endif
  
  static enum xprt_stat
-@@ -500,7 +500,7 @@ svcudp_enablecache (SVCXPRT *transp, u_long size)
+@@ -502,7 +502,7 @@
    su->su_cache = (char *) uc;
    return 1;
  }
@@ -1179,11 +1150,9 @@ index 04c8407e64..6c4d75a814 100644
  
  
  /*
-diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
-index 2b02682e72..94507b2403 100644
 --- a/sunrpc/svc_unix.c
 +++ b/sunrpc/svc_unix.c
-@@ -184,7 +184,7 @@ svcunix_create (int sock, u_int sendsize, u_int recvsize, char *path)
+@@ -187,7 +187,7 @@
    xprt_register (xprt);
    return xprt;
  }
@@ -1192,7 +1161,7 @@ index 2b02682e72..94507b2403 100644
  
  /*
   * Like svunix_create(), except the routine takes any *open* UNIX file
-@@ -195,7 +195,7 @@ svcunixfd_create (int fd, u_int sendsize, u_int recvsize)
+@@ -198,7 +198,7 @@
  {
    return makefd_xprt (fd, sendsize, recvsize);
  }
@@ -1201,11 +1170,9 @@ index 2b02682e72..94507b2403 100644
  
  static SVCXPRT *
  internal_function
-diff --git a/sunrpc/svcauth_des.c b/sunrpc/svcauth_des.c
-index b9656e25da..9609734960 100644
 --- a/sunrpc/svcauth_des.c
 +++ b/sunrpc/svcauth_des.c
-@@ -583,7 +583,7 @@ authdes_getucred (const struct authdes_cred *adc, uid_t * uid, gid_t * gid,
+@@ -583,7 +583,7 @@
      groups[i] = cred->groups[i];
    return 1;
  }
@@ -1214,11 +1181,9 @@ index b9656e25da..9609734960 100644
  
  static void
  internal_function
-diff --git a/sunrpc/xcrypt.c b/sunrpc/xcrypt.c
-index 8b7642b503..2e53f2d9e9 100644
 --- a/sunrpc/xcrypt.c
 +++ b/sunrpc/xcrypt.c
-@@ -127,7 +127,7 @@ xencrypt (char *secret, char *passwd)
+@@ -127,7 +127,7 @@
    free (buf);
    return 1;
  }
@@ -1227,7 +1192,7 @@ index 8b7642b503..2e53f2d9e9 100644
  
  /*
   * Decrypt secret key using passwd
-@@ -163,7 +163,7 @@ xdecrypt (char *secret, char *passwd)
+@@ -163,7 +163,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdecrypt)
  #else
@@ -1236,11 +1201,9 @@ index 8b7642b503..2e53f2d9e9 100644
  #endif
  
  /*
-diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
-index 4dd82ff044..7eac2d40f0 100644
 --- a/sunrpc/xdr.c
 +++ b/sunrpc/xdr.c
-@@ -72,7 +72,7 @@ xdr_free (xdrproc_t proc, char *objp)
+@@ -74,7 +74,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_free)
  #else
@@ -1249,7 +1212,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -86,7 +86,7 @@ xdr_void (void)
+@@ -88,7 +88,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_void)
  #else
@@ -1258,7 +1221,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -126,7 +126,7 @@ xdr_int (XDR *xdrs, int *ip)
+@@ -128,7 +128,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_int)
  #else
@@ -1267,7 +1230,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -165,7 +165,7 @@ xdr_u_int (XDR *xdrs, u_int *up)
+@@ -167,7 +167,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_int)
  #else
@@ -1276,7 +1239,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -193,7 +193,7 @@ xdr_long (XDR *xdrs, long *lp)
+@@ -195,7 +195,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_long)
  #else
@@ -1285,7 +1248,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -232,7 +232,7 @@ xdr_u_long (XDR *xdrs, u_long *ulp)
+@@ -234,7 +234,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_long)
  #else
@@ -1294,7 +1257,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -268,7 +268,7 @@ xdr_hyper (XDR *xdrs, quad_t *llp)
+@@ -270,7 +270,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_hyper)
  #else
@@ -1303,7 +1266,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -304,7 +304,7 @@ xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
+@@ -306,7 +306,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_hyper)
  #else
@@ -1312,7 +1275,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  bool_t
-@@ -315,7 +315,7 @@ xdr_longlong_t (XDR *xdrs, quad_t *llp)
+@@ -317,7 +317,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_longlong_t)
  #else
@@ -1321,7 +1284,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  bool_t
-@@ -326,7 +326,7 @@ xdr_u_longlong_t (XDR *xdrs, u_quad_t *ullp)
+@@ -328,7 +328,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_longlong_t)
  #else
@@ -1330,7 +1293,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -359,7 +359,7 @@ xdr_short (XDR *xdrs, short *sp)
+@@ -361,7 +361,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_short)
  #else
@@ -1339,7 +1302,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -392,7 +392,7 @@ xdr_u_short (XDR *xdrs, u_short *usp)
+@@ -394,7 +394,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_short)
  #else
@@ -1348,7 +1311,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  
-@@ -415,7 +415,7 @@ xdr_char (XDR *xdrs, char *cp)
+@@ -417,7 +417,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_char)
  #else
@@ -1357,7 +1320,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -437,7 +437,7 @@ xdr_u_char (XDR *xdrs, u_char *cp)
+@@ -439,7 +439,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_char)
  #else
@@ -1366,7 +1329,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -470,7 +470,7 @@ xdr_bool (XDR *xdrs, bool_t *bp)
+@@ -472,7 +472,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_bool)
  #else
@@ -1375,7 +1338,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -525,7 +525,7 @@ xdr_enum (XDR *xdrs, enum_t *ep)
+@@ -527,7 +527,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_enum)
  #else
@@ -1384,7 +1347,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -580,7 +580,7 @@ xdr_opaque (XDR *xdrs, caddr_t cp, u_int cnt)
+@@ -582,7 +582,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_opaque)
  #else
@@ -1393,7 +1356,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -648,7 +648,7 @@ xdr_bytes (xdrs, cpp, sizep, maxsize)
+@@ -650,7 +650,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_bytes)
  #else
@@ -1402,7 +1365,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -665,7 +665,7 @@ xdr_netobj (xdrs, np)
+@@ -667,7 +667,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_netobj)
  #else
@@ -1411,7 +1374,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -714,7 +714,7 @@ xdr_union (xdrs, dscmp, unp, choices, dfault)
+@@ -716,7 +716,7 @@
    return ((dfault == NULL_xdrproc_t) ? FALSE :
  	  (*dfault) (xdrs, unp, LASTUNSIGNED));
  }
@@ -1420,7 +1383,7 @@ index 4dd82ff044..7eac2d40f0 100644
  
  
  /*
-@@ -806,7 +806,7 @@ xdr_string (xdrs, cpp, maxsize)
+@@ -808,7 +808,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_string)
  #else
@@ -1429,18 +1392,16 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -827,5 +827,5 @@ xdr_wrapstring (xdrs, cpp)
+@@ -829,5 +829,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_wrapstring)
  #else
 -libc_hidden_nolink (xdr_wrapstring, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_wrapstring, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
-index b832078342..a634861278 100644
 --- a/sunrpc/xdr_array.c
 +++ b/sunrpc/xdr_array.c
-@@ -127,7 +127,7 @@ xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc)
+@@ -130,7 +130,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_array)
  #else
@@ -1449,17 +1410,15 @@ index b832078342..a634861278 100644
  #endif
  
  /*
-@@ -162,4 +162,4 @@ xdr_vector (xdrs, basep, nelem, elemsize, xdr_elem)
+@@ -165,4 +165,4 @@
      }
    return TRUE;
  }
 -libc_hidden_nolink (xdr_vector, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_vector, GLIBC_2_0)
-diff --git a/sunrpc/xdr_float.c b/sunrpc/xdr_float.c
-index 1a9c260617..78e8f3bd2d 100644
 --- a/sunrpc/xdr_float.c
 +++ b/sunrpc/xdr_float.c
-@@ -158,7 +158,7 @@ xdr_float(xdrs, fp)
+@@ -158,7 +158,7 @@
  	}
  	return (FALSE);
  }
@@ -1468,17 +1427,15 @@ index 1a9c260617..78e8f3bd2d 100644
  
  /*
   * This routine works on Suns (Sky / 68000's) and Vaxen.
-@@ -300,4 +300,4 @@ xdr_double(xdrs, dp)
+@@ -300,4 +300,4 @@
  	}
  	return (FALSE);
  }
 -libc_hidden_nolink (xdr_double, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_double, GLIBC_2_0)
-diff --git a/sunrpc/xdr_intXX_t.c b/sunrpc/xdr_intXX_t.c
-index fe06f45df3..02a0c09b5b 100644
 --- a/sunrpc/xdr_intXX_t.c
 +++ b/sunrpc/xdr_intXX_t.c
-@@ -46,14 +46,14 @@ xdr_int64_t (XDR *xdrs, int64_t *ip)
+@@ -47,14 +47,14 @@
        return FALSE;
      }
  }
@@ -1495,7 +1452,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 64bit unsigned integers */
  bool_t
-@@ -82,14 +82,14 @@ xdr_uint64_t (XDR *xdrs, uint64_t *uip)
+@@ -83,14 +83,14 @@
        return FALSE;
      }
  }
@@ -1512,7 +1469,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 32bit integers */
  bool_t
-@@ -107,7 +107,7 @@ xdr_int32_t (XDR *xdrs, int32_t *lp)
+@@ -108,7 +108,7 @@
        return FALSE;
      }
  }
@@ -1521,7 +1478,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 32bit unsigned integers */
  bool_t
-@@ -128,7 +128,7 @@ xdr_uint32_t (XDR *xdrs, uint32_t *ulp)
+@@ -129,7 +129,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_uint32_t)
  #else
@@ -1530,7 +1487,7 @@ index fe06f45df3..02a0c09b5b 100644
  #endif
  
  /* XDR 16bit integers */
-@@ -153,7 +153,7 @@ xdr_int16_t (XDR *xdrs, int16_t *ip)
+@@ -154,7 +154,7 @@
        return FALSE;
      }
  }
@@ -1539,7 +1496,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 16bit unsigned integers */
  bool_t
-@@ -177,7 +177,7 @@ xdr_uint16_t (XDR *xdrs, uint16_t *uip)
+@@ -178,7 +178,7 @@
        return FALSE;
      }
  }
@@ -1548,7 +1505,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 8bit integers */
  bool_t
-@@ -201,7 +201,7 @@ xdr_int8_t (XDR *xdrs, int8_t *ip)
+@@ -202,7 +202,7 @@
        return FALSE;
      }
  }
@@ -1557,17 +1514,15 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 8bit unsigned integers */
  bool_t
-@@ -225,4 +225,4 @@ xdr_uint8_t (XDR *xdrs, uint8_t *uip)
+@@ -226,4 +226,4 @@
        return FALSE;
      }
  }
 -libc_hidden_nolink (xdr_uint8_t, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (xdr_uint8_t, GLIBC_2_1)
-diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c
-index 093a718739..ba7661aa54 100644
 --- a/sunrpc/xdr_mem.c
 +++ b/sunrpc/xdr_mem.c
-@@ -81,7 +81,7 @@ xdrmem_create (XDR *xdrs, const caddr_t addr, u_int size, enum xdr_op op)
+@@ -81,7 +81,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdrmem_create)
  #else
@@ -1576,11 +1531,9 @@ index 093a718739..ba7661aa54 100644
  #endif
  
  /*
-diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c
-index 556c6c4bc0..f5d6ef2af9 100644
 --- a/sunrpc/xdr_rec.c
 +++ b/sunrpc/xdr_rec.c
-@@ -189,7 +189,7 @@ xdrrec_create (XDR *xdrs, u_int sendsize,
+@@ -192,7 +192,7 @@
    rstrm->fbtbc = 0;
    rstrm->last_frag = TRUE;
  }
@@ -1589,7 +1542,7 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  
  /*
-@@ -477,7 +477,7 @@ xdrrec_skiprecord (XDR *xdrs)
+@@ -480,7 +480,7 @@
    rstrm->last_frag = FALSE;
    return TRUE;
  }
@@ -1598,7 +1551,7 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  /*
   * Lookahead function.
-@@ -501,7 +501,7 @@ xdrrec_eof (XDR *xdrs)
+@@ -504,7 +504,7 @@
      return TRUE;
    return FALSE;
  }
@@ -1607,7 +1560,7 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  /*
   * The client must tell the package when an end-of-record has occurred.
-@@ -528,7 +528,7 @@ xdrrec_endofrecord (XDR *xdrs, bool_t sendnow)
+@@ -531,7 +531,7 @@
    rstrm->out_finger += BYTES_PER_XDR_UNIT;
    return TRUE;
  }
@@ -1616,11 +1569,9 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  
  /*
-diff --git a/sunrpc/xdr_ref.c b/sunrpc/xdr_ref.c
-index 7510bed873..8fb4584a75 100644
 --- a/sunrpc/xdr_ref.c
 +++ b/sunrpc/xdr_ref.c
-@@ -90,7 +90,7 @@ xdr_reference (xdrs, pp, size, proc)
+@@ -93,7 +93,7 @@
      }
    return stat;
  }
@@ -1629,29 +1580,25 @@ index 7510bed873..8fb4584a75 100644
  
  
  /*
-@@ -137,5 +137,5 @@ xdr_pointer (xdrs, objpp, obj_size, xdr_obj)
+@@ -140,5 +140,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_pointer)
  #else
 -libc_hidden_nolink (xdr_pointer, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_pointer, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/xdr_sizeof.c b/sunrpc/xdr_sizeof.c
-index 0119486c3d..56e870a455 100644
 --- a/sunrpc/xdr_sizeof.c
 +++ b/sunrpc/xdr_sizeof.c
-@@ -161,5 +161,5 @@ xdr_sizeof (xdrproc_t func, void *data)
+@@ -161,5 +161,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_sizeof)
  #else
 -libc_hidden_nolink (xdr_sizeof, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (xdr_sizeof, GLIBC_2_1)
  #endif
-diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
-index d9866063f9..667515e0a6 100644
 --- a/sunrpc/xdr_stdio.c
 +++ b/sunrpc/xdr_stdio.c
-@@ -191,5 +191,5 @@ xdrstdio_putint32 (XDR *xdrs, const int32_t *ip)
+@@ -193,5 +193,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdrstdio_create)
  #else
diff --git a/packages/glibc/2.14.1/998-obstack-common.patch b/packages/glibc/2.14.1/0042-obstack-common.patch
similarity index 87%
rename from packages/glibc/2.14.1/998-obstack-common.patch
rename to packages/glibc/2.14.1/0042-obstack-common.patch
index 4b95f062..1993be24 100644
--- a/packages/glibc/2.14.1/998-obstack-common.patch
+++ b/packages/glibc/2.14.1/0042-obstack-common.patch
@@ -15,11 +15,13 @@ Date:   Wed May 15 20:28:08 2013 +0200
             * malloc/obstack.c (_obstack_compat): Add initializer.
     -
 
-diff --git a/malloc/obstack.c b/malloc/obstack.c
-index 25a90514f7..c3c7db4a96 100644
+---
+ malloc/obstack.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/malloc/obstack.c
 +++ b/malloc/obstack.c
-@@ -115,7 +115,7 @@ int obstack_exit_failure = EXIT_FAILURE;
+@@ -117,7 +117,7 @@
  /* A looong time ago (before 1994, anyway; we're not sure) this global variable
     was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
     library still exports it because somebody might use it.  */
diff --git a/packages/glibc/2.13/999-new-tools.patch b/packages/glibc/2.14.1/0043-new-tools.patch
similarity index 79%
rename from packages/glibc/2.13/999-new-tools.patch
rename to packages/glibc/2.14.1/0043-new-tools.patch
index d2d498a2..2d89a0fd 100644
--- a/packages/glibc/2.13/999-new-tools.patch
+++ b/packages/glibc/2.14.1/0043-new-tools.patch
@@ -1,7 +1,11 @@
-diff -urpN glibc-2.13.orig/configure glibc-2.13/configure
---- glibc-2.13.orig/configure	2011-01-17 20:34:07.000000000 -0800
-+++ glibc-2.13/configure	2017-02-08 00:38:22.017735530 -0800
-@@ -5041,7 +5041,7 @@ $as_echo_n "checking version of $CC... "
+---
+ configure    |    8 ++++----
+ configure.in |    8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -4957,7 +4957,7 @@
    ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -10,7 +14,7 @@ diff -urpN glibc-2.13.orig/configure glibc-2.13/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5104,7 +5104,7 @@ $as_echo_n "checking version of $MAKE...
+@@ -5020,7 +5020,7 @@
    ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -19,7 +23,7 @@ diff -urpN glibc-2.13.orig/configure glibc-2.13/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5231,7 +5231,7 @@ $as_echo_n "checking version of $MAKEINF
+@@ -5147,7 +5147,7 @@
    ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -28,7 +32,7 @@ diff -urpN glibc-2.13.orig/configure glibc-2.13/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5291,7 +5291,7 @@ else
+@@ -5207,7 +5207,7 @@
    # Found it, now check the version.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
  $as_echo_n "checking version of $SED... " >&6; }
@@ -37,10 +41,9 @@ diff -urpN glibc-2.13.orig/configure glibc-2.13/configure
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
      3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.13.orig/configure.in glibc-2.13/configure.in
---- glibc-2.13.orig/configure.in	2011-01-17 20:34:07.000000000 -0800
-+++ glibc-2.13/configure.in	2017-02-08 00:30:01.720295526 -0800
-@@ -1026,11 +1026,11 @@ fi
+--- a/configure.in
++++ b/configure.in
+@@ -1037,11 +1037,11 @@
  # These programs are version sensitive.
  AC_CHECK_TOOL_PREFIX
  AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
@@ -54,7 +57,7 @@ diff -urpN glibc-2.13.orig/configure.in glibc-2.13/configure.in
  
  AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
    [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -1038,10 +1038,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
+@@ -1049,10 +1049,10 @@
    MSGFMT=: aux_missing="$aux_missing msgfmt")
  AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
    [GNU texinfo.* \([0-9][0-9.]*\)],
diff --git a/packages/glibc/2.14.1/430-alpha-creat.patch b/packages/glibc/2.14.1/430-alpha-creat.patch
deleted file mode 100644
index da6dddad..00000000
--- a/packages/glibc/2.14.1/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a70528..00000000
--- a/packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/packages/glibc/2.14.1/920-fix-rpc_parse-format.patch b/packages/glibc/2.14.1/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.14.1/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.14.1/940-nis-bogus-conditional.patch b/packages/glibc/2.14.1/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.14.1/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.15/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.15/0000-respect-env-CPPFLAGS.patch
similarity index 71%
rename from packages/glibc/2.15/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.15/0000-respect-env-CPPFLAGS.patch
index 3798cb21..4e08fd65 100644
--- a/packages/glibc/2.15/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.15/0000-respect-env-CPPFLAGS.patch
@@ -1,10 +1,13 @@
 Respect environment CPPFLAGS when we run ./configure so we can inject
 random -D things without having to set CFLAGS/ASFLAGS
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.13/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-@@ -697,6 +697,7 @@
+---
+ Makeconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -709,6 +709,7 @@
  	   $(foreach lib,$(libof-$(basename $(@F))) \
  			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
  	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
diff --git a/packages/glibc/2.15/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.15/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
new file mode 100644
index 00000000..30a70a2f
--- /dev/null
+++ b/packages/glibc/2.15/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -0,0 +1,75 @@
+From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
+From: Yvan Roux <yvan.roux@linaro.org>
+Date: Fri, 15 Apr 2016 13:29:26 +0200
+Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
+ -Wparentheses
+
+---
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+--- a/nis/nis_call.c
++++ b/nis/nis_call.c
+@@ -682,16 +682,18 @@
+   /* Choose which entry should be evicted from the cache.  */
+   loc = &nis_server_cache[0];
+   if (*loc != NULL)
+-    for (i = 1; i < 16; ++i)
+-      if (nis_server_cache[i] == NULL)
+-	{
++    {
++      for (i = 1; i < 16; ++i)
++	if (nis_server_cache[i] == NULL)
++	  {
++	    loc = &nis_server_cache[i];
++	    break;
++	  }
++	else if ((*loc)->uses > nis_server_cache[i]->uses
++		 || ((*loc)->uses == nis_server_cache[i]->uses
++		     && (*loc)->expires > nis_server_cache[i]->expires))
+ 	  loc = &nis_server_cache[i];
+-	  break;
+-	}
+-      else if ((*loc)->uses > nis_server_cache[i]->uses
+-	       || ((*loc)->uses == nis_server_cache[i]->uses
+-		   && (*loc)->expires > nis_server_cache[i]->expires))
+-	loc = &nis_server_cache[i];
++    }
+   old = *loc;
+   *loc = new;
+ 
+--- a/stdlib/setenv.c
++++ b/stdlib/setenv.c
+@@ -328,18 +328,20 @@
+   ep = __environ;
+   if (ep != NULL)
+     while (*ep != NULL)
+-      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+-	{
+-	  /* Found it.  Remove this pointer by moving later ones back.  */
+-	  char **dp = ep;
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
+-	  do
+-	    dp[0] = dp[1];
+-	  while (*dp++);
+-	  /* Continue the loop in case NAME appears again.  */
+-	}
+-      else
+-	++ep;
++	    do
++		dp[0] = dp[1];
++	    while (*dp++);
++	    /* Continue the loop in case NAME appears again.  */
++	  }
++	else
++	  ++ep;
++      }
+ 
+   UNLOCK;
+ 
diff --git a/packages/glibc/2.15/0002-fix-signed-shift-overlow.patch b/packages/glibc/2.15/0002-fix-signed-shift-overlow.patch
new file mode 100644
index 00000000..437818b7
--- /dev/null
+++ b/packages/glibc/2.15/0002-fix-signed-shift-overlow.patch
@@ -0,0 +1,97 @@
+commit 5542236837c5c41435f8282ec92799f480c36f18
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date:   Tue Jul 21 22:50:29 2015 -0700
+
+    Port the 0x7efe...feff pattern to GCC 6.
+    
+    See Steve Ellcey's bug report in:
+    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
+    * string/memrchr.c (MEMRCHR):
+    * string/rawmemchr.c (RAWMEMCHR):
+    * string/strchr.c (strchr):
+    * string/strchrnul.c (STRCHRNUL):
+    Rewrite code to avoid issues with signed shift overflow.
+
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
+--- a/string/memrchr.c
++++ b/string/memrchr.c
+@@ -103,15 +103,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/rawmemchr.c
++++ b/string/rawmemchr.c
+@@ -90,15 +90,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchr.c
++++ b/string/strchr.c
+@@ -65,13 +65,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchrnul.c
++++ b/string/strchrnul.c
+@@ -63,13 +63,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
diff --git a/packages/glibc/2.15/0003-dl-openat64-variadic.patch b/packages/glibc/2.15/0003-dl-openat64-variadic.patch
new file mode 100644
index 00000000..e69bb173
--- /dev/null
+++ b/packages/glibc/2.15/0003-dl-openat64-variadic.patch
@@ -0,0 +1,197 @@
+commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Oct 20 11:54:09 2015 +0000
+
+    Convert 113 more function definitions to prototype style (files with assertions).
+    
+    This mostly automatically-generated patch converts 113 function
+    definitions in glibc from old-style K&R to prototype-style.  Following
+    my other recent such patches, this one deals with the case of function
+    definitions in files that either contain assertions or where grep
+    suggested they might contain assertions - and thus where it isn't
+    possible to use a simple object code comparison as a sanity check on
+    the correctness of the patch, because line numbers are changed.
+    
+    A few such automatically-generated changes needed to be supplemented
+    by manual changes for the result to compile.  openat64 had a prototype
+    declaration with "..." but an old-style definition in
+    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
+    generated prototype in the definition (I've filed
+    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
+    such cases in GCC; the old state was undefined behavior not requiring
+    a diagnostic, but one seems a good idea).  In addition, as Florian has
+    noted regparm attribute mismatches between declaration and definition
+    are only diagnosed for prototype definitions, and five functions
+    needed internal_function added to their definitions (in the case of
+    __pthread_mutex_cond_lock, via the macro definition of
+    __pthread_mutex_lock) to compile on i386.
+    
+    After this patch is in, remaining old-style definitions are probably
+    most readily fixed manually before we can turn on
+    -Wold-style-definition for all builds.
+    
+    Tested for x86_64 and x86 (testsuite).
+    
+            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
+            function definition.
+            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
+            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
+            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
+            * elf/dl-minimal.c (_itoa): Likewise.
+            * hurd/hurdmalloc.c (malloc): Likewise.
+            (free): Likewise.
+            (realloc): Likewise.
+            * inet/inet6_option.c (inet6_option_space): Likewise.
+            (inet6_option_init): Likewise.
+            (inet6_option_append): Likewise.
+            (inet6_option_alloc): Likewise.
+            (inet6_option_next): Likewise.
+            (inet6_option_find): Likewise.
+            * io/ftw.c (FTW_NAME): Likewise.
+            (NFTW_NAME): Likewise.
+            (NFTW_NEW_NAME): Likewise.
+            (NFTW_OLD_NAME): Likewise.
+            * libio/iofwide.c (_IO_fwide): Likewise.
+            * libio/strops.c (_IO_str_init_static_internal): Likewise.
+            (_IO_str_init_static): Likewise.
+            (_IO_str_init_readonly): Likewise.
+            (_IO_str_overflow): Likewise.
+            (_IO_str_underflow): Likewise.
+            (_IO_str_count): Likewise.
+            (_IO_str_seekoff): Likewise.
+            (_IO_str_pbackfail): Likewise.
+            (_IO_str_finish): Likewise.
+            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
+            (_IO_wstr_overflow): Likewise.
+            (_IO_wstr_underflow): Likewise.
+            (_IO_wstr_count): Likewise.
+            (_IO_wstr_seekoff): Likewise.
+            (_IO_wstr_pbackfail): Likewise.
+            (_IO_wstr_finish): Likewise.
+            * locale/programs/localedef.c (normalize_codeset): Likewise.
+            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
+            (add_locales_to_archive): Likewise.
+            (delete_locales_from_archive): Likewise.
+            * malloc/malloc.c (__libc_mallinfo): Likewise.
+            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
+            * misc/tsearch.c (__tfind): Likewise.
+            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
+            * nptl/pthread_attr_getdetachstate.c
+            (__pthread_attr_getdetachstate): Likewise.
+            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
+            Likewise.
+            * nptl/pthread_attr_getinheritsched.c
+            (__pthread_attr_getinheritsched): Likewise.
+            * nptl/pthread_attr_getschedparam.c
+            (__pthread_attr_getschedparam): Likewise.
+            * nptl/pthread_attr_getschedpolicy.c
+            (__pthread_attr_getschedpolicy): Likewise.
+            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
+            Likewise.
+            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
+            Likewise.
+            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
+            Likewise.
+            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
+            Likewise.
+            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
+            (__pthread_attr_init_2_0): Likewise.
+            * nptl/pthread_attr_setdetachstate.c
+            (__pthread_attr_setdetachstate): Likewise.
+            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
+            Likewise.
+            * nptl/pthread_attr_setinheritsched.c
+            (__pthread_attr_setinheritsched): Likewise.
+            * nptl/pthread_attr_setschedparam.c
+            (__pthread_attr_setschedparam): Likewise.
+            * nptl/pthread_attr_setschedpolicy.c
+            (__pthread_attr_setschedpolicy): Likewise.
+            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
+            Likewise.
+            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
+            Likewise.
+            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
+            Likewise.
+            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
+            Likewise.
+            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
+            Likewise.
+            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
+            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
+            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
+            use internal_function.
+            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
+            prototype-style function definition.
+            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
+            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
+            internal_function.
+            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
+            Convert to prototype-style function definition.
+            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
+            Likewise.
+            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
+            Likewise.
+            (__pthread_mutex_unlock): Likewise.
+            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
+            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
+            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
+            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
+            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
+            * nss/makedb.c (process_input): Likewise.
+            * posix/fnmatch.c (__strchrnul): Likewise.
+            (__wcschrnul): Likewise.
+            (fnmatch): Likewise.
+            * posix/fnmatch_loop.c (FCT): Likewise.
+            * posix/glob.c (globfree): Likewise.
+            (__glob_pattern_type): Likewise.
+            (__glob_pattern_p): Likewise.
+            * posix/regcomp.c (re_compile_pattern): Likewise.
+            (re_set_syntax): Likewise.
+            (re_compile_fastmap): Likewise.
+            (regcomp): Likewise.
+            (regerror): Likewise.
+            (regfree): Likewise.
+            * posix/regexec.c (regexec): Likewise.
+            (re_match): Likewise.
+            (re_search): Likewise.
+            (re_match_2): Likewise.
+            (re_search_2): Likewise.
+            (re_search_stub): Likewise.  Use internal_function
+            (re_copy_regs): Likewise.
+            (re_set_registers): Convert to prototype-style function
+            definition.
+            (prune_impossible_nodes): Likewise.  Use internal_function.
+            * resolv/inet_net_pton.c (inet_net_pton): Convert to
+            prototype-style function definition.
+            (inet_net_pton_ipv4): Likewise.
+            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
+            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
+            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
+            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
+            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
+            Make variadic.
+            * time/strptime_l.c (localtime_r): Convert to prototype-style
+            function definition.
+            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
+            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
+            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
+            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
+
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/sysdeps/unix/sysv/linux/dl-openat64.c
++++ b/sysdeps/unix/sysv/linux/dl-openat64.c
+@@ -24,10 +24,7 @@
+ 
+ 
+ int
+-openat64 (dfd, file, oflag)
+-     int dfd;
+-     const char *file;
+-     int oflag;
++openat64 (int dfd, const char *file, int oflag, ...)
+ {
+   assert ((oflag & O_CREAT) == 0);
+ 
diff --git a/packages/glibc/2.15/104-unused-variables.patch b/packages/glibc/2.15/0004-unused-variables.patch
similarity index 79%
rename from packages/glibc/2.15/104-unused-variables.patch
rename to packages/glibc/2.15/0004-unused-variables.patch
index 63e4a40c..65f9f584 100644
--- a/packages/glibc/2.15/104-unused-variables.patch
+++ b/packages/glibc/2.15/0004-unused-variables.patch
@@ -19,8 +19,18 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    2 --
+ sysdeps/ieee754/flt-32/s_cosf.c        |    6 ------
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ 9 files changed, 1 insertion(+), 22 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,11 +44,9 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
-@@ -65,10 +65,8 @@
+@@ -69,10 +69,8 @@
  /**/ hpi1           = {{0x3c91a626, 0x33145c07} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0xbff921fb, 0x54442d18} }, /* -pi/2         */
  /**/ qpi            = {{0x3fe921fb, 0x54442d18} }, /*  pi/4         */
@@ -49,7 +57,7 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0xc002d97c, 0x7f3321d2} }, /* -3pi/4        */
  /**/ u1             = {{0x3c314c2a, 0x00000000} }, /*  9.377e-19    */
  /**/ u2             = {{0x3bf955e4, 0x00000000} }, /*  8.584e-20    */
-@@ -129,10 +127,8 @@
+@@ -139,10 +137,8 @@
  /**/ hpi1           = {{0x33145c07, 0x3c91a626} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0x54442d18, 0xbff921fb} }, /* -pi/2         */
  /**/ qpi            = {{0x54442d18, 0x3fe921fb} }, /*  pi/4         */
@@ -60,11 +68,9 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  
  #include "mydefs.h"
  
@@ -73,11 +79,9 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
-@@ -34,7 +34,6 @@
+@@ -36,7 +36,6 @@
  /**/ INF            = {{0x7ff00000, 0x00000000}}, /* INF           */
  /**/ nINF           = {{0xfff00000, 0x00000000}}, /* -INF          */
  /**/ NaNQ           = {{0x7ff80000, 0x00000000}}, /* NaNQ          */
@@ -85,7 +89,7 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0x3fe62e42, 0xfefa3800}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x3d2ef357, 0x93c76730}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0x4297ffff, 0xfffffd2c}}, /* 1.5*2**42 -724*2**-10  */
-@@ -48,7 +47,6 @@
+@@ -51,7 +50,6 @@
  /**/ INF            = {{0x00000000, 0x7ff00000}}, /* INF           */
  /**/ nINF           = {{0x00000000, 0xfff00000}}, /* -INF           */
  /**/ NaNQ           = {{0x00000000, 0x7ff80000}}, /* NaNQ          */
@@ -93,11 +97,9 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,8 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
+@@ -22,8 +22,6 @@
  log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
@@ -106,28 +108,24 @@ index 96f0e81..1daeef7 100644
  float
  __ieee754_log10f(float x)
  {
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,12 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
- #include "math.h"
+@@ -22,12 +22,6 @@
  #include "math_private.h"
  
--#ifdef __STDC__
+ #ifdef __STDC__
 -static const float one=1.0;
 -#else
 -static float one=1.0;
 -#endif
 -
- #ifdef __STDC__
+-#ifdef __STDC__
  	float __cosf(float x)
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
+ 	float __cosf(x)
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -74,7 +74,6 @@
  static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  static const long double one = 1.0L;
@@ -135,11 +133,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = 1.0e4000L;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -142,7 +142,6 @@
  static long double
  #endif
  tiny = 1e-4931L,
@@ -147,11 +143,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
diff --git a/packages/glibc/2.15/0005-misleading-indentation.patch b/packages/glibc/2.15/0005-misleading-indentation.patch
new file mode 100644
index 00000000..35bcb1b8
--- /dev/null
+++ b/packages/glibc/2.15/0005-misleading-indentation.patch
@@ -0,0 +1,26 @@
+commit 976ef870542580cf5fed896c2c652b3e1a95f9da
+Author: Steve Ellcey <sellcey@mips.com>
+Date:   Fri Dec 11 09:19:37 2015 -0800
+
+    Fix indentation.
+    
+            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
+            Fix indentation.
+
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
++++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
+@@ -82,7 +82,9 @@
+ 
+     /* compute q[0],q[1],...q[jk] */
+ 	for (i=0;i<=jk;i++) {
+-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
++	    for(j=0,fw=0.0;j<=jx;j++)
++		fw += x[j]*f[jx+i-j];
++	    q[i] = fw;
+ 	}
+ 
+ 	jz = jk;
diff --git a/packages/glibc/2.15/106-dl-open-array-bounds.patch b/packages/glibc/2.15/0006-dl-open-array-bounds.patch
similarity index 88%
rename from packages/glibc/2.15/106-dl-open-array-bounds.patch
rename to packages/glibc/2.15/0006-dl-open-array-bounds.patch
index bdb5c19f..2ad3817c 100644
--- a/packages/glibc/2.15/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.15/0006-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -546,8 +546,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc/2.15/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.15/0007-i386-x86_64-revert-clone-cfi.patch
similarity index 56%
rename from packages/glibc/2.15/120-i386-x86_64-revert-clone-cfi.patch
rename to packages/glibc/2.15/0007-i386-x86_64-revert-clone-cfi.patch
index c7f6182d..f872bac4 100644
--- a/packages/glibc/2.15/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.15/0007-i386-x86_64-revert-clone-cfi.patch
@@ -4,16 +4,13 @@ elsewhere.  this cfi code does not gain us a whole lot anyways.
 
 http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
 
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
+---
+ sysdeps/unix/sysv/linux/i386/clone.S   |    4 ----
+ sysdeps/unix/sysv/linux/x86_64/clone.S |    4 ----
+ 2 files changed, 8 deletions(-)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/i386/clone.S
++++ b/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@
  	ret
  
@@ -32,9 +29,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysde
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ b/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@
  	ret
  
diff --git a/packages/glibc/2.15/140-disable-ldconfig.patch b/packages/glibc/2.15/0008-disable-ldconfig.patch
similarity index 70%
rename from packages/glibc/2.15/140-disable-ldconfig.patch
rename to packages/glibc/2.15/0008-disable-ldconfig.patch
index 378e1df5..4c5615df 100644
--- a/packages/glibc/2.15/140-disable-ldconfig.patch
+++ b/packages/glibc/2.15/0008-disable-ldconfig.patch
@@ -3,10 +3,13 @@ file outside of the chroot.  doesnt matter anyways as we wont use the cache
 results (portage will rebuild cache), so running ldconfig is simply a waste
 of time.
 
-diff -durN glibc-2.13.orig/Makefile glibc-2.13/Makefile
---- glibc-2.13.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.13/Makefile	2009-11-13 00:49:49.000000000 +0100
-@@ -116,6 +116,7 @@
+---
+ Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makefile
++++ b/Makefile
+@@ -107,6 +107,7 @@
  	rm -f $(symbolic-link-list)
  
  install:
diff --git a/packages/glibc/2.15/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.15/0009-Fix-combreloc-test-BSD-grep.patch
similarity index 70%
rename from packages/glibc/2.15/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.15/0009-Fix-combreloc-test-BSD-grep.patch
index c36cdf43..ce164556 100644
--- a/packages/glibc/2.15/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.15/0009-Fix-combreloc-test-BSD-grep.patch
@@ -13,15 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
---- glibc-2.15.orig/configure	2012-03-19 07:56:58.000000000 -0700
-+++ glibc-2.15/configure	2017-03-08 21:02:21.000000000 -0800
-@@ -6566,7 +6566,7 @@ EOF
+--- a/configure
++++ b/configure
+@@ -6566,7 +6566,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
    then
@@ -30,10 +28,9 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
        libc_cv_z_combreloc=yes
      else
        libc_cv_z_combreloc=no
-diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
---- glibc-2.15.orig/configure.in	2012-01-01 04:16:32.000000000 -0800
-+++ glibc-2.15/configure.in	2017-03-08 21:01:54.000000000 -0800
-@@ -1716,7 +1716,7 @@ dnl cross-platform since the gcc used ca
+--- a/configure.in
++++ b/configure.in
+@@ -1716,7 +1716,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
diff --git a/packages/glibc/2.16.0/150-queue-header-updates.patch b/packages/glibc/2.15/0010-queue-header-updates.patch
similarity index 90%
rename from packages/glibc/2.16.0/150-queue-header-updates.patch
rename to packages/glibc/2.15/0010-queue-header-updates.patch
index 7cbe70ef..f6515e2b 100644
--- a/packages/glibc/2.16.0/150-queue-header-updates.patch
+++ b/packages/glibc/2.15/0010-queue-header-updates.patch
@@ -2,11 +2,12 @@ grab some updates from FreeBSD
 
 http://bugs.gentoo.org/201979
 
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
+---
+ misc/sys/queue.h |   36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
 
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
---- glibc-2.13.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.13/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
+--- a/misc/sys/queue.h
++++ b/misc/sys/queue.h
 @@ -136,6 +136,11 @@
  		(var);							\
  		(var) = ((var)->field.le_next))
diff --git a/packages/glibc/2.12.1/160-manual-no-perl.patch b/packages/glibc/2.15/0011-manual-no-perl.patch
similarity index 73%
rename from packages/glibc/2.12.1/160-manual-no-perl.patch
rename to packages/glibc/2.15/0011-manual-no-perl.patch
index 2eb5414e..7e232aa0 100644
--- a/packages/glibc/2.12.1/160-manual-no-perl.patch
+++ b/packages/glibc/2.15/0011-manual-no-perl.patch
@@ -4,10 +4,13 @@ deal, so just whine a little and continue on our merry way.
 
 http://bugs.gentoo.org/60132
 
-diff -durN glibc-2.12.1.orig/manual/Makefile glibc-2.12.1/manual/Makefile
---- glibc-2.12.1.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
-+++ glibc-2.12.1/manual/Makefile	2009-11-13 00:49:54.000000000 +0100
-@@ -104,9 +104,14 @@
+---
+ manual/Makefile |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/manual/Makefile
++++ b/manual/Makefile
+@@ -106,9 +106,14 @@
  libm-err.texi: stamp-libm-err
  stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
  						     $(dir)/libm-test-ulps))
diff --git a/packages/glibc/2.14.1/170-localedef-fix-trampoline.patch b/packages/glibc/2.15/0012-localedef-fix-trampoline.patch
similarity index 87%
rename from packages/glibc/2.14.1/170-localedef-fix-trampoline.patch
rename to packages/glibc/2.15/0012-localedef-fix-trampoline.patch
index 3cc65597..3b8fd6e8 100644
--- a/packages/glibc/2.14.1/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.15/0012-localedef-fix-trampoline.patch
@@ -5,9 +5,12 @@
 # DP: Upstream status: Unknown
 # DP: Status Details: Unknown
 # DP: Date: 2004-03-16
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
+---
+# locale/programs/3level.h |   36 ++++++++++++++++++++++++++++++++++++
+# 1 file changed, 36 insertions(+)
+#
+--- a/locale/programs/3level.h
++++ b/locale/programs/3level.h
 @@ -203,6 +203,42 @@
  	}
      }
diff --git a/packages/glibc/2.14.1/180-resolv-dynamic.patch b/packages/glibc/2.15/0013-resolv-dynamic.patch
similarity index 81%
rename from packages/glibc/2.14.1/180-resolv-dynamic.patch
rename to packages/glibc/2.15/0013-resolv-dynamic.patch
index e916bce3..fcc2f80a 100644
--- a/packages/glibc/2.14.1/180-resolv-dynamic.patch
+++ b/packages/glibc/2.15/0013-resolv-dynamic.patch
@@ -5,9 +5,12 @@ already running get the updated information.
 
 http://bugs.gentoo.org/177416
 
-diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c
---- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
+---
+ resolv/res_libc.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+--- a/resolv/res_libc.c
++++ b/resolv/res_libc.c
 @@ -22,6 +22,7 @@
  #include <arpa/nameser.h>
  #include <resolv.h>
diff --git a/packages/glibc/2.15/200-fadvise64_64.patch b/packages/glibc/2.15/0014-fadvise64_64.patch
similarity index 67%
rename from packages/glibc/2.15/200-fadvise64_64.patch
rename to packages/glibc/2.15/0014-fadvise64_64.patch
index 71bca381..191d8330 100644
--- a/packages/glibc/2.15/200-fadvise64_64.patch
+++ b/packages/glibc/2.15/0014-fadvise64_64.patch
@@ -3,9 +3,8 @@ ripped from Debian
  sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/posix_fadvise.c
++++ b/sysdeps/unix/sysv/linux/posix_fadvise.c
 @@ -35,6 +35,19 @@
      return INTERNAL_SYSCALL_ERRNO (ret, err);
    return 0;
diff --git a/packages/glibc/2.12.1/220-section-comments.patch b/packages/glibc/2.15/0015-section-comments.patch
similarity index 73%
rename from packages/glibc/2.12.1/220-section-comments.patch
rename to packages/glibc/2.15/0015-section-comments.patch
index 4d355357..75cb5275 100644
--- a/packages/glibc/2.12.1/220-section-comments.patch
+++ b/packages/glibc/2.15/0015-section-comments.patch
@@ -3,10 +3,13 @@ http://sources.redhat.com/ml/binutils/2004-04/msg00665.html
 fixes building on some architectures (like m68k/arm/cris/etc...) because
 it does the right thing
 
-diff -durN glibc-2.12.1.orig/include/libc-symbols.h glibc-2.12.1/include/libc-symbols.h
---- glibc-2.12.1.orig/include/libc-symbols.h	2009-03-14 00:51:46.000000000 +0100
-+++ glibc-2.12.1/include/libc-symbols.h	2009-11-13 00:50:07.000000000 +0100
-@@ -239,12 +239,12 @@
+---
+ include/libc-symbols.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/include/libc-symbols.h
++++ b/include/libc-symbols.h
+@@ -235,12 +235,12 @@
  #  define __make_section_unallocated(section_string)
  # endif
  
diff --git a/packages/glibc/2.12.1/230-no-inline-gmon.patch b/packages/glibc/2.15/0016-no-inline-gmon.patch
similarity index 70%
rename from packages/glibc/2.12.1/230-no-inline-gmon.patch
rename to packages/glibc/2.15/0016-no-inline-gmon.patch
index 594fb799..ed027040 100644
--- a/packages/glibc/2.12.1/230-no-inline-gmon.patch
+++ b/packages/glibc/2.15/0016-no-inline-gmon.patch
@@ -19,12 +19,12 @@ Kazu Hirata
 	* sysdeps/generic/initfini.c (call_gmon_start): Add
 	__attribute__ ((noinline)).
 
-Index: sysdeps/generic/initfini.c
-===================================================================
+---
+ sysdeps/generic/initfini.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff -durN glibc-2.12.1.orig/sysdeps/generic/initfini.c glibc-2.12.1/sysdeps/generic/initfini.c
---- glibc-2.12.1.orig/sysdeps/generic/initfini.c	2007-06-17 20:02:40.000000000 +0200
-+++ glibc-2.12.1/sysdeps/generic/initfini.c	2009-11-13 00:50:09.000000000 +0100
+--- a/sysdeps/generic/initfini.c
++++ b/sysdeps/generic/initfini.c
 @@ -70,7 +70,7 @@
  /* The beginning of _init:  */
  asm ("\n/*@_init_PROLOG_BEGINS*/");
diff --git a/packages/glibc/2.12.1/260-assume-pipe2.patch b/packages/glibc/2.15/0017-assume-pipe2.patch
similarity index 81%
rename from packages/glibc/2.12.1/260-assume-pipe2.patch
rename to packages/glibc/2.15/0017-assume-pipe2.patch
index b84f8821..0074ea65 100644
--- a/packages/glibc/2.12.1/260-assume-pipe2.patch
+++ b/packages/glibc/2.15/0017-assume-pipe2.patch
@@ -20,9 +20,12 @@ __have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
 older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
 stub for it.  so popen() will always fail as glibc assumes pipe2() works.
 
-diff -durN glibc-2.12.1.orig/socket/have_sock_cloexec.c glibc-2.12.1/socket/have_sock_cloexec.c
---- glibc-2.12.1.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.12.1/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
+---
+ socket/have_sock_cloexec.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/socket/have_sock_cloexec.c
++++ b/socket/have_sock_cloexec.c
 @@ -16,9 +16,14 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
diff --git a/packages/glibc/2.15/270-china.patch b/packages/glibc/2.15/0018-china.patch
similarity index 70%
rename from packages/glibc/2.15/270-china.patch
rename to packages/glibc/2.15/0018-china.patch
index 41d77590..b323cf67 100644
--- a/packages/glibc/2.15/270-china.patch
+++ b/packages/glibc/2.15/0018-china.patch
@@ -1,8 +1,11 @@
 
 
-diff -durN glibc-2.13.orig/localedata/locales/zh_TW glibc-2.13/localedata/locales/zh_TW
---- glibc-2.13.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.13/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
+---
+ localedata/locales/zh_TW |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/localedata/locales/zh_TW
++++ b/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
diff --git a/packages/glibc/2.16.0/280-new-valencian-locale.patch b/packages/glibc/2.15/0019-new-valencian-locale.patch
similarity index 81%
rename from packages/glibc/2.16.0/280-new-valencian-locale.patch
rename to packages/glibc/2.15/0019-new-valencian-locale.patch
index 4cdd108e..8f677119 100644
--- a/packages/glibc/2.16.0/280-new-valencian-locale.patch
+++ b/packages/glibc/2.15/0019-new-valencian-locale.patch
@@ -1,10 +1,14 @@
 http://bugs.gentoo.org/show_bug.cgi?id=131815
 http://sourceware.org/bugzilla/show_bug.cgi?id=2522
 
-diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
---- glibc-2.13.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.13/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
-@@ -72,6 +72,8 @@
+---
+ localedata/SUPPORTED              |    2 
+ localedata/locales/ca_ES@valencia |   96 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 98 insertions(+)
+
+--- a/localedata/SUPPORTED
++++ b/localedata/SUPPORTED
+@@ -75,6 +75,8 @@
  ca_ES.UTF-8/UTF-8 \
  ca_ES/ISO-8859-1 \
  ca_ES@euro/ISO-8859-15 \
@@ -13,9 +17,8 @@ diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
  ca_FR.UTF-8/UTF-8 \
  ca_FR/ISO-8859-15 \
  ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.13.orig/localedata/locales/ca_ES@valencia glibc-2.13/localedata/locales/ca_ES@valencia
---- glibc-2.13.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
+--- /dev/null
++++ b/localedata/locales/ca_ES@valencia
 @@ -0,0 +1,96 @@
 +comment_char %
 +escape_char  /
diff --git a/packages/glibc/2.15/0020-macos-cross-rpcgen.patch b/packages/glibc/2.15/0020-macos-cross-rpcgen.patch
new file mode 100644
index 00000000..b439b0f6
--- /dev/null
+++ b/packages/glibc/2.15/0020-macos-cross-rpcgen.patch
@@ -0,0 +1,34 @@
+commit ae7080d30c68cfa0c81ce3422dca948f64a94f50
+Author: Jia Liu <proljc@gmail.com>
+Date:   Sat Sep 7 00:01:08 2013 +0800
+
+    sunrpc/rpc/types.h: fix OS X and FreeBSD build problems
+    
+    When I build arm-linux-gcc on OS X, I find glibc will get a build error
+    in sunrpc/rpc/types.h, so I add __APPLE_CC__ to make OS X build OK.
+    For FreeBSD, Add __FreeBSD__ to make it build OK, too.
+    
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00155.html
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00217.html
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00240.html
+    Signed-off-by: Jia Liu <proljc@gmail.com>
+    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+---
+ sunrpc/rpc/types.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sunrpc/rpc/types.h
++++ b/sunrpc/rpc/types.h
+@@ -69,6 +69,11 @@
+ #include <sys/types.h>
+ #endif
+ 
++#if defined __APPLE_CC__ || defined __FreeBSD__
++# define __u_char_defined
++# define __daddr_t_defined
++#endif
++
+ #ifndef __u_char_defined
+ typedef __u_char u_char;
+ typedef __u_short u_short;
diff --git a/packages/glibc/2.12.1/300-nscd-one-fork.patch b/packages/glibc/2.15/0021-nscd-one-fork.patch
similarity index 75%
rename from packages/glibc/2.12.1/300-nscd-one-fork.patch
rename to packages/glibc/2.15/0021-nscd-one-fork.patch
index 27eae51f..11861f5e 100644
--- a/packages/glibc/2.12.1/300-nscd-one-fork.patch
+++ b/packages/glibc/2.15/0021-nscd-one-fork.patch
@@ -2,10 +2,13 @@ only fork one to assist in stop-start-daemon assumptions about daemon behavior
 
 http://bugs.gentoo.org/190785
 
-diff -durN glibc-2.12.1.orig/nscd/nscd.c glibc-2.12.1/nscd/nscd.c
---- glibc-2.12.1.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.12.1/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
-@@ -182,6 +182,9 @@
+---
+ nscd/nscd.c |   12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+--- a/nscd/nscd.c
++++ b/nscd/nscd.c
+@@ -185,6 +185,9 @@
        if (pid != 0)
  	exit (0);
  
@@ -15,7 +18,7 @@ diff -durN glibc-2.12.1.orig/nscd/nscd.c glibc-2.12.1/nscd/nscd.c
        int nullfd = open (_PATH_DEVNULL, O_RDWR);
        if (nullfd != -1)
  	{
-@@ -231,12 +234,6 @@
+@@ -234,12 +237,6 @@
  	for (i = min_close_fd; i < getdtablesize (); i++)
  	  close (i);
  
@@ -28,7 +31,7 @@ diff -durN glibc-2.12.1.orig/nscd/nscd.c glibc-2.12.1/nscd/nscd.c
        setsid ();
  
        if (chdir ("/") != 0)
-@@ -245,9 +242,6 @@
+@@ -248,9 +245,6 @@
  
        openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
  
diff --git a/packages/glibc/2.15/310-hppa-nptl-carlos.patch b/packages/glibc/2.15/0022-hppa-nptl-carlos.patch
similarity index 84%
rename from packages/glibc/2.15/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.15/0022-hppa-nptl-carlos.patch
index 4c028b27..cad57978 100644
--- a/packages/glibc/2.15/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.15/0022-hppa-nptl-carlos.patch
@@ -1,9 +1,18 @@
 
 
-diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
---- glibc-2.13.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.13/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
-@@ -392,14 +392,14 @@
+---
+ elf/rtld.c                    |   10 +++++-----
+ include/atomic.h              |   26 +++++++++++++-------------
+ nptl/Makefile                 |   35 ++++++++++++++++++++++++++++++++---
+ nptl/pthread_barrier_wait.c   |    2 +-
+ nptl/sysdeps/pthread/Makefile |    2 ++
+ stdio-common/Makefile         |    2 +-
+ sunrpc/clnt_udp.c             |    2 +-
+ 7 files changed, 55 insertions(+), 24 deletions(-)
+
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -393,14 +393,14 @@
       know it is available.  We do not have to clear the memory if we
       do not have to use the temporary bootstrap_map.  Global variables
       are initialized to zero by default.  */
@@ -23,9 +32,8 @@ diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
  # endif
  # if USE___THREAD
    bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
---- glibc-2.13.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.13/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
+--- a/include/atomic.h
++++ b/include/atomic.h
 @@ -185,7 +185,7 @@
       __typeof (*(mem)) __atg5_value = (newvalue);			      \
  									      \
@@ -143,9 +151,8 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
       while (__builtin_expect						      \
  	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
  						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
---- glibc-2.13.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.13/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/Makefile
++++ b/nptl/Makefile
 @@ -265,9 +265,9 @@
  # Files which must not be linked with libpthread.
  tests-nolibpthread = tst-unload
@@ -195,9 +202,8 @@ diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
  CFLAGS-tst-align.c += $(stack-align-test-flags)
  CFLAGS-tst-align3.c += $(stack-align-test-flags)
  CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_barrier_wait.c
---- glibc-2.13.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.13/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/pthread_barrier_wait.c
++++ b/nptl/pthread_barrier_wait.c
 @@ -64,7 +64,7 @@
        do
  	lll_futex_wait (&ibarrier->curr_event, event,
@@ -207,9 +213,8 @@ diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_b
      }
  
    /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps/pthread/Makefile
---- glibc-2.13.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.13/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/sysdeps/pthread/Makefile
++++ b/nptl/sysdeps/pthread/Makefile
 @@ -33,7 +33,9 @@
  
  ifeq ($(have-forced-unwind),yes)
@@ -220,9 +225,8 @@ diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps
  endif
  endif
  
-diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefile
---- glibc-2.13.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.13/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
 @@ -82,7 +82,7 @@
  	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
  endif
@@ -232,10 +236,9 @@ diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefil
  CFLAGS-vfwprintf.c = -Wno-uninitialized
  CFLAGS-tst-printf.c = -Wno-format
  CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.13.orig/sunrpc/clnt_udp.c glibc-2.13/sunrpc/clnt_udp.c
---- glibc-2.13.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.13/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
-@@ -456,7 +456,7 @@
+--- a/sunrpc/clnt_udp.c
++++ b/sunrpc/clnt_udp.c
+@@ -462,7 +462,7 @@
        while (inlen < 0 && errno == EINTR);
        if (inlen < 0)
  	{
diff --git a/packages/glibc/2.15/340-dl_execstack-PaX-support.patch b/packages/glibc/2.15/0023-dl_execstack-PaX-support.patch
similarity index 73%
rename from packages/glibc/2.15/340-dl_execstack-PaX-support.patch
rename to packages/glibc/2.15/0023-dl_execstack-PaX-support.patch
index 2402af07..7b565493 100644
--- a/packages/glibc/2.15/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.15/0023-dl_execstack-PaX-support.patch
@@ -8,10 +8,14 @@
 
 	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
 
-diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
---- glibc-2.13.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.13/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -329,7 +329,8 @@
+---
+ nptl/allocatestack.c                   |    3 ++-
+ sysdeps/unix/sysv/linux/dl-execstack.c |   19 ++++++++++++++++---
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+--- a/nptl/allocatestack.c
++++ b/nptl/allocatestack.c
+@@ -335,7 +335,8 @@
  # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
  #endif
    if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
@@ -21,9 +25,8 @@ diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
  
    return 0;
  }
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/dl-execstack.c
++++ b/sysdeps/unix/sysv/linux/dl-execstack.c
 @@ -63,7 +63,10 @@
        else
  # endif
diff --git a/packages/glibc/2.16.0/350-pre20040117-pt_pax.patch b/packages/glibc/2.15/0024-pre20040117-pt_pax.patch
similarity index 85%
rename from packages/glibc/2.16.0/350-pre20040117-pt_pax.patch
rename to packages/glibc/2.15/0024-pre20040117-pt_pax.patch
index f8f6b834..544b3f6e 100644
--- a/packages/glibc/2.16.0/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.15/0024-pre20040117-pt_pax.patch
@@ -1,9 +1,12 @@
 
 
-diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
---- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
-@@ -580,6 +580,7 @@
+---
+ elf/elf.h |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/elf/elf.h
++++ b/elf/elf.h
+@@ -581,6 +581,7 @@
  #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
  #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
  #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
@@ -11,7 +14,7 @@ diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
  #define PT_LOSUNW	0x6ffffffa
  #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
  #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-@@ -593,6 +594,18 @@
+@@ -594,6 +595,18 @@
  #define PF_X		(1 << 0)	/* Segment is executable */
  #define PF_W		(1 << 1)	/* Segment is writable */
  #define PF_R		(1 << 2)	/* Segment is readable */
diff --git a/packages/glibc/2.16.0/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.15/0025-tests-sandbox-libdl-paths.patch
similarity index 67%
rename from packages/glibc/2.16.0/360-tests-sandbox-libdl-paths.patch
rename to packages/glibc/2.15/0025-tests-sandbox-libdl-paths.patch
index 9f78c52f..1c4ee594 100644
--- a/packages/glibc/2.16.0/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.15/0025-tests-sandbox-libdl-paths.patch
@@ -15,9 +15,23 @@ Fix by Wormo
 
 http://bugs.gentoo.org/56898
 
-diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
---- glibc-2.13.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.13/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
+---
+ grp/tst_fgetgrent.sh        |    3 ++-
+ iconvdata/run-iconv-test.sh |    2 +-
+ iconvdata/tst-table.sh      |    5 ++++-
+ intl/tst-codeset.sh         |    3 +++
+ intl/tst-gettext.sh         |    5 ++++-
+ intl/tst-gettext2.sh        |    5 ++++-
+ intl/tst-translit.sh        |    5 ++++-
+ malloc/tst-mtrace.sh        |    5 ++++-
+ nptl/tst-tls6.sh            |    4 ++--
+ posix/globtest.sh           |    2 +-
+ posix/tst-getconf.sh        |    5 ++++-
+ posix/wordexp-tst.sh        |    5 ++++-
+ 12 files changed, 37 insertions(+), 12 deletions(-)
+
+--- a/grp/tst_fgetgrent.sh
++++ b/grp/tst_fgetgrent.sh
 @@ -24,7 +24,8 @@
  rtld_installed_name=$1; shift
  
@@ -28,9 +42,8 @@ diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
  
  result=0
  
-diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-iconv-test.sh
---- glibc-2.13.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.13/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/iconvdata/run-iconv-test.sh
++++ b/iconvdata/run-iconv-test.sh
 @@ -34,7 +34,7 @@
  export GCONV_PATH
  
@@ -40,9 +53,8 @@ diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-
  
  # How the start the iconv(1) program.
  ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table.sh
---- glibc-2.13.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.13/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/iconvdata/tst-table.sh
++++ b/iconvdata/tst-table.sh
 @@ -59,8 +59,11 @@
    irreversible=${charset}.irreversible
  fi
@@ -56,9 +68,8 @@ diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table
  ${objpfx}tst-table-from ${charset} \
    > ${objpfx}tst-${charset}.table
  
-diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
---- glibc-2.13.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.13/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-codeset.sh
++++ b/intl/tst-codeset.sh
 @@ -37,6 +37,9 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -69,9 +80,8 @@ diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
  ${common_objpfx}elf/ld.so --library-path $common_objpfx \
  ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
  
-diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
---- glibc-2.13.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-gettext.sh
++++ b/intl/tst-gettext.sh
 @@ -51,9 +51,12 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -86,9 +96,8 @@ diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
  ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
  
  exit $?
-diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
---- glibc-2.13.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-gettext2.sh
++++ b/intl/tst-gettext2.sh
 @@ -65,8 +65,11 @@
  LOCPATH=${objpfx}domaindir
  export LOCPATH
@@ -102,9 +111,8 @@ diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
  ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
  cmp ${objpfx}tst-gettext2.out - <<EOF
  String1 - Lang1: 1st string
-diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
---- glibc-2.13.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.13/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-translit.sh
++++ b/intl/tst-translit.sh
 @@ -36,7 +36,10 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -117,9 +125,8 @@ diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
  ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
  
  exit $?
-diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
---- glibc-2.13.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.13/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/malloc/tst-mtrace.sh
++++ b/malloc/tst-mtrace.sh
 @@ -24,9 +24,12 @@
  status=0
  trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
@@ -134,9 +141,8 @@ diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
    ${common_objpfx}malloc/tst-mtrace || status=1
  
  if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
---- glibc-2.13.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.13/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/nptl/tst-tls6.sh
++++ b/nptl/tst-tls6.sh
 @@ -5,8 +5,8 @@
  rtld_installed_name=$1; shift
  logfile=$common_objpfx/nptl/tst-tls6.out
@@ -148,9 +154,8 @@ diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
  tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
  	  ${common_objpfx}/nptl/tst-tls5"
  
-diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
---- glibc-2.13.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.13/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/globtest.sh
++++ b/posix/globtest.sh
 @@ -18,7 +18,7 @@
  esac
  
@@ -160,9 +165,8 @@ diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
  
  # Since we use `sort' we must make sure to use the same locale everywhere.
  LC_ALL=C
-diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
---- glibc-2.13.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.13/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/tst-getconf.sh
++++ b/posix/tst-getconf.sh
 @@ -10,7 +10,10 @@
  else
    rtld_installed_name=$1; shift
@@ -175,9 +179,8 @@ diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
    }
  fi
  
-diff -durN glibc-2.13.orig/posix/wordexp-tst.sh glibc-2.13/posix/wordexp-tst.sh
---- glibc-2.13.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.13/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/wordexp-tst.sh
++++ b/posix/wordexp-tst.sh
 @@ -19,8 +19,11 @@
  "
  export IFS
diff --git a/packages/glibc/2.15/380-dont-build-timezone.patch b/packages/glibc/2.15/0026-dont-build-timezone.patch
similarity index 69%
rename from packages/glibc/2.15/380-dont-build-timezone.patch
rename to packages/glibc/2.15/0026-dont-build-timezone.patch
index 11c358ea..a1442ab1 100644
--- a/packages/glibc/2.15/380-dont-build-timezone.patch
+++ b/packages/glibc/2.15/0026-dont-build-timezone.patch
@@ -1,9 +1,12 @@
 timezone data has been split into the package sys-libs/timezone-data
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:41.000000000 +0100
-@@ -944,7 +944,7 @@
+---
+ Makeconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -958,7 +958,7 @@
  	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
  	      grp pwd posix io termios resource misc socket sysvipc gmon    \
  	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
diff --git a/packages/glibc/2.15/400-alpha-xstat.patch b/packages/glibc/2.15/0027-alpha-xstat.patch
similarity index 57%
rename from packages/glibc/2.15/400-alpha-xstat.patch
rename to packages/glibc/2.15/0027-alpha-xstat.patch
index 6e4ab8fe..4fa9517e 100644
--- a/packages/glibc/2.15/400-alpha-xstat.patch
+++ b/packages/glibc/2.15/0027-alpha-xstat.patch
@@ -1,6 +1,9 @@
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -386,6 +386,11 @@
  # define __ASSUME_GETDENTS32_D_TYPE	1
  #endif
diff --git a/packages/glibc/2.15/0028-alpha-creat.patch b/packages/glibc/2.15/0028-alpha-creat.patch
new file mode 100644
index 00000000..6ef52782
--- /dev/null
+++ b/packages/glibc/2.15/0028-alpha-creat.patch
@@ -0,0 +1,17 @@
+alpha does not have a __NR_creat
+
+http://bugs.gentoo.org/227275
+http://sourceware.org/bugzilla/show_bug.cgi?id=6650
+
+---
+ sysdeps/unix/sysv/linux/wordsize-64/creat64.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
++++ b/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
+@@ -1 +1,5 @@
+ /* Defined as alias for the syscall.  */
++#include <sysdep.h>
++#ifndef __NR_creat
++#include "../../../../../io/creat64.c"
++#endif
diff --git a/packages/glibc/2.16.0/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.15/0029-alpha_alpha-add-fdatasync-support.patch
similarity index 74%
rename from packages/glibc/2.16.0/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.15/0029-alpha_alpha-add-fdatasync-support.patch
index acf250db..9724d4ed 100644
--- a/packages/glibc/2.16.0/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.15/0029-alpha_alpha-add-fdatasync-support.patch
@@ -13,9 +13,8 @@
  sysdeps/unix/sysv/linux/syscalls.list     |    1 
  4 files changed, 76 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/Makefile
++++ b/sysdeps/unix/sysv/linux/Makefile
 @@ -21,6 +21,7 @@
  		   setfsuid setfsgid makedev epoll_pwait signalfd \
  		   eventfd eventfd_read eventfd_write prlimit
@@ -24,9 +23,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/u
  CFLAGS-gethostid.c = -fexceptions
  CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=0x80000000-__getpagesize()"
  
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/fdatasync.c
 @@ -0,0 +1,69 @@
 +/* fdatasync -- synchronize at least the data part of a file with 
 +   the underlying media. Linux version. 
@@ -97,9 +95,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdep
 +
 +weak_alias (__fdatasync, fdatasync)
 +
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -459,6 +459,12 @@
  # define __ASSUME_FUTEX_LOCK_PI	1
  #endif
@@ -113,10 +110,9 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/
  /* Support for utimensat syscall was added in 2.6.22, on SH
     only after 2.6.22-rc1.  */
  #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
-@@ -11,7 +11,6 @@
+--- a/sysdeps/unix/sysv/linux/syscalls.list
++++ b/sysdeps/unix/sysv/linux/syscalls.list
+@@ -12,7 +12,6 @@
  epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
  epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
  epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
diff --git a/packages/glibc/2.16.0/560-ppc-atomic.patch b/packages/glibc/2.15/0030-ppc-atomic.patch
similarity index 93%
rename from packages/glibc/2.16.0/560-ppc-atomic.patch
rename to packages/glibc/2.15/0030-ppc-atomic.patch
index ee1cb909..a38c1c53 100644
--- a/packages/glibc/2.16.0/560-ppc-atomic.patch
+++ b/packages/glibc/2.15/0030-ppc-atomic.patch
@@ -1,14 +1,13 @@
 sniped from suse
 
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
+---
+ sysdeps/powerpc/bits/atomic.h           |   66 ++++++++++-----------
+ sysdeps/powerpc/powerpc32/bits/atomic.h |   16 ++---
+ sysdeps/powerpc/powerpc64/bits/atomic.h |   98 ++++++++++++++++----------------
+ 3 files changed, 90 insertions(+), 90 deletions(-)
 
-diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powerpc/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/bits/atomic.h
++++ b/sysdeps/powerpc/bits/atomic.h
 @@ -85,14 +85,14 @@
        __typeof (*(mem)) __tmp;						      \
        __typeof (mem)  __memp = (mem);					      \
@@ -151,9 +150,8 @@ diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powe
  		       : "cr0", "memory");				      \
       __val;								      \
    })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/powerpc32/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc32/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp;							      \
@@ -192,9 +190,8 @@ diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sy
  		    : "cr0", "memory");					      \
    __tmp != 0;								      \
  })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/powerpc64/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc64/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp, __tmp2;						      \
diff --git a/packages/glibc/2.13/630-mips_shn_undef-hack.patch b/packages/glibc/2.15/0031-mips_shn_undef-hack.patch
similarity index 58%
rename from packages/glibc/2.13/630-mips_shn_undef-hack.patch
rename to packages/glibc/2.15/0031-mips_shn_undef-hack.patch
index 791d76cf..a12c977c 100644
--- a/packages/glibc/2.13/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.15/0031-mips_shn_undef-hack.patch
@@ -1,10 +1,13 @@
-diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
---- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
-@@ -301,6 +301,12 @@
+---
+ elf/dl-lookup.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/elf/dl-lookup.c
++++ b/elf/dl-lookup.c
+@@ -300,6 +300,12 @@
  	      /* FALLTHROUGH */
  	    case STB_GLOBAL:
-	    success:
+ 	    success:
 +#ifdef __mips__
 +	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
 +		 symbols, we skip them. */
diff --git a/packages/glibc/2.13/640-alpha-atfcts.patch b/packages/glibc/2.15/0032-alpha-atfcts.patch
similarity index 63%
rename from packages/glibc/2.13/640-alpha-atfcts.patch
rename to packages/glibc/2.15/0032-alpha-atfcts.patch
index 7a8a94a5..2eff9188 100644
--- a/packages/glibc/2.13/640-alpha-atfcts.patch
+++ b/packages/glibc/2.15/0032-alpha-atfcts.patch
@@ -1,5 +1,9 @@
---- glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -437,7 +437,8 @@
     the code.  On PPC they were introduced in 2.6.17-rc1,
     on SH in 2.6.19-rc1.  */
diff --git a/packages/glibc/2.15/650-syslog.patch b/packages/glibc/2.15/0033-syslog.patch
similarity index 57%
rename from packages/glibc/2.15/650-syslog.patch
rename to packages/glibc/2.15/0033-syslog.patch
index c20cafc8..a2d9722a 100644
--- a/packages/glibc/2.15/650-syslog.patch
+++ b/packages/glibc/2.15/0033-syslog.patch
@@ -1,6 +1,9 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
+---
+ misc/syslog.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/misc/syslog.c
++++ b/misc/syslog.c
 @@ -152,7 +152,7 @@
  #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
  	/* Check for invalid bits. */
diff --git a/packages/glibc/2.15/0034-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.15/0034-debug-readlink_chk-readklinkat_chk.patch
new file mode 100644
index 00000000..0b930f38
--- /dev/null
+++ b/packages/glibc/2.15/0034-debug-readlink_chk-readklinkat_chk.patch
@@ -0,0 +1,27 @@
+---
+ debug/readlink_chk.c   |    2 +-
+ debug/readlinkat_chk.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/debug/readlink_chk.c
++++ b/debug/readlink_chk.c
+@@ -25,7 +25,7 @@
+ 
+ 
+ ssize_t
+-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
++__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
+ {
+   if (len > buflen)
+     __chk_fail ();
+--- a/debug/readlinkat_chk.c
++++ b/debug/readlinkat_chk.c
+@@ -21,7 +21,7 @@
+ 
+ 
+ ssize_t
+-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
++__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
+ 		  size_t buflen)
+ {
+   if (len > buflen)
diff --git a/packages/glibc/2.15/900-cpuid-include.patch b/packages/glibc/2.15/0035-cpuid-include.patch
similarity index 96%
rename from packages/glibc/2.15/900-cpuid-include.patch
rename to packages/glibc/2.15/0035-cpuid-include.patch
index 29edf7ba..e6d656a2 100644
--- a/packages/glibc/2.15/900-cpuid-include.patch
+++ b/packages/glibc/2.15/0035-cpuid-include.patch
@@ -19,10 +19,14 @@ Tested x86_64 (native).
 
 Origin: http://sourceware.org/ml/libc-alpha/2012-03/msg00177.html
 
-diff -urpN '--exclude=autom4te.cache' glibc-2.15.orig/sysdeps/i386/configure glibc-2.15/sysdeps/i386/configure
---- glibc-2.15.orig/sysdeps/i386/configure	2017-02-08 14:28:19.947516097 -0800
-+++ glibc-2.15/sysdeps/i386/configure	2017-02-08 17:25:19.756462280 -0800
-@@ -16,23 +16,6 @@ as_fn_exit ()
+---
+ sysdeps/i386/configure    |  480 ----------------------------------------------
+ sysdeps/i386/configure.in |    5 
+ 2 files changed, 4 insertions(+), 481 deletions(-)
+
+--- a/sysdeps/i386/configure
++++ b/sysdeps/i386/configure
+@@ -16,23 +16,6 @@
    as_fn_set_status $1
    exit $1
  } # as_fn_exit
@@ -46,7 +50,7 @@ diff -urpN '--exclude=autom4te.cache' glibc-2.15.orig/sysdeps/i386/configure gli
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -97,42 +80,6 @@ $as_echo X/"$0" |
+@@ -97,42 +80,6 @@
    exit
  }
  
@@ -89,7 +93,7 @@ diff -urpN '--exclude=autom4te.cache' glibc-2.15.orig/sysdeps/i386/configure gli
  
  # ac_fn_c_try_compile LINENO
  # --------------------------
-@@ -172,172 +119,6 @@ fi
+@@ -172,172 +119,6 @@
  
  } # ac_fn_c_try_compile
  
@@ -262,7 +266,7 @@ diff -urpN '--exclude=autom4te.cache' glibc-2.15.orig/sysdeps/i386/configure gli
  # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
  # -------------------------------------------------------
  # Tests whether HEADER exists and can be compiled using the include files in
-@@ -372,267 +153,8 @@ $as_echo "$ac_res" >&6; }
+@@ -372,267 +153,8 @@
   # Local configure fragment for sysdeps/i386.
  
  
@@ -531,9 +535,8 @@ diff -urpN '--exclude=autom4te.cache' glibc-2.15.orig/sysdeps/i386/configure gli
  if test "x$ac_cv_header_cpuid_h" = xyes; then :
  
  else
-diff -urpN '--exclude=autom4te.cache' glibc-2.15.orig/sysdeps/i386/configure.in glibc-2.15/sysdeps/i386/configure.in
---- glibc-2.15.orig/sysdeps/i386/configure.in	2017-02-08 14:28:19.951516034 -0800
-+++ glibc-2.15/sysdeps/i386/configure.in	2017-02-08 17:24:29.995973278 -0800
+--- a/sysdeps/i386/configure.in
++++ b/sysdeps/i386/configure.in
 @@ -1,8 +1,9 @@
  GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
  # Local configure fragment for sysdeps/i386.
diff --git a/packages/glibc/2.14.1/910-asm-i686.patch b/packages/glibc/2.15/0036-asm-i686.patch
similarity index 76%
rename from packages/glibc/2.14.1/910-asm-i686.patch
rename to packages/glibc/2.15/0036-asm-i686.patch
index b0498876..ea3c88a2 100644
--- a/packages/glibc/2.14.1/910-asm-i686.patch
+++ b/packages/glibc/2.15/0036-asm-i686.patch
@@ -18,9 +18,13 @@ Description:             Fixes the following build problem with GCC-4.5.0:
 ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression
 make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
 
-diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 20:10:20.000000000 +0000
-+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c	2010-04-17 11:34:06.882681001 +0000
+---
+ nptl/sysdeps/pthread/pt-initfini.c    |    5 +++++
+ sysdeps/unix/sysv/linux/i386/sysdep.h |    4 ++++
+ 2 files changed, 9 insertions(+)
+
+--- a/nptl/sysdeps/pthread/pt-initfini.c
++++ b/nptl/sysdeps/pthread/pt-initfini.c
 @@ -45,6 +45,11 @@
  /* Embed an #include to pull in the alignment and .end directives. */
  asm ("\n#include \"defs.h\"");
@@ -33,9 +37,8 @@ diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/npt
  /* The initial common code ends here. */
  asm ("\n/*@HEADER_ENDS*/");
  
-diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 20:10:20.000000000 +0000
-+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-04-17 11:34:06.882681001 +0000
+--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
++++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
 @@ -29,6 +29,10 @@
  #include <dl-sysdep.h>
  #include <tls.h>
@@ -47,4 +50,3 @@ diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/
  
  /* For Linux we can use the system call table in the header file
  	/usr/include/asm/unistd.h
-
diff --git a/packages/glibc/2.15/0037-fix-rpc_parse-format.patch b/packages/glibc/2.15/0037-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.15/0037-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.15/0038-nis-bogus-conditional.patch b/packages/glibc/2.15/0038-nis-bogus-conditional.patch
new file mode 100644
index 00000000..732b859b
--- /dev/null
+++ b/packages/glibc/2.15/0038-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -293,7 +293,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.15/990-try-link-static.patch b/packages/glibc/2.15/0039-try-link-static.patch
similarity index 85%
rename from packages/glibc/2.15/990-try-link-static.patch
rename to packages/glibc/2.15/0039-try-link-static.patch
index a0ffadd3..15d4d252 100644
--- a/packages/glibc/2.15/990-try-link-static.patch
+++ b/packages/glibc/2.15/0039-try-link-static.patch
@@ -6,10 +6,15 @@ Date:   Thu Mar 8 00:17:27 2012 +0000
 
     Fix .ctors/.dtors header configure test for bootstrapping.
 
-diff -urpN glibc-2.15.orig/aclocal.m4 glibc-2.15/aclocal.m4
---- glibc-2.15.orig/aclocal.m4	2017-02-08 11:27:28.445657746 -0800
-+++ glibc-2.15/aclocal.m4	2017-02-08 11:37:25.818463475 -0800
-@@ -114,3 +114,17 @@ AC_CACHE_CHECK(whether $LD is GNU ld, li
+---
+ aclocal.m4   |   14 ++++++++++++++
+ configure    |   57 ++++++++++++++++++++++++++++++---------------------------
+ configure.in |   27 ++++++++++-----------------
+ 3 files changed, 54 insertions(+), 44 deletions(-)
+
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -114,3 +114,17 @@
  [LIBC_PROG_FOO_GNU($LD, libc_cv_prog_ld_gnu=yes, libc_cv_prog_ld_gnu=no)])
  gnu_ld=$libc_cv_prog_ld_gnu
  ])
@@ -27,10 +32,9 @@ diff -urpN glibc-2.15.orig/aclocal.m4 glibc-2.15/aclocal.m4
 +		       1>&AS_MESSAGE_LOG_FD])],
 +      [$2], [$3])
 +rm -f conftest*])
-diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
---- glibc-2.15.orig/configure	2017-02-08 11:27:28.453657802 -0800
-+++ glibc-2.15/configure	2017-02-08 11:47:36.184360147 -0800
-@@ -6147,29 +6147,32 @@ $as_echo_n "checking for .preinit_array/
+--- a/configure
++++ b/configure
+@@ -6147,29 +6147,32 @@
  if ${libc_cv_initfini_array+:} false; then :
    $as_echo_n "(cached) " >&6
  else
@@ -74,7 +78,7 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_initfini_array" >&5
  $as_echo "$libc_cv_initfini_array" >&6; }
-@@ -6183,21 +6186,22 @@ if ${libc_cv_ctors_header+:} false; then
+@@ -6183,21 +6186,22 @@
    $as_echo_n "(cached) " >&6
  else
        libc_cv_ctors_header=yes
@@ -111,7 +115,7 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
          if $READELF -WS conftest$ac_exeext | $AWK '
  	{ gsub(/\[ */, "[") }
  	$2 == ".ctors" || $2 == ".dtors" {
-@@ -6219,8 +6223,7 @@ else
+@@ -6219,8 +6223,7 @@
          as_fn_error $? "missing __attribute__ ((constructor)) support??" "$LINENO" 5
  
  fi
@@ -121,10 +125,9 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
  
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ctors_header" >&5
-diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
---- glibc-2.15.orig/configure.in	2017-02-08 11:27:28.433657663 -0800
-+++ glibc-2.15/configure.in	2017-02-08 11:46:58.994915812 -0800
-@@ -1439,24 +1439,17 @@ EOF
+--- a/configure.in
++++ b/configure.in
+@@ -1439,24 +1439,17 @@
  
    AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support,
  		 libc_cv_initfini_array, [dnl
@@ -156,7 +159,7 @@ diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
    if test $libc_cv_initfini_array != yes; then
      AC_MSG_ERROR([Need linker with .init_array/.fini_array support.])
    fi
-@@ -1464,9 +1457,9 @@ EOF
+@@ -1464,9 +1457,9 @@
    AC_CACHE_CHECK(whether to use .ctors/.dtors header and trailer,
  		 libc_cv_ctors_header, [dnl
      libc_cv_ctors_header=yes
diff --git a/packages/glibc/2.15/991-builtin_expect.patch b/packages/glibc/2.15/0040-builtin_expect.patch
similarity index 81%
rename from packages/glibc/2.15/991-builtin_expect.patch
rename to packages/glibc/2.15/0040-builtin_expect.patch
index 8a327fa7..4112bb9d 100644
--- a/packages/glibc/2.15/991-builtin_expect.patch
+++ b/packages/glibc/2.15/0040-builtin_expect.patch
@@ -6,10 +6,14 @@ Date:   Sun Jan 8 09:21:09 2012 -0500
 
      No need for test for __builtin_expect
 
-diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
---- glibc-2.15.orig/configure	2017-02-08 12:47:52.580858002 -0800
-+++ glibc-2.15/configure	2017-02-08 13:01:40.682870318 -0800
-@@ -7185,38 +7185,6 @@ if test "$libc_cv_c_asmcr0_bug" != 'no';
+---
+ configure    |   32 --------------------------------
+ configure.in |   22 ----------------------
+ 2 files changed, 54 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -7185,38 +7185,6 @@
  fi
  fi
  
@@ -48,10 +52,9 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_memset" >&5
  $as_echo_n "checking for __builtin_memset... " >&6; }
  if ${libc_cv_gcc_builtin_memset+:} false; then :
-diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
---- glibc-2.15.orig/configure.in	2017-02-08 12:47:52.580858002 -0800
-+++ glibc-2.15/configure.in	2017-02-08 13:01:17.638580410 -0800
-@@ -2098,28 +2098,6 @@ if test "$libc_cv_c_asmcr0_bug" != 'no';
+--- a/configure.in
++++ b/configure.in
+@@ -2098,28 +2098,6 @@
  fi
  fi
  
diff --git a/packages/glibc/2.15/992-gcc_s-suffix.patch b/packages/glibc/2.15/0041-gcc_s-suffix.patch
similarity index 73%
rename from packages/glibc/2.15/992-gcc_s-suffix.patch
rename to packages/glibc/2.15/0041-gcc_s-suffix.patch
index 6dbc70f7..74f29d8d 100644
--- a/packages/glibc/2.15/992-gcc_s-suffix.patch
+++ b/packages/glibc/2.15/0041-gcc_s-suffix.patch
@@ -5,10 +5,16 @@ Date:   Tue Apr 24 10:22:45 2012 +0000
 
     Don't handle libgcc_s suffixes.
 
-diff -urpN glibc-2.15.orig/config.make.in glibc-2.15/config.make.in
---- glibc-2.15.orig/config.make.in	2017-02-08 13:24:23.338055977 -0800
-+++ glibc-2.15/config.make.in	2017-02-08 13:25:21.810625337 -0800
-@@ -50,7 +50,6 @@ have-z-execstack = @libc_cv_z_execstack@
+---
+ Makeconfig     |    2 +-
+ config.make.in |    1 -
+ configure      |   21 +--------------------
+ configure.in   |   16 +---------------
+ 4 files changed, 3 insertions(+), 37 deletions(-)
+
+--- a/config.make.in
++++ b/config.make.in
+@@ -50,7 +50,6 @@
  have-initfini = @libc_cv_have_initfini@
  have-Bgroup = @libc_cv_Bgroup@
  have-as-needed = @libc_cv_as_needed@
@@ -16,10 +22,9 @@ diff -urpN glibc-2.15.orig/config.make.in glibc-2.15/config.make.in
  need-nopic-initfini = @nopic_initfini@
  with-fp = @with_fp@
  old-glibc-headers = @old_glibc_headers@
-diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
---- glibc-2.15.orig/configure	2017-02-08 13:24:23.346056054 -0800
-+++ glibc-2.15/configure	2017-02-08 13:27:07.327670602 -0800
-@@ -654,7 +654,6 @@ libc_cv_z_execstack
+--- a/configure
++++ b/configure
+@@ -654,7 +654,6 @@
  libc_cv_z_combreloc
  ASFLAGS_config
  libc_cv_as_needed
@@ -27,7 +32,7 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
  libc_cv_Bgroup
  libc_cv_cc_with_libunwind
  VERSIONING
-@@ -6465,24 +6464,6 @@ fi
+@@ -6465,24 +6464,6 @@
  $as_echo "$libc_cv_Bgroup" >&6; }
  
  
@@ -52,7 +57,7 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed option" >&5
  $as_echo_n "checking for --as-needed option... " >&6; }
  if ${libc_cv_as_needed+:} false; then :
-@@ -6493,7 +6474,7 @@ int main (void) { return 0; }
+@@ -6493,7 +6474,7 @@
  EOF
    if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
  			      -fPIC -shared -o conftest.so conftest.c
@@ -61,10 +66,9 @@ diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
  			      -nostdlib 1>&5'
    { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
    (eval $ac_try) 2>&5
-diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
---- glibc-2.15.orig/configure.in	2017-02-08 13:24:23.346056054 -0800
-+++ glibc-2.15/configure.in	2017-02-08 13:26:44.383441535 -0800
-@@ -1639,20 +1639,6 @@ EOF
+--- a/configure.in
++++ b/configure.in
+@@ -1639,20 +1639,6 @@
    rm -f conftest*])
    AC_SUBST(libc_cv_Bgroup)
  
@@ -85,7 +89,7 @@ diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
    AC_CACHE_CHECK(for --as-needed option,
  		 libc_cv_as_needed, [dnl
    cat > conftest.c <<EOF
-@@ -1660,7 +1646,7 @@ int main (void) { return 0; }
+@@ -1660,7 +1646,7 @@
  EOF
    if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
  			      -fPIC -shared -o conftest.so conftest.c
@@ -94,10 +98,9 @@ diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
  			      -nostdlib 1>&AS_MESSAGE_LOG_FD])
    then
      libc_cv_as_needed=yes
-diff -urpN glibc-2.15.orig/Makeconfig glibc-2.15/Makeconfig
---- glibc-2.15.orig/Makeconfig	2017-02-08 13:24:23.338055977 -0800
-+++ glibc-2.15/Makeconfig	2017-02-08 13:24:31.262132679 -0800
-@@ -565,7 +565,7 @@ endif
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -565,7 +565,7 @@
  ifneq ($(have-as-needed),yes)
   libgcc_eh := -lgcc_eh $(libunwind)
  else
diff --git a/packages/glibc/2.15/996-obsolete-rpc.patch b/packages/glibc/2.15/0042-obsolete-rpc.patch
similarity index 71%
rename from packages/glibc/2.15/996-obsolete-rpc.patch
rename to packages/glibc/2.15/0042-obsolete-rpc.patch
index 459be29b..4e0f1cc3 100644
--- a/packages/glibc/2.15/996-obsolete-rpc.patch
+++ b/packages/glibc/2.15/0042-obsolete-rpc.patch
@@ -10,11 +10,68 @@ Date:   Thu May 10 20:16:53 2012 +0200
       after the TI-RPC library becomes fully sufficient for the needs of
       existing applications.
 
-diff --git a/config.h.in b/config.h.in
-index 787873b4c0..54952609ef 100644
+---
+ config.h.in            |    3 +++
+ config.make.in         |    1 +
+ configure              |   18 ++++++++++++++++++
+ configure.in           |   11 +++++++++++
+ include/libc-symbols.h |    7 ++++++-
+ nis/Makefile           |    6 ++++++
+ sunrpc/Makefile        |    6 ++++++
+ sunrpc/auth_des.c      |    4 ++--
+ sunrpc/auth_none.c     |    2 +-
+ sunrpc/auth_unix.c     |    4 ++--
+ sunrpc/authdes_prot.c  |    4 ++--
+ sunrpc/authuxprot.c    |    2 +-
+ sunrpc/clnt_gen.c      |    2 +-
+ sunrpc/clnt_perr.c     |   10 +++++-----
+ sunrpc/clnt_raw.c      |    2 +-
+ sunrpc/clnt_simp.c     |    2 +-
+ sunrpc/clnt_tcp.c      |    2 +-
+ sunrpc/clnt_udp.c      |    6 +++---
+ sunrpc/clnt_unix.c     |    2 +-
+ sunrpc/des_crypt.c     |    4 ++--
+ sunrpc/des_soft.c      |    2 +-
+ sunrpc/get_myaddr.c    |    2 +-
+ sunrpc/key_call.c      |   18 +++++++++---------
+ sunrpc/key_prot.c      |   20 ++++++++++----------
+ sunrpc/netname.c       |   10 +++++-----
+ sunrpc/pm_getmaps.c    |    2 +-
+ sunrpc/pm_getport.c    |    4 ++--
+ sunrpc/pmap_clnt.c     |    4 ++--
+ sunrpc/pmap_prot.c     |    2 +-
+ sunrpc/pmap_prot2.c    |    2 +-
+ sunrpc/pmap_rmt.c      |    8 ++++----
+ sunrpc/publickey.c     |    4 ++--
+ sunrpc/rpc_cmsg.c      |    2 +-
+ sunrpc/rpc_common.c    |    2 +-
+ sunrpc/rpc_dtable.c    |    2 +-
+ sunrpc/rpc_prot.c      |   14 +++++++-------
+ sunrpc/rpc_thread.c    |    8 ++++----
+ sunrpc/rtime.c         |    2 +-
+ sunrpc/svc.c           |   32 ++++++++++++++++----------------
+ sunrpc/svc_auth.c      |    2 +-
+ sunrpc/svc_raw.c       |    2 +-
+ sunrpc/svc_run.c       |    4 ++--
+ sunrpc/svc_tcp.c       |    4 ++--
+ sunrpc/svc_udp.c       |    6 +++---
+ sunrpc/svc_unix.c      |    4 ++--
+ sunrpc/svcauth_des.c   |    2 +-
+ sunrpc/xcrypt.c        |    4 ++--
+ sunrpc/xdr.c           |   44 ++++++++++++++++++++++----------------------
+ sunrpc/xdr_array.c     |    4 ++--
+ sunrpc/xdr_float.c     |    4 ++--
+ sunrpc/xdr_intXX_t.c   |   20 ++++++++++----------
+ sunrpc/xdr_mem.c       |    2 +-
+ sunrpc/xdr_rec.c       |    8 ++++----
+ sunrpc/xdr_ref.c       |    4 ++--
+ sunrpc/xdr_sizeof.c    |    2 +-
+ sunrpc/xdr_stdio.c     |    2 +-
+ 56 files changed, 203 insertions(+), 153 deletions(-)
+
 --- a/config.h.in
 +++ b/config.h.in
-@@ -178,6 +178,9 @@
+@@ -187,6 +187,9 @@
  /* Define if `.ctors' and `.dtors' sections shouldn't be used.  */
  #undef	NO_CTORS_DTORS_SECTIONS
  
@@ -24,11 +81,9 @@ index 787873b4c0..54952609ef 100644
  /*
   */
  
-diff --git a/config.make.in b/config.make.in
-index 5f6f9e281d..6c4d04ee33 100644
 --- a/config.make.in
 +++ b/config.make.in
-@@ -96,6 +96,7 @@ add-on-subdirs = @add_on_subdirs@
+@@ -100,6 +100,7 @@
  sysdeps-add-ons = @sysdeps_add_ons@
  cross-compiling = @cross_compiling@
  force-install = @force_install@
@@ -36,11 +91,9 @@ index 5f6f9e281d..6c4d04ee33 100644
  
  # Build tools.
  CC = @CC@
-diff --git a/configure b/configure
-index 1c5f4adbea..c7cb47d0c2 100755
 --- a/configure
 +++ b/configure
-@@ -687,6 +687,7 @@ multi_arch
+@@ -692,6 +692,7 @@
  base_machine
  add_on_subdirs
  add_ons
@@ -48,7 +101,7 @@ index 1c5f4adbea..c7cb47d0c2 100755
  libc_cv_nss_crypt
  all_warnings
  force_install
-@@ -779,6 +780,7 @@ enable_kernel
+@@ -790,6 +791,7 @@
  enable_all_warnings
  enable_multi_arch
  enable_nss_crypt
@@ -56,7 +109,7 @@ index 1c5f4adbea..c7cb47d0c2 100755
  with_cpu
  '
        ac_precious_vars='build_alias
-@@ -1434,6 +1436,8 @@ Optional Features:
+@@ -1449,6 +1451,8 @@
    --enable-multi-arch     enable single DSO with optimizations for multiple
                            architectures
    --enable-nss-crypt      enable libcrypt to use nss
@@ -65,7 +118,7 @@ index 1c5f4adbea..c7cb47d0c2 100755
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -3746,6 +3750,20 @@ else
+@@ -3803,6 +3807,20 @@
  fi
  
  
@@ -86,11 +139,9 @@ index 1c5f4adbea..c7cb47d0c2 100755
  # The way shlib-versions is used to generate soversions.mk uses a
  # fairly simplistic model for name recognition that can't distinguish
  # i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a $host_os
-diff --git a/configure.in b/configure.in
-index 19a2c1a0f0..4eb9277e8c 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -252,6 +252,17 @@ else
+@@ -290,6 +290,17 @@
  fi
  AC_SUBST(libc_cv_nss_crypt)
  
@@ -108,11 +159,9 @@ index 19a2c1a0f0..4eb9277e8c 100644
  # The way shlib-versions is used to generate soversions.mk uses a
  # fairly simplistic model for name recognition that can't distinguish
  # i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a $host_os
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 951e46a6e3..0c3274e253 100644
 --- a/include/libc-symbols.h
 +++ b/include/libc-symbols.h
-@@ -556,7 +556,12 @@ for linking")
+@@ -626,7 +626,12 @@
  # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
  # define libc_hidden_def(name) hidden_def (name)
  # define libc_hidden_weak(name) hidden_weak (name)
@@ -126,11 +175,9 @@ index 951e46a6e3..0c3274e253 100644
  # define libc_hidden_ver(local, name) hidden_ver (local, name)
  # define libc_hidden_data_def(name) hidden_data_def (name)
  # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/nis/Makefile b/nis/Makefile
-index a48753f7a9..b412cee304 100644
 --- a/nis/Makefile
 +++ b/nis/Makefile
-@@ -23,6 +23,12 @@ subdir	:= nis
+@@ -23,6 +23,12 @@
  
  aux			:= nis_hash
  
@@ -143,11 +190,9 @@ index a48753f7a9..b412cee304 100644
  distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
  			   nisplus-parser.h nis_xdr.h nss \
  			   $(wildcard rpcsvc/*.[hx])
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index e61efd02b3..3b79dcdb72 100644
 --- a/sunrpc/Makefile
 +++ b/sunrpc/Makefile
-@@ -60,6 +60,10 @@ generated-dirs := rpcsvc
+@@ -61,6 +61,10 @@
  
  include ../Makeconfig
  
@@ -158,7 +203,7 @@ index e61efd02b3..3b79dcdb72 100644
  ifeq ($(versioning),yes)
  need-export-routines := auth_des auth_unix clnt_gen clnt_perr clnt_tcp \
  			clnt_udp get_myaddr key_call netname pm_getport \
-@@ -73,9 +77,11 @@ routines := auth_none authuxprot bindrsvprt clnt_raw clnt_simp \
+@@ -74,9 +78,11 @@
  	    svc_simple xdr_float xdr_rec publickey authdes_prot \
  	    des_crypt des_impl des_soft key_prot openchild rtime svcauth_des \
  	    clnt_unix svc_unix create_xid $(need-export-routines)
@@ -170,11 +215,9 @@ index e61efd02b3..3b79dcdb72 100644
  
  # We do not build rpcinfo anymore.  It is not needed for a bootstrap
  # and not wanted on complete systems.
-diff --git a/sunrpc/auth_des.c b/sunrpc/auth_des.c
-index 96bbcfc328..0408d60826 100644
 --- a/sunrpc/auth_des.c
 +++ b/sunrpc/auth_des.c
-@@ -117,7 +117,7 @@ authdes_create (const char *servername, u_int window,
+@@ -117,7 +117,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (authdes_create)
  #else
@@ -183,7 +226,7 @@ index 96bbcfc328..0408d60826 100644
  #endif
  
  AUTH *
-@@ -211,7 +211,7 @@ failed:
+@@ -211,7 +211,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (authdes_pk_create)
  #else
@@ -192,11 +235,9 @@ index 96bbcfc328..0408d60826 100644
  #endif
  
  /*
-diff --git a/sunrpc/auth_none.c b/sunrpc/auth_none.c
-index 5f252a9544..3af5966794 100644
 --- a/sunrpc/auth_none.c
 +++ b/sunrpc/auth_none.c
-@@ -95,7 +95,7 @@ authnone_create (void)
+@@ -95,7 +95,7 @@
    __libc_once (authnone_private_guard, authnone_create_once);
    return &authnone_private.no_client;
  }
@@ -205,11 +246,9 @@ index 5f252a9544..3af5966794 100644
  
  static bool_t
  authnone_marshal (AUTH *client, XDR *xdrs)
-diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
-index d3b5dc7dee..68b42d7b1f 100644
 --- a/sunrpc/auth_unix.c
 +++ b/sunrpc/auth_unix.c
-@@ -149,7 +149,7 @@ no_memory:
+@@ -149,7 +149,7 @@
    marshal_new_auth (auth);
    return auth;
  }
@@ -218,7 +257,7 @@ index d3b5dc7dee..68b42d7b1f 100644
  
  /*
   * Returns an auth handle with parameters determined by doing lots of
-@@ -216,7 +216,7 @@ authunix_create_default (void)
+@@ -216,7 +216,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (authunix_create_default)
  #else
@@ -227,11 +266,9 @@ index d3b5dc7dee..68b42d7b1f 100644
  #endif
  
  /*
-diff --git a/sunrpc/authdes_prot.c b/sunrpc/authdes_prot.c
-index 0a25bac143..164c1223ca 100644
 --- a/sunrpc/authdes_prot.c
 +++ b/sunrpc/authdes_prot.c
-@@ -63,7 +63,7 @@ xdr_authdes_cred (XDR *xdrs, struct authdes_cred *cred)
+@@ -63,7 +63,7 @@
        return FALSE;
      }
  }
@@ -240,38 +277,32 @@ index 0a25bac143..164c1223ca 100644
  
  
  bool_t
-@@ -78,4 +78,4 @@ xdr_authdes_verf (register XDR *xdrs, register struct authdes_verf *verf)
+@@ -78,4 +78,4 @@
  		       sizeof (verf->adv_int_u)));
    return TRUE;
  }
 -libc_hidden_nolink (xdr_authdes_verf, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (xdr_authdes_verf, GLIBC_2_1)
-diff --git a/sunrpc/authuxprot.c b/sunrpc/authuxprot.c
-index 64da1799e0..d37faee0c7 100644
 --- a/sunrpc/authuxprot.c
 +++ b/sunrpc/authuxprot.c
-@@ -63,4 +63,4 @@ xdr_authunix_parms (XDR * xdrs, struct authunix_parms *p)
+@@ -63,4 +63,4 @@
      }
    return FALSE;
  }
 -libc_hidden_nolink (xdr_authunix_parms, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_authunix_parms, GLIBC_2_0)
-diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c
-index 2b7096cf20..df34672d72 100644
 --- a/sunrpc/clnt_gen.c
 +++ b/sunrpc/clnt_gen.c
-@@ -175,5 +175,5 @@ clnt_create (const char *hostname, u_long prog, u_long vers,
+@@ -175,5 +175,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_create)
  #else
 -libc_hidden_nolink (clnt_create, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (clnt_create, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c
-index 175370ebfc..b4f84c92e8 100644
 --- a/sunrpc/clnt_perr.c
 +++ b/sunrpc/clnt_perr.c
-@@ -127,7 +127,7 @@ clnt_sperror (CLIENT * rpch, const char *msg)
+@@ -127,7 +127,7 @@
  
    return str;
  }
@@ -280,7 +311,7 @@ index 175370ebfc..b4f84c92e8 100644
  
  void
  clnt_perror (CLIENT * rpch, const char *msg)
-@@ -137,7 +137,7 @@ clnt_perror (CLIENT * rpch, const char *msg)
+@@ -137,7 +137,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_perror)
  #else
@@ -289,7 +320,7 @@ index 175370ebfc..b4f84c92e8 100644
  #endif
  
  
-@@ -270,7 +270,7 @@ clnt_perrno (enum clnt_stat num)
+@@ -270,7 +270,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_perrno)
  #else
@@ -298,7 +329,7 @@ index 175370ebfc..b4f84c92e8 100644
  #endif
  
  char *
-@@ -308,7 +308,7 @@ clnt_spcreateerror (const char *msg)
+@@ -308,7 +308,7 @@
  
    return str;
  }
@@ -307,7 +338,7 @@ index 175370ebfc..b4f84c92e8 100644
  
  void
  clnt_pcreateerror (const char *msg)
-@@ -318,7 +318,7 @@ clnt_pcreateerror (const char *msg)
+@@ -318,7 +318,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_pcreateerror)
  #else
@@ -316,11 +347,9 @@ index 175370ebfc..b4f84c92e8 100644
  #endif
  
  struct auth_errtab
-diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c
-index 95e3eae988..4004c6b6a8 100644
 --- a/sunrpc/clnt_raw.c
 +++ b/sunrpc/clnt_raw.c
-@@ -129,7 +129,7 @@ clntraw_create (u_long prog, u_long vers)
+@@ -129,7 +129,7 @@
    client->cl_auth = authnone_create ();
    return client;
  }
@@ -329,11 +358,9 @@ index 95e3eae988..4004c6b6a8 100644
  
  static enum clnt_stat
  clntraw_call (h, proc, xargs, argsp, xresults, resultsp, timeout)
-diff --git a/sunrpc/clnt_simp.c b/sunrpc/clnt_simp.c
-index d2dd3b307a..d612df09a0 100644
 --- a/sunrpc/clnt_simp.c
 +++ b/sunrpc/clnt_simp.c
-@@ -139,7 +139,7 @@ callrpc (const char *host, u_long prognum, u_long versnum, u_long procnum,
+@@ -139,7 +139,7 @@
      crp->valid = 0;
    return (int) clnt_stat;
  }
@@ -342,11 +369,9 @@ index d2dd3b307a..d612df09a0 100644
  
  #ifdef _RPC_THREAD_SAFE_
  void
-diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c
-index d1fc43dbfd..6bd4c8c0cd 100644
 --- a/sunrpc/clnt_tcp.c
 +++ b/sunrpc/clnt_tcp.c
-@@ -220,7 +220,7 @@ fooy:
+@@ -220,7 +220,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnttcp_create)
  #else
@@ -355,11 +380,9 @@ index d1fc43dbfd..6bd4c8c0cd 100644
  #endif
  
  static enum clnt_stat
-diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
-index 294e13a58c..7ecf2ef5a5 100644
 --- a/sunrpc/clnt_udp.c
 +++ b/sunrpc/clnt_udp.c
-@@ -239,7 +239,7 @@ fooy:
+@@ -239,7 +239,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__libc_clntudp_bufcreate)
  #else
@@ -368,7 +391,7 @@ index 294e13a58c..7ecf2ef5a5 100644
  #endif
  
  CLIENT *
-@@ -250,7 +250,7 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
+@@ -250,7 +250,7 @@
    return __libc_clntudp_bufcreate (raddr, program, version, wait,
  				   sockp, sendsz, recvsz, 0);
  }
@@ -377,7 +400,7 @@ index 294e13a58c..7ecf2ef5a5 100644
  
  CLIENT *
  clntudp_create (raddr, program, version, wait, sockp)
-@@ -266,7 +266,7 @@ clntudp_create (raddr, program, version, wait, sockp)
+@@ -266,7 +266,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clntudp_create)
  #else
@@ -386,11 +409,9 @@ index 294e13a58c..7ecf2ef5a5 100644
  #endif
  
  static int
-diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c
-index 282127bb8b..776ceab484 100644
 --- a/sunrpc/clnt_unix.c
 +++ b/sunrpc/clnt_unix.c
-@@ -200,7 +200,7 @@ fooy:
+@@ -200,7 +200,7 @@
    mem_free ((caddr_t) h, sizeof (CLIENT));
    return (CLIENT *) NULL;
  }
@@ -399,11 +420,9 @@ index 282127bb8b..776ceab484 100644
  
  static enum clnt_stat
  clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
-diff --git a/sunrpc/des_crypt.c b/sunrpc/des_crypt.c
-index 8745900b82..22a34b7f3a 100644
 --- a/sunrpc/des_crypt.c
 +++ b/sunrpc/des_crypt.c
-@@ -102,7 +102,7 @@ cbc_crypt (char *key, char *buf, unsigned int len, unsigned int mode,
+@@ -102,7 +102,7 @@
    COPY8 (dp.des_ivec, ivec);
    return err;
  }
@@ -412,38 +431,32 @@ index 8745900b82..22a34b7f3a 100644
  
  /*
   * ECB mode encryption
-@@ -115,4 +115,4 @@ ecb_crypt (char *key, char *buf, unsigned int len, unsigned int mode)
+@@ -115,4 +115,4 @@
    dp.des_mode = ECB;
    return common_crypt (key, buf, len, mode, &dp);
  }
 -libc_hidden_nolink (ecb_crypt, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (ecb_crypt, GLIBC_2_1)
-diff --git a/sunrpc/des_soft.c b/sunrpc/des_soft.c
-index 27d918c64d..cddef5d76b 100644
 --- a/sunrpc/des_soft.c
 +++ b/sunrpc/des_soft.c
-@@ -70,4 +70,4 @@ des_setparity (char *p)
+@@ -70,4 +70,4 @@
        p++;
      }
  }
 -libc_hidden_nolink (des_setparity, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (des_setparity, GLIBC_2_1)
-diff --git a/sunrpc/get_myaddr.c b/sunrpc/get_myaddr.c
-index def5b7a74a..24407b53ec 100644
 --- a/sunrpc/get_myaddr.c
 +++ b/sunrpc/get_myaddr.c
-@@ -99,5 +99,5 @@ get_myaddress (struct sockaddr_in *addr)
+@@ -99,5 +99,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (get_myaddress)
  #else
 -libc_hidden_nolink (get_myaddress, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (get_myaddress, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
-index 6d08bf8e80..e0a076b47f 100644
 --- a/sunrpc/key_call.c
 +++ b/sunrpc/key_call.c
-@@ -80,7 +80,7 @@ key_setsecret (char *secretkey)
+@@ -80,7 +80,7 @@
      }
    return 0;
  }
@@ -452,7 +465,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  /* key_secretkey_is_set() returns 1 if the keyserver has a secret key
   * stored for the caller's effective uid; it returns 0 otherwise
-@@ -109,7 +109,7 @@ key_secretkey_is_set (void)
+@@ -109,7 +109,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (key_secretkey_is_set)
  #else
@@ -461,7 +474,7 @@ index 6d08bf8e80..e0a076b47f 100644
  #endif
  
  int
-@@ -133,7 +133,7 @@ key_encryptsession (char *remotename, des_block *deskey)
+@@ -133,7 +133,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -470,7 +483,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_decryptsession (char *remotename, des_block *deskey)
-@@ -155,7 +155,7 @@ key_decryptsession (char *remotename, des_block *deskey)
+@@ -155,7 +155,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -479,7 +492,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_encryptsession_pk (char *remotename, netobj *remotekey,
-@@ -180,7 +180,7 @@ key_encryptsession_pk (char *remotename, netobj *remotekey,
+@@ -180,7 +180,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -488,7 +501,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_decryptsession_pk (char *remotename, netobj *remotekey,
-@@ -205,7 +205,7 @@ key_decryptsession_pk (char *remotename, netobj *remotekey,
+@@ -205,7 +205,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -497,7 +510,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_gendes (des_block *key)
-@@ -239,7 +239,7 @@ key_gendes (des_block *key)
+@@ -239,7 +239,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (key_gendes)
  #else
@@ -506,7 +519,7 @@ index 6d08bf8e80..e0a076b47f 100644
  #endif
  
  int
-@@ -259,7 +259,7 @@ key_setnet (struct key_netstarg *arg)
+@@ -259,7 +259,7 @@
      }
    return 1;
  }
@@ -515,7 +528,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_get_conv (char *pkey, des_block *deskey)
-@@ -278,7 +278,7 @@ key_get_conv (char *pkey, des_block *deskey)
+@@ -278,7 +278,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -524,11 +537,9 @@ index 6d08bf8e80..e0a076b47f 100644
  
  /*
   * Hack to allow the keyserver to use AUTH_DES (for authenticated
-diff --git a/sunrpc/key_prot.c b/sunrpc/key_prot.c
-index dd73f5e3cb..2899c9a448 100644
 --- a/sunrpc/key_prot.c
 +++ b/sunrpc/key_prot.c
-@@ -38,7 +38,7 @@ xdr_keystatus (XDR * xdrs, keystatus * objp)
+@@ -38,7 +38,7 @@
  
    return TRUE;
  }
@@ -537,7 +548,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_keybuf (XDR * xdrs, keybuf objp)
-@@ -48,7 +48,7 @@ xdr_keybuf (XDR * xdrs, keybuf objp)
+@@ -48,7 +48,7 @@
  
    return TRUE;
  }
@@ -546,7 +557,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_netnamestr (XDR * xdrs, netnamestr * objp)
-@@ -58,7 +58,7 @@ xdr_netnamestr (XDR * xdrs, netnamestr * objp)
+@@ -58,7 +58,7 @@
  
    return TRUE;
  }
@@ -555,7 +566,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_cryptkeyarg (XDR * xdrs, cryptkeyarg * objp)
-@@ -71,7 +71,7 @@ xdr_cryptkeyarg (XDR * xdrs, cryptkeyarg * objp)
+@@ -71,7 +71,7 @@
  
    return TRUE;
  }
@@ -564,7 +575,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_cryptkeyarg2 (XDR * xdrs, cryptkeyarg2 * objp)
-@@ -84,7 +84,7 @@ xdr_cryptkeyarg2 (XDR * xdrs, cryptkeyarg2 * objp)
+@@ -84,7 +84,7 @@
      return FALSE;
    return TRUE;
  }
@@ -573,7 +584,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_cryptkeyres (XDR * xdrs, cryptkeyres * objp)
-@@ -102,7 +102,7 @@ xdr_cryptkeyres (XDR * xdrs, cryptkeyres * objp)
+@@ -102,7 +102,7 @@
      }
    return TRUE;
  }
@@ -582,7 +593,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_unixcred (XDR * xdrs, unixcred * objp)
-@@ -117,7 +117,7 @@ xdr_unixcred (XDR * xdrs, unixcred * objp)
+@@ -117,7 +117,7 @@
      return FALSE;
    return TRUE;
  }
@@ -591,7 +602,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_getcredres (XDR * xdrs, getcredres * objp)
-@@ -135,7 +135,7 @@ xdr_getcredres (XDR * xdrs, getcredres * objp)
+@@ -135,7 +135,7 @@
      }
    return TRUE;
  }
@@ -600,7 +611,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_key_netstarg (XDR * xdrs, key_netstarg * objp)
-@@ -148,7 +148,7 @@ xdr_key_netstarg (XDR * xdrs, key_netstarg * objp)
+@@ -148,7 +148,7 @@
      return FALSE;
    return TRUE;
  }
@@ -609,17 +620,15 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_key_netstres (XDR * xdrs, key_netstres * objp)
-@@ -166,4 +166,4 @@ xdr_key_netstres (XDR * xdrs, key_netstres * objp)
+@@ -166,4 +166,4 @@
      }
    return TRUE;
  }
 -libc_hidden_nolink (xdr_key_netstres, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_key_netstres, GLIBC_2_0)
-diff --git a/sunrpc/netname.c b/sunrpc/netname.c
-index 0b4980074c..197d503eae 100644
 --- a/sunrpc/netname.c
 +++ b/sunrpc/netname.c
-@@ -54,7 +54,7 @@ user2netname (char netname[MAXNETNAMELEN + 1], const uid_t uid,
+@@ -55,7 +55,7 @@
      netname[i - 1] = '\0';
    return 1;
  }
@@ -628,7 +637,7 @@ index 0b4980074c..197d503eae 100644
  
  int
  host2netname (char netname[MAXNETNAMELEN + 1], const char *host,
-@@ -118,7 +118,7 @@ host2netname (char netname[MAXNETNAMELEN + 1], const char *host,
+@@ -119,7 +119,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (host2netname)
  #else
@@ -637,7 +646,7 @@ index 0b4980074c..197d503eae 100644
  #endif
  
  int
-@@ -134,7 +134,7 @@ getnetname (char name[MAXNETNAMELEN + 1])
+@@ -135,7 +135,7 @@
      dummy = user2netname (name, uid, NULL);
    return (dummy);
  }
@@ -646,7 +655,7 @@ index 0b4980074c..197d503eae 100644
  
  /* Type of the lookup function for netname2user.  */
  typedef int (*netname2user_function) (const char netname[MAXNETNAMELEN + 1],
-@@ -187,7 +187,7 @@ netname2user (const char netname[MAXNETNAMELEN + 1], uid_t * uidp, gid_t * gidp,
+@@ -188,7 +188,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (netname2user)
  #else
@@ -655,27 +664,23 @@ index 0b4980074c..197d503eae 100644
  #endif
  
  int
-@@ -214,4 +214,4 @@ netname2host (const char netname[MAXNETNAMELEN + 1], char *hostname,
+@@ -215,4 +215,4 @@
  
    return 1;
  }
 -libc_hidden_nolink (netname2host, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (netname2host, GLIBC_2_1)
-diff --git a/sunrpc/pm_getmaps.c b/sunrpc/pm_getmaps.c
-index 6b61d324f9..6f7ad10ef6 100644
 --- a/sunrpc/pm_getmaps.c
 +++ b/sunrpc/pm_getmaps.c
-@@ -84,4 +84,4 @@ pmap_getmaps (struct sockaddr_in *address)
+@@ -84,4 +84,4 @@
    address->sin_port = 0;
    return head;
  }
 -libc_hidden_nolink (pmap_getmaps, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (pmap_getmaps, GLIBC_2_0)
-diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
-index 58974a5661..f10f87250d 100644
 --- a/sunrpc/pm_getport.c
 +++ b/sunrpc/pm_getport.c
-@@ -142,7 +142,7 @@ __libc_rpc_getport (address, program, version, protocol, timeout_sec,
+@@ -142,7 +142,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__libc_rpc_getport)
  #else
@@ -684,17 +689,15 @@ index 58974a5661..f10f87250d 100644
  #endif
  
  
-@@ -160,4 +160,4 @@ pmap_getport (address, program, version, protocol)
+@@ -160,4 +160,4 @@
  {
    return __libc_rpc_getport (address, program, version, protocol, 5, 60);
  }
 -libc_hidden_nolink (pmap_getport, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (pmap_getport, GLIBC_2_0)
-diff --git a/sunrpc/pmap_clnt.c b/sunrpc/pmap_clnt.c
-index 36479f0e5c..5d7d185766 100644
 --- a/sunrpc/pmap_clnt.c
 +++ b/sunrpc/pmap_clnt.c
-@@ -131,7 +131,7 @@ pmap_set (u_long program, u_long version, int protocol, u_short port)
+@@ -131,7 +131,7 @@
    /* (void)close(socket); CLNT_DESTROY closes it */
    return rslt;
  }
@@ -703,37 +706,31 @@ index 36479f0e5c..5d7d185766 100644
  
  /*
   * Remove the mapping between program,version and port.
-@@ -162,4 +162,4 @@ pmap_unset (u_long program, u_long version)
+@@ -162,4 +162,4 @@
    /* (void)close(socket); CLNT_DESTROY already closed it */
    return rslt;
  }
 -libc_hidden_nolink (pmap_unset, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (pmap_unset, GLIBC_2_0)
-diff --git a/sunrpc/pmap_prot.c b/sunrpc/pmap_prot.c
-index 5a2e052728..8df41dc5f2 100644
 --- a/sunrpc/pmap_prot.c
 +++ b/sunrpc/pmap_prot.c
-@@ -49,4 +49,4 @@ xdr_pmap (xdrs, regs)
+@@ -49,4 +49,4 @@
      return xdr_u_long (xdrs, &regs->pm_port);
    return FALSE;
  }
 -libc_hidden_nolink (xdr_pmap, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_pmap, GLIBC_2_0)
-diff --git a/sunrpc/pmap_prot2.c b/sunrpc/pmap_prot2.c
-index 3213898ce8..57b0800178 100644
 --- a/sunrpc/pmap_prot2.c
 +++ b/sunrpc/pmap_prot2.c
-@@ -110,4 +110,4 @@ xdr_pmaplist (xdrs, rp)
+@@ -110,4 +110,4 @@
        rp = freeing ? &next : &((*rp)->pml_next);
      }
  }
 -libc_hidden_nolink (xdr_pmaplist, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_pmaplist, GLIBC_2_0)
-diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c
-index 16f322773e..fd8de85589 100644
 --- a/sunrpc/pmap_rmt.c
 +++ b/sunrpc/pmap_rmt.c
-@@ -104,7 +104,7 @@ pmap_rmtcall (addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_p
+@@ -104,7 +104,7 @@
    addr->sin_port = 0;
    return stat;
  }
@@ -742,7 +739,7 @@ index 16f322773e..fd8de85589 100644
  
  
  /*
-@@ -137,7 +137,7 @@ xdr_rmtcall_args (XDR *xdrs, struct rmtcallargs *cap)
+@@ -137,7 +137,7 @@
      }
    return FALSE;
  }
@@ -751,7 +748,7 @@ index 16f322773e..fd8de85589 100644
  
  /*
   * XDR remote call results
-@@ -160,7 +160,7 @@ xdr_rmtcallres (xdrs, crp)
+@@ -160,7 +160,7 @@
      }
    return FALSE;
  }
@@ -760,17 +757,15 @@ index 16f322773e..fd8de85589 100644
  
  
  /*
-@@ -388,4 +388,4 @@ done_broad:
+@@ -388,4 +388,4 @@
    AUTH_DESTROY (unix_auth);
    return stat;
  }
 -libc_hidden_nolink (clnt_broadcast, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (clnt_broadcast, GLIBC_2_0)
-diff --git a/sunrpc/publickey.c b/sunrpc/publickey.c
-index 4d0b09874c..089b544953 100644
 --- a/sunrpc/publickey.c
 +++ b/sunrpc/publickey.c
-@@ -75,7 +75,7 @@ getpublickey (const char *name, char *key)
+@@ -76,7 +76,7 @@
  
    return status == NSS_STATUS_SUCCESS;
  }
@@ -779,24 +774,20 @@ index 4d0b09874c..089b544953 100644
  
  
  int
-@@ -118,4 +118,4 @@ getsecretkey (const char *name, char *key, const char *passwd)
+@@ -119,4 +119,4 @@
  
    return status == NSS_STATUS_SUCCESS;
  }
 -libc_hidden_nolink (getsecretkey, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (getsecretkey, GLIBC_2_0)
-diff --git a/sunrpc/rpc_cmsg.c b/sunrpc/rpc_cmsg.c
-index ed70104b68..62d95fcc83 100644
 --- a/sunrpc/rpc_cmsg.c
 +++ b/sunrpc/rpc_cmsg.c
-@@ -194,4 +194,4 @@ xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg)
+@@ -194,4 +194,4 @@
      return xdr_opaque_auth (xdrs, &(cmsg->rm_call.cb_verf));
    return FALSE;
  }
 -libc_hidden_nolink (xdr_callmsg, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_callmsg, GLIBC_2_0)
-diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c
-index 44b4b38f4d..710191163c 100644
 --- a/sunrpc/rpc_common.c
 +++ b/sunrpc/rpc_common.c
 @@ -45,7 +45,7 @@
@@ -808,21 +799,17 @@ index 44b4b38f4d..710191163c 100644
  fd_set svc_fdset;
  struct rpc_createerr rpc_createerr;
  struct pollfd *svc_pollfd;
-diff --git a/sunrpc/rpc_dtable.c b/sunrpc/rpc_dtable.c
-index 9bee215496..81ddf8f55a 100644
 --- a/sunrpc/rpc_dtable.c
 +++ b/sunrpc/rpc_dtable.c
-@@ -46,4 +46,4 @@ _rpc_dtablesize (void)
+@@ -46,4 +46,4 @@
  
    return size;
  }
 -libc_hidden_nolink (_rpc_dtablesize, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (_rpc_dtablesize, GLIBC_2_0)
-diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c
-index 9a23cc1b02..dc24f3673b 100644
 --- a/sunrpc/rpc_prot.c
 +++ b/sunrpc/rpc_prot.c
-@@ -57,7 +57,7 @@ xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap)
+@@ -57,7 +57,7 @@
  		      &ap->oa_length, MAX_AUTH_BYTES);
    return FALSE;
  }
@@ -831,7 +818,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /*
   * XDR a DES block
-@@ -67,7 +67,7 @@ xdr_des_block (XDR *xdrs, des_block *blkp)
+@@ -67,7 +67,7 @@
  {
    return xdr_opaque (xdrs, (caddr_t) blkp, sizeof (des_block));
  }
@@ -840,7 +827,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /* * * * * * * * * * * * * * XDR RPC MESSAGE * * * * * * * * * * * * * * * */
  
-@@ -95,7 +95,7 @@ xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar)
+@@ -95,7 +95,7 @@
      }
    return TRUE;		/* TRUE => open ended set of problems */
  }
@@ -849,7 +836,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /*
   * XDR the MSG_DENIED part of a reply message union
-@@ -118,7 +118,7 @@ xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr)
+@@ -118,7 +118,7 @@
      }
    return FALSE;
  }
@@ -858,7 +845,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  static const struct xdr_discrim reply_dscrm[3] =
  {
-@@ -142,7 +142,7 @@ xdr_replymsg (xdrs, rmsg)
+@@ -142,7 +142,7 @@
  		      NULL_xdrproc_t);
    return FALSE;
  }
@@ -867,7 +854,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  
  /*
-@@ -167,7 +167,7 @@ xdr_callhdr (xdrs, cmsg)
+@@ -167,7 +167,7 @@
      return xdr_u_long (xdrs, &(cmsg->rm_call.cb_vers));
    return FALSE;
  }
@@ -876,17 +863,15 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /* ************************** Client utility routine ************* */
  
-@@ -277,4 +277,4 @@ _seterr_reply (struct rpc_msg *msg,
+@@ -277,4 +277,4 @@
        break;
      }
  }
 -libc_hidden_nolink (_seterr_reply, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (_seterr_reply, GLIBC_2_0)
-diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
-index ac4c18fcee..94d9f1fd80 100644
 --- a/sunrpc/rpc_thread.c
 +++ b/sunrpc/rpc_thread.c
-@@ -97,7 +97,7 @@ __rpc_thread_svc_fdset (void)
+@@ -97,7 +97,7 @@
  		return &svc_fdset;
  	return &tvp->svc_fdset_s;
  }
@@ -895,7 +880,7 @@ index ac4c18fcee..94d9f1fd80 100644
  
  struct rpc_createerr *
  __rpc_thread_createerr (void)
-@@ -109,7 +109,7 @@ __rpc_thread_createerr (void)
+@@ -109,7 +109,7 @@
  		return &rpc_createerr;
  	return &tvp->rpc_createerr_s;
  }
@@ -904,7 +889,7 @@ index ac4c18fcee..94d9f1fd80 100644
  
  struct pollfd **
  __rpc_thread_svc_pollfd (void)
-@@ -124,7 +124,7 @@ __rpc_thread_svc_pollfd (void)
+@@ -124,7 +124,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__rpc_thread_svc_pollfd)
  #else
@@ -913,7 +898,7 @@ index ac4c18fcee..94d9f1fd80 100644
  #endif
  
  int *
-@@ -140,7 +140,7 @@ __rpc_thread_svc_max_pollfd (void)
+@@ -140,7 +140,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__rpc_thread_svc_max_pollfd)
  #else
@@ -922,21 +907,17 @@ index ac4c18fcee..94d9f1fd80 100644
  #endif
  
  #endif /* _RPC_THREAD_SAFE_ */
-diff --git a/sunrpc/rtime.c b/sunrpc/rtime.c
-index 8506df554c..bcb280b48f 100644
 --- a/sunrpc/rtime.c
 +++ b/sunrpc/rtime.c
-@@ -140,4 +140,4 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep,
+@@ -140,4 +140,4 @@
    timep->tv_usec = 0;
    return 0;
  }
 -libc_hidden_nolink (rtime, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (rtime, GLIBC_2_1)
-diff --git a/sunrpc/svc.c b/sunrpc/svc.c
-index e1f4a322e8..103770a42c 100644
 --- a/sunrpc/svc.c
 +++ b/sunrpc/svc.c
-@@ -115,7 +115,7 @@ xprt_register (SVCXPRT *xprt)
+@@ -115,7 +115,7 @@
  					       POLLRDNORM | POLLRDBAND);
      }
  }
@@ -945,7 +926,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* De-activate a transport handle. */
  void
-@@ -139,7 +139,7 @@ xprt_unregister (SVCXPRT *xprt)
+@@ -139,7 +139,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xprt_unregister)
  #else
@@ -954,7 +935,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  
-@@ -218,7 +218,7 @@ pmap_it:
+@@ -218,7 +218,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_register)
  #else
@@ -963,7 +944,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Remove a service program from the callout list. */
-@@ -242,7 +242,7 @@ svc_unregister (rpcprog_t prog, rpcvers_t vers)
+@@ -242,7 +242,7 @@
    if (! svc_is_mapped (prog, vers))
      pmap_unset (prog, vers);
  }
@@ -972,7 +953,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* ******************* REPLY GENERATION ROUTINES  ************ */
  
-@@ -264,7 +264,7 @@ svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
+@@ -264,7 +264,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_sendreply)
  #else
@@ -981,7 +962,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* No procedure error reply */
-@@ -282,7 +282,7 @@ svcerr_noproc (register SVCXPRT *xprt)
+@@ -282,7 +282,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcerr_noproc)
  #else
@@ -990,7 +971,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Can't decode args error reply */
-@@ -300,7 +300,7 @@ svcerr_decode (register SVCXPRT *xprt)
+@@ -300,7 +300,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcerr_decode)
  #else
@@ -999,7 +980,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Some system error */
-@@ -318,7 +318,7 @@ svcerr_systemerr (register SVCXPRT *xprt)
+@@ -318,7 +318,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcerr_systemerr)
  #else
@@ -1008,7 +989,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Authentication error reply */
-@@ -333,7 +333,7 @@ svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
+@@ -333,7 +333,7 @@
    rply.rjcted_rply.rj_why = why;
    SVC_REPLY (xprt, &rply);
  }
@@ -1017,7 +998,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* Auth too weak error reply */
  void
-@@ -341,7 +341,7 @@ svcerr_weakauth (SVCXPRT *xprt)
+@@ -341,7 +341,7 @@
  {
    svcerr_auth (xprt, AUTH_TOOWEAK);
  }
@@ -1026,7 +1007,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* Program unavailable error reply */
  void
-@@ -355,7 +355,7 @@ svcerr_noprog (register SVCXPRT *xprt)
+@@ -355,7 +355,7 @@
    rply.acpted_rply.ar_stat = PROG_UNAVAIL;
    SVC_REPLY (xprt, &rply);
  }
@@ -1035,7 +1016,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* Program version mismatch error reply */
  void
-@@ -372,7 +372,7 @@ svcerr_progvers (register SVCXPRT *xprt, rpcvers_t low_vers,
+@@ -372,7 +372,7 @@
    rply.acpted_rply.ar_vers.high = high_vers;
    SVC_REPLY (xprt, &rply);
  }
@@ -1044,7 +1025,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* ******************* SERVER INPUT STUFF ******************* */
  
-@@ -401,7 +401,7 @@ svc_getreq (int rdfds)
+@@ -401,7 +401,7 @@
    readfds.fds_bits[0] = rdfds;
    svc_getreqset (&readfds);
  }
@@ -1053,7 +1034,7 @@ index e1f4a322e8..103770a42c 100644
  
  void
  svc_getreqset (fd_set *readfds)
-@@ -420,7 +420,7 @@ svc_getreqset (fd_set *readfds)
+@@ -420,7 +420,7 @@
      for (mask = *maskp++; (bit = ffsl (mask)); mask ^= (1L << (bit - 1)))
        svc_getreq_common (sock + bit - 1);
  }
@@ -1062,7 +1043,7 @@ index e1f4a322e8..103770a42c 100644
  
  void
  svc_getreq_poll (struct pollfd *pfdp, int pollretval)
-@@ -449,7 +449,7 @@ svc_getreq_poll (struct pollfd *pfdp, int pollretval)
+@@ -449,7 +449,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_getreq_poll)
  #else
@@ -1071,7 +1052,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  
-@@ -542,7 +542,7 @@ svc_getreq_common (const int fd)
+@@ -542,7 +542,7 @@
      }
    while (stat == XPRT_MOREREQS);
  }
@@ -1080,11 +1061,9 @@ index e1f4a322e8..103770a42c 100644
  
  #ifdef _RPC_THREAD_SAFE_
  
-diff --git a/sunrpc/svc_auth.c b/sunrpc/svc_auth.c
-index facbb13982..f33bda2f20 100644
 --- a/sunrpc/svc_auth.c
 +++ b/sunrpc/svc_auth.c
-@@ -105,7 +105,7 @@ _authenticate (register struct svc_req *rqst, struct rpc_msg *msg)
+@@ -105,7 +105,7 @@
  
    return AUTH_REJECTEDCRED;
  }
@@ -1093,11 +1072,9 @@ index facbb13982..f33bda2f20 100644
  
  static enum auth_stat
  _svcauth_null (struct svc_req *rqst, struct rpc_msg *msg)
-diff --git a/sunrpc/svc_raw.c b/sunrpc/svc_raw.c
-index 90f5d96e63..7d885574af 100644
 --- a/sunrpc/svc_raw.c
 +++ b/sunrpc/svc_raw.c
-@@ -88,7 +88,7 @@ svcraw_create (void)
+@@ -88,7 +88,7 @@
    xdrmem_create (&srp->xdr_stream, srp->_raw_buf, UDPMSGSIZE, XDR_FREE);
    return &srp->server;
  }
@@ -1106,11 +1083,9 @@ index 90f5d96e63..7d885574af 100644
  
  static enum xprt_stat
  svcraw_stat (SVCXPRT *xprt)
-diff --git a/sunrpc/svc_run.c b/sunrpc/svc_run.c
-index 09f40dd188..90dfc94056 100644
 --- a/sunrpc/svc_run.c
 +++ b/sunrpc/svc_run.c
-@@ -46,7 +46,7 @@ svc_exit (void)
+@@ -46,7 +46,7 @@
    svc_pollfd = NULL;
    svc_max_pollfd = 0;
  }
@@ -1119,18 +1094,16 @@ index 09f40dd188..90dfc94056 100644
  
  void
  svc_run (void)
-@@ -104,5 +104,5 @@ svc_run (void)
+@@ -104,5 +104,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_run)
  #else
 -libc_hidden_nolink (svc_run, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (svc_run, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c
-index e0515322a5..eb615494d8 100644
 --- a/sunrpc/svc_tcp.c
 +++ b/sunrpc/svc_tcp.c
-@@ -187,7 +187,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize)
+@@ -187,7 +187,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svctcp_create)
  #else
@@ -1139,7 +1112,7 @@ index e0515322a5..eb615494d8 100644
  #endif
  
  /*
-@@ -199,7 +199,7 @@ svcfd_create (int fd, u_int sendsize, u_int recvsize)
+@@ -199,7 +199,7 @@
  {
    return makefd_xprt (fd, sendsize, recvsize);
  }
@@ -1148,11 +1121,9 @@ index e0515322a5..eb615494d8 100644
  
  static SVCXPRT *
  internal_function
-diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
-index 04c8407e64..6c4d75a814 100644
 --- a/sunrpc/svc_udp.c
 +++ b/sunrpc/svc_udp.c
-@@ -184,7 +184,7 @@ svcudp_create: xp_pad is too small for IP_PKTINFO\n"));
+@@ -184,7 +184,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcudp_bufcreate)
  #else
@@ -1161,7 +1132,7 @@ index 04c8407e64..6c4d75a814 100644
  #endif
  
  SVCXPRT *
-@@ -196,7 +196,7 @@ svcudp_create (sock)
+@@ -196,7 +196,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcudp_create)
  #else
@@ -1170,7 +1141,7 @@ index 04c8407e64..6c4d75a814 100644
  #endif
  
  static enum xprt_stat
-@@ -500,7 +500,7 @@ svcudp_enablecache (SVCXPRT *transp, u_long size)
+@@ -500,7 +500,7 @@
    su->su_cache = (char *) uc;
    return 1;
  }
@@ -1179,11 +1150,9 @@ index 04c8407e64..6c4d75a814 100644
  
  
  /*
-diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
-index 2b02682e72..94507b2403 100644
 --- a/sunrpc/svc_unix.c
 +++ b/sunrpc/svc_unix.c
-@@ -184,7 +184,7 @@ svcunix_create (int sock, u_int sendsize, u_int recvsize, char *path)
+@@ -184,7 +184,7 @@
    xprt_register (xprt);
    return xprt;
  }
@@ -1192,7 +1161,7 @@ index 2b02682e72..94507b2403 100644
  
  /*
   * Like svunix_create(), except the routine takes any *open* UNIX file
-@@ -195,7 +195,7 @@ svcunixfd_create (int fd, u_int sendsize, u_int recvsize)
+@@ -195,7 +195,7 @@
  {
    return makefd_xprt (fd, sendsize, recvsize);
  }
@@ -1201,11 +1170,9 @@ index 2b02682e72..94507b2403 100644
  
  static SVCXPRT *
  internal_function
-diff --git a/sunrpc/svcauth_des.c b/sunrpc/svcauth_des.c
-index b9656e25da..9609734960 100644
 --- a/sunrpc/svcauth_des.c
 +++ b/sunrpc/svcauth_des.c
-@@ -583,7 +583,7 @@ authdes_getucred (const struct authdes_cred *adc, uid_t * uid, gid_t * gid,
+@@ -583,7 +583,7 @@
      groups[i] = cred->groups[i];
    return 1;
  }
@@ -1214,11 +1181,9 @@ index b9656e25da..9609734960 100644
  
  static void
  internal_function
-diff --git a/sunrpc/xcrypt.c b/sunrpc/xcrypt.c
-index 8b7642b503..2e53f2d9e9 100644
 --- a/sunrpc/xcrypt.c
 +++ b/sunrpc/xcrypt.c
-@@ -127,7 +127,7 @@ xencrypt (char *secret, char *passwd)
+@@ -127,7 +127,7 @@
    free (buf);
    return 1;
  }
@@ -1227,7 +1192,7 @@ index 8b7642b503..2e53f2d9e9 100644
  
  /*
   * Decrypt secret key using passwd
-@@ -163,7 +163,7 @@ xdecrypt (char *secret, char *passwd)
+@@ -163,7 +163,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdecrypt)
  #else
@@ -1236,11 +1201,9 @@ index 8b7642b503..2e53f2d9e9 100644
  #endif
  
  /*
-diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
-index 4dd82ff044..7eac2d40f0 100644
 --- a/sunrpc/xdr.c
 +++ b/sunrpc/xdr.c
-@@ -72,7 +72,7 @@ xdr_free (xdrproc_t proc, char *objp)
+@@ -72,7 +72,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_free)
  #else
@@ -1249,7 +1212,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -86,7 +86,7 @@ xdr_void (void)
+@@ -86,7 +86,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_void)
  #else
@@ -1258,7 +1221,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -126,7 +126,7 @@ xdr_int (XDR *xdrs, int *ip)
+@@ -126,7 +126,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_int)
  #else
@@ -1267,7 +1230,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -165,7 +165,7 @@ xdr_u_int (XDR *xdrs, u_int *up)
+@@ -165,7 +165,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_int)
  #else
@@ -1276,7 +1239,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -193,7 +193,7 @@ xdr_long (XDR *xdrs, long *lp)
+@@ -193,7 +193,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_long)
  #else
@@ -1285,7 +1248,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -232,7 +232,7 @@ xdr_u_long (XDR *xdrs, u_long *ulp)
+@@ -232,7 +232,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_long)
  #else
@@ -1294,7 +1257,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -268,7 +268,7 @@ xdr_hyper (XDR *xdrs, quad_t *llp)
+@@ -268,7 +268,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_hyper)
  #else
@@ -1303,7 +1266,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -304,7 +304,7 @@ xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
+@@ -304,7 +304,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_hyper)
  #else
@@ -1312,7 +1275,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  bool_t
-@@ -315,7 +315,7 @@ xdr_longlong_t (XDR *xdrs, quad_t *llp)
+@@ -315,7 +315,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_longlong_t)
  #else
@@ -1321,7 +1284,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  bool_t
-@@ -326,7 +326,7 @@ xdr_u_longlong_t (XDR *xdrs, u_quad_t *ullp)
+@@ -326,7 +326,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_longlong_t)
  #else
@@ -1330,7 +1293,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -359,7 +359,7 @@ xdr_short (XDR *xdrs, short *sp)
+@@ -359,7 +359,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_short)
  #else
@@ -1339,7 +1302,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -392,7 +392,7 @@ xdr_u_short (XDR *xdrs, u_short *usp)
+@@ -392,7 +392,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_short)
  #else
@@ -1348,7 +1311,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  
-@@ -415,7 +415,7 @@ xdr_char (XDR *xdrs, char *cp)
+@@ -415,7 +415,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_char)
  #else
@@ -1357,7 +1320,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -437,7 +437,7 @@ xdr_u_char (XDR *xdrs, u_char *cp)
+@@ -437,7 +437,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_char)
  #else
@@ -1366,7 +1329,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -470,7 +470,7 @@ xdr_bool (XDR *xdrs, bool_t *bp)
+@@ -470,7 +470,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_bool)
  #else
@@ -1375,7 +1338,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -525,7 +525,7 @@ xdr_enum (XDR *xdrs, enum_t *ep)
+@@ -525,7 +525,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_enum)
  #else
@@ -1384,7 +1347,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -580,7 +580,7 @@ xdr_opaque (XDR *xdrs, caddr_t cp, u_int cnt)
+@@ -580,7 +580,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_opaque)
  #else
@@ -1393,7 +1356,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -648,7 +648,7 @@ xdr_bytes (xdrs, cpp, sizep, maxsize)
+@@ -648,7 +648,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_bytes)
  #else
@@ -1402,7 +1365,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -665,7 +665,7 @@ xdr_netobj (xdrs, np)
+@@ -665,7 +665,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_netobj)
  #else
@@ -1411,7 +1374,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -714,7 +714,7 @@ xdr_union (xdrs, dscmp, unp, choices, dfault)
+@@ -714,7 +714,7 @@
    return ((dfault == NULL_xdrproc_t) ? FALSE :
  	  (*dfault) (xdrs, unp, LASTUNSIGNED));
  }
@@ -1420,7 +1383,7 @@ index 4dd82ff044..7eac2d40f0 100644
  
  
  /*
-@@ -806,7 +806,7 @@ xdr_string (xdrs, cpp, maxsize)
+@@ -806,7 +806,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_string)
  #else
@@ -1429,18 +1392,16 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -827,5 +827,5 @@ xdr_wrapstring (xdrs, cpp)
+@@ -827,5 +827,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_wrapstring)
  #else
 -libc_hidden_nolink (xdr_wrapstring, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_wrapstring, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
-index b832078342..a634861278 100644
 --- a/sunrpc/xdr_array.c
 +++ b/sunrpc/xdr_array.c
-@@ -127,7 +127,7 @@ xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc)
+@@ -127,7 +127,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_array)
  #else
@@ -1449,17 +1410,15 @@ index b832078342..a634861278 100644
  #endif
  
  /*
-@@ -162,4 +162,4 @@ xdr_vector (xdrs, basep, nelem, elemsize, xdr_elem)
+@@ -162,4 +162,4 @@
      }
    return TRUE;
  }
 -libc_hidden_nolink (xdr_vector, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_vector, GLIBC_2_0)
-diff --git a/sunrpc/xdr_float.c b/sunrpc/xdr_float.c
-index 1a9c260617..78e8f3bd2d 100644
 --- a/sunrpc/xdr_float.c
 +++ b/sunrpc/xdr_float.c
-@@ -158,7 +158,7 @@ xdr_float(xdrs, fp)
+@@ -158,7 +158,7 @@
  	}
  	return (FALSE);
  }
@@ -1468,17 +1427,15 @@ index 1a9c260617..78e8f3bd2d 100644
  
  /*
   * This routine works on Suns (Sky / 68000's) and Vaxen.
-@@ -300,4 +300,4 @@ xdr_double(xdrs, dp)
+@@ -300,4 +300,4 @@
  	}
  	return (FALSE);
  }
 -libc_hidden_nolink (xdr_double, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_double, GLIBC_2_0)
-diff --git a/sunrpc/xdr_intXX_t.c b/sunrpc/xdr_intXX_t.c
-index fe06f45df3..02a0c09b5b 100644
 --- a/sunrpc/xdr_intXX_t.c
 +++ b/sunrpc/xdr_intXX_t.c
-@@ -46,14 +46,14 @@ xdr_int64_t (XDR *xdrs, int64_t *ip)
+@@ -47,14 +47,14 @@
        return FALSE;
      }
  }
@@ -1495,7 +1452,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 64bit unsigned integers */
  bool_t
-@@ -82,14 +82,14 @@ xdr_uint64_t (XDR *xdrs, uint64_t *uip)
+@@ -83,14 +83,14 @@
        return FALSE;
      }
  }
@@ -1512,7 +1469,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 32bit integers */
  bool_t
-@@ -107,7 +107,7 @@ xdr_int32_t (XDR *xdrs, int32_t *lp)
+@@ -108,7 +108,7 @@
        return FALSE;
      }
  }
@@ -1521,7 +1478,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 32bit unsigned integers */
  bool_t
-@@ -128,7 +128,7 @@ xdr_uint32_t (XDR *xdrs, uint32_t *ulp)
+@@ -129,7 +129,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_uint32_t)
  #else
@@ -1530,7 +1487,7 @@ index fe06f45df3..02a0c09b5b 100644
  #endif
  
  /* XDR 16bit integers */
-@@ -153,7 +153,7 @@ xdr_int16_t (XDR *xdrs, int16_t *ip)
+@@ -154,7 +154,7 @@
        return FALSE;
      }
  }
@@ -1539,7 +1496,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 16bit unsigned integers */
  bool_t
-@@ -177,7 +177,7 @@ xdr_uint16_t (XDR *xdrs, uint16_t *uip)
+@@ -178,7 +178,7 @@
        return FALSE;
      }
  }
@@ -1548,7 +1505,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 8bit integers */
  bool_t
-@@ -201,7 +201,7 @@ xdr_int8_t (XDR *xdrs, int8_t *ip)
+@@ -202,7 +202,7 @@
        return FALSE;
      }
  }
@@ -1557,17 +1514,15 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 8bit unsigned integers */
  bool_t
-@@ -225,4 +225,4 @@ xdr_uint8_t (XDR *xdrs, uint8_t *uip)
+@@ -226,4 +226,4 @@
        return FALSE;
      }
  }
 -libc_hidden_nolink (xdr_uint8_t, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (xdr_uint8_t, GLIBC_2_1)
-diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c
-index 093a718739..ba7661aa54 100644
 --- a/sunrpc/xdr_mem.c
 +++ b/sunrpc/xdr_mem.c
-@@ -81,7 +81,7 @@ xdrmem_create (XDR *xdrs, const caddr_t addr, u_int size, enum xdr_op op)
+@@ -81,7 +81,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdrmem_create)
  #else
@@ -1576,11 +1531,9 @@ index 093a718739..ba7661aa54 100644
  #endif
  
  /*
-diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c
-index 556c6c4bc0..f5d6ef2af9 100644
 --- a/sunrpc/xdr_rec.c
 +++ b/sunrpc/xdr_rec.c
-@@ -189,7 +189,7 @@ xdrrec_create (XDR *xdrs, u_int sendsize,
+@@ -189,7 +189,7 @@
    rstrm->fbtbc = 0;
    rstrm->last_frag = TRUE;
  }
@@ -1589,7 +1542,7 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  
  /*
-@@ -477,7 +477,7 @@ xdrrec_skiprecord (XDR *xdrs)
+@@ -477,7 +477,7 @@
    rstrm->last_frag = FALSE;
    return TRUE;
  }
@@ -1598,7 +1551,7 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  /*
   * Lookahead function.
-@@ -501,7 +501,7 @@ xdrrec_eof (XDR *xdrs)
+@@ -501,7 +501,7 @@
      return TRUE;
    return FALSE;
  }
@@ -1607,7 +1560,7 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  /*
   * The client must tell the package when an end-of-record has occurred.
-@@ -528,7 +528,7 @@ xdrrec_endofrecord (XDR *xdrs, bool_t sendnow)
+@@ -528,7 +528,7 @@
    rstrm->out_finger += BYTES_PER_XDR_UNIT;
    return TRUE;
  }
@@ -1616,11 +1569,9 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  
  /*
-diff --git a/sunrpc/xdr_ref.c b/sunrpc/xdr_ref.c
-index 7510bed873..8fb4584a75 100644
 --- a/sunrpc/xdr_ref.c
 +++ b/sunrpc/xdr_ref.c
-@@ -90,7 +90,7 @@ xdr_reference (xdrs, pp, size, proc)
+@@ -90,7 +90,7 @@
      }
    return stat;
  }
@@ -1629,29 +1580,25 @@ index 7510bed873..8fb4584a75 100644
  
  
  /*
-@@ -137,5 +137,5 @@ xdr_pointer (xdrs, objpp, obj_size, xdr_obj)
+@@ -137,5 +137,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_pointer)
  #else
 -libc_hidden_nolink (xdr_pointer, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_pointer, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/xdr_sizeof.c b/sunrpc/xdr_sizeof.c
-index 0119486c3d..56e870a455 100644
 --- a/sunrpc/xdr_sizeof.c
 +++ b/sunrpc/xdr_sizeof.c
-@@ -161,5 +161,5 @@ xdr_sizeof (xdrproc_t func, void *data)
+@@ -161,5 +161,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_sizeof)
  #else
 -libc_hidden_nolink (xdr_sizeof, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (xdr_sizeof, GLIBC_2_1)
  #endif
-diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
-index d9866063f9..667515e0a6 100644
 --- a/sunrpc/xdr_stdio.c
 +++ b/sunrpc/xdr_stdio.c
-@@ -191,5 +191,5 @@ xdrstdio_putint32 (XDR *xdrs, const int32_t *ip)
+@@ -191,5 +191,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdrstdio_create)
  #else
diff --git a/packages/glibc/2.15/0043-obstack-common.patch b/packages/glibc/2.15/0043-obstack-common.patch
new file mode 100644
index 00000000..1993be24
--- /dev/null
+++ b/packages/glibc/2.15/0043-obstack-common.patch
@@ -0,0 +1,32 @@
+commit 39b1f6172a2f9ddc74a8f82d6e84dd13b22dbaf2
+Author: Peter Collingbourne <pcc@google.com>
+Date:   Wed May 15 20:28:08 2013 +0200
+
+    Move _obstack_compat out of common
+    
+    it is impossible to create an alias of a common symbol (as
+    compat_symbol does), because common symbols do not have a section or
+    an offset until linked.  GNU as tolerates aliases of common symbols by
+    simply creating another common symbol, but other assemblers (notably
+    LLVM's integrated assembler) are less tolerant.
+    
+    2013-05-15  Peter Collingbourne  <pcc@google.com>
+    
+            * malloc/obstack.c (_obstack_compat): Add initializer.
+    -
+
+---
+ malloc/obstack.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/malloc/obstack.c
++++ b/malloc/obstack.c
+@@ -117,7 +117,7 @@
+ /* A looong time ago (before 1994, anyway; we're not sure) this global variable
+    was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
+    library still exports it because somebody might use it.  */
+-struct obstack *_obstack_compat;
++struct obstack *_obstack_compat = 0;
+ compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
+ #  endif
+ # endif
diff --git a/packages/glibc/2.14.1/999-new-tools.patch b/packages/glibc/2.15/0044-new-tools.patch
similarity index 78%
rename from packages/glibc/2.14.1/999-new-tools.patch
rename to packages/glibc/2.15/0044-new-tools.patch
index f335a54e..5cd33982 100644
--- a/packages/glibc/2.14.1/999-new-tools.patch
+++ b/packages/glibc/2.15/0044-new-tools.patch
@@ -1,7 +1,11 @@
-diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
---- glibc-2.14.1.orig/configure	2011-10-07 02:48:55.000000000 -0700
-+++ glibc-2.14.1/configure	2017-02-08 00:38:43.765952352 -0800
-@@ -4939,7 +4939,7 @@ $as_echo_n "checking version of $CC... "
+---
+ configure    |    8 ++++----
+ configure.in |    8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -4939,7 +4939,7 @@
    ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -10,7 +14,7 @@ diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5002,7 +5002,7 @@ $as_echo_n "checking version of $MAKE...
+@@ -5002,7 +5002,7 @@
    ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -19,7 +23,7 @@ diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5129,7 +5129,7 @@ $as_echo_n "checking version of $MAKEINF
+@@ -5129,7 +5129,7 @@
    ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -28,7 +32,7 @@ diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5189,7 +5189,7 @@ else
+@@ -5189,7 +5189,7 @@
    # Found it, now check the version.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
  $as_echo_n "checking version of $SED... " >&6; }
@@ -37,10 +41,9 @@ diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
      3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.14.1.orig/configure.in glibc-2.14.1/configure.in
---- glibc-2.14.1.orig/configure.in	2011-10-07 02:48:55.000000000 -0700
-+++ glibc-2.14.1/configure.in	2017-02-08 00:30:13.660439376 -0800
-@@ -1026,11 +1026,11 @@ fi
+--- a/configure.in
++++ b/configure.in
+@@ -1011,11 +1011,11 @@
  # These programs are version sensitive.
  AC_CHECK_TOOL_PREFIX
  AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
@@ -54,7 +57,7 @@ diff -urpN glibc-2.14.1.orig/configure.in glibc-2.14.1/configure.in
  
  AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
    [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -1038,10 +1038,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
+@@ -1023,10 +1023,10 @@
    MSGFMT=: aux_missing="$aux_missing msgfmt")
  AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
    [GNU texinfo.* \([0-9][0-9.]*\)],
diff --git a/packages/glibc/2.15/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.15/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
deleted file mode 100644
index 6fd663a2..00000000
--- a/packages/glibc/2.15/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
- -Wparentheses
-
----
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-2.7.4
-
diff --git a/packages/glibc/2.15/102-fix-signed-shift-overlow.patch b/packages/glibc/2.15/102-fix-signed-shift-overlow.patch
deleted file mode 100644
index ef49f831..00000000
--- a/packages/glibc/2.15/102-fix-signed-shift-overlow.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-commit 5542236837c5c41435f8282ec92799f480c36f18
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Tue Jul 21 22:50:29 2015 -0700
-
-    Port the 0x7efe...feff pattern to GCC 6.
-    
-    See Steve Ellcey's bug report in:
-    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
-    * string/memrchr.c (MEMRCHR):
-    * string/rawmemchr.c (RAWMEMCHR):
-    * string/strchr.c (strchr):
-    * string/strchrnul.c (STRCHRNUL):
-    Rewrite code to avoid issues with signed shift overflow.
-
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
---- a/string/memrchr.c
-+++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
---- a/string/rawmemchr.c
-+++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
---- a/string/strchr.c
-+++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
---- a/string/strchrnul.c
-+++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
diff --git a/packages/glibc/2.15/105-misleading-indentation.patch b/packages/glibc/2.15/105-misleading-indentation.patch
deleted file mode 100644
index 1dd8d851..00000000
--- a/packages/glibc/2.15/105-misleading-indentation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 976ef870542580cf5fed896c2c652b3e1a95f9da
-Author: Steve Ellcey <sellcey@mips.com>
-Date:   Fri Dec 11 09:19:37 2015 -0800
-
-    Fix indentation.
-    
-            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
-            Fix indentation.
-
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
---- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-+++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
- 
-     /* compute q[0],q[1],...q[jk] */
- 	for (i=0;i<=jk;i++) {
--	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-+	    for(j=0,fw=0.0;j<=jx;j++)
-+		fw += x[j]*f[jx+i-j];
-+	    q[i] = fw;
- 	}
- 
- 	jz = jk;
diff --git a/packages/glibc/2.15/300-macos-cross-rpcgen.patch b/packages/glibc/2.15/300-macos-cross-rpcgen.patch
deleted file mode 100644
index e654644c..00000000
--- a/packages/glibc/2.15/300-macos-cross-rpcgen.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit ae7080d30c68cfa0c81ce3422dca948f64a94f50
-Author: Jia Liu <proljc@gmail.com>
-Date:   Sat Sep 7 00:01:08 2013 +0800
-
-    sunrpc/rpc/types.h: fix OS X and FreeBSD build problems
-    
-    When I build arm-linux-gcc on OS X, I find glibc will get a build error
-    in sunrpc/rpc/types.h, so I add __APPLE_CC__ to make OS X build OK.
-    For FreeBSD, Add __FreeBSD__ to make it build OK, too.
-    
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00155.html
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00217.html
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00240.html
-    Signed-off-by: Jia Liu <proljc@gmail.com>
-    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-
-diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
-index 3dca5c4..beded52 100644
---- a/sunrpc/rpc/types.h
-+++ b/sunrpc/rpc/types.h
-@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t;
- #include <sys/types.h>
- #endif
- 
-+#if defined __APPLE_CC__ || defined __FreeBSD__
-+# define __u_char_defined
-+# define __daddr_t_defined
-+#endif
-+
- #ifndef __u_char_defined
- typedef __u_char u_char;
- typedef __u_short u_short;
diff --git a/packages/glibc/2.15/430-alpha-creat.patch b/packages/glibc/2.15/430-alpha-creat.patch
deleted file mode 100644
index da6dddad..00000000
--- a/packages/glibc/2.15/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/packages/glibc/2.15/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.15/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a70528..00000000
--- a/packages/glibc/2.15/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/packages/glibc/2.15/920-fix-rpc_parse-format.patch b/packages/glibc/2.15/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.15/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.15/940-nis-bogus-conditional.patch b/packages/glibc/2.15/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.15/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.15/998-obstack-common.patch b/packages/glibc/2.15/998-obstack-common.patch
deleted file mode 100644
index 4b95f062..00000000
--- a/packages/glibc/2.15/998-obstack-common.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 39b1f6172a2f9ddc74a8f82d6e84dd13b22dbaf2
-Author: Peter Collingbourne <pcc@google.com>
-Date:   Wed May 15 20:28:08 2013 +0200
-
-    Move _obstack_compat out of common
-    
-    it is impossible to create an alias of a common symbol (as
-    compat_symbol does), because common symbols do not have a section or
-    an offset until linked.  GNU as tolerates aliases of common symbols by
-    simply creating another common symbol, but other assemblers (notably
-    LLVM's integrated assembler) are less tolerant.
-    
-    2013-05-15  Peter Collingbourne  <pcc@google.com>
-    
-            * malloc/obstack.c (_obstack_compat): Add initializer.
-    -
-
-diff --git a/malloc/obstack.c b/malloc/obstack.c
-index 25a90514f7..c3c7db4a96 100644
---- a/malloc/obstack.c
-+++ b/malloc/obstack.c
-@@ -115,7 +115,7 @@ int obstack_exit_failure = EXIT_FAILURE;
- /* A looong time ago (before 1994, anyway; we're not sure) this global variable
-    was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
-    library still exports it because somebody might use it.  */
--struct obstack *_obstack_compat;
-+struct obstack *_obstack_compat = 0;
- compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
- #  endif
- # endif
diff --git a/packages/glibc/2.16.0/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.16.0/0000-respect-env-CPPFLAGS.patch
similarity index 74%
rename from packages/glibc/2.16.0/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.16.0/0000-respect-env-CPPFLAGS.patch
index dce491cf..be9d0bb9 100644
--- a/packages/glibc/2.16.0/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.16.0/0000-respect-env-CPPFLAGS.patch
@@ -1,9 +1,12 @@
 Respect environment CPPFLAGS when we run ./configure so we can inject
 random -D things without having to set CFLAGS/ASFLAGS
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.13/Makeconfig	2009-11-13 00:49:41.000000000 +0100
+---
+ Makeconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makeconfig
++++ b/Makeconfig
 @@ -668,6 +668,7 @@
  	   $(foreach lib,$(libof-$(basename $(@F))) \
  			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
diff --git a/packages/glibc/2.16.0/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.16.0/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
new file mode 100644
index 00000000..31e9499b
--- /dev/null
+++ b/packages/glibc/2.16.0/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -0,0 +1,75 @@
+From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
+From: Yvan Roux <yvan.roux@linaro.org>
+Date: Fri, 15 Apr 2016 13:29:26 +0200
+Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
+ -Wparentheses
+
+---
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+--- a/nis/nis_call.c
++++ b/nis/nis_call.c
+@@ -681,16 +681,18 @@
+   /* Choose which entry should be evicted from the cache.  */
+   loc = &nis_server_cache[0];
+   if (*loc != NULL)
+-    for (i = 1; i < 16; ++i)
+-      if (nis_server_cache[i] == NULL)
+-	{
++    {
++      for (i = 1; i < 16; ++i)
++	if (nis_server_cache[i] == NULL)
++	  {
++	    loc = &nis_server_cache[i];
++	    break;
++	  }
++	else if ((*loc)->uses > nis_server_cache[i]->uses
++		 || ((*loc)->uses == nis_server_cache[i]->uses
++		     && (*loc)->expires > nis_server_cache[i]->expires))
+ 	  loc = &nis_server_cache[i];
+-	  break;
+-	}
+-      else if ((*loc)->uses > nis_server_cache[i]->uses
+-	       || ((*loc)->uses == nis_server_cache[i]->uses
+-		   && (*loc)->expires > nis_server_cache[i]->expires))
+-	loc = &nis_server_cache[i];
++    }
+   old = *loc;
+   *loc = new;
+ 
+--- a/stdlib/setenv.c
++++ b/stdlib/setenv.c
+@@ -327,18 +327,20 @@
+   ep = __environ;
+   if (ep != NULL)
+     while (*ep != NULL)
+-      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+-	{
+-	  /* Found it.  Remove this pointer by moving later ones back.  */
+-	  char **dp = ep;
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
+-	  do
+-	    dp[0] = dp[1];
+-	  while (*dp++);
+-	  /* Continue the loop in case NAME appears again.  */
+-	}
+-      else
+-	++ep;
++	    do
++		dp[0] = dp[1];
++	    while (*dp++);
++	    /* Continue the loop in case NAME appears again.  */
++	  }
++	else
++	  ++ep;
++      }
+ 
+   UNLOCK;
+ 
diff --git a/packages/glibc/2.16.0/0002-fix-signed-shift-overlow.patch b/packages/glibc/2.16.0/0002-fix-signed-shift-overlow.patch
new file mode 100644
index 00000000..3b2ef40d
--- /dev/null
+++ b/packages/glibc/2.16.0/0002-fix-signed-shift-overlow.patch
@@ -0,0 +1,97 @@
+commit 5542236837c5c41435f8282ec92799f480c36f18
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date:   Tue Jul 21 22:50:29 2015 -0700
+
+    Port the 0x7efe...feff pattern to GCC 6.
+    
+    See Steve Ellcey's bug report in:
+    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
+    * string/memrchr.c (MEMRCHR):
+    * string/rawmemchr.c (RAWMEMCHR):
+    * string/strchr.c (strchr):
+    * string/strchrnul.c (STRCHRNUL):
+    Rewrite code to avoid issues with signed shift overflow.
+
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
+--- a/string/memrchr.c
++++ b/string/memrchr.c
+@@ -96,15 +96,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/rawmemchr.c
++++ b/string/rawmemchr.c
+@@ -83,15 +83,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchr.c
++++ b/string/strchr.c
+@@ -64,13 +64,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchrnul.c
++++ b/string/strchrnul.c
+@@ -62,13 +62,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
diff --git a/packages/glibc/2.16.0/103-dl-openat64-variadic.patch b/packages/glibc/2.16.0/0003-dl-openat64-variadic.patch
similarity index 98%
rename from packages/glibc/2.16.0/103-dl-openat64-variadic.patch
rename to packages/glibc/2.16.0/0003-dl-openat64-variadic.patch
index fe94b96d..552db126 100644
--- a/packages/glibc/2.16.0/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.16.0/0003-dl-openat64-variadic.patch
@@ -177,8 +177,10 @@ Date:   Tue Oct 20 11:54:09 2015 +0000
             * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
             * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
 
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
 --- a/sysdeps/unix/sysv/linux/dl-openat64.c
 +++ b/sysdeps/unix/sysv/linux/dl-openat64.c
 @@ -23,10 +23,7 @@
diff --git a/packages/glibc/2.16.0/104-unused-variables.patch b/packages/glibc/2.16.0/0004-unused-variables.patch
similarity index 80%
rename from packages/glibc/2.16.0/104-unused-variables.patch
rename to packages/glibc/2.16.0/0004-unused-variables.patch
index 2a85a0c8..db6f1b42 100644
--- a/packages/glibc/2.16.0/104-unused-variables.patch
+++ b/packages/glibc/2.16.0/0004-unused-variables.patch
@@ -19,8 +19,18 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    2 --
+ sysdeps/ieee754/flt-32/s_cosf.c        |    2 --
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ 9 files changed, 1 insertion(+), 18 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,11 +44,9 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
-@@ -65,10 +65,8 @@
+@@ -68,10 +68,8 @@
  /**/ hpi1           = {{0x3c91a626, 0x33145c07} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0xbff921fb, 0x54442d18} }, /* -pi/2         */
  /**/ qpi            = {{0x3fe921fb, 0x54442d18} }, /*  pi/4         */
@@ -49,7 +57,7 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0xc002d97c, 0x7f3321d2} }, /* -3pi/4        */
  /**/ u1             = {{0x3c314c2a, 0x00000000} }, /*  9.377e-19    */
  /**/ u2             = {{0x3bf955e4, 0x00000000} }, /*  8.584e-20    */
-@@ -129,10 +127,8 @@
+@@ -138,10 +136,8 @@
  /**/ hpi1           = {{0x33145c07, 0x3c91a626} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0x54442d18, 0xbff921fb} }, /* -pi/2         */
  /**/ qpi            = {{0x54442d18, 0x3fe921fb} }, /*  pi/4         */
@@ -60,8 +68,6 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
 @@ -29,7 +29,7 @@
@@ -73,11 +79,9 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
-@@ -34,7 +34,6 @@
+@@ -35,7 +35,6 @@
  /**/ INF            = {{0x7ff00000, 0x00000000}}, /* INF           */
  /**/ nINF           = {{0xfff00000, 0x00000000}}, /* -INF          */
  /**/ NaNQ           = {{0x7ff80000, 0x00000000}}, /* NaNQ          */
@@ -85,7 +89,7 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0x3fe62e42, 0xfefa3800}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x3d2ef357, 0x93c76730}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0x4297ffff, 0xfffffd2c}}, /* 1.5*2**42 -724*2**-10  */
-@@ -48,7 +47,6 @@
+@@ -50,7 +49,6 @@
  /**/ INF            = {{0x00000000, 0x7ff00000}}, /* INF           */
  /**/ nINF           = {{0x00000000, 0xfff00000}}, /* -INF           */
  /**/ NaNQ           = {{0x00000000, 0x7ff80000}}, /* NaNQ          */
@@ -93,11 +97,9 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,8 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
+@@ -22,8 +22,6 @@
  log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
@@ -106,11 +108,9 @@ index 96f0e81..1daeef7 100644
  float
  __ieee754_log10f(float x)
  {
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,8 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
+@@ -21,8 +21,6 @@
  #include <math.h>
  #include <math_private.h>
  
@@ -119,11 +119,9 @@ index 864ab27..0affd40 100644
  float __cosf(float x)
  {
  	float y[2],z=0.0;
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -74,7 +74,6 @@
  static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  static const long double one = 1.0L;
@@ -131,11 +129,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = 1.0e4000L;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -138,7 +138,6 @@
  
  static const long double
  tiny = 1e-4931L,
@@ -143,11 +139,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
diff --git a/packages/glibc/2.16.0/0005-misleading-indentation.patch b/packages/glibc/2.16.0/0005-misleading-indentation.patch
new file mode 100644
index 00000000..8e08259e
--- /dev/null
+++ b/packages/glibc/2.16.0/0005-misleading-indentation.patch
@@ -0,0 +1,26 @@
+commit 976ef870542580cf5fed896c2c652b3e1a95f9da
+Author: Steve Ellcey <sellcey@mips.com>
+Date:   Fri Dec 11 09:19:37 2015 -0800
+
+    Fix indentation.
+    
+            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
+            Fix indentation.
+
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
++++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
+@@ -65,7 +65,9 @@
+ 
+     /* compute q[0],q[1],...q[jk] */
+ 	for (i=0;i<=jk;i++) {
+-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
++	    for(j=0,fw=0.0;j<=jx;j++)
++		fw += x[j]*f[jx+i-j];
++	    q[i] = fw;
+ 	}
+ 
+ 	jz = jk;
diff --git a/packages/glibc/2.16.0/106-dl-open-array-bounds.patch b/packages/glibc/2.16.0/0006-dl-open-array-bounds.patch
similarity index 88%
rename from packages/glibc/2.16.0/106-dl-open-array-bounds.patch
rename to packages/glibc/2.16.0/0006-dl-open-array-bounds.patch
index a8efe9aa..4df83464 100644
--- a/packages/glibc/2.16.0/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.16.0/0006-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -609,8 +609,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc/2.16.0/0007-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.16.0/0007-i386-x86_64-revert-clone-cfi.patch
new file mode 100644
index 00000000..30e89294
--- /dev/null
+++ b/packages/glibc/2.16.0/0007-i386-x86_64-revert-clone-cfi.patch
@@ -0,0 +1,51 @@
+revert cfi additions to clone on i386/x86_64 to workaround problems in
+gcc's unwinder code.  this is not a bug in glibc, it triggers problems
+elsewhere.  this cfi code does not gain us a whole lot anyways.
+
+http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
+
+---
+ sysdeps/unix/sysv/linux/i386/clone.S   |    4 ----
+ sysdeps/unix/sysv/linux/x86_64/clone.S |    4 ----
+ 2 files changed, 8 deletions(-)
+
+--- a/sysdeps/unix/sysv/linux/i386/clone.S
++++ b/sysdeps/unix/sysv/linux/i386/clone.S
+@@ -119,9 +119,6 @@
+ 	ret
+ 
+ L(thread_start):
+-	cfi_startproc;
+-	/* Clearing frame pointer is insufficient, use CFI.  */
+-	cfi_undefined (eip);
+ 	/* Note: %esi is zero.  */
+ 	movl	%esi,%ebp	/* terminate the stack frame */
+ #ifdef RESET_PID
+@@ -154,7 +151,6 @@
+ 	jmp	L(haspid)
+ 	.previous
+ #endif
+-	cfi_endproc;
+ 
+ 	cfi_startproc
+ PSEUDO_END (BP_SYM (__clone))
+--- a/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ b/sysdeps/unix/sysv/linux/x86_64/clone.S
+@@ -88,9 +88,6 @@
+ 	ret
+ 
+ L(thread_start):
+-	cfi_startproc;
+-	/* Clearing frame pointer is insufficient, use CFI.  */
+-	cfi_undefined (rip);
+ 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
+ 	   the outermost frame obviously.  */
+ 	xorl	%ebp, %ebp
+@@ -115,7 +112,6 @@
+ 	/* Call exit with return value from function call. */
+ 	movq	%rax, %rdi
+ 	call	HIDDEN_JUMPTARGET (_exit)
+-	cfi_endproc;
+ 
+ 	cfi_startproc;
+ PSEUDO_END (BP_SYM (__clone))
diff --git a/packages/glibc/2.16.0/0008-disable-ldconfig.patch b/packages/glibc/2.16.0/0008-disable-ldconfig.patch
new file mode 100644
index 00000000..49f39b5e
--- /dev/null
+++ b/packages/glibc/2.16.0/0008-disable-ldconfig.patch
@@ -0,0 +1,19 @@
+do not bother running ldconfig on DESTDIR.  it wants to write the temp cache
+file outside of the chroot.  doesnt matter anyways as we wont use the cache
+results (portage will rebuild cache), so running ldconfig is simply a waste
+of time.
+
+---
+ Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makefile
++++ b/Makefile
+@@ -105,6 +105,7 @@
+ 	rm -f $(symbolic-link-list)
+ 
+ install:
++dont-bother-with-destdir:
+ 	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
+ 	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
+ 				       $(slibdir) $(libdir)
diff --git a/packages/glibc/2.16.0/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.16.0/0009-Fix-combreloc-test-BSD-grep.patch
similarity index 77%
rename from packages/glibc/2.16.0/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.16.0/0009-Fix-combreloc-test-BSD-grep.patch
index 3c34e01d..e1d7dec4 100644
--- a/packages/glibc/2.16.0/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.16.0/0009-Fix-combreloc-test-BSD-grep.patch
@@ -13,16 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
 --- a/configure
 +++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+@@ -6440,7 +6440,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
  then
@@ -31,11 +28,9 @@ index eecd0ac..0118bd1 100755
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
+@@ -1586,7 +1586,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
@@ -44,6 +39,3 @@ index 4a77411..19f6d87 100644
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc/2.16.0/0010-queue-header-updates.patch b/packages/glibc/2.16.0/0010-queue-header-updates.patch
new file mode 100644
index 00000000..f6515e2b
--- /dev/null
+++ b/packages/glibc/2.16.0/0010-queue-header-updates.patch
@@ -0,0 +1,86 @@
+grab some updates from FreeBSD
+
+http://bugs.gentoo.org/201979
+
+---
+ misc/sys/queue.h |   36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+--- a/misc/sys/queue.h
++++ b/misc/sys/queue.h
+@@ -136,6 +136,11 @@
+ 		(var);							\
+ 		(var) = ((var)->field.le_next))
+ 
++#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
++	for ((var) = LIST_FIRST((head));				\
++	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
++	    (var) = (tvar))
++
+ /*
+  * List access methods.
+  */
+@@ -197,6 +202,16 @@
+ #define	SLIST_FOREACH(var, head, field)					\
+ 	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
+ 
++#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
++	for ((var) = SLIST_FIRST((head));				\
++	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
++	    (var) = (tvar))
++
++#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
++	for ((varp) = &SLIST_FIRST((head));				\
++	    ((var) = *(varp)) != NULL;					\
++	    (varp) = &SLIST_NEXT((var), field))
++
+ /*
+  * Singly-linked List access methods.
+  */
+@@ -242,6 +257,12 @@
+ 	(head)->stqh_last = &(elm)->field.stqe_next;			\
+ } while (/*CONSTCOND*/0)
+ 
++#define	STAILQ_LAST(head, type, field)					\
++	(STAILQ_EMPTY((head)) ?						\
++		NULL :							\
++	        ((struct type *)(void *)				\
++		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
++
+ #define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+ 	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
+ 		(head)->stqh_last = &(elm)->field.stqe_next;		\
+@@ -271,6 +292,11 @@
+ 		(var);							\
+ 		(var) = ((var)->field.stqe_next))
+ 
++#define STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
++	for ((var) = STAILQ_FIRST((head));				\
++		(var) && ((tvar) = STAILQ_NEXT((var), field), 1);	\
++		(var) = (tvar))
++
+ #define	STAILQ_CONCAT(head1, head2) do {				\
+ 	if (!STAILQ_EMPTY((head2))) {					\
+ 		*(head1)->stqh_last = (head2)->stqh_first;		\
+@@ -437,11 +463,21 @@
+ 		(var);							\
+ 		(var) = ((var)->field.tqe_next))
+ 
++#define TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
++	for ((var) = TAILQ_FIRST((head));				\
++		(var) && ((tvar) = TAILQ_NEXT((var), field), 1);	\
++		(var) = (tvar))
++
+ #define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
+ 	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
+ 		(var);							\
+ 		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
+ 
++#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
++	for ((var) = TAILQ_LAST((head), headname);			\
++		(var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
++		(var) = (tvar))
++
+ #define	TAILQ_CONCAT(head1, head2, field) do {				\
+ 	if (!TAILQ_EMPTY(head2)) {					\
+ 		*(head1)->tqh_last = (head2)->tqh_first;		\
diff --git a/packages/glibc/2.16.0/0011-localedef-fix-trampoline.patch b/packages/glibc/2.16.0/0011-localedef-fix-trampoline.patch
new file mode 100644
index 00000000..e6392c1f
--- /dev/null
+++ b/packages/glibc/2.16.0/0011-localedef-fix-trampoline.patch
@@ -0,0 +1,56 @@
+# DP: Description: Fix localedef segfault when run under exec-shield,
+#        PaX or similar. (#231438, #198099)
+# DP: Dpatch Author: James Troup <james@nocrew.org>
+# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
+# DP: Upstream status: Unknown
+# DP: Status Details: Unknown
+# DP: Date: 2004-03-16
+---
+# locale/programs/3level.h |   36 ++++++++++++++++++++++++++++++++++++
+# 1 file changed, 36 insertions(+)
+#
+--- a/locale/programs/3level.h
++++ b/locale/programs/3level.h
+@@ -202,6 +202,42 @@
+ 	}
+     }
+ }
++
++/* GCC ATM seems to do a poor job with pointers to nested functions passed
++   to inlined functions.  Help it a little bit with this hack.  */
++#define wchead_table_iterate(tp, fn) \
++do									      \
++  {									      \
++    struct wchead_table *t = (tp);					      \
++    uint32_t index1;							      \
++    for (index1 = 0; index1 < t->level1_size; index1++)			      \
++      {									      \
++	uint32_t lookup1 = t->level1[index1];				      \
++	if (lookup1 != ((uint32_t) ~0))					      \
++	  {								      \
++	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
++	    uint32_t index2;						      \
++	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
++	      {								      \
++		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
++		if (lookup2 != ((uint32_t) ~0))				      \
++		  {							      \
++		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
++		    uint32_t index3;					      \
++		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
++		      {							      \
++			struct element_t *lookup3			      \
++			  = t->level3[index3 + lookup2_shifted];	      \
++			if (lookup3 != NULL)				      \
++			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
++			      lookup3);					      \
++		      }							      \
++		  }							      \
++	      }								      \
++	  }								      \
++      }									      \
++  } while (0)
++
+ #endif
+ 
+ #ifndef NO_FINALIZE
diff --git a/packages/glibc/2.16.0/0012-resolv-dynamic.patch b/packages/glibc/2.16.0/0012-resolv-dynamic.patch
new file mode 100644
index 00000000..fcc2f80a
--- /dev/null
+++ b/packages/glibc/2.16.0/0012-resolv-dynamic.patch
@@ -0,0 +1,42 @@
+ripped from SuSE
+
+if /etc/resolv.conf is updated, then make sure applications
+already running get the updated information.
+
+http://bugs.gentoo.org/177416
+
+---
+ resolv/res_libc.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+--- a/resolv/res_libc.c
++++ b/resolv/res_libc.c
+@@ -22,6 +22,7 @@
+ #include <arpa/nameser.h>
+ #include <resolv.h>
+ #include <bits/libc-lock.h>
++#include <sys/stat.h>
+ 
+ 
+ /* The following bit is copied from res_data.c (where it is #ifdef'ed
+@@ -95,6 +96,20 @@
+ __res_maybe_init (res_state resp, int preinit)
+ {
+ 	if (resp->options & RES_INIT) {
++		static time_t last_mtime, last_check;
++		time_t now;
++		struct stat statbuf;
++		
++		time (&now);
++		if (now != last_check) {
++			last_check = now;
++			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
++				last_mtime = statbuf.st_mtime;
++				atomicinclock (lock);
++				atomicinc (__res_initstamp);
++				atomicincunlock (lock);
++			}
++		}
+ 		if (__res_initstamp != resp->_u._ext.initstamp) {
+ 			if (resp->nscount > 0)
+ 				__res_iclose (resp, true);
diff --git a/packages/glibc/2.16.0/0013-fadvise64_64.patch b/packages/glibc/2.16.0/0013-fadvise64_64.patch
new file mode 100644
index 00000000..3f827ab4
--- /dev/null
+++ b/packages/glibc/2.16.0/0013-fadvise64_64.patch
@@ -0,0 +1,27 @@
+ripped from Debian
+
+ sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/posix_fadvise.c
++++ b/sysdeps/unix/sysv/linux/posix_fadvise.c
+@@ -34,6 +34,19 @@
+     return INTERNAL_SYSCALL_ERRNO (ret, err);
+   return 0;
+ #else
++# ifdef __NR_fadvise64_64
++  INTERNAL_SYSCALL_DECL (err);  
++  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
++			      __LONG_LONG_PAIR ((long) (offset >> 31),
++						(long) offset),
++			      __LONG_LONG_PAIR ((long) (len >> 31),
++						(long) len),
++			      advise);
++  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
++    return INTERNAL_SYSCALL_ERRNO (ret, err);
++  return 0;
++# else
+   return ENOSYS;
++# endif
+ #endif
+ }
diff --git a/packages/glibc/2.16.0/260-assume-pipe2.patch b/packages/glibc/2.16.0/0014-assume-pipe2.patch
similarity index 81%
rename from packages/glibc/2.16.0/260-assume-pipe2.patch
rename to packages/glibc/2.16.0/0014-assume-pipe2.patch
index 54f03829..a36b602e 100644
--- a/packages/glibc/2.16.0/260-assume-pipe2.patch
+++ b/packages/glibc/2.16.0/0014-assume-pipe2.patch
@@ -20,9 +20,12 @@ __have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
 older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
 stub for it.  so popen() will always fail as glibc assumes pipe2() works.
 
-diff -durN glibc-2.16.0.orig/socket/have_sock_cloexec.c glibc-2.16.0/socket/have_sock_cloexec.c
---- glibc-2.16.0.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.16.0/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
+---
+ socket/have_sock_cloexec.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/socket/have_sock_cloexec.c
++++ b/socket/have_sock_cloexec.c
 @@ -15,9 +15,14 @@
     License along with the GNU C Library; if not, see
     <http://www.gnu.org/licenses/>.  */
diff --git a/packages/glibc/2.16.0/0015-china.patch b/packages/glibc/2.16.0/0015-china.patch
new file mode 100644
index 00000000..b323cf67
--- /dev/null
+++ b/packages/glibc/2.16.0/0015-china.patch
@@ -0,0 +1,35 @@
+
+
+---
+ localedata/locales/zh_TW |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/localedata/locales/zh_TW
++++ b/localedata/locales/zh_TW
+@@ -1,7 +1,7 @@
+ comment_char %
+ escape_char /
+ %
+-% Chinese language locale for Taiwan R.O.C.
++% Chinese language locale for Taiwan
+ % charmap: BIG5-CP950
+ %
+ % Original Author:
+@@ -17,7 +17,7 @@
+ % Reference:	http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
+ 
+ LC_IDENTIFICATION
+-title      "Chinese locale for Taiwan R.O.C."
++title      "Chinese locale for Taiwan"
+ source     ""
+ address    ""
+ contact    ""
+@@ -25,7 +25,7 @@
+ tel        ""
+ fax        ""
+ language   "Chinese"
+-territory  "Taiwan R.O.C."
++territory  "Taiwan"
+ revision   "0.2"
+ date       "2000-08-02"
+ %
diff --git a/packages/glibc/2.16.0/0016-new-valencian-locale.patch b/packages/glibc/2.16.0/0016-new-valencian-locale.patch
new file mode 100644
index 00000000..8f677119
--- /dev/null
+++ b/packages/glibc/2.16.0/0016-new-valencian-locale.patch
@@ -0,0 +1,118 @@
+http://bugs.gentoo.org/show_bug.cgi?id=131815
+http://sourceware.org/bugzilla/show_bug.cgi?id=2522
+
+---
+ localedata/SUPPORTED              |    2 
+ localedata/locales/ca_ES@valencia |   96 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 98 insertions(+)
+
+--- a/localedata/SUPPORTED
++++ b/localedata/SUPPORTED
+@@ -75,6 +75,8 @@
+ ca_ES.UTF-8/UTF-8 \
+ ca_ES/ISO-8859-1 \
+ ca_ES@euro/ISO-8859-15 \
++ca_ES.UTF-8@valencia/UTF-8 \
++ca_ES@valencia/ISO-8859-15 \
+ ca_FR.UTF-8/UTF-8 \
+ ca_FR/ISO-8859-15 \
+ ca_IT.UTF-8/UTF-8 \
+--- /dev/null
++++ b/localedata/locales/ca_ES@valencia
+@@ -0,0 +1,96 @@
++comment_char %
++escape_char  /
++%
++% Valencian (southern Catalan) locale for Spain with Euro
++%
++% Note that this locale is almost the same as ca_ES@euro.  The point of having
++% a separate locale is only for PO translations, which have a lot of social
++% support and are very appreciated by the Valencian-speaking community.
++%
++% Contact: Jordi Mallach
++% Email: jordi@gnu.org
++% Tel:
++% Fax:
++% Language: ca
++% Territory: ES
++% Option: euro
++% Revision: 1.0
++% Date: 2006-04-06
++% Application: general
++% Users: general
++% Repertoiremap: mnemonic,ds
++% Charset: ISO-8859-15
++% Distribution and use is free, also
++% for commercial purposes.
++
++LC_IDENTIFICATION
++title      "Valencian (southern Catalan) locale for Spain with Euro"
++source     ""
++address    ""
++contact    "Jordi Mallach"
++email      "jordi@gnu.org"
++tel        ""
++fax        ""
++language   "Catalan"
++territory  "Spain"
++revision   "1.0"
++date       "2006-04-06"
++%
++category  "ca_ES@valencia:2006";LC_IDENTIFICATION
++category  "ca_ES@valencia:2006";LC_CTYPE
++category  "ca_ES@valencia:2006";LC_COLLATE
++category  "ca_ES@valencia:2006";LC_MONETARY
++category  "ca_ES@valencia:2006";LC_NUMERIC
++category  "ca_ES@valencia:2006";LC_TIME
++category  "ca_ES@valencia:2006";LC_MESSAGES
++category  "ca_ES@valencia:2006";LC_PAPER
++category  "ca_ES@valencia:2006";LC_NAME
++category  "ca_ES@valencia:2006";LC_ADDRESS
++category  "ca_ES@valencia:2006";LC_TELEPHONE
++category  "ca_ES@valencia:2006";LC_MEASUREMENT
++
++END LC_IDENTIFICATION
++
++LC_CTYPE
++copy "i18n"
++END LC_CTYPE
++
++LC_COLLATE
++copy "ca_ES"
++END LC_COLLATE
++
++LC_MONETARY
++copy "ca_ES"
++END LC_MONETARY
++
++LC_NUMERIC
++copy "ca_ES"
++END LC_NUMERIC
++
++LC_TIME
++copy "ca_ES"
++END LC_TIME
++
++LC_MESSAGES
++copy "ca_ES"
++END LC_MESSAGES
++
++LC_PAPER
++copy "ca_ES"
++END LC_PAPER
++
++LC_NAME
++copy "ca_ES"
++END LC_NAME
++
++LC_ADDRESS
++copy "ca_ES"
++END LC_ADDRESS
++
++LC_TELEPHONE
++copy "ca_ES"
++END LC_TELEPHONE
++
++LC_MEASUREMENT
++copy "ca_ES"
++END LC_MEASUREMENT
diff --git a/packages/glibc/2.16.0/0017-macos-cross-rpcgen.patch b/packages/glibc/2.16.0/0017-macos-cross-rpcgen.patch
new file mode 100644
index 00000000..b439b0f6
--- /dev/null
+++ b/packages/glibc/2.16.0/0017-macos-cross-rpcgen.patch
@@ -0,0 +1,34 @@
+commit ae7080d30c68cfa0c81ce3422dca948f64a94f50
+Author: Jia Liu <proljc@gmail.com>
+Date:   Sat Sep 7 00:01:08 2013 +0800
+
+    sunrpc/rpc/types.h: fix OS X and FreeBSD build problems
+    
+    When I build arm-linux-gcc on OS X, I find glibc will get a build error
+    in sunrpc/rpc/types.h, so I add __APPLE_CC__ to make OS X build OK.
+    For FreeBSD, Add __FreeBSD__ to make it build OK, too.
+    
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00155.html
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00217.html
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00240.html
+    Signed-off-by: Jia Liu <proljc@gmail.com>
+    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+---
+ sunrpc/rpc/types.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sunrpc/rpc/types.h
++++ b/sunrpc/rpc/types.h
+@@ -69,6 +69,11 @@
+ #include <sys/types.h>
+ #endif
+ 
++#if defined __APPLE_CC__ || defined __FreeBSD__
++# define __u_char_defined
++# define __daddr_t_defined
++#endif
++
+ #ifndef __u_char_defined
+ typedef __u_char u_char;
+ typedef __u_short u_short;
diff --git a/packages/glibc/2.16.0/300-nscd-one-fork.patch b/packages/glibc/2.16.0/0018-nscd-one-fork.patch
similarity index 80%
rename from packages/glibc/2.16.0/300-nscd-one-fork.patch
rename to packages/glibc/2.16.0/0018-nscd-one-fork.patch
index 13b28612..0d72f07d 100644
--- a/packages/glibc/2.16.0/300-nscd-one-fork.patch
+++ b/packages/glibc/2.16.0/0018-nscd-one-fork.patch
@@ -2,9 +2,12 @@ only fork one to assist in stop-start-daemon assumptions about daemon behavior
 
 http://bugs.gentoo.org/190785
 
-diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
---- glibc-2.13.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.13/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
+---
+ nscd/nscd.c |   15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+--- a/nscd/nscd.c
++++ b/nscd/nscd.c
 @@ -203,6 +203,9 @@
  	    exit (0);
  	}
@@ -31,7 +34,7 @@ diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
        setsid ();
  
        if (chdir ("/") != 0)
-@@ -245,9 +242,6 @@
+@@ -269,9 +263,6 @@
  
        openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
  
diff --git a/packages/glibc/2.16.0/310-hppa-nptl-carlos.patch b/packages/glibc/2.16.0/0019-hppa-nptl-carlos.patch
similarity index 81%
rename from packages/glibc/2.16.0/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.16.0/0019-hppa-nptl-carlos.patch
index 11e8a653..6c2ca8e9 100644
--- a/packages/glibc/2.16.0/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.16.0/0019-hppa-nptl-carlos.patch
@@ -1,9 +1,18 @@
 
 
-diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
---- glibc-2.13.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.13/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
-@@ -392,14 +392,14 @@
+---
+ elf/rtld.c                    |   10 +++++-----
+ include/atomic.h              |   26 +++++++++++++-------------
+ nptl/Makefile                 |   35 ++++++++++++++++++++++++++++++++---
+ nptl/pthread_barrier_wait.c   |    2 +-
+ nptl/sysdeps/pthread/Makefile |    2 ++
+ stdio-common/Makefile         |    2 +-
+ sunrpc/clnt_udp.c             |    2 +-
+ 7 files changed, 55 insertions(+), 24 deletions(-)
+
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -393,14 +393,14 @@
       know it is available.  We do not have to clear the memory if we
       do not have to use the temporary bootstrap_map.  Global variables
       are initialized to zero by default.  */
@@ -23,10 +32,9 @@ diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
  # endif
  # if USE___THREAD
    bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
---- glibc-2.13.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.13/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
-@@ -185,7 +185,7 @@
+--- a/include/atomic.h
++++ b/include/atomic.h
+@@ -184,7 +184,7 @@
       __typeof (*(mem)) __atg5_value = (newvalue);			      \
  									      \
       do									      \
@@ -35,7 +43,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
       while (__builtin_expect						      \
  	    (atomic_compare_and_exchange_bool_acq (__atg5_memp, __atg5_value, \
  						   __atg5_oldval), 0));	      \
-@@ -206,7 +206,7 @@
+@@ -205,7 +205,7 @@
       __typeof (*(mem)) __atg6_value = (value);				      \
  									      \
       do									      \
@@ -44,7 +52,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
       while (__builtin_expect						      \
  	    (atomic_compare_and_exchange_bool_acq (__atg6_memp,		      \
  						   __atg6_oldval	      \
-@@ -224,7 +224,7 @@
+@@ -223,7 +223,7 @@
       __typeof (*(mem)) __atg7_value = (value);				      \
  									      \
       do									      \
@@ -53,7 +61,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
       while (__builtin_expect						      \
  	    (catomic_compare_and_exchange_bool_acq (__atg7_memp,	      \
  						    __atg7_oldv		      \
-@@ -242,7 +242,7 @@
+@@ -241,7 +241,7 @@
      __typeof (mem) __atg8_memp = (mem);					      \
      __typeof (*(mem)) __atg8_value = (value);				      \
      do {								      \
@@ -62,7 +70,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
        if (__atg8_oldval >= __atg8_value)				      \
  	break;								      \
      } while (__builtin_expect						      \
-@@ -259,7 +259,7 @@
+@@ -258,7 +258,7 @@
      __typeof (mem) __atg9_memp = (mem);					      \
      __typeof (*(mem)) __atg9_value = (value);				      \
      do {								      \
@@ -71,7 +79,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
        if (__atg9_oldv >= __atg9_value)					      \
  	break;								      \
      } while (__builtin_expect						      \
-@@ -277,7 +277,7 @@
+@@ -276,7 +276,7 @@
      __typeof (mem) __atg10_memp = (mem);				      \
      __typeof (*(mem)) __atg10_value = (value);				      \
      do {								      \
@@ -80,7 +88,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
        if (__atg10_oldval <= __atg10_value)				      \
  	break;								      \
      } while (__builtin_expect						      \
-@@ -361,7 +361,7 @@
+@@ -360,7 +360,7 @@
  									      \
       do									      \
         {								      \
@@ -89,7 +97,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
  	 if (__builtin_expect (__atg11_oldval <= 0, 0))			      \
  	   break;							      \
         }								      \
-@@ -400,7 +400,7 @@
+@@ -399,7 +399,7 @@
       __typeof (*(mem)) __atg14_mask = ((__typeof (*(mem))) 1 << (bit));	      \
  									      \
       do									      \
@@ -98,7 +106,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
       while (__builtin_expect						      \
  	    (atomic_compare_and_exchange_bool_acq (__atg14_memp,	      \
  						   __atg14_old | __atg14_mask,\
-@@ -418,7 +418,7 @@
+@@ -417,7 +417,7 @@
      __typeof (*(mem)) __atg15_mask = (mask);				      \
  									      \
      do									      \
@@ -107,7 +115,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
      while (__builtin_expect						      \
  	   (atomic_compare_and_exchange_bool_acq (__atg15_memp,		      \
  						  __atg15_old & __atg15_mask, \
-@@ -450,7 +450,7 @@
+@@ -449,7 +449,7 @@
       __typeof (*(mem)) __atg16_mask = (mask);				      \
  									      \
       do									      \
@@ -116,7 +124,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
       while (__builtin_expect						      \
  	    (atomic_compare_and_exchange_bool_acq (__atg16_memp,	      \
  						   __atg16_old & __atg16_mask,\
-@@ -468,7 +468,7 @@
+@@ -467,7 +467,7 @@
      __typeof (*(mem)) __atg17_mask = (mask);				      \
  									      \
      do									      \
@@ -125,7 +133,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
      while (__builtin_expect						      \
  	   (atomic_compare_and_exchange_bool_acq (__atg17_memp,		      \
  						  __atg17_old | __atg17_mask, \
-@@ -484,7 +484,7 @@
+@@ -483,7 +483,7 @@
      __typeof (*(mem)) __atg18_mask = (mask);				      \
  									      \
      do									      \
@@ -134,7 +142,7 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
      while (__builtin_expect						      \
  	   (catomic_compare_and_exchange_bool_acq (__atg18_memp,	      \
  						   __atg18_old | __atg18_mask,\
-@@ -500,7 +500,7 @@
+@@ -499,7 +499,7 @@
       __typeof (*(mem)) __atg19_mask = (mask);				      \
  									      \
       do									      \
@@ -143,9 +151,8 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
       while (__builtin_expect						      \
  	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
  						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
---- glibc-2.13.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.13/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/Makefile
++++ b/nptl/Makefile
 @@ -266,9 +266,9 @@
  # Files which must not be linked with libpthread.
  tests-nolibpthread = tst-unload
@@ -159,7 +166,7 @@ diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
  
  gen-as-const-headers = pthread-errnos.sym
  
-@@ -426,6 +426,35 @@
+@@ -421,6 +421,35 @@
  CFLAGS-tst-cleanupx4.c += -fexceptions
  CFLAGS-tst-oncex3.c += -fexceptions
  CFLAGS-tst-oncex4.c += -fexceptions
@@ -195,10 +202,9 @@ diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
  CFLAGS-tst-align.c += $(stack-align-test-flags)
  CFLAGS-tst-align3.c += $(stack-align-test-flags)
  CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_barrier_wait.c
---- glibc-2.13.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.13/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
-@@ -64,7 +64,7 @@
+--- a/nptl/pthread_barrier_wait.c
++++ b/nptl/pthread_barrier_wait.c
+@@ -63,7 +63,7 @@
        do
  	lll_futex_wait (&ibarrier->curr_event, event,
  			ibarrier->private ^ FUTEX_PRIVATE_FLAG);
@@ -207,10 +213,9 @@ diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_b
      }
  
    /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps/pthread/Makefile
---- glibc-2.13.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.13/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -33,7 +33,9 @@
+--- a/nptl/sysdeps/pthread/Makefile
++++ b/nptl/sysdeps/pthread/Makefile
+@@ -32,7 +32,9 @@
  
  ifeq ($(have-forced-unwind),yes)
  tests += tst-mqueue8x
@@ -220,10 +225,9 @@ diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps
  endif
  endif
  
-diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefile
---- glibc-2.13.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.13/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -82,7 +82,7 @@
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
+@@ -76,7 +76,7 @@
  	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
  endif
  
@@ -232,10 +236,9 @@ diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefil
  CFLAGS-vfwprintf.c = -Wno-uninitialized
  CFLAGS-tst-printf.c = -Wno-format
  CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.13.orig/sunrpc/clnt_udp.c glibc-2.13/sunrpc/clnt_udp.c
---- glibc-2.13.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.13/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
-@@ -456,7 +456,7 @@
+--- a/sunrpc/clnt_udp.c
++++ b/sunrpc/clnt_udp.c
+@@ -462,7 +462,7 @@
        while (inlen < 0 && errno == EINTR);
        if (inlen < 0)
  	{
diff --git a/packages/glibc/2.16.0/0020-dl_execstack-PaX-support.patch b/packages/glibc/2.16.0/0020-dl_execstack-PaX-support.patch
new file mode 100644
index 00000000..cd60905f
--- /dev/null
+++ b/packages/glibc/2.16.0/0020-dl_execstack-PaX-support.patch
@@ -0,0 +1,69 @@
+	With latest versions of glibc, a lot of apps failed on a PaX enabled
+	system with:
+		 cannot enable executable stack as shared object requires: Permission denied
+	
+	This is due to PaX 'exec-protecting' the stack, and ld.so then trying
+	to make the stack executable due to some libraries not containing the
+	PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
+
+	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
+
+---
+ nptl/allocatestack.c                   |    3 ++-
+ sysdeps/unix/sysv/linux/dl-execstack.c |   19 ++++++++++++++++---
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+--- a/nptl/allocatestack.c
++++ b/nptl/allocatestack.c
+@@ -334,7 +334,8 @@
+ # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
+ #endif
+   if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
+-    return errno;
++    if (errno != EACCES) /* PAX is enabled */
++    	return errno;
+ 
+   return 0;
+ }
+--- a/sysdeps/unix/sysv/linux/dl-execstack.c
++++ b/sysdeps/unix/sysv/linux/dl-execstack.c
+@@ -62,7 +62,10 @@
+       else
+ # endif
+ 	{
+-	  result = errno;
++	  if (errno == EACCES)  /* PAX is enabled */
++	    result = 0;
++	  else
++	    result = errno;
+ 	  goto out;
+ 	}
+     }
+@@ -88,7 +91,12 @@
+ 	page -= size;
+       else
+ 	{
+-	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
++	  if (errno == EACCES)		/* PAX is enabled */
++	    {
++	      result = 0;
++	      goto out;
++	    }
++	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
+ 	    {
+ 	      result = errno;
+ 	      goto out;
+@@ -114,7 +122,12 @@
+ 	page += size;
+       else
+ 	{
+-	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
++	  if (errno == EACCES)		/* PAX is enabled */
++	    {
++	      result = 0;
++	      goto out;
++	    }
++	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
+ 	    {
+ 	      result = errno;
+ 	      goto out;
diff --git a/packages/glibc/2.16.0/0021-pre20040117-pt_pax.patch b/packages/glibc/2.16.0/0021-pre20040117-pt_pax.patch
new file mode 100644
index 00000000..544b3f6e
--- /dev/null
+++ b/packages/glibc/2.16.0/0021-pre20040117-pt_pax.patch
@@ -0,0 +1,35 @@
+
+
+---
+ elf/elf.h |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/elf/elf.h
++++ b/elf/elf.h
+@@ -581,6 +581,7 @@
+ #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
+ #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
+ #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
++#define PT_PAX_FLAGS	0x65041580	/* Indicates PaX flag markings */
+ #define PT_LOSUNW	0x6ffffffa
+ #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
+ #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
+@@ -594,6 +595,18 @@
+ #define PF_X		(1 << 0)	/* Segment is executable */
+ #define PF_W		(1 << 1)	/* Segment is writable */
+ #define PF_R		(1 << 2)	/* Segment is readable */
++#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
++#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
++#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
++#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
++#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
++#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
++#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
++#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
++#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
++#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
++#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
++#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
+ #define PF_MASKOS	0x0ff00000	/* OS-specific */
+ #define PF_MASKPROC	0xf0000000	/* Processor-specific */
+ 
diff --git a/packages/glibc/2.16.0/0022-tests-sandbox-libdl-paths.patch b/packages/glibc/2.16.0/0022-tests-sandbox-libdl-paths.patch
new file mode 100644
index 00000000..0c51c882
--- /dev/null
+++ b/packages/glibc/2.16.0/0022-tests-sandbox-libdl-paths.patch
@@ -0,0 +1,196 @@
+when glibc runs its tests, it does so by invoking the local library loader.
+in Gentoo, we build/run inside of our "sandbox" which itself is linked against
+libdl (so that it can load libraries and pull out symbols).  the trouble
+is that when you upgrade from an older glibc to the new one, often times
+internal symbols change name or abi.  this is normally OK as you cannot use
+libc.so from say version 2.3.6 but libpthread.so from say version 2.5, so
+we always say "keep all of the glibc libraries from the same build".  but
+when glibc runs its tests, it uses dynamic paths to point to its new local
+copies of libraries.  if the test doesnt use libdl, then glibc doesnt add
+its path, and when sandbox triggers the loading of libdl, glibc does so
+from the host system system.  this gets us into the case of all libraries
+are from the locally compiled version of glibc except for libdl.so.
+
+Fix by Wormo
+
+http://bugs.gentoo.org/56898
+
+---
+ grp/tst_fgetgrent.sh        |    3 ++-
+ iconvdata/run-iconv-test.sh |    2 +-
+ iconvdata/tst-table.sh      |    5 ++++-
+ intl/tst-codeset.sh         |    3 +++
+ intl/tst-gettext.sh         |    5 ++++-
+ intl/tst-gettext2.sh        |    5 ++++-
+ intl/tst-translit.sh        |    5 ++++-
+ malloc/tst-mtrace.sh        |    5 ++++-
+ nptl/tst-tls6.sh            |    4 ++--
+ posix/globtest.sh           |    2 +-
+ posix/tst-getconf.sh        |    5 ++++-
+ posix/wordexp-tst.sh        |    5 ++++-
+ 12 files changed, 37 insertions(+), 12 deletions(-)
+
+--- a/grp/tst_fgetgrent.sh
++++ b/grp/tst_fgetgrent.sh
+@@ -23,7 +23,8 @@
+ rtld_installed_name=$1; shift
+ 
+ testout=${common_objpfx}/grp/tst_fgetgrent.out
+-library_path=${common_objpfx}
++# make sure libdl is also in path in case sandbox is in use
++library_path=${common_objpfx}:${common_objpfx}/dlfcn
+ 
+ result=0
+ 
+--- a/iconvdata/run-iconv-test.sh
++++ b/iconvdata/run-iconv-test.sh
+@@ -33,7 +33,7 @@
+ export GCONV_PATH
+ 
+ # We have to have some directories in the library path.
+-LIBPATH=$codir:$codir/iconvdata
++LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn
+ 
+ # How the start the iconv(1) program.
+ ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
+--- a/iconvdata/tst-table.sh
++++ b/iconvdata/tst-table.sh
+@@ -58,8 +58,11 @@
+   irreversible=${charset}.irreversible
+ fi
+ 
++# make sure libdl is also in path in case sandbox is in use
++library_path=${common_objpfx}:${common_objpfx}/dlfcn
++
+ # iconv in one direction.
+-${common_objpfx}elf/ld.so --library-path $common_objpfx \
++${common_objpfx}elf/ld.so --library-path $library_path \
+ ${objpfx}tst-table-from ${charset} \
+   > ${objpfx}tst-${charset}.table
+ 
+--- a/intl/tst-codeset.sh
++++ b/intl/tst-codeset.sh
+@@ -36,6 +36,9 @@
+ LOCPATH=${common_objpfx}localedata
+ export LOCPATH
+ 
++# make sure libdl is also in path in case sandbox is in use
++library_path=${common_objpfx}:${common_objpfx}/dlfcn
++
+ ${common_objpfx}elf/ld.so --library-path $common_objpfx \
+ ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
+ 
+--- a/intl/tst-gettext.sh
++++ b/intl/tst-gettext.sh
+@@ -50,9 +50,12 @@
+ LOCPATH=${common_objpfx}localedata
+ export LOCPATH
+ 
++# make sure libdl is also in path in case sandbox is in use
++library_path=${common_objpfx}:${common_objpfx}/dlfcn
++
+ # Now run the test.
+ MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
+-${common_objpfx}elf/ld.so --library-path $common_objpfx \
++${common_objpfx}elf/ld.so --library-path $library_path \
+ ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
+ 
+ exit $?
+--- a/intl/tst-gettext2.sh
++++ b/intl/tst-gettext2.sh
+@@ -64,8 +64,11 @@
+ LOCPATH=${objpfx}domaindir
+ export LOCPATH
+ 
++# make sure libdl is also in path in case sandbox is in use
++library_path=${common_objpfx}:${common_objpfx}/dlfcn
++
+ # Now run the test.
+-${common_objpfx}elf/ld.so --library-path $common_objpfx \
++${common_objpfx}elf/ld.so --library-path $library_path \
+ ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
+ cmp ${objpfx}tst-gettext2.out - <<EOF
+ String1 - Lang1: 1st string
+--- a/intl/tst-translit.sh
++++ b/intl/tst-translit.sh
+@@ -35,7 +35,10 @@
+ LOCPATH=${common_objpfx}localedata
+ export LOCPATH
+ 
+-${common_objpfx}elf/ld.so --library-path $common_objpfx \
++# make sure libdl is also in path in case sandbox is in use
++library_path=${common_objpfx}:${common_objpfx}/dlfcn
++
++${common_objpfx}elf/ld.so --library-path $library_path \
+ ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
+ 
+ exit $?
+--- a/malloc/tst-mtrace.sh
++++ b/malloc/tst-mtrace.sh
+@@ -23,9 +23,12 @@
+ status=0
+ trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
+ 
++# make sure libdl is also in path in case sandbox is in use
++library_path=${common_objpfx}:${common_objpfx}/dlfcn
++
+ MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
+ LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
+-${common_objpfx}elf/ld.so --library-path $common_objpfx \
++${common_objpfx}elf/ld.so --library-path $library_path \
+   ${common_objpfx}malloc/tst-mtrace || status=1
+ 
+ if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
+--- a/nptl/tst-tls6.sh
++++ b/nptl/tst-tls6.sh
+@@ -5,8 +5,8 @@
+ rtld_installed_name=$1; shift
+ logfile=$common_objpfx/nptl/tst-tls6.out
+ 
+-# We have to find libc and nptl
+-library_path=${common_objpfx}:${common_objpfx}nptl
++# We have to find libc and nptl (also libdl in case sandbox is in use)
++library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn
+ tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
+ 	  ${common_objpfx}/nptl/tst-tls5"
+ 
+--- a/posix/globtest.sh
++++ b/posix/globtest.sh
+@@ -18,7 +18,7 @@
+ esac
+ 
+ # We have to find the libc and the NSS modules.
+-library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod
++library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod:${common_objpfx}/dlfcn
+ 
+ # Since we use `sort' we must make sure to use the same locale everywhere.
+ LC_ALL=C
+--- a/posix/tst-getconf.sh
++++ b/posix/tst-getconf.sh
+@@ -10,7 +10,10 @@
+ else
+   rtld_installed_name=$1; shift
+   runit() {
+-    ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"
++    
++  # make sure libdl is also in path in case sandbox is in use
++  library_path=${common_objpfx}:${common_objpfx}/dlfcn
++    ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} "$@"
+   }
+ fi
+ 
+--- a/posix/wordexp-tst.sh
++++ b/posix/wordexp-tst.sh
+@@ -19,8 +19,11 @@
+ "
+ export IFS
+ 
++# make sure libdl is also in path in case sandbox is in use
++library_path=${common_objpfx}:${common_objpfx}/dlfcn
++
+ failed=0
+-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
++${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
+ ${common_objpfx}posix/wordexp-test '$*' > ${testout}1
+ cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
+ wordexp returned 0
diff --git a/packages/glibc/2.16.0/0023-dont-build-timezone.patch b/packages/glibc/2.16.0/0023-dont-build-timezone.patch
new file mode 100644
index 00000000..dca2a275
--- /dev/null
+++ b/packages/glibc/2.16.0/0023-dont-build-timezone.patch
@@ -0,0 +1,17 @@
+timezone data has been split into the package sys-libs/timezone-data
+
+---
+ Makeconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -926,7 +926,7 @@
+ 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
+ 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
+ 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
+-	      crypt nss localedata timezone rt conform debug		    \
++	      crypt nss localedata rt conform debug		    \
+ 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
+ 
+ ifndef avoid-generated
diff --git a/packages/glibc/2.16.0/0024-alpha-xstat.patch b/packages/glibc/2.16.0/0024-alpha-xstat.patch
new file mode 100644
index 00000000..a329214c
--- /dev/null
+++ b/packages/glibc/2.16.0/0024-alpha-xstat.patch
@@ -0,0 +1,18 @@
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
+@@ -285,6 +285,11 @@
+ # define __ASSUME_GETDENTS32_D_TYPE	1
+ #endif
+ 
++/* Starting with version 2.6.4, alpha stat64 syscalls are available.  */
++#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
++# define __ASSUME_STAT64_SYSCALL	1
++#endif
++
+ /* Starting with version 2.5.3, the initial location returned by `brk'
+    after exec is always rounded up to the next page.  */
+ #if __LINUX_KERNEL_VERSION >= 132355
diff --git a/packages/glibc/2.16.0/0025-alpha-creat.patch b/packages/glibc/2.16.0/0025-alpha-creat.patch
new file mode 100644
index 00000000..6ef52782
--- /dev/null
+++ b/packages/glibc/2.16.0/0025-alpha-creat.patch
@@ -0,0 +1,17 @@
+alpha does not have a __NR_creat
+
+http://bugs.gentoo.org/227275
+http://sourceware.org/bugzilla/show_bug.cgi?id=6650
+
+---
+ sysdeps/unix/sysv/linux/wordsize-64/creat64.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
++++ b/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
+@@ -1 +1,5 @@
+ /* Defined as alias for the syscall.  */
++#include <sysdep.h>
++#ifndef __NR_creat
++#include "../../../../../io/creat64.c"
++#endif
diff --git a/packages/glibc/2.15/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.16.0/0026-alpha_alpha-add-fdatasync-support.patch
similarity index 74%
rename from packages/glibc/2.15/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.16.0/0026-alpha_alpha-add-fdatasync-support.patch
index acf250db..159d8d0d 100644
--- a/packages/glibc/2.15/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.16.0/0026-alpha_alpha-add-fdatasync-support.patch
@@ -13,10 +13,9 @@
  sysdeps/unix/sysv/linux/syscalls.list     |    1 
  4 files changed, 76 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
-@@ -21,6 +21,7 @@
+--- a/sysdeps/unix/sysv/linux/Makefile
++++ b/sysdeps/unix/sysv/linux/Makefile
+@@ -23,6 +23,7 @@
  		   setfsuid setfsgid makedev epoll_pwait signalfd \
  		   eventfd eventfd_read eventfd_write prlimit
  
@@ -24,9 +23,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/u
  CFLAGS-gethostid.c = -fexceptions
  CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=0x80000000-__getpagesize()"
  
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/fdatasync.c
 @@ -0,0 +1,69 @@
 +/* fdatasync -- synchronize at least the data part of a file with 
 +   the underlying media. Linux version. 
@@ -97,10 +95,9 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdep
 +
 +weak_alias (__fdatasync, fdatasync)
 +
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
-@@ -459,6 +459,12 @@
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
+@@ -357,6 +357,12 @@
  # define __ASSUME_FUTEX_LOCK_PI	1
  #endif
  
@@ -113,10 +110,9 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/
  /* Support for utimensat syscall was added in 2.6.22, on SH
     only after 2.6.22-rc1.  */
  #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
-@@ -11,7 +11,6 @@
+--- a/sysdeps/unix/sysv/linux/syscalls.list
++++ b/sysdeps/unix/sysv/linux/syscalls.list
+@@ -13,7 +13,6 @@
  epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
  epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
  epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
diff --git a/packages/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch b/packages/glibc/2.16.0/0027-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
similarity index 89%
rename from packages/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
rename to packages/glibc/2.16.0/0027-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
index 803ac6f6..b3668052 100644
--- a/packages/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
+++ b/packages/glibc/2.16.0/0027-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
@@ -14,7 +14,7 @@ Ported from master, fixes CVE-2015-0235.
 
 --- a/nss/Makefile
 +++ b/nss/Makefile
-@@ -38,7 +38,7 @@ install-bin             := getent makedb
+@@ -38,7 +38,7 @@
  makedb-modules = xmalloc hash-string
  extra-objs		+= $(makedb-modules:=.o)
  
@@ -25,7 +25,7 @@ Ported from master, fixes CVE-2015-0235.
  include ../Makeconfig
 --- a/nss/digits_dots.c
 +++ b/nss/digits_dots.c
-@@ -46,7 +46,10 @@ __nss_hostname_digits_dots (const char *
+@@ -46,7 +46,10 @@
      {
        if (h_errnop)
  	*h_errnop = NETDB_INTERNAL;
@@ -37,7 +37,7 @@ Ported from master, fixes CVE-2015-0235.
        return -1;
      }
  
-@@ -83,14 +86,16 @@ __nss_hostname_digits_dots (const char *
+@@ -83,14 +86,16 @@
  	}
  
        size_needed = (sizeof (*host_addr)
@@ -56,7 +56,7 @@ Ported from master, fixes CVE-2015-0235.
  	      __set_errno (ERANGE);
  	      goto done;
  	    }
-@@ -109,7 +114,7 @@ __nss_hostname_digits_dots (const char *
+@@ -109,7 +114,7 @@
  	      *buffer_size = 0;
  	      __set_errno (save);
  	      if (h_errnop != NULL)
@@ -65,7 +65,7 @@ Ported from master, fixes CVE-2015-0235.
  	      *result = NULL;
  	      goto done;
  	    }
-@@ -149,7 +154,9 @@ __nss_hostname_digits_dots (const char *
+@@ -149,7 +154,9 @@
  		  if (! ok)
  		    {
  		      *h_errnop = HOST_NOT_FOUND;
@@ -76,7 +76,7 @@ Ported from master, fixes CVE-2015-0235.
  			*result = NULL;
  		      goto done;
  		    }
-@@ -190,7 +197,7 @@ __nss_hostname_digits_dots (const char *
+@@ -190,7 +197,7 @@
  		  if (buffer_size == NULL)
  		    *status = NSS_STATUS_SUCCESS;
  		  else
@@ -85,7 +85,7 @@ Ported from master, fixes CVE-2015-0235.
  		  goto done;
  		}
  
-@@ -201,15 +208,6 @@ __nss_hostname_digits_dots (const char *
+@@ -201,15 +208,6 @@
  
        if ((isxdigit (name[0]) && strchr (name, ':') != NULL) || name[0] == ':')
  	{
@@ -101,7 +101,7 @@ Ported from master, fixes CVE-2015-0235.
  	  switch (af)
  	    {
  	    default:
-@@ -225,7 +223,10 @@ __nss_hostname_digits_dots (const char *
+@@ -225,7 +223,10 @@
  	      /* This is not possible.  We cannot represent an IPv6 address
  		 in an `struct in_addr' variable.  */
  	      *h_errnop = HOST_NOT_FOUND;
@@ -113,7 +113,7 @@ Ported from master, fixes CVE-2015-0235.
  	      goto done;
  
  	    case AF_INET6:
-@@ -233,42 +234,6 @@ __nss_hostname_digits_dots (const char *
+@@ -233,42 +234,6 @@
  	      break;
  	    }
  
@@ -156,7 +156,7 @@ Ported from master, fixes CVE-2015-0235.
  	  for (cp = name;; ++cp)
  	    {
  	      if (!*cp)
-@@ -281,7 +246,9 @@ __nss_hostname_digits_dots (const char *
+@@ -281,7 +246,9 @@
  		  if (inet_pton (AF_INET6, name, host_addr) <= 0)
  		    {
  		      *h_errnop = HOST_NOT_FOUND;
@@ -210,7 +210,7 @@ Ported from master, fixes CVE-2015-0235.
 +#include "../test-skeleton.c"
 --- a/nss/getXXbyYY_r.c
 +++ b/nss/getXXbyYY_r.c
-@@ -179,6 +179,9 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, L
+@@ -179,6 +179,9 @@
      case -1:
        return errno;
      case 1:
diff --git a/packages/glibc/2.16.0/0028-ppc-atomic.patch b/packages/glibc/2.16.0/0028-ppc-atomic.patch
new file mode 100644
index 00000000..53409371
--- /dev/null
+++ b/packages/glibc/2.16.0/0028-ppc-atomic.patch
@@ -0,0 +1,412 @@
+sniped from suse
+
+---
+ sysdeps/powerpc/bits/atomic.h           |   66 ++++++++++-----------
+ sysdeps/powerpc/powerpc32/bits/atomic.h |   16 ++---
+ sysdeps/powerpc/powerpc64/bits/atomic.h |   98 ++++++++++++++++----------------
+ 3 files changed, 90 insertions(+), 90 deletions(-)
+
+--- a/sysdeps/powerpc/bits/atomic.h
++++ b/sysdeps/powerpc/bits/atomic.h
+@@ -84,14 +84,14 @@
+       __typeof (*(mem)) __tmp;						      \
+       __typeof (mem)  __memp = (mem);					      \
+       __asm __volatile (						      \
+-		        "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
++		        "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
+ 		        "	cmpw	%0,%2\n"			      \
+ 		        "	bne	2f\n"				      \
+-		        "	stwcx.	%3,0,%1\n"			      \
++		        "	stwcx.	%3,%y1\n"			      \
+ 		        "	bne-	1b\n"				      \
+ 		        "2:	" __ARCH_ACQ_INSTR			      \
+-		        : "=&r" (__tmp)					      \
+-		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
++		        : "=&r" (__tmp), "+Z" (*__memp)			      \
++		        : "r" (oldval), "r" (newval)			      \
+ 		        : "cr0", "memory");				      \
+       __tmp;								      \
+   })
+@@ -101,14 +101,14 @@
+       __typeof (*(mem)) __tmp;						      \
+       __typeof (mem)  __memp = (mem);					      \
+       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
+-		        "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
++		        "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
+ 		        "	cmpw	%0,%2\n"			      \
+ 		        "	bne	2f\n"				      \
+-		        "	stwcx.	%3,0,%1\n"			      \
++		        "	stwcx.	%3,%y1\n"			      \
+ 		        "	bne-	1b\n"				      \
+ 		        "2:	"					      \
+-		        : "=&r" (__tmp)					      \
+-		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
++		        : "=&r" (__tmp), "+Z" (__memp)			      \
++		        : "r" (oldval), "r" (newval)			      \
+ 		        : "cr0", "memory");				      \
+       __tmp;								      \
+   })
+@@ -117,12 +117,12 @@
+   ({									      \
+     __typeof (*mem) __val;						      \
+     __asm __volatile (							      \
+-		      "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
+-		      "		stwcx.	%3,0,%2\n"			      \
++		      "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
++		      "		stwcx.	%2,%y1\n"			      \
+ 		      "		bne-	1b\n"				      \
+ 		      "   " __ARCH_ACQ_INSTR				      \
+-		      : "=&r" (__val), "=m" (*mem)			      \
+-		      : "b" (mem), "r" (value), "m" (*mem)		      \
++		      : "=&r" (__val), "+Z" (*mem)			      \
++		      : "r" (value)					      \
+ 		      : "cr0", "memory");				      \
+     __val;								      \
+   })
+@@ -131,11 +131,11 @@
+   ({									      \
+     __typeof (*mem) __val;						      \
+     __asm __volatile (__ARCH_REL_INSTR "\n"				      \
+-		      "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
+-		      "		stwcx.	%3,0,%2\n"			      \
++		      "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
++		      "		stwcx.	%2,%y1\n"			      \
+ 		      "		bne-	1b"				      \
+-		      : "=&r" (__val), "=m" (*mem)			      \
+-		      : "b" (mem), "r" (value), "m" (*mem)		      \
++		      : "=&r" (__val), "+Z" (*mem)			      \
++		      : "r" (value)					      \
+ 		      : "cr0", "memory");				      \
+     __val;								      \
+   })
+@@ -143,12 +143,12 @@
+ #define __arch_atomic_exchange_and_add_32(mem, value) \
+   ({									      \
+     __typeof (*mem) __val, __tmp;					      \
+-    __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
+-		      "		add	%1,%0,%4\n"			      \
+-		      "		stwcx.	%1,0,%3\n"			      \
++    __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
++		      "		add	%1,%0,%3\n"			      \
++		      "		stwcx.	%1,%y2\n"			      \
+ 		      "		bne-	1b"				      \
+-		      : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
+-		      : "b" (mem), "r" (value), "m" (*mem)		      \
++		      : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
++		      : "r" (value)					      \
+ 		      : "cr0", "memory");				      \
+     __val;								      \
+   })
+@@ -156,12 +156,12 @@
+ #define __arch_atomic_increment_val_32(mem) \
+   ({									      \
+     __typeof (*(mem)) __val;						      \
+-    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
++    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
+ 		      "		addi	%0,%0,1\n"			      \
+-		      "		stwcx.	%0,0,%2\n"			      \
++		      "		stwcx.	%0,%y1\n"			      \
+ 		      "		bne-	1b"				      \
+-		      : "=&b" (__val), "=m" (*mem)			      \
+-		      : "b" (mem), "m" (*mem)				      \
++		      : "=&b" (__val), "+Z" (*mem)			      \
++		      :							      \
+ 		      : "cr0", "memory");				      \
+     __val;								      \
+   })
+@@ -169,27 +169,27 @@
+ #define __arch_atomic_decrement_val_32(mem) \
+   ({									      \
+     __typeof (*(mem)) __val;						      \
+-    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
++    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
+ 		      "		subi	%0,%0,1\n"			      \
+-		      "		stwcx.	%0,0,%2\n"			      \
++		      "		stwcx.	%0,%y1\n"			      \
+ 		      "		bne-	1b"				      \
+-		      : "=&b" (__val), "=m" (*mem)			      \
+-		      : "b" (mem), "m" (*mem)				      \
++		      : "=&b" (__val), "+Z" (*mem)			      \
++		      :							      \
+ 		      : "cr0", "memory");				      \
+     __val;								      \
+   })
+ 
+ #define __arch_atomic_decrement_if_positive_32(mem) \
+   ({ int __val, __tmp;							      \
+-     __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
++     __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
+ 		       "	cmpwi	0,%0,0\n"			      \
+ 		       "	addi	%1,%0,-1\n"			      \
+ 		       "	ble	2f\n"				      \
+-		       "	stwcx.	%1,0,%3\n"			      \
++		       "	stwcx.	%1,%y2\n"			      \
+ 		       "	bne-	1b\n"				      \
+ 		       "2:	" __ARCH_ACQ_INSTR			      \
+-		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
+-		       : "b" (mem), "m" (*mem)				      \
++		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
++		       :						      \
+ 		       : "cr0", "memory");				      \
+      __val;								      \
+   })
+--- a/sysdeps/powerpc/powerpc32/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc32/bits/atomic.h
+@@ -43,14 +43,14 @@
+ ({									      \
+   unsigned int __tmp;							      \
+   __asm __volatile (							      \
+-		    "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
++		    "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
+ 		    "	subf.	%0,%2,%0\n"				      \
+ 		    "	bne	2f\n"					      \
+-		    "	stwcx.	%3,0,%1\n"				      \
++		    "	stwcx.	%3,%y1\n"				      \
+ 		    "	bne-	1b\n"					      \
+ 		    "2:	" __ARCH_ACQ_INSTR				      \
+-		    : "=&r" (__tmp)					      \
+-		    : "b" (mem), "r" (oldval), "r" (newval)		      \
++		    : "=&r" (__tmp), "+Z" (*(mem))			      \
++		    : "r" (oldval), "r" (newval)			      \
+ 		    : "cr0", "memory");					      \
+   __tmp != 0;								      \
+ })
+@@ -59,14 +59,14 @@
+ ({									      \
+   unsigned int __tmp;							      \
+   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
+-		    "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"		      \
++		    "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
+ 		    "	subf.	%0,%2,%0\n"				      \
+ 		    "	bne	2f\n"					      \
+-		    "	stwcx.	%3,0,%1\n"				      \
++		    "	stwcx.	%3,%y1\n"				      \
+ 		    "	bne-	1b\n"					      \
+ 		    "2:	"						      \
+-		    : "=&r" (__tmp)					      \
+-		    : "b" (mem), "r" (oldval), "r" (newval)		      \
++		    : "=&r" (__tmp), "+Z" (*(mem))			      \
++		    : "r" (oldval), "r" (newval)			      \
+ 		    : "cr0", "memory");					      \
+   __tmp != 0;								      \
+ })
+--- a/sysdeps/powerpc/powerpc64/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc64/bits/atomic.h
+@@ -43,14 +43,14 @@
+ ({									      \
+   unsigned int __tmp, __tmp2;						      \
+   __asm __volatile ("   clrldi  %1,%1,32\n"				      \
+-		    "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	 	      \
++		    "1:	lwarx	%0,%y2" MUTEX_HINT_ACQ "\n"	 	      \
+ 		    "	subf.	%0,%1,%0\n"				      \
+ 		    "	bne	2f\n"					      \
+-		    "	stwcx.	%4,0,%2\n"				      \
++		    "	stwcx.	%4,%y2\n"				      \
+ 		    "	bne-	1b\n"					      \
+ 		    "2:	" __ARCH_ACQ_INSTR				      \
+-		    : "=&r" (__tmp), "=r" (__tmp2)			      \
+-		    : "b" (mem), "1" (oldval), "r" (newval)		      \
++		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
++		    : "1" (oldval), "r" (newval)			      \
+ 		    : "cr0", "memory");					      \
+   __tmp != 0;								      \
+ })
+@@ -60,14 +60,14 @@
+   unsigned int __tmp, __tmp2;						      \
+   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
+ 		    "   clrldi  %1,%1,32\n"				      \
+-		    "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
++		    "1:	lwarx	%0,%y2" MUTEX_HINT_REL "\n"		      \
+ 		    "	subf.	%0,%1,%0\n"				      \
+ 		    "	bne	2f\n"					      \
+-		    "	stwcx.	%4,0,%2\n"				      \
++		    "	stwcx.	%4,%y2\n"				      \
+ 		    "	bne-	1b\n"					      \
+ 		    "2:	"						      \
+-		    : "=&r" (__tmp), "=r" (__tmp2)			      \
+-		    : "b" (mem), "1" (oldval), "r" (newval)		      \
++		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
++		    : "1" (oldval), "r" (newval)			      \
+ 		    : "cr0", "memory");					      \
+   __tmp != 0;								      \
+ })
+@@ -81,14 +81,14 @@
+ ({									      \
+   unsigned long	__tmp;							      \
+   __asm __volatile (							      \
+-		    "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
++		    "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
+ 		    "	subf.	%0,%2,%0\n"				      \
+ 		    "	bne	2f\n"					      \
+-		    "	stdcx.	%3,0,%1\n"				      \
++		    "	stdcx.	%3,%y1\n"				      \
+ 		    "	bne-	1b\n"					      \
+ 		    "2:	" __ARCH_ACQ_INSTR				      \
+-		    : "=&r" (__tmp)					      \
+-		    : "b" (mem), "r" (oldval), "r" (newval)		      \
++		    : "=&r" (__tmp), "+Z" (*(mem))			      \
++		    : "r" (oldval), "r" (newval)			      \
+ 		    : "cr0", "memory");					      \
+   __tmp != 0;								      \
+ })
+@@ -97,14 +97,14 @@
+ ({									      \
+   unsigned long	__tmp;							      \
+   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
+-		    "1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
++		    "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
+ 		    "	subf.	%0,%2,%0\n"				      \
+ 		    "	bne	2f\n"					      \
+-		    "	stdcx.	%3,0,%1\n"				      \
++		    "	stdcx.	%3,%y1\n"				      \
+ 		    "	bne-	1b\n"					      \
+ 		    "2:	"						      \
+-		    : "=&r" (__tmp)					      \
+-		    : "b" (mem), "r" (oldval), "r" (newval)		      \
++		    : "=&r" (__tmp), "+Z" (*(mem))			      \
++		    : "r" (oldval), "r" (newval)			      \
+ 		    : "cr0", "memory");					      \
+   __tmp != 0;								      \
+ })
+@@ -114,14 +114,14 @@
+       __typeof (*(mem)) __tmp;						      \
+       __typeof (mem)  __memp = (mem);					      \
+       __asm __volatile (						      \
+-		        "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
++		        "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
+ 		        "	cmpd	%0,%2\n"			      \
+ 		        "	bne	2f\n"				      \
+-		        "	stdcx.	%3,0,%1\n"			      \
++		        "	stdcx.	%3,%y1\n"			      \
+ 		        "	bne-	1b\n"				      \
+ 		        "2:	" __ARCH_ACQ_INSTR			      \
+-		        : "=&r" (__tmp)					      \
+-		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
++		        : "=&r" (__tmp), "+Z" (*__memp)			      \
++		        : "r" (oldval), "r" (newval)			      \
+ 		        : "cr0", "memory");				      \
+       __tmp;								      \
+   })
+@@ -131,14 +131,14 @@
+       __typeof (*(mem)) __tmp;						      \
+       __typeof (mem)  __memp = (mem);					      \
+       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
+-		        "1:	ldarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
++		        "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
+ 		        "	cmpd	%0,%2\n"			      \
+ 		        "	bne	2f\n"				      \
+-		        "	stdcx.	%3,0,%1\n"			      \
++		        "	stdcx.	%3,%y1\n"			      \
+ 		        "	bne-	1b\n"				      \
+ 		        "2:	"					      \
+-		        : "=&r" (__tmp)					      \
+-		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
++		        : "=&r" (__tmp), "+Z" (*__memp)			      \
++		        : "r" (oldval), "r" (newval)			      \
+ 		        : "cr0", "memory");				      \
+       __tmp;								      \
+   })
+@@ -147,12 +147,12 @@
+     ({									      \
+       __typeof (*mem) __val;						      \
+       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
+-			"1:	ldarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
+-			"	stdcx.	%3,0,%2\n"			      \
++			"1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
++			"	stdcx.	%2,%y1\n"			      \
+ 			"	bne-	1b\n"				      \
+ 		  " " __ARCH_ACQ_INSTR					      \
+-			: "=&r" (__val), "=m" (*mem)			      \
+-			: "b" (mem), "r" (value), "m" (*mem)		      \
++			: "=&r" (__val), "+Z" (*(mem))			      \
++			: "r" (value)					      \
+ 			: "cr0", "memory");				      \
+       __val;								      \
+     })
+@@ -161,11 +161,11 @@
+     ({									      \
+       __typeof (*mem) __val;						      \
+       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
+-			"1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
+-			"	stdcx.	%3,0,%2\n"			      \
++			"1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
++			"	stdcx.	%2,%y1\n"			      \
+ 			"	bne-	1b"				      \
+-			: "=&r" (__val), "=m" (*mem)			      \
+-			: "b" (mem), "r" (value), "m" (*mem)		      \
++			: "=&r" (__val), "+Z" (*(mem))			      \
++			: "r" (value)					      \
+ 			: "cr0", "memory");				      \
+       __val;								      \
+     })
+@@ -173,12 +173,12 @@
+ #define __arch_atomic_exchange_and_add_64(mem, value) \
+     ({									      \
+       __typeof (*mem) __val, __tmp;					      \
+-      __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
+-			"	add	%1,%0,%4\n"			      \
+-			"	stdcx.	%1,0,%3\n"			      \
++      __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
++			"	add	%1,%0,%3\n"			      \
++			"	stdcx.	%1,%y2\n"			      \
+ 			"	bne-	1b"				      \
+-			: "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
+-			: "b" (mem), "r" (value), "m" (*mem)		      \
++			: "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
++			: "r" (value)					      \
+ 			: "cr0", "memory");				      \
+       __val;								      \
+     })
+@@ -186,12 +186,12 @@
+ #define __arch_atomic_increment_val_64(mem) \
+     ({									      \
+       __typeof (*(mem)) __val;						      \
+-      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
++      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
+ 			"	addi	%0,%0,1\n"			      \
+-			"	stdcx.	%0,0,%2\n"			      \
++			"	stdcx.	%0,%y1\n"			      \
+ 			"	bne-	1b"				      \
+-			: "=&b" (__val), "=m" (*mem)			      \
+-			: "b" (mem), "m" (*mem)				      \
++			: "=&b" (__val), "+Z" (*(mem))			      \
++			:						      \
+ 			: "cr0", "memory");				      \
+       __val;								      \
+     })
+@@ -199,27 +199,27 @@
+ #define __arch_atomic_decrement_val_64(mem) \
+     ({									      \
+       __typeof (*(mem)) __val;						      \
+-      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
++      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
+ 			"	subi	%0,%0,1\n"			      \
+-			"	stdcx.	%0,0,%2\n"			      \
++			"	stdcx.	%0,%y1\n"			      \
+ 			"	bne-	1b"				      \
+-			: "=&b" (__val), "=m" (*mem)			      \
+-			: "b" (mem), "m" (*mem)				      \
++			: "=&b" (__val), "+Z" (*(mem))			      \
++			:						      \
+ 			: "cr0", "memory");				      \
+       __val;								      \
+     })
+ 
+ #define __arch_atomic_decrement_if_positive_64(mem) \
+   ({ int __val, __tmp;							      \
+-     __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
++     __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
+ 		       "	cmpdi	0,%0,0\n"			      \
+ 		       "	addi	%1,%0,-1\n"			      \
+ 		       "	ble	2f\n"				      \
+-		       "	stdcx.	%1,0,%3\n"			      \
++		       "	stdcx.	%1,%y2\n"			      \
+ 		       "	bne-	1b\n"				      \
+ 		       "2:	" __ARCH_ACQ_INSTR			      \
+-		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
+-		       : "b" (mem), "m" (*mem)				      \
++		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
++		       :						      \
+ 		       : "cr0", "memory");				      \
+      __val;								      \
+   })
diff --git a/packages/glibc/2.16.0/0029-mips_shn_undef-hack.patch b/packages/glibc/2.16.0/0029-mips_shn_undef-hack.patch
new file mode 100644
index 00000000..5b82f134
--- /dev/null
+++ b/packages/glibc/2.16.0/0029-mips_shn_undef-hack.patch
@@ -0,0 +1,19 @@
+---
+ elf/dl-lookup.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/elf/dl-lookup.c
++++ b/elf/dl-lookup.c
+@@ -299,6 +299,12 @@
+ 	      /* FALLTHROUGH */
+ 	    case STB_GLOBAL:
+ 	    success:
++#ifdef __mips__
++	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
++		 symbols, we skip them. */
++	      if (sym->st_shndx == SHN_UNDEF)
++		break;
++#endif
+ 	      /* Global definition.  Just what we need.  */
+ 	      result->s = sym;
+ 	      result->m = (struct link_map *) map;
diff --git a/packages/glibc/2.16.0/0030-alpha-atfcts.patch b/packages/glibc/2.16.0/0030-alpha-atfcts.patch
new file mode 100644
index 00000000..5f138a98
--- /dev/null
+++ b/packages/glibc/2.16.0/0030-alpha-atfcts.patch
@@ -0,0 +1,16 @@
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
+@@ -335,7 +335,8 @@
+    the code.  On PPC they were introduced in 2.6.17-rc1,
+    on SH in 2.6.19-rc1.  */
+ #if __LINUX_KERNEL_VERSION >= 0x020611 \
+-    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613)
++    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613) \
++    && (!defined __alpha__)
+ # define __ASSUME_ATFCTS	1
+ #endif
+ 
diff --git a/packages/glibc/2.16.0/0031-syslog.patch b/packages/glibc/2.16.0/0031-syslog.patch
new file mode 100644
index 00000000..cd3c4262
--- /dev/null
+++ b/packages/glibc/2.16.0/0031-syslog.patch
@@ -0,0 +1,15 @@
+---
+ misc/syslog.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/misc/syslog.c
++++ b/misc/syslog.c
+@@ -150,7 +150,7 @@
+ #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
+ 	/* Check for invalid bits. */
+ 	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
+-		syslog(INTERNALLOG,
++		__syslog(INTERNALLOG,
+ 		    "syslog: unknown facility/priority: %x", pri);
+ 		pri &= LOG_PRIMASK|LOG_FACMASK;
+ 	}
diff --git a/packages/glibc/2.16.0/0032-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.16.0/0032-debug-readlink_chk-readklinkat_chk.patch
new file mode 100644
index 00000000..44d596a2
--- /dev/null
+++ b/packages/glibc/2.16.0/0032-debug-readlink_chk-readklinkat_chk.patch
@@ -0,0 +1,27 @@
+---
+ debug/readlink_chk.c   |    2 +-
+ debug/readlinkat_chk.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/debug/readlink_chk.c
++++ b/debug/readlink_chk.c
+@@ -24,7 +24,7 @@
+ 
+ 
+ ssize_t
+-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
++__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
+ {
+   if (len > buflen)
+     __chk_fail ();
+--- a/debug/readlinkat_chk.c
++++ b/debug/readlinkat_chk.c
+@@ -20,7 +20,7 @@
+ 
+ 
+ ssize_t
+-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
++__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
+ 		  size_t buflen)
+ {
+   if (len > buflen)
diff --git a/packages/glibc/2.16.0/0033-fix-rpc_parse-format.patch b/packages/glibc/2.16.0/0033-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.16.0/0033-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.16.0/0034-nis-bogus-conditional.patch b/packages/glibc/2.16.0/0034-nis-bogus-conditional.patch
new file mode 100644
index 00000000..b8b806c6
--- /dev/null
+++ b/packages/glibc/2.16.0/0034-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -292,7 +292,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.16.0/0035-obstack-common.patch b/packages/glibc/2.16.0/0035-obstack-common.patch
new file mode 100644
index 00000000..ad1f8ebe
--- /dev/null
+++ b/packages/glibc/2.16.0/0035-obstack-common.patch
@@ -0,0 +1,32 @@
+commit 39b1f6172a2f9ddc74a8f82d6e84dd13b22dbaf2
+Author: Peter Collingbourne <pcc@google.com>
+Date:   Wed May 15 20:28:08 2013 +0200
+
+    Move _obstack_compat out of common
+    
+    it is impossible to create an alias of a common symbol (as
+    compat_symbol does), because common symbols do not have a section or
+    an offset until linked.  GNU as tolerates aliases of common symbols by
+    simply creating another common symbol, but other assemblers (notably
+    LLVM's integrated assembler) are less tolerant.
+    
+    2013-05-15  Peter Collingbourne  <pcc@google.com>
+    
+            * malloc/obstack.c (_obstack_compat): Add initializer.
+    -
+
+---
+ malloc/obstack.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/malloc/obstack.c
++++ b/malloc/obstack.c
+@@ -116,7 +116,7 @@
+ /* A looong time ago (before 1994, anyway; we're not sure) this global variable
+    was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
+    library still exports it because somebody might use it.  */
+-struct obstack *_obstack_compat;
++struct obstack *_obstack_compat = 0;
+ compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
+ #  endif
+ # endif
diff --git a/packages/glibc/2.16.0/999-new-tools.patch b/packages/glibc/2.16.0/0036-new-tools.patch
similarity index 69%
rename from packages/glibc/2.16.0/999-new-tools.patch
rename to packages/glibc/2.16.0/0036-new-tools.patch
index e7533652..8805a3e6 100644
--- a/packages/glibc/2.16.0/999-new-tools.patch
+++ b/packages/glibc/2.16.0/0036-new-tools.patch
@@ -1,7 +1,11 @@
-diff -urpN glibc-2.16.0.orig/configure glibc-2.16.0/configure
---- glibc-2.16.0.orig/configure	2012-06-30 12:12:34.000000000 -0700
-+++ glibc-2.16.0/configure	2017-02-08 00:39:03.778150878 -0800
-@@ -4845,7 +4845,7 @@ $as_echo_n "checking version of $MAKE...
+---
+ configure    |    4 ++--
+ configure.in |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -4845,7 +4845,7 @@
    ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -10,7 +14,7 @@ diff -urpN glibc-2.16.0.orig/configure glibc-2.16.0/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5032,7 +5032,7 @@ else
+@@ -5032,7 +5032,7 @@
    # Found it, now check the version.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
  $as_echo_n "checking version of $SED... " >&6; }
@@ -19,10 +23,9 @@ diff -urpN glibc-2.16.0.orig/configure glibc-2.16.0/configure
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
      3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.16.0.orig/configure.in glibc-2.16.0/configure.in
---- glibc-2.16.0.orig/configure.in	2012-06-30 12:12:34.000000000 -0700
-+++ glibc-2.16.0/configure.in	2017-02-08 00:14:07.996446792 -0800
-@@ -940,7 +940,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}g
+--- a/configure.in
++++ b/configure.in
+@@ -940,7 +940,7 @@
    critic_missing="$critic_missing gcc")
  AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
    [GNU Make[^0-9]*\([0-9][0-9.]*\)],
diff --git a/packages/glibc/2.16.0/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.16.0/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
deleted file mode 100644
index 6fd663a2..00000000
--- a/packages/glibc/2.16.0/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
- -Wparentheses
-
----
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-2.7.4
-
diff --git a/packages/glibc/2.16.0/102-fix-signed-shift-overlow.patch b/packages/glibc/2.16.0/102-fix-signed-shift-overlow.patch
deleted file mode 100644
index ef49f831..00000000
--- a/packages/glibc/2.16.0/102-fix-signed-shift-overlow.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-commit 5542236837c5c41435f8282ec92799f480c36f18
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Tue Jul 21 22:50:29 2015 -0700
-
-    Port the 0x7efe...feff pattern to GCC 6.
-    
-    See Steve Ellcey's bug report in:
-    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
-    * string/memrchr.c (MEMRCHR):
-    * string/rawmemchr.c (RAWMEMCHR):
-    * string/strchr.c (strchr):
-    * string/strchrnul.c (STRCHRNUL):
-    Rewrite code to avoid issues with signed shift overflow.
-
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
---- a/string/memrchr.c
-+++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
---- a/string/rawmemchr.c
-+++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
---- a/string/strchr.c
-+++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
---- a/string/strchrnul.c
-+++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
diff --git a/packages/glibc/2.16.0/105-misleading-indentation.patch b/packages/glibc/2.16.0/105-misleading-indentation.patch
deleted file mode 100644
index 1dd8d851..00000000
--- a/packages/glibc/2.16.0/105-misleading-indentation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 976ef870542580cf5fed896c2c652b3e1a95f9da
-Author: Steve Ellcey <sellcey@mips.com>
-Date:   Fri Dec 11 09:19:37 2015 -0800
-
-    Fix indentation.
-    
-            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
-            Fix indentation.
-
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
---- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-+++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
- 
-     /* compute q[0],q[1],...q[jk] */
- 	for (i=0;i<=jk;i++) {
--	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-+	    for(j=0,fw=0.0;j<=jx;j++)
-+		fw += x[j]*f[jx+i-j];
-+	    q[i] = fw;
- 	}
- 
- 	jz = jk;
diff --git a/packages/glibc/2.16.0/300-macos-cross-rpcgen.patch b/packages/glibc/2.16.0/300-macos-cross-rpcgen.patch
deleted file mode 100644
index e654644c..00000000
--- a/packages/glibc/2.16.0/300-macos-cross-rpcgen.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit ae7080d30c68cfa0c81ce3422dca948f64a94f50
-Author: Jia Liu <proljc@gmail.com>
-Date:   Sat Sep 7 00:01:08 2013 +0800
-
-    sunrpc/rpc/types.h: fix OS X and FreeBSD build problems
-    
-    When I build arm-linux-gcc on OS X, I find glibc will get a build error
-    in sunrpc/rpc/types.h, so I add __APPLE_CC__ to make OS X build OK.
-    For FreeBSD, Add __FreeBSD__ to make it build OK, too.
-    
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00155.html
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00217.html
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00240.html
-    Signed-off-by: Jia Liu <proljc@gmail.com>
-    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-
-diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
-index 3dca5c4..beded52 100644
---- a/sunrpc/rpc/types.h
-+++ b/sunrpc/rpc/types.h
-@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t;
- #include <sys/types.h>
- #endif
- 
-+#if defined __APPLE_CC__ || defined __FreeBSD__
-+# define __u_char_defined
-+# define __daddr_t_defined
-+#endif
-+
- #ifndef __u_char_defined
- typedef __u_char u_char;
- typedef __u_short u_short;
diff --git a/packages/glibc/2.16.0/430-alpha-creat.patch b/packages/glibc/2.16.0/430-alpha-creat.patch
deleted file mode 100644
index da6dddad..00000000
--- a/packages/glibc/2.16.0/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/packages/glibc/2.16.0/640-alpha-atfcts.patch b/packages/glibc/2.16.0/640-alpha-atfcts.patch
deleted file mode 100644
index 7a8a94a5..00000000
--- a/packages/glibc/2.16.0/640-alpha-atfcts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
-@@ -437,7 +437,8 @@
-    the code.  On PPC they were introduced in 2.6.17-rc1,
-    on SH in 2.6.19-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020611 \
--    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613)
-+    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613) \
-+    && (!defined __alpha__)
- # define __ASSUME_ATFCTS	1
- #endif
- 
diff --git a/packages/glibc/2.16.0/650-syslog.patch b/packages/glibc/2.16.0/650-syslog.patch
deleted file mode 100644
index c20cafc8..00000000
--- a/packages/glibc/2.16.0/650-syslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
-@@ -152,7 +152,7 @@
- #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
- 	/* Check for invalid bits. */
- 	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
--		syslog(INTERNALLOG,
-+		__syslog(INTERNALLOG,
- 		    "syslog: unknown facility/priority: %x", pri);
- 		pri &= LOG_PRIMASK|LOG_FACMASK;
- 	}
diff --git a/packages/glibc/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a70528..00000000
--- a/packages/glibc/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/packages/glibc/2.16.0/920-fix-rpc_parse-format.patch b/packages/glibc/2.16.0/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.16.0/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.16.0/940-nis-bogus-conditional.patch b/packages/glibc/2.16.0/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.16.0/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.16.0/998-obstack-common.patch b/packages/glibc/2.16.0/998-obstack-common.patch
deleted file mode 100644
index 4b95f062..00000000
--- a/packages/glibc/2.16.0/998-obstack-common.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 39b1f6172a2f9ddc74a8f82d6e84dd13b22dbaf2
-Author: Peter Collingbourne <pcc@google.com>
-Date:   Wed May 15 20:28:08 2013 +0200
-
-    Move _obstack_compat out of common
-    
-    it is impossible to create an alias of a common symbol (as
-    compat_symbol does), because common symbols do not have a section or
-    an offset until linked.  GNU as tolerates aliases of common symbols by
-    simply creating another common symbol, but other assemblers (notably
-    LLVM's integrated assembler) are less tolerant.
-    
-    2013-05-15  Peter Collingbourne  <pcc@google.com>
-    
-            * malloc/obstack.c (_obstack_compat): Add initializer.
-    -
-
-diff --git a/malloc/obstack.c b/malloc/obstack.c
-index 25a90514f7..c3c7db4a96 100644
---- a/malloc/obstack.c
-+++ b/malloc/obstack.c
-@@ -115,7 +115,7 @@ int obstack_exit_failure = EXIT_FAILURE;
- /* A looong time ago (before 1994, anyway; we're not sure) this global variable
-    was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
-    library still exports it because somebody might use it.  */
--struct obstack *_obstack_compat;
-+struct obstack *_obstack_compat = 0;
- compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
- #  endif
- # endif
diff --git a/packages/glibc/2.17/100-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc/2.17/0000-Fix-ARM-build-with-GCC-trunk.patch
similarity index 79%
rename from packages/glibc/2.17/100-Fix-ARM-build-with-GCC-trunk.patch
rename to packages/glibc/2.17/0000-Fix-ARM-build-with-GCC-trunk.patch
index 59f95aad..7be14543 100644
--- a/packages/glibc/2.17/100-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc/2.17/0000-Fix-ARM-build-with-GCC-trunk.patch
@@ -17,12 +17,10 @@ Tested that this fixes the build for ARM.
 	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
 	Likewise.
 ---
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
+ ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c |    3 ++-
+ ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c       |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-index 6ccd9b4..660d148 100644
 --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -22,7 +22,8 @@
@@ -35,8 +33,6 @@ index 6ccd9b4..660d148 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
 --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -20,7 +20,8 @@
@@ -49,6 +45,3 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  
--- 
-1.9.4
-
diff --git a/packages/glibc/2.17/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.17/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
new file mode 100644
index 00000000..31e9499b
--- /dev/null
+++ b/packages/glibc/2.17/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -0,0 +1,75 @@
+From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
+From: Yvan Roux <yvan.roux@linaro.org>
+Date: Fri, 15 Apr 2016 13:29:26 +0200
+Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
+ -Wparentheses
+
+---
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+--- a/nis/nis_call.c
++++ b/nis/nis_call.c
+@@ -681,16 +681,18 @@
+   /* Choose which entry should be evicted from the cache.  */
+   loc = &nis_server_cache[0];
+   if (*loc != NULL)
+-    for (i = 1; i < 16; ++i)
+-      if (nis_server_cache[i] == NULL)
+-	{
++    {
++      for (i = 1; i < 16; ++i)
++	if (nis_server_cache[i] == NULL)
++	  {
++	    loc = &nis_server_cache[i];
++	    break;
++	  }
++	else if ((*loc)->uses > nis_server_cache[i]->uses
++		 || ((*loc)->uses == nis_server_cache[i]->uses
++		     && (*loc)->expires > nis_server_cache[i]->expires))
+ 	  loc = &nis_server_cache[i];
+-	  break;
+-	}
+-      else if ((*loc)->uses > nis_server_cache[i]->uses
+-	       || ((*loc)->uses == nis_server_cache[i]->uses
+-		   && (*loc)->expires > nis_server_cache[i]->expires))
+-	loc = &nis_server_cache[i];
++    }
+   old = *loc;
+   *loc = new;
+ 
+--- a/stdlib/setenv.c
++++ b/stdlib/setenv.c
+@@ -327,18 +327,20 @@
+   ep = __environ;
+   if (ep != NULL)
+     while (*ep != NULL)
+-      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+-	{
+-	  /* Found it.  Remove this pointer by moving later ones back.  */
+-	  char **dp = ep;
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
+-	  do
+-	    dp[0] = dp[1];
+-	  while (*dp++);
+-	  /* Continue the loop in case NAME appears again.  */
+-	}
+-      else
+-	++ep;
++	    do
++		dp[0] = dp[1];
++	    while (*dp++);
++	    /* Continue the loop in case NAME appears again.  */
++	  }
++	else
++	  ++ep;
++      }
+ 
+   UNLOCK;
+ 
diff --git a/packages/glibc/2.17/0002-fix-signed-shift-overlow.patch b/packages/glibc/2.17/0002-fix-signed-shift-overlow.patch
new file mode 100644
index 00000000..3b2ef40d
--- /dev/null
+++ b/packages/glibc/2.17/0002-fix-signed-shift-overlow.patch
@@ -0,0 +1,97 @@
+commit 5542236837c5c41435f8282ec92799f480c36f18
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date:   Tue Jul 21 22:50:29 2015 -0700
+
+    Port the 0x7efe...feff pattern to GCC 6.
+    
+    See Steve Ellcey's bug report in:
+    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
+    * string/memrchr.c (MEMRCHR):
+    * string/rawmemchr.c (RAWMEMCHR):
+    * string/strchr.c (strchr):
+    * string/strchrnul.c (STRCHRNUL):
+    Rewrite code to avoid issues with signed shift overflow.
+
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
+--- a/string/memrchr.c
++++ b/string/memrchr.c
+@@ -96,15 +96,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/rawmemchr.c
++++ b/string/rawmemchr.c
+@@ -83,15 +83,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchr.c
++++ b/string/strchr.c
+@@ -64,13 +64,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchrnul.c
++++ b/string/strchrnul.c
+@@ -62,13 +62,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
diff --git a/packages/glibc-linaro/2.20-2014.11/103-dl-openat64-variadic.patch b/packages/glibc/2.17/0003-dl-openat64-variadic.patch
similarity index 98%
rename from packages/glibc-linaro/2.20-2014.11/103-dl-openat64-variadic.patch
rename to packages/glibc/2.17/0003-dl-openat64-variadic.patch
index fe94b96d..552db126 100644
--- a/packages/glibc-linaro/2.20-2014.11/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.17/0003-dl-openat64-variadic.patch
@@ -177,8 +177,10 @@ Date:   Tue Oct 20 11:54:09 2015 +0000
             * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
             * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
 
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
 --- a/sysdeps/unix/sysv/linux/dl-openat64.c
 +++ b/sysdeps/unix/sysv/linux/dl-openat64.c
 @@ -23,10 +23,7 @@
diff --git a/packages/glibc/2.17/104-unused-variables.patch b/packages/glibc/2.17/0004-unused-variables.patch
similarity index 80%
rename from packages/glibc/2.17/104-unused-variables.patch
rename to packages/glibc/2.17/0004-unused-variables.patch
index 80e0ff2e..bebd96a2 100644
--- a/packages/glibc/2.17/104-unused-variables.patch
+++ b/packages/glibc/2.17/0004-unused-variables.patch
@@ -19,8 +19,18 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    2 --
+ sysdeps/ieee754/flt-32/s_cosf.c        |    2 --
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ 9 files changed, 1 insertion(+), 18 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,11 +44,9 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
-@@ -65,10 +65,8 @@
+@@ -68,10 +68,8 @@
  /**/ hpi1           = {{0x3c91a626, 0x33145c07} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0xbff921fb, 0x54442d18} }, /* -pi/2         */
  /**/ qpi            = {{0x3fe921fb, 0x54442d18} }, /*  pi/4         */
@@ -49,7 +57,7 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0xc002d97c, 0x7f3321d2} }, /* -3pi/4        */
  /**/ u1             = {{0x3c314c2a, 0x00000000} }, /*  9.377e-19    */
  /**/ u2             = {{0x3bf955e4, 0x00000000} }, /*  8.584e-20    */
-@@ -129,10 +127,8 @@
+@@ -138,10 +136,8 @@
  /**/ hpi1           = {{0x33145c07, 0x3c91a626} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0x54442d18, 0xbff921fb} }, /* -pi/2         */
  /**/ qpi            = {{0x54442d18, 0x3fe921fb} }, /*  pi/4         */
@@ -60,8 +68,6 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
 @@ -29,7 +29,7 @@
@@ -73,11 +79,9 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
-@@ -34,7 +34,6 @@
+@@ -35,7 +35,6 @@
  /**/ INF            = {{0x7ff00000, 0x00000000}}, /* INF           */
  /**/ nINF           = {{0xfff00000, 0x00000000}}, /* -INF          */
  /**/ NaNQ           = {{0x7ff80000, 0x00000000}}, /* NaNQ          */
@@ -85,7 +89,7 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0x3fe62e42, 0xfefa3800}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x3d2ef357, 0x93c76730}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0x4297ffff, 0xfffffd2c}}, /* 1.5*2**42 -724*2**-10  */
-@@ -48,7 +47,6 @@
+@@ -50,7 +49,6 @@
  /**/ INF            = {{0x00000000, 0x7ff00000}}, /* INF           */
  /**/ nINF           = {{0x00000000, 0xfff00000}}, /* -INF           */
  /**/ NaNQ           = {{0x00000000, 0x7ff80000}}, /* NaNQ          */
@@ -93,11 +97,9 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,8 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
+@@ -22,8 +22,6 @@
  log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
@@ -106,11 +108,9 @@ index 96f0e81..1daeef7 100644
  float
  __ieee754_log10f(float x)
  {
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,8 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
+@@ -21,8 +21,6 @@
  #include <math.h>
  #include <math_private.h>
  
@@ -119,11 +119,9 @@ index 864ab27..0affd40 100644
  #ifndef COSF
  # define COSF_FUNC __cosf
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -74,7 +74,6 @@
  static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  static const long double one = 1.0L;
@@ -131,11 +129,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = 1.0e4000L;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -138,7 +138,6 @@
  
  static const long double
  tiny = 1e-4931L,
@@ -143,11 +139,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
diff --git a/packages/glibc/2.17/0005-misleading-indentation.patch b/packages/glibc/2.17/0005-misleading-indentation.patch
new file mode 100644
index 00000000..8e08259e
--- /dev/null
+++ b/packages/glibc/2.17/0005-misleading-indentation.patch
@@ -0,0 +1,26 @@
+commit 976ef870542580cf5fed896c2c652b3e1a95f9da
+Author: Steve Ellcey <sellcey@mips.com>
+Date:   Fri Dec 11 09:19:37 2015 -0800
+
+    Fix indentation.
+    
+            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
+            Fix indentation.
+
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
++++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
+@@ -65,7 +65,9 @@
+ 
+     /* compute q[0],q[1],...q[jk] */
+ 	for (i=0;i<=jk;i++) {
+-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
++	    for(j=0,fw=0.0;j<=jx;j++)
++		fw += x[j]*f[jx+i-j];
++	    q[i] = fw;
+ 	}
+ 
+ 	jz = jk;
diff --git a/packages/glibc/2.17/106-dl-open-array-bounds.patch b/packages/glibc/2.17/0006-dl-open-array-bounds.patch
similarity index 88%
rename from packages/glibc/2.17/106-dl-open-array-bounds.patch
rename to packages/glibc/2.17/0006-dl-open-array-bounds.patch
index a8efe9aa..d4ce7e8a 100644
--- a/packages/glibc/2.17/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.17/0006-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -627,8 +627,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc/2.18/120-support-make4.patch b/packages/glibc/2.17/0007-support-make4.patch
similarity index 81%
rename from packages/glibc/2.18/120-support-make4.patch
rename to packages/glibc/2.17/0007-support-make4.patch
index ca2bae02..81b6c47f 100644
--- a/packages/glibc/2.18/120-support-make4.patch
+++ b/packages/glibc/2.17/0007-support-make4.patch
@@ -10,11 +10,14 @@ X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=28d708c4
 Accept make versions 4.0 and greater
 ---
 
-diff --git a/configure b/configure
-index f382138..5e61abd 100755
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/configure
 +++ b/configure
-@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
+@@ -4972,7 +4972,7 @@
    ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -23,11 +26,9 @@ index f382138..5e61abd 100755
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-diff --git a/configure.in b/configure.in
-index 49b70fd..6da8efd 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+@@ -935,7 +935,7 @@
    critic_missing="$critic_missing gcc")
  AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
    [GNU Make[^0-9]*\([0-9][0-9.]*\)],
diff --git a/packages/glibc/2.17/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.17/0008-Fix-combreloc-test-BSD-grep.patch
similarity index 77%
rename from packages/glibc/2.17/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.17/0008-Fix-combreloc-test-BSD-grep.patch
index 3c34e01d..20f0ea34 100644
--- a/packages/glibc/2.17/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.17/0008-Fix-combreloc-test-BSD-grep.patch
@@ -13,16 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
 --- a/configure
 +++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+@@ -6507,7 +6507,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
  then
@@ -31,11 +28,9 @@ index eecd0ac..0118bd1 100755
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
+@@ -1542,7 +1542,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
@@ -44,6 +39,3 @@ index 4a77411..19f6d87 100644
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc/2.17/0009-macos-cross-rpcgen.patch b/packages/glibc/2.17/0009-macos-cross-rpcgen.patch
new file mode 100644
index 00000000..b439b0f6
--- /dev/null
+++ b/packages/glibc/2.17/0009-macos-cross-rpcgen.patch
@@ -0,0 +1,34 @@
+commit ae7080d30c68cfa0c81ce3422dca948f64a94f50
+Author: Jia Liu <proljc@gmail.com>
+Date:   Sat Sep 7 00:01:08 2013 +0800
+
+    sunrpc/rpc/types.h: fix OS X and FreeBSD build problems
+    
+    When I build arm-linux-gcc on OS X, I find glibc will get a build error
+    in sunrpc/rpc/types.h, so I add __APPLE_CC__ to make OS X build OK.
+    For FreeBSD, Add __FreeBSD__ to make it build OK, too.
+    
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00155.html
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00217.html
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00240.html
+    Signed-off-by: Jia Liu <proljc@gmail.com>
+    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+---
+ sunrpc/rpc/types.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sunrpc/rpc/types.h
++++ b/sunrpc/rpc/types.h
+@@ -69,6 +69,11 @@
+ #include <sys/types.h>
+ #endif
+ 
++#if defined __APPLE_CC__ || defined __FreeBSD__
++# define __u_char_defined
++# define __daddr_t_defined
++#endif
++
+ #ifndef __u_char_defined
+ typedef __u_char u_char;
+ typedef __u_short u_short;
diff --git a/packages/glibc/2.17/0010-fix-rpc_parse-format.patch b/packages/glibc/2.17/0010-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.17/0010-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.17/0011-nis-bogus-conditional.patch b/packages/glibc/2.17/0011-nis-bogus-conditional.patch
new file mode 100644
index 00000000..b8b806c6
--- /dev/null
+++ b/packages/glibc/2.17/0011-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -292,7 +292,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.17/0012-obstack-common.patch b/packages/glibc/2.17/0012-obstack-common.patch
new file mode 100644
index 00000000..ad1f8ebe
--- /dev/null
+++ b/packages/glibc/2.17/0012-obstack-common.patch
@@ -0,0 +1,32 @@
+commit 39b1f6172a2f9ddc74a8f82d6e84dd13b22dbaf2
+Author: Peter Collingbourne <pcc@google.com>
+Date:   Wed May 15 20:28:08 2013 +0200
+
+    Move _obstack_compat out of common
+    
+    it is impossible to create an alias of a common symbol (as
+    compat_symbol does), because common symbols do not have a section or
+    an offset until linked.  GNU as tolerates aliases of common symbols by
+    simply creating another common symbol, but other assemblers (notably
+    LLVM's integrated assembler) are less tolerant.
+    
+    2013-05-15  Peter Collingbourne  <pcc@google.com>
+    
+            * malloc/obstack.c (_obstack_compat): Add initializer.
+    -
+
+---
+ malloc/obstack.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/malloc/obstack.c
++++ b/malloc/obstack.c
+@@ -116,7 +116,7 @@
+ /* A looong time ago (before 1994, anyway; we're not sure) this global variable
+    was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
+    library still exports it because somebody might use it.  */
+-struct obstack *_obstack_compat;
++struct obstack *_obstack_compat = 0;
+ compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
+ #  endif
+ # endif
diff --git a/packages/glibc/2.17/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.17/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
deleted file mode 100644
index 6fd663a2..00000000
--- a/packages/glibc/2.17/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
- -Wparentheses
-
----
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-2.7.4
-
diff --git a/packages/glibc/2.17/102-fix-signed-shift-overlow.patch b/packages/glibc/2.17/102-fix-signed-shift-overlow.patch
deleted file mode 100644
index ef49f831..00000000
--- a/packages/glibc/2.17/102-fix-signed-shift-overlow.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-commit 5542236837c5c41435f8282ec92799f480c36f18
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Tue Jul 21 22:50:29 2015 -0700
-
-    Port the 0x7efe...feff pattern to GCC 6.
-    
-    See Steve Ellcey's bug report in:
-    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
-    * string/memrchr.c (MEMRCHR):
-    * string/rawmemchr.c (RAWMEMCHR):
-    * string/strchr.c (strchr):
-    * string/strchrnul.c (STRCHRNUL):
-    Rewrite code to avoid issues with signed shift overflow.
-
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
---- a/string/memrchr.c
-+++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
---- a/string/rawmemchr.c
-+++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
---- a/string/strchr.c
-+++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
---- a/string/strchrnul.c
-+++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
diff --git a/packages/glibc/2.17/103-dl-openat64-variadic.patch b/packages/glibc/2.17/103-dl-openat64-variadic.patch
deleted file mode 100644
index fe94b96d..00000000
--- a/packages/glibc/2.17/103-dl-openat64-variadic.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Oct 20 11:54:09 2015 +0000
-
-    Convert 113 more function definitions to prototype style (files with assertions).
-    
-    This mostly automatically-generated patch converts 113 function
-    definitions in glibc from old-style K&R to prototype-style.  Following
-    my other recent such patches, this one deals with the case of function
-    definitions in files that either contain assertions or where grep
-    suggested they might contain assertions - and thus where it isn't
-    possible to use a simple object code comparison as a sanity check on
-    the correctness of the patch, because line numbers are changed.
-    
-    A few such automatically-generated changes needed to be supplemented
-    by manual changes for the result to compile.  openat64 had a prototype
-    declaration with "..." but an old-style definition in
-    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
-    generated prototype in the definition (I've filed
-    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
-    such cases in GCC; the old state was undefined behavior not requiring
-    a diagnostic, but one seems a good idea).  In addition, as Florian has
-    noted regparm attribute mismatches between declaration and definition
-    are only diagnosed for prototype definitions, and five functions
-    needed internal_function added to their definitions (in the case of
-    __pthread_mutex_cond_lock, via the macro definition of
-    __pthread_mutex_lock) to compile on i386.
-    
-    After this patch is in, remaining old-style definitions are probably
-    most readily fixed manually before we can turn on
-    -Wold-style-definition for all builds.
-    
-    Tested for x86_64 and x86 (testsuite).
-    
-            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
-            function definition.
-            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
-            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
-            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
-            * elf/dl-minimal.c (_itoa): Likewise.
-            * hurd/hurdmalloc.c (malloc): Likewise.
-            (free): Likewise.
-            (realloc): Likewise.
-            * inet/inet6_option.c (inet6_option_space): Likewise.
-            (inet6_option_init): Likewise.
-            (inet6_option_append): Likewise.
-            (inet6_option_alloc): Likewise.
-            (inet6_option_next): Likewise.
-            (inet6_option_find): Likewise.
-            * io/ftw.c (FTW_NAME): Likewise.
-            (NFTW_NAME): Likewise.
-            (NFTW_NEW_NAME): Likewise.
-            (NFTW_OLD_NAME): Likewise.
-            * libio/iofwide.c (_IO_fwide): Likewise.
-            * libio/strops.c (_IO_str_init_static_internal): Likewise.
-            (_IO_str_init_static): Likewise.
-            (_IO_str_init_readonly): Likewise.
-            (_IO_str_overflow): Likewise.
-            (_IO_str_underflow): Likewise.
-            (_IO_str_count): Likewise.
-            (_IO_str_seekoff): Likewise.
-            (_IO_str_pbackfail): Likewise.
-            (_IO_str_finish): Likewise.
-            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
-            (_IO_wstr_overflow): Likewise.
-            (_IO_wstr_underflow): Likewise.
-            (_IO_wstr_count): Likewise.
-            (_IO_wstr_seekoff): Likewise.
-            (_IO_wstr_pbackfail): Likewise.
-            (_IO_wstr_finish): Likewise.
-            * locale/programs/localedef.c (normalize_codeset): Likewise.
-            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
-            (add_locales_to_archive): Likewise.
-            (delete_locales_from_archive): Likewise.
-            * malloc/malloc.c (__libc_mallinfo): Likewise.
-            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
-            * misc/tsearch.c (__tfind): Likewise.
-            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
-            * nptl/pthread_attr_getdetachstate.c
-            (__pthread_attr_getdetachstate): Likewise.
-            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
-            Likewise.
-            * nptl/pthread_attr_getinheritsched.c
-            (__pthread_attr_getinheritsched): Likewise.
-            * nptl/pthread_attr_getschedparam.c
-            (__pthread_attr_getschedparam): Likewise.
-            * nptl/pthread_attr_getschedpolicy.c
-            (__pthread_attr_getschedpolicy): Likewise.
-            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
-            Likewise.
-            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
-            Likewise.
-            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
-            Likewise.
-            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
-            Likewise.
-            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
-            (__pthread_attr_init_2_0): Likewise.
-            * nptl/pthread_attr_setdetachstate.c
-            (__pthread_attr_setdetachstate): Likewise.
-            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
-            Likewise.
-            * nptl/pthread_attr_setinheritsched.c
-            (__pthread_attr_setinheritsched): Likewise.
-            * nptl/pthread_attr_setschedparam.c
-            (__pthread_attr_setschedparam): Likewise.
-            * nptl/pthread_attr_setschedpolicy.c
-            (__pthread_attr_setschedpolicy): Likewise.
-            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
-            Likewise.
-            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
-            Likewise.
-            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
-            Likewise.
-            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
-            Likewise.
-            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
-            Likewise.
-            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
-            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
-            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
-            use internal_function.
-            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
-            prototype-style function definition.
-            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
-            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
-            internal_function.
-            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
-            Convert to prototype-style function definition.
-            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
-            Likewise.
-            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
-            Likewise.
-            (__pthread_mutex_unlock): Likewise.
-            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
-            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
-            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
-            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
-            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
-            * nss/makedb.c (process_input): Likewise.
-            * posix/fnmatch.c (__strchrnul): Likewise.
-            (__wcschrnul): Likewise.
-            (fnmatch): Likewise.
-            * posix/fnmatch_loop.c (FCT): Likewise.
-            * posix/glob.c (globfree): Likewise.
-            (__glob_pattern_type): Likewise.
-            (__glob_pattern_p): Likewise.
-            * posix/regcomp.c (re_compile_pattern): Likewise.
-            (re_set_syntax): Likewise.
-            (re_compile_fastmap): Likewise.
-            (regcomp): Likewise.
-            (regerror): Likewise.
-            (regfree): Likewise.
-            * posix/regexec.c (regexec): Likewise.
-            (re_match): Likewise.
-            (re_search): Likewise.
-            (re_match_2): Likewise.
-            (re_search_2): Likewise.
-            (re_search_stub): Likewise.  Use internal_function
-            (re_copy_regs): Likewise.
-            (re_set_registers): Convert to prototype-style function
-            definition.
-            (prune_impossible_nodes): Likewise.  Use internal_function.
-            * resolv/inet_net_pton.c (inet_net_pton): Convert to
-            prototype-style function definition.
-            (inet_net_pton_ipv4): Likewise.
-            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
-            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
-            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
-            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
-            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
-            Make variadic.
-            * time/strptime_l.c (localtime_r): Convert to prototype-style
-            function definition.
-            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
-            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
-            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
-            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
-
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
---- a/sysdeps/unix/sysv/linux/dl-openat64.c
-+++ b/sysdeps/unix/sysv/linux/dl-openat64.c
-@@ -23,10 +23,7 @@
- 
- 
- int
--openat64 (dfd, file, oflag)
--     int dfd;
--     const char *file;
--     int oflag;
-+openat64 (int dfd, const char *file, int oflag, ...)
- {
-   assert ((oflag & O_CREAT) == 0);
- 
diff --git a/packages/glibc/2.17/105-misleading-indentation.patch b/packages/glibc/2.17/105-misleading-indentation.patch
deleted file mode 100644
index 1dd8d851..00000000
--- a/packages/glibc/2.17/105-misleading-indentation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 976ef870542580cf5fed896c2c652b3e1a95f9da
-Author: Steve Ellcey <sellcey@mips.com>
-Date:   Fri Dec 11 09:19:37 2015 -0800
-
-    Fix indentation.
-    
-            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
-            Fix indentation.
-
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
---- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-+++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
- 
-     /* compute q[0],q[1],...q[jk] */
- 	for (i=0;i<=jk;i++) {
--	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-+	    for(j=0,fw=0.0;j<=jx;j++)
-+		fw += x[j]*f[jx+i-j];
-+	    q[i] = fw;
- 	}
- 
- 	jz = jk;
diff --git a/packages/glibc/2.17/300-macos-cross-rpcgen.patch b/packages/glibc/2.17/300-macos-cross-rpcgen.patch
deleted file mode 100644
index e654644c..00000000
--- a/packages/glibc/2.17/300-macos-cross-rpcgen.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit ae7080d30c68cfa0c81ce3422dca948f64a94f50
-Author: Jia Liu <proljc@gmail.com>
-Date:   Sat Sep 7 00:01:08 2013 +0800
-
-    sunrpc/rpc/types.h: fix OS X and FreeBSD build problems
-    
-    When I build arm-linux-gcc on OS X, I find glibc will get a build error
-    in sunrpc/rpc/types.h, so I add __APPLE_CC__ to make OS X build OK.
-    For FreeBSD, Add __FreeBSD__ to make it build OK, too.
-    
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00155.html
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00217.html
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00240.html
-    Signed-off-by: Jia Liu <proljc@gmail.com>
-    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-
-diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
-index 3dca5c4..beded52 100644
---- a/sunrpc/rpc/types.h
-+++ b/sunrpc/rpc/types.h
-@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t;
- #include <sys/types.h>
- #endif
- 
-+#if defined __APPLE_CC__ || defined __FreeBSD__
-+# define __u_char_defined
-+# define __daddr_t_defined
-+#endif
-+
- #ifndef __u_char_defined
- typedef __u_char u_char;
- typedef __u_short u_short;
diff --git a/packages/glibc/2.17/920-fix-rpc_parse-format.patch b/packages/glibc/2.17/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.17/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.17/940-nis-bogus-conditional.patch b/packages/glibc/2.17/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.17/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.17/998-obstack-common.patch b/packages/glibc/2.17/998-obstack-common.patch
deleted file mode 100644
index 4b95f062..00000000
--- a/packages/glibc/2.17/998-obstack-common.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 39b1f6172a2f9ddc74a8f82d6e84dd13b22dbaf2
-Author: Peter Collingbourne <pcc@google.com>
-Date:   Wed May 15 20:28:08 2013 +0200
-
-    Move _obstack_compat out of common
-    
-    it is impossible to create an alias of a common symbol (as
-    compat_symbol does), because common symbols do not have a section or
-    an offset until linked.  GNU as tolerates aliases of common symbols by
-    simply creating another common symbol, but other assemblers (notably
-    LLVM's integrated assembler) are less tolerant.
-    
-    2013-05-15  Peter Collingbourne  <pcc@google.com>
-    
-            * malloc/obstack.c (_obstack_compat): Add initializer.
-    -
-
-diff --git a/malloc/obstack.c b/malloc/obstack.c
-index 25a90514f7..c3c7db4a96 100644
---- a/malloc/obstack.c
-+++ b/malloc/obstack.c
-@@ -115,7 +115,7 @@ int obstack_exit_failure = EXIT_FAILURE;
- /* A looong time ago (before 1994, anyway; we're not sure) this global variable
-    was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
-    library still exports it because somebody might use it.  */
--struct obstack *_obstack_compat;
-+struct obstack *_obstack_compat = 0;
- compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
- #  endif
- # endif
diff --git a/packages/glibc/2.18/100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch b/packages/glibc/2.18/0000-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch
similarity index 80%
rename from packages/glibc/2.18/100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch
rename to packages/glibc/2.18/0000-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch
index 40e36324..d441b0c9 100644
--- a/packages/glibc/2.18/100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch
+++ b/packages/glibc/2.18/0000-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch
@@ -17,11 +17,15 @@ Date:   Thu Aug 29 20:10:26 2013 +0100
     
     (cherry picked from commit 6b06ac56cdfc9293908724e51e827534e97819aa)
 
-diff --git a/NEWS b/NEWS
-index b023c30..f64fb82 100644
+---
+ NEWS                                      |    6 ++++++
+ ports/ChangeLog.arm                       |    6 ++++++
+ ports/sysdeps/unix/sysv/linux/arm/clone.S |    4 ++--
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+
 --- a/NEWS
 +++ b/NEWS
-@@ -5,6 +5,12 @@ See the end for copying conditions.
+@@ -5,6 +5,12 @@
  Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
  using `glibc' in the "product" field.
  
@@ -34,8 +38,6 @@ index b023c30..f64fb82 100644
  Version 2.18
  
  * The following bugs are resolved with this release:
-diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
-index 1e7a35c..54debd7 100644
 --- a/ports/ChangeLog.arm
 +++ b/ports/ChangeLog.arm
 @@ -1,3 +1,9 @@
@@ -48,11 +50,9 @@ index 1e7a35c..54debd7 100644
  2013-07-03  Joseph Myers  <joseph@codesourcery.com>
  
  	* sysdeps/arm/include/bits/setjmp.h [_ISOMAC] (JMP_BUF_REGLIST):
-diff --git a/ports/sysdeps/unix/sysv/linux/arm/clone.S b/ports/sysdeps/unix/sysv/linux/arm/clone.S
-index ce9c2a5..6e74fa7 100644
 --- a/ports/sysdeps/unix/sysv/linux/arm/clone.S
 +++ b/ports/sysdeps/unix/sysv/linux/arm/clone.S
-@@ -93,8 +93,8 @@ PSEUDO_END (__clone)
+@@ -93,8 +93,8 @@
  	mov	lr, pc
  	bx      ip
  #else
diff --git a/packages/glibc/2.18/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.18/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
new file mode 100644
index 00000000..5d724b26
--- /dev/null
+++ b/packages/glibc/2.18/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -0,0 +1,75 @@
+From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
+From: Yvan Roux <yvan.roux@linaro.org>
+Date: Fri, 15 Apr 2016 13:29:26 +0200
+Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
+ -Wparentheses
+
+---
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+--- a/nis/nis_call.c
++++ b/nis/nis_call.c
+@@ -680,16 +680,18 @@
+   /* Choose which entry should be evicted from the cache.  */
+   loc = &nis_server_cache[0];
+   if (*loc != NULL)
+-    for (i = 1; i < 16; ++i)
+-      if (nis_server_cache[i] == NULL)
+-	{
++    {
++      for (i = 1; i < 16; ++i)
++	if (nis_server_cache[i] == NULL)
++	  {
++	    loc = &nis_server_cache[i];
++	    break;
++	  }
++	else if ((*loc)->uses > nis_server_cache[i]->uses
++		 || ((*loc)->uses == nis_server_cache[i]->uses
++		     && (*loc)->expires > nis_server_cache[i]->expires))
+ 	  loc = &nis_server_cache[i];
+-	  break;
+-	}
+-      else if ((*loc)->uses > nis_server_cache[i]->uses
+-	       || ((*loc)->uses == nis_server_cache[i]->uses
+-		   && (*loc)->expires > nis_server_cache[i]->expires))
+-	loc = &nis_server_cache[i];
++    }
+   old = *loc;
+   *loc = new;
+ 
+--- a/stdlib/setenv.c
++++ b/stdlib/setenv.c
+@@ -327,18 +327,20 @@
+   ep = __environ;
+   if (ep != NULL)
+     while (*ep != NULL)
+-      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+-	{
+-	  /* Found it.  Remove this pointer by moving later ones back.  */
+-	  char **dp = ep;
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
+-	  do
+-	    dp[0] = dp[1];
+-	  while (*dp++);
+-	  /* Continue the loop in case NAME appears again.  */
+-	}
+-      else
+-	++ep;
++	    do
++		dp[0] = dp[1];
++	    while (*dp++);
++	    /* Continue the loop in case NAME appears again.  */
++	  }
++	else
++	  ++ep;
++      }
+ 
+   UNLOCK;
+ 
diff --git a/packages/glibc/2.18/0002-fix-signed-shift-overlow.patch b/packages/glibc/2.18/0002-fix-signed-shift-overlow.patch
new file mode 100644
index 00000000..cf36780c
--- /dev/null
+++ b/packages/glibc/2.18/0002-fix-signed-shift-overlow.patch
@@ -0,0 +1,97 @@
+commit 5542236837c5c41435f8282ec92799f480c36f18
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date:   Tue Jul 21 22:50:29 2015 -0700
+
+    Port the 0x7efe...feff pattern to GCC 6.
+    
+    See Steve Ellcey's bug report in:
+    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
+    * string/memrchr.c (MEMRCHR):
+    * string/rawmemchr.c (RAWMEMCHR):
+    * string/strchr.c (strchr):
+    * string/strchrnul.c (STRCHRNUL):
+    Rewrite code to avoid issues with signed shift overflow.
+
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
+--- a/string/memrchr.c
++++ b/string/memrchr.c
+@@ -96,15 +96,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/rawmemchr.c
++++ b/string/rawmemchr.c
+@@ -83,15 +83,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchr.c
++++ b/string/strchr.c
+@@ -63,13 +63,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchrnul.c
++++ b/string/strchrnul.c
+@@ -62,13 +62,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
diff --git a/packages/glibc/2.14.1/103-dl-openat64-variadic.patch b/packages/glibc/2.18/0003-dl-openat64-variadic.patch
similarity index 98%
rename from packages/glibc/2.14.1/103-dl-openat64-variadic.patch
rename to packages/glibc/2.18/0003-dl-openat64-variadic.patch
index fe94b96d..552db126 100644
--- a/packages/glibc/2.14.1/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.18/0003-dl-openat64-variadic.patch
@@ -177,8 +177,10 @@ Date:   Tue Oct 20 11:54:09 2015 +0000
             * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
             * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
 
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
 --- a/sysdeps/unix/sysv/linux/dl-openat64.c
 +++ b/sysdeps/unix/sysv/linux/dl-openat64.c
 @@ -23,10 +23,7 @@
diff --git a/packages/glibc/2.18/0004-unused-variables.patch b/packages/glibc/2.18/0004-unused-variables.patch
new file mode 100644
index 00000000..0f17740c
--- /dev/null
+++ b/packages/glibc/2.18/0004-unused-variables.patch
@@ -0,0 +1,151 @@
+commit 6565fcb6e189d67b5a3f321453daebb805056d73
+Author: Wilco Dijkstra <wdijkstr@arm.com>
+Date:   Fri Sep 18 20:27:20 2015 +0100
+
+    Fix several build failures with GCC6 due to unused static variables.
+    
+    2015-09-18  Wilco Dijkstra  <wdijkstr@arm.com>
+    
+            * resolv/base64.c (rcsid): Remove unused static.
+            * sysdeps/ieee754/dbl-64/atnat2.h (qpi1): Remove unused
+            static.  (tqpi1): Likewise.
+            * sysdeps/ieee754/dbl-64/uexp.h (one): Likewise.
+            * sysdeps/ieee754/dbl-64/upow.h (sqrt_2): Likewise.
+            * sysdeps/ieee754/flt-32/e_log10f.c (one): Likewise.
+            * sysdeps/ieee754/flt-32/s_cosf.c (one): Likewise.
+            * sysdeps/ieee754/ldbl-128/e_lgammal_r.c (zero): Likewise.
+            * sysdeps/ieee754/ldbl-128/s_erfl.c (half): Likewise.
+            * sysdeps/ieee754/ldbl-128/s_log1pl.c (maxlog): Likewise.
+            * timezone/private.h (time_t_min): Likewise.  (time_t_max):
+            Likewise.
+
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    2 --
+ sysdeps/ieee754/flt-32/s_cosf.c        |    2 --
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ 9 files changed, 1 insertion(+), 18 deletions(-)
+
+--- a/resolv/base64.c
++++ b/resolv/base64.c
+@@ -40,10 +40,6 @@
+  * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+  */
+ 
+-#if !defined(LINT) && !defined(CODECENTER)
+-static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $";
+-#endif /* not lint */
+-
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+--- a/sysdeps/ieee754/dbl-64/atnat2.h
++++ b/sysdeps/ieee754/dbl-64/atnat2.h
+@@ -65,10 +65,8 @@
+ /**/ hpi1           = {{0x3c91a626, 0x33145c07} }, /*  pi/2-hpi     */
+ /**/ mhpi           = {{0xbff921fb, 0x54442d18} }, /* -pi/2         */
+ /**/ qpi            = {{0x3fe921fb, 0x54442d18} }, /*  pi/4         */
+-/**/ qpi1           = {{0x3c81a626, 0x33145c07} }, /*  pi/4-qpi     */
+ /**/ mqpi           = {{0xbfe921fb, 0x54442d18} }, /* -pi/4         */
+ /**/ tqpi           = {{0x4002d97c, 0x7f3321d2} }, /*  3pi/4        */
+-/**/ tqpi1          = {{0x3c9a7939, 0x4c9e8a0a} }, /*  3pi/4-tqpi   */
+ /**/ mtqpi          = {{0xc002d97c, 0x7f3321d2} }, /* -3pi/4        */
+ /**/ u1             = {{0x3c314c2a, 0x00000000} }, /*  9.377e-19    */
+ /**/ u2             = {{0x3bf955e4, 0x00000000} }, /*  8.584e-20    */
+@@ -129,10 +127,8 @@
+ /**/ hpi1           = {{0x33145c07, 0x3c91a626} }, /*  pi/2-hpi     */
+ /**/ mhpi           = {{0x54442d18, 0xbff921fb} }, /* -pi/2         */
+ /**/ qpi            = {{0x54442d18, 0x3fe921fb} }, /*  pi/4         */
+-/**/ qpi1           = {{0x33145c07, 0x3c81a626} }, /*  pi/4-qpi     */
+ /**/ mqpi           = {{0x54442d18, 0xbfe921fb} }, /* -pi/4         */
+ /**/ tqpi           = {{0x7f3321d2, 0x4002d97c} }, /*  3pi/4        */
+-/**/ tqpi1          = {{0x4c9e8a0a, 0x3c9a7939} }, /*  3pi/4-tqpi   */
+ /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
+ /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
+ /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
+--- a/sysdeps/ieee754/dbl-64/uexp.h
++++ b/sysdeps/ieee754/dbl-64/uexp.h
+@@ -29,7 +29,7 @@
+ 
+ #include "mydefs.h"
+ 
+-const static double one = 1.0, zero = 0.0, hhuge = 1.0e300, tiny = 1.0e-300,
++const static double zero = 0.0, hhuge = 1.0e300, tiny = 1.0e-300,
+ err_0 = 1.000014, err_1 = 0.000016;
+ const static int4 bigint = 0x40862002,
+              badint = 0x40876000,smallint = 0x3C8fffff;
+--- a/sysdeps/ieee754/dbl-64/upow.h
++++ b/sysdeps/ieee754/dbl-64/upow.h
+@@ -34,7 +34,6 @@
+ /**/ nZERO	    = {{0x80000000, 0}},	  /* -0.0          */
+ /**/ INF            = {{0x7ff00000, 0x00000000}}, /* INF           */
+ /**/ nINF           = {{0xfff00000, 0x00000000}}, /* -INF          */
+-/**/ sqrt_2         = {{0x3ff6a09e, 0x667f3bcc}}, /* sqrt(2)       */
+ /**/ ln2a           = {{0x3fe62e42, 0xfefa3800}}, /* ln(2) 43 bits */
+ /**/ ln2b           = {{0x3d2ef357, 0x93c76730}}, /* ln(2)-ln2a    */
+ /**/ bigu           = {{0x4297ffff, 0xfffffd2c}}, /* 1.5*2**42 -724*2**-10  */
+@@ -48,7 +47,6 @@
+ /**/ nZERO	    = {{0, 0x80000000}},	  /* -0.0          */
+ /**/ INF            = {{0x00000000, 0x7ff00000}}, /* INF           */
+ /**/ nINF           = {{0x00000000, 0xfff00000}}, /* -INF           */
+-/**/ sqrt_2         = {{0x667f3bcc, 0x3ff6a09e}}, /* sqrt(2)       */
+ /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
+ /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
+ /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
+--- a/sysdeps/ieee754/flt-32/e_log10f.c
++++ b/sysdeps/ieee754/flt-32/e_log10f.c
+@@ -22,8 +22,6 @@
+ log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
+ log10_2lo  =  7.9034151668e-07; /* 0x355427db */
+ 
+-static const float zero   =  0.0;
+-
+ float
+ __ieee754_log10f(float x)
+ {
+--- a/sysdeps/ieee754/flt-32/s_cosf.c
++++ b/sysdeps/ieee754/flt-32/s_cosf.c
+@@ -21,8 +21,6 @@
+ #include <math.h>
+ #include <math_private.h>
+ 
+-static const float one=1.0;
+-
+ #ifndef COSF
+ # define COSF_FUNC __cosf
+ #else
+--- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
++++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
+@@ -74,7 +74,6 @@
+ static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
+ static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
+ static const long double one = 1.0L;
+-static const long double zero = 0.0L;
+ static const long double huge = 1.0e4000L;
+ 
+ /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
+--- a/sysdeps/ieee754/ldbl-128/s_erfl.c
++++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
+@@ -138,7 +138,6 @@
+ 
+ static const long double
+ tiny = 1e-4931L,
+-  half = 0.5L,
+   one = 1.0L,
+   two = 2.0L,
+   /* 2/sqrt(pi) - 1 */
+--- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
++++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
+@@ -116,7 +116,6 @@
+ 
+ static const long double sqrth = 0.7071067811865475244008443621048490392848L;
+ /* ln (2^16384 * (1 - 2^-113)) */
+-static const long double maxlog = 1.1356523406294143949491931077970764891253E4L;
+ static const long double zero = 0.0L;
+ 
+ long double
diff --git a/packages/glibc/2.18/0005-misleading-indentation.patch b/packages/glibc/2.18/0005-misleading-indentation.patch
new file mode 100644
index 00000000..8e08259e
--- /dev/null
+++ b/packages/glibc/2.18/0005-misleading-indentation.patch
@@ -0,0 +1,26 @@
+commit 976ef870542580cf5fed896c2c652b3e1a95f9da
+Author: Steve Ellcey <sellcey@mips.com>
+Date:   Fri Dec 11 09:19:37 2015 -0800
+
+    Fix indentation.
+    
+            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
+            Fix indentation.
+
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
++++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
+@@ -65,7 +65,9 @@
+ 
+     /* compute q[0],q[1],...q[jk] */
+ 	for (i=0;i<=jk;i++) {
+-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
++	    for(j=0,fw=0.0;j<=jx;j++)
++		fw += x[j]*f[jx+i-j];
++	    q[i] = fw;
+ 	}
+ 
+ 	jz = jk;
diff --git a/packages/glibc/2.20/106-dl-open-array-bounds.patch b/packages/glibc/2.18/0006-dl-open-array-bounds.patch
similarity index 87%
rename from packages/glibc/2.20/106-dl-open-array-bounds.patch
rename to packages/glibc/2.18/0006-dl-open-array-bounds.patch
index 08a90765..83eb0b3c 100644
--- a/packages/glibc/2.20/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.18/0006-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -211,7 +211,7 @@ dl_open_worker (void *a)
+@@ -211,7 +211,7 @@
        struct link_map *l = _dl_find_dso_for_object ((ElfW(Addr)) caller_dlopen);
  
        if (l)
@@ -17,7 +19,7 @@ index 0dbe07f..2d0e082 100644
  
        if (args->nsid == __LM_ID_CALLER)
  	args->nsid = call_map->l_ns;
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -627,8 +627,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc/2.18/110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch b/packages/glibc/2.18/0007-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch
similarity index 82%
rename from packages/glibc/2.18/110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch
rename to packages/glibc/2.18/0007-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch
index 7ad9fdf7..5249bf39 100644
--- a/packages/glibc/2.18/110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch
+++ b/packages/glibc/2.18/0007-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch
@@ -10,11 +10,16 @@ Date:   Thu Oct 3 08:26:21 2013 +0530
     of PTHREAD_MUTEX_ROBUST_NORMAL_NP.  It has now been replaced by the
     already existing convenience macro USE_REQUEUE_PI.
 
-diff --git a/NEWS b/NEWS
-index f64fb82..fb6069d 100644
+---
+ NEWS                          |    2 +-
+ nptl/ChangeLog                |    9 +++++++++
+ nptl/pthread_cond_broadcast.c |    5 +----
+ nptl/pthread_cond_signal.c    |    7 +------
+ 4 files changed, 12 insertions(+), 11 deletions(-)
+
 --- a/NEWS
 +++ b/NEWS
-@@ -9,7 +9,7 @@ Version 2.18.1
+@@ -9,7 +9,7 @@
  
  * The following bugs are resolved with this release:
  
@@ -23,8 +28,6 @@ index f64fb82..fb6069d 100644
  
  Version 2.18
  
-diff --git a/nptl/ChangeLog b/nptl/ChangeLog
-index eae5079..2d78490 100644
 --- a/nptl/ChangeLog
 +++ b/nptl/ChangeLog
 @@ -1,3 +1,12 @@
@@ -40,11 +43,9 @@ index eae5079..2d78490 100644
  2013-07-23  David S. Miller  <davem@davemloft.net>
  
  	* tst-cancel4.c (WRITE_BUFFER_SIZE): Adjust comment.
-diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c
-index 0702ec0..7ba9efa 100644
 --- a/nptl/pthread_cond_broadcast.c
 +++ b/nptl/pthread_cond_broadcast.c
-@@ -63,10 +63,7 @@ __pthread_cond_broadcast (cond)
+@@ -63,10 +63,7 @@
  
  #if (defined lll_futex_cmp_requeue_pi \
       && defined __ASSUME_REQUEUE_PI)
@@ -56,11 +57,9 @@ index 0702ec0..7ba9efa 100644
  	{
  	  if (lll_futex_cmp_requeue_pi (&cond->__data.__futex, 1, INT_MAX,
  					&mut->__data.__lock, futex_val,
-diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c
-index 102d0b3..ffc35dc 100644
 --- a/nptl/pthread_cond_signal.c
 +++ b/nptl/pthread_cond_signal.c
-@@ -49,14 +49,9 @@ __pthread_cond_signal (cond)
+@@ -49,14 +49,9 @@
  
  #if (defined lll_futex_cmp_requeue_pi \
       && defined __ASSUME_REQUEUE_PI)
diff --git a/packages/glibc/2.17/120-support-make4.patch b/packages/glibc/2.18/0008-support-make4.patch
similarity index 81%
rename from packages/glibc/2.17/120-support-make4.patch
rename to packages/glibc/2.18/0008-support-make4.patch
index ca2bae02..a9be159b 100644
--- a/packages/glibc/2.17/120-support-make4.patch
+++ b/packages/glibc/2.18/0008-support-make4.patch
@@ -10,11 +10,14 @@ X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=28d708c4
 Accept make versions 4.0 and greater
 ---
 
-diff --git a/configure b/configure
-index f382138..5e61abd 100755
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/configure
 +++ b/configure
-@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
+@@ -4772,7 +4772,7 @@
    ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -23,11 +26,9 @@ index f382138..5e61abd 100755
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-diff --git a/configure.in b/configure.in
-index 49b70fd..6da8efd 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+@@ -989,7 +989,7 @@
    critic_missing="$critic_missing gcc")
  AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
    [GNU Make[^0-9]*\([0-9][0-9.]*\)],
diff --git a/packages/glibc/2.18/130-arm-unwind.patch b/packages/glibc/2.18/0009-arm-unwind.patch
similarity index 53%
rename from packages/glibc/2.18/130-arm-unwind.patch
rename to packages/glibc/2.18/0009-arm-unwind.patch
index 69cc07ad..85288d0d 100644
--- a/packages/glibc/2.18/130-arm-unwind.patch
+++ b/packages/glibc/2.18/0009-arm-unwind.patch
@@ -1,6 +1,12 @@
-diff -urN glibc-2.18.orig/nptl/sysdeps/pthread/unwind-forcedunwind.c glibc-2.18/nptl/sysdeps/pthread/unwind-forcedunwind.c
---- glibc-2.18.orig/nptl/sysdeps/pthread/unwind-forcedunwind.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/nptl/sysdeps/pthread/unwind-forcedunwind.c	2016-09-15 02:30:09.199939478 +0300
+---
+ nptl/sysdeps/pthread/unwind-forcedunwind.c                   |    2 +-
+ ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c |    2 +-
+ ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c       |    2 +-
+ sysdeps/gnu/unwind-resume.c                                  |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/nptl/sysdeps/pthread/unwind-forcedunwind.c
++++ b/nptl/sysdeps/pthread/unwind-forcedunwind.c
 @@ -24,7 +24,7 @@
  #include <gnu/lib-names.h>
  
@@ -10,9 +16,8 @@ diff -urN glibc-2.18.orig/nptl/sysdeps/pthread/unwind-forcedunwind.c glibc-2.18/
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
-diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
---- glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c	2016-09-15 02:29:07.096945862 +0300
+--- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
++++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -22,7 +22,7 @@
  #include <pthreadP.h>
  
@@ -22,9 +27,8 @@ diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedun
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
---- glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c	2016-09-15 02:29:37.352917115 +0300
+--- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
++++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -20,7 +20,7 @@
  #include <stdio.h>
  #include <unwind.h>
@@ -34,9 +38,8 @@ diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  
-diff -urN glibc-2.18.orig/sysdeps/gnu/unwind-resume.c glibc-2.18/sysdeps/gnu/unwind-resume.c
---- glibc-2.18.orig/sysdeps/gnu/unwind-resume.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/sysdeps/gnu/unwind-resume.c	2016-09-15 02:29:53.376431503 +0300
+--- a/sysdeps/gnu/unwind-resume.c
++++ b/sysdeps/gnu/unwind-resume.c
 @@ -21,7 +21,7 @@
  #include <unwind.h>
  #include <gnu/lib-names.h>
diff --git a/packages/glibc/2.18/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.18/0010-Fix-combreloc-test-BSD-grep.patch
similarity index 77%
rename from packages/glibc/2.18/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.18/0010-Fix-combreloc-test-BSD-grep.patch
index 3c34e01d..e457c3c5 100644
--- a/packages/glibc/2.18/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.18/0010-Fix-combreloc-test-BSD-grep.patch
@@ -13,16 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
 --- a/configure
 +++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+@@ -6307,7 +6307,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
  then
@@ -31,11 +28,9 @@ index eecd0ac..0118bd1 100755
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
+@@ -1596,7 +1596,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
@@ -44,6 +39,3 @@ index 4a77411..19f6d87 100644
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc/2.18/0011-macos-cross-rpcgen.patch b/packages/glibc/2.18/0011-macos-cross-rpcgen.patch
new file mode 100644
index 00000000..b439b0f6
--- /dev/null
+++ b/packages/glibc/2.18/0011-macos-cross-rpcgen.patch
@@ -0,0 +1,34 @@
+commit ae7080d30c68cfa0c81ce3422dca948f64a94f50
+Author: Jia Liu <proljc@gmail.com>
+Date:   Sat Sep 7 00:01:08 2013 +0800
+
+    sunrpc/rpc/types.h: fix OS X and FreeBSD build problems
+    
+    When I build arm-linux-gcc on OS X, I find glibc will get a build error
+    in sunrpc/rpc/types.h, so I add __APPLE_CC__ to make OS X build OK.
+    For FreeBSD, Add __FreeBSD__ to make it build OK, too.
+    
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00155.html
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00217.html
+    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00240.html
+    Signed-off-by: Jia Liu <proljc@gmail.com>
+    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+---
+ sunrpc/rpc/types.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sunrpc/rpc/types.h
++++ b/sunrpc/rpc/types.h
+@@ -69,6 +69,11 @@
+ #include <sys/types.h>
+ #endif
+ 
++#if defined __APPLE_CC__ || defined __FreeBSD__
++# define __u_char_defined
++# define __daddr_t_defined
++#endif
++
+ #ifndef __u_char_defined
+ typedef __u_char u_char;
+ typedef __u_short u_short;
diff --git a/packages/glibc/2.18/0012-fix-rpc_parse-format.patch b/packages/glibc/2.18/0012-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.18/0012-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.18/0013-nis-bogus-conditional.patch b/packages/glibc/2.18/0013-nis-bogus-conditional.patch
new file mode 100644
index 00000000..e7283681
--- /dev/null
+++ b/packages/glibc/2.18/0013-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -291,7 +291,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.18/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.18/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
deleted file mode 100644
index 6fd663a2..00000000
--- a/packages/glibc/2.18/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
- -Wparentheses
-
----
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-2.7.4
-
diff --git a/packages/glibc/2.18/102-fix-signed-shift-overlow.patch b/packages/glibc/2.18/102-fix-signed-shift-overlow.patch
deleted file mode 100644
index ef49f831..00000000
--- a/packages/glibc/2.18/102-fix-signed-shift-overlow.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-commit 5542236837c5c41435f8282ec92799f480c36f18
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Tue Jul 21 22:50:29 2015 -0700
-
-    Port the 0x7efe...feff pattern to GCC 6.
-    
-    See Steve Ellcey's bug report in:
-    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
-    * string/memrchr.c (MEMRCHR):
-    * string/rawmemchr.c (RAWMEMCHR):
-    * string/strchr.c (strchr):
-    * string/strchrnul.c (STRCHRNUL):
-    Rewrite code to avoid issues with signed shift overflow.
-
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
---- a/string/memrchr.c
-+++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
---- a/string/rawmemchr.c
-+++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
---- a/string/strchr.c
-+++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
---- a/string/strchrnul.c
-+++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
diff --git a/packages/glibc/2.18/103-dl-openat64-variadic.patch b/packages/glibc/2.18/103-dl-openat64-variadic.patch
deleted file mode 100644
index fe94b96d..00000000
--- a/packages/glibc/2.18/103-dl-openat64-variadic.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Oct 20 11:54:09 2015 +0000
-
-    Convert 113 more function definitions to prototype style (files with assertions).
-    
-    This mostly automatically-generated patch converts 113 function
-    definitions in glibc from old-style K&R to prototype-style.  Following
-    my other recent such patches, this one deals with the case of function
-    definitions in files that either contain assertions or where grep
-    suggested they might contain assertions - and thus where it isn't
-    possible to use a simple object code comparison as a sanity check on
-    the correctness of the patch, because line numbers are changed.
-    
-    A few such automatically-generated changes needed to be supplemented
-    by manual changes for the result to compile.  openat64 had a prototype
-    declaration with "..." but an old-style definition in
-    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
-    generated prototype in the definition (I've filed
-    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
-    such cases in GCC; the old state was undefined behavior not requiring
-    a diagnostic, but one seems a good idea).  In addition, as Florian has
-    noted regparm attribute mismatches between declaration and definition
-    are only diagnosed for prototype definitions, and five functions
-    needed internal_function added to their definitions (in the case of
-    __pthread_mutex_cond_lock, via the macro definition of
-    __pthread_mutex_lock) to compile on i386.
-    
-    After this patch is in, remaining old-style definitions are probably
-    most readily fixed manually before we can turn on
-    -Wold-style-definition for all builds.
-    
-    Tested for x86_64 and x86 (testsuite).
-    
-            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
-            function definition.
-            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
-            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
-            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
-            * elf/dl-minimal.c (_itoa): Likewise.
-            * hurd/hurdmalloc.c (malloc): Likewise.
-            (free): Likewise.
-            (realloc): Likewise.
-            * inet/inet6_option.c (inet6_option_space): Likewise.
-            (inet6_option_init): Likewise.
-            (inet6_option_append): Likewise.
-            (inet6_option_alloc): Likewise.
-            (inet6_option_next): Likewise.
-            (inet6_option_find): Likewise.
-            * io/ftw.c (FTW_NAME): Likewise.
-            (NFTW_NAME): Likewise.
-            (NFTW_NEW_NAME): Likewise.
-            (NFTW_OLD_NAME): Likewise.
-            * libio/iofwide.c (_IO_fwide): Likewise.
-            * libio/strops.c (_IO_str_init_static_internal): Likewise.
-            (_IO_str_init_static): Likewise.
-            (_IO_str_init_readonly): Likewise.
-            (_IO_str_overflow): Likewise.
-            (_IO_str_underflow): Likewise.
-            (_IO_str_count): Likewise.
-            (_IO_str_seekoff): Likewise.
-            (_IO_str_pbackfail): Likewise.
-            (_IO_str_finish): Likewise.
-            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
-            (_IO_wstr_overflow): Likewise.
-            (_IO_wstr_underflow): Likewise.
-            (_IO_wstr_count): Likewise.
-            (_IO_wstr_seekoff): Likewise.
-            (_IO_wstr_pbackfail): Likewise.
-            (_IO_wstr_finish): Likewise.
-            * locale/programs/localedef.c (normalize_codeset): Likewise.
-            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
-            (add_locales_to_archive): Likewise.
-            (delete_locales_from_archive): Likewise.
-            * malloc/malloc.c (__libc_mallinfo): Likewise.
-            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
-            * misc/tsearch.c (__tfind): Likewise.
-            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
-            * nptl/pthread_attr_getdetachstate.c
-            (__pthread_attr_getdetachstate): Likewise.
-            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
-            Likewise.
-            * nptl/pthread_attr_getinheritsched.c
-            (__pthread_attr_getinheritsched): Likewise.
-            * nptl/pthread_attr_getschedparam.c
-            (__pthread_attr_getschedparam): Likewise.
-            * nptl/pthread_attr_getschedpolicy.c
-            (__pthread_attr_getschedpolicy): Likewise.
-            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
-            Likewise.
-            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
-            Likewise.
-            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
-            Likewise.
-            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
-            Likewise.
-            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
-            (__pthread_attr_init_2_0): Likewise.
-            * nptl/pthread_attr_setdetachstate.c
-            (__pthread_attr_setdetachstate): Likewise.
-            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
-            Likewise.
-            * nptl/pthread_attr_setinheritsched.c
-            (__pthread_attr_setinheritsched): Likewise.
-            * nptl/pthread_attr_setschedparam.c
-            (__pthread_attr_setschedparam): Likewise.
-            * nptl/pthread_attr_setschedpolicy.c
-            (__pthread_attr_setschedpolicy): Likewise.
-            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
-            Likewise.
-            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
-            Likewise.
-            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
-            Likewise.
-            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
-            Likewise.
-            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
-            Likewise.
-            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
-            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
-            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
-            use internal_function.
-            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
-            prototype-style function definition.
-            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
-            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
-            internal_function.
-            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
-            Convert to prototype-style function definition.
-            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
-            Likewise.
-            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
-            Likewise.
-            (__pthread_mutex_unlock): Likewise.
-            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
-            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
-            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
-            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
-            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
-            * nss/makedb.c (process_input): Likewise.
-            * posix/fnmatch.c (__strchrnul): Likewise.
-            (__wcschrnul): Likewise.
-            (fnmatch): Likewise.
-            * posix/fnmatch_loop.c (FCT): Likewise.
-            * posix/glob.c (globfree): Likewise.
-            (__glob_pattern_type): Likewise.
-            (__glob_pattern_p): Likewise.
-            * posix/regcomp.c (re_compile_pattern): Likewise.
-            (re_set_syntax): Likewise.
-            (re_compile_fastmap): Likewise.
-            (regcomp): Likewise.
-            (regerror): Likewise.
-            (regfree): Likewise.
-            * posix/regexec.c (regexec): Likewise.
-            (re_match): Likewise.
-            (re_search): Likewise.
-            (re_match_2): Likewise.
-            (re_search_2): Likewise.
-            (re_search_stub): Likewise.  Use internal_function
-            (re_copy_regs): Likewise.
-            (re_set_registers): Convert to prototype-style function
-            definition.
-            (prune_impossible_nodes): Likewise.  Use internal_function.
-            * resolv/inet_net_pton.c (inet_net_pton): Convert to
-            prototype-style function definition.
-            (inet_net_pton_ipv4): Likewise.
-            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
-            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
-            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
-            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
-            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
-            Make variadic.
-            * time/strptime_l.c (localtime_r): Convert to prototype-style
-            function definition.
-            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
-            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
-            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
-            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
-
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
---- a/sysdeps/unix/sysv/linux/dl-openat64.c
-+++ b/sysdeps/unix/sysv/linux/dl-openat64.c
-@@ -23,10 +23,7 @@
- 
- 
- int
--openat64 (dfd, file, oflag)
--     int dfd;
--     const char *file;
--     int oflag;
-+openat64 (int dfd, const char *file, int oflag, ...)
- {
-   assert ((oflag & O_CREAT) == 0);
- 
diff --git a/packages/glibc/2.18/105-misleading-indentation.patch b/packages/glibc/2.18/105-misleading-indentation.patch
deleted file mode 100644
index 1dd8d851..00000000
--- a/packages/glibc/2.18/105-misleading-indentation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 976ef870542580cf5fed896c2c652b3e1a95f9da
-Author: Steve Ellcey <sellcey@mips.com>
-Date:   Fri Dec 11 09:19:37 2015 -0800
-
-    Fix indentation.
-    
-            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
-            Fix indentation.
-
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
---- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-+++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
- 
-     /* compute q[0],q[1],...q[jk] */
- 	for (i=0;i<=jk;i++) {
--	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-+	    for(j=0,fw=0.0;j<=jx;j++)
-+		fw += x[j]*f[jx+i-j];
-+	    q[i] = fw;
- 	}
- 
- 	jz = jk;
diff --git a/packages/glibc/2.18/300-macos-cross-rpcgen.patch b/packages/glibc/2.18/300-macos-cross-rpcgen.patch
deleted file mode 100644
index e654644c..00000000
--- a/packages/glibc/2.18/300-macos-cross-rpcgen.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit ae7080d30c68cfa0c81ce3422dca948f64a94f50
-Author: Jia Liu <proljc@gmail.com>
-Date:   Sat Sep 7 00:01:08 2013 +0800
-
-    sunrpc/rpc/types.h: fix OS X and FreeBSD build problems
-    
-    When I build arm-linux-gcc on OS X, I find glibc will get a build error
-    in sunrpc/rpc/types.h, so I add __APPLE_CC__ to make OS X build OK.
-    For FreeBSD, Add __FreeBSD__ to make it build OK, too.
-    
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00155.html
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00217.html
-    URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00240.html
-    Signed-off-by: Jia Liu <proljc@gmail.com>
-    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-
-diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
-index 3dca5c4..beded52 100644
---- a/sunrpc/rpc/types.h
-+++ b/sunrpc/rpc/types.h
-@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t;
- #include <sys/types.h>
- #endif
- 
-+#if defined __APPLE_CC__ || defined __FreeBSD__
-+# define __u_char_defined
-+# define __daddr_t_defined
-+#endif
-+
- #ifndef __u_char_defined
- typedef __u_char u_char;
- typedef __u_short u_short;
diff --git a/packages/glibc/2.18/920-fix-rpc_parse-format.patch b/packages/glibc/2.18/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.18/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.18/940-nis-bogus-conditional.patch b/packages/glibc/2.18/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.18/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.19/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.19/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
new file mode 100644
index 00000000..5d724b26
--- /dev/null
+++ b/packages/glibc/2.19/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -0,0 +1,75 @@
+From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
+From: Yvan Roux <yvan.roux@linaro.org>
+Date: Fri, 15 Apr 2016 13:29:26 +0200
+Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
+ -Wparentheses
+
+---
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+--- a/nis/nis_call.c
++++ b/nis/nis_call.c
+@@ -680,16 +680,18 @@
+   /* Choose which entry should be evicted from the cache.  */
+   loc = &nis_server_cache[0];
+   if (*loc != NULL)
+-    for (i = 1; i < 16; ++i)
+-      if (nis_server_cache[i] == NULL)
+-	{
++    {
++      for (i = 1; i < 16; ++i)
++	if (nis_server_cache[i] == NULL)
++	  {
++	    loc = &nis_server_cache[i];
++	    break;
++	  }
++	else if ((*loc)->uses > nis_server_cache[i]->uses
++		 || ((*loc)->uses == nis_server_cache[i]->uses
++		     && (*loc)->expires > nis_server_cache[i]->expires))
+ 	  loc = &nis_server_cache[i];
+-	  break;
+-	}
+-      else if ((*loc)->uses > nis_server_cache[i]->uses
+-	       || ((*loc)->uses == nis_server_cache[i]->uses
+-		   && (*loc)->expires > nis_server_cache[i]->expires))
+-	loc = &nis_server_cache[i];
++    }
+   old = *loc;
+   *loc = new;
+ 
+--- a/stdlib/setenv.c
++++ b/stdlib/setenv.c
+@@ -327,18 +327,20 @@
+   ep = __environ;
+   if (ep != NULL)
+     while (*ep != NULL)
+-      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+-	{
+-	  /* Found it.  Remove this pointer by moving later ones back.  */
+-	  char **dp = ep;
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
+-	  do
+-	    dp[0] = dp[1];
+-	  while (*dp++);
+-	  /* Continue the loop in case NAME appears again.  */
+-	}
+-      else
+-	++ep;
++	    do
++		dp[0] = dp[1];
++	    while (*dp++);
++	    /* Continue the loop in case NAME appears again.  */
++	  }
++	else
++	  ++ep;
++      }
+ 
+   UNLOCK;
+ 
diff --git a/packages/glibc/2.19/0001-fix-signed-shift-overlow.patch b/packages/glibc/2.19/0001-fix-signed-shift-overlow.patch
new file mode 100644
index 00000000..1e291a52
--- /dev/null
+++ b/packages/glibc/2.19/0001-fix-signed-shift-overlow.patch
@@ -0,0 +1,97 @@
+commit 5542236837c5c41435f8282ec92799f480c36f18
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date:   Tue Jul 21 22:50:29 2015 -0700
+
+    Port the 0x7efe...feff pattern to GCC 6.
+    
+    See Steve Ellcey's bug report in:
+    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
+    * string/memrchr.c (MEMRCHR):
+    * string/rawmemchr.c (RAWMEMCHR):
+    * string/strchr.c (strchr):
+    * string/strchrnul.c (STRCHRNUL):
+    Rewrite code to avoid issues with signed shift overflow.
+
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
+--- a/string/memrchr.c
++++ b/string/memrchr.c
+@@ -96,15 +96,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/rawmemchr.c
++++ b/string/rawmemchr.c
+@@ -86,15 +86,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchr.c
++++ b/string/strchr.c
+@@ -63,13 +63,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchrnul.c
++++ b/string/strchrnul.c
+@@ -66,13 +66,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
diff --git a/packages/glibc/2.19/0002-dl-openat64-variadic.patch b/packages/glibc/2.19/0002-dl-openat64-variadic.patch
new file mode 100644
index 00000000..552db126
--- /dev/null
+++ b/packages/glibc/2.19/0002-dl-openat64-variadic.patch
@@ -0,0 +1,197 @@
+commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Oct 20 11:54:09 2015 +0000
+
+    Convert 113 more function definitions to prototype style (files with assertions).
+    
+    This mostly automatically-generated patch converts 113 function
+    definitions in glibc from old-style K&R to prototype-style.  Following
+    my other recent such patches, this one deals with the case of function
+    definitions in files that either contain assertions or where grep
+    suggested they might contain assertions - and thus where it isn't
+    possible to use a simple object code comparison as a sanity check on
+    the correctness of the patch, because line numbers are changed.
+    
+    A few such automatically-generated changes needed to be supplemented
+    by manual changes for the result to compile.  openat64 had a prototype
+    declaration with "..." but an old-style definition in
+    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
+    generated prototype in the definition (I've filed
+    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
+    such cases in GCC; the old state was undefined behavior not requiring
+    a diagnostic, but one seems a good idea).  In addition, as Florian has
+    noted regparm attribute mismatches between declaration and definition
+    are only diagnosed for prototype definitions, and five functions
+    needed internal_function added to their definitions (in the case of
+    __pthread_mutex_cond_lock, via the macro definition of
+    __pthread_mutex_lock) to compile on i386.
+    
+    After this patch is in, remaining old-style definitions are probably
+    most readily fixed manually before we can turn on
+    -Wold-style-definition for all builds.
+    
+    Tested for x86_64 and x86 (testsuite).
+    
+            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
+            function definition.
+            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
+            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
+            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
+            * elf/dl-minimal.c (_itoa): Likewise.
+            * hurd/hurdmalloc.c (malloc): Likewise.
+            (free): Likewise.
+            (realloc): Likewise.
+            * inet/inet6_option.c (inet6_option_space): Likewise.
+            (inet6_option_init): Likewise.
+            (inet6_option_append): Likewise.
+            (inet6_option_alloc): Likewise.
+            (inet6_option_next): Likewise.
+            (inet6_option_find): Likewise.
+            * io/ftw.c (FTW_NAME): Likewise.
+            (NFTW_NAME): Likewise.
+            (NFTW_NEW_NAME): Likewise.
+            (NFTW_OLD_NAME): Likewise.
+            * libio/iofwide.c (_IO_fwide): Likewise.
+            * libio/strops.c (_IO_str_init_static_internal): Likewise.
+            (_IO_str_init_static): Likewise.
+            (_IO_str_init_readonly): Likewise.
+            (_IO_str_overflow): Likewise.
+            (_IO_str_underflow): Likewise.
+            (_IO_str_count): Likewise.
+            (_IO_str_seekoff): Likewise.
+            (_IO_str_pbackfail): Likewise.
+            (_IO_str_finish): Likewise.
+            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
+            (_IO_wstr_overflow): Likewise.
+            (_IO_wstr_underflow): Likewise.
+            (_IO_wstr_count): Likewise.
+            (_IO_wstr_seekoff): Likewise.
+            (_IO_wstr_pbackfail): Likewise.
+            (_IO_wstr_finish): Likewise.
+            * locale/programs/localedef.c (normalize_codeset): Likewise.
+            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
+            (add_locales_to_archive): Likewise.
+            (delete_locales_from_archive): Likewise.
+            * malloc/malloc.c (__libc_mallinfo): Likewise.
+            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
+            * misc/tsearch.c (__tfind): Likewise.
+            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
+            * nptl/pthread_attr_getdetachstate.c
+            (__pthread_attr_getdetachstate): Likewise.
+            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
+            Likewise.
+            * nptl/pthread_attr_getinheritsched.c
+            (__pthread_attr_getinheritsched): Likewise.
+            * nptl/pthread_attr_getschedparam.c
+            (__pthread_attr_getschedparam): Likewise.
+            * nptl/pthread_attr_getschedpolicy.c
+            (__pthread_attr_getschedpolicy): Likewise.
+            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
+            Likewise.
+            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
+            Likewise.
+            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
+            Likewise.
+            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
+            Likewise.
+            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
+            (__pthread_attr_init_2_0): Likewise.
+            * nptl/pthread_attr_setdetachstate.c
+            (__pthread_attr_setdetachstate): Likewise.
+            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
+            Likewise.
+            * nptl/pthread_attr_setinheritsched.c
+            (__pthread_attr_setinheritsched): Likewise.
+            * nptl/pthread_attr_setschedparam.c
+            (__pthread_attr_setschedparam): Likewise.
+            * nptl/pthread_attr_setschedpolicy.c
+            (__pthread_attr_setschedpolicy): Likewise.
+            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
+            Likewise.
+            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
+            Likewise.
+            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
+            Likewise.
+            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
+            Likewise.
+            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
+            Likewise.
+            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
+            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
+            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
+            use internal_function.
+            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
+            prototype-style function definition.
+            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
+            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
+            internal_function.
+            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
+            Convert to prototype-style function definition.
+            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
+            Likewise.
+            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
+            Likewise.
+            (__pthread_mutex_unlock): Likewise.
+            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
+            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
+            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
+            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
+            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
+            * nss/makedb.c (process_input): Likewise.
+            * posix/fnmatch.c (__strchrnul): Likewise.
+            (__wcschrnul): Likewise.
+            (fnmatch): Likewise.
+            * posix/fnmatch_loop.c (FCT): Likewise.
+            * posix/glob.c (globfree): Likewise.
+            (__glob_pattern_type): Likewise.
+            (__glob_pattern_p): Likewise.
+            * posix/regcomp.c (re_compile_pattern): Likewise.
+            (re_set_syntax): Likewise.
+            (re_compile_fastmap): Likewise.
+            (regcomp): Likewise.
+            (regerror): Likewise.
+            (regfree): Likewise.
+            * posix/regexec.c (regexec): Likewise.
+            (re_match): Likewise.
+            (re_search): Likewise.
+            (re_match_2): Likewise.
+            (re_search_2): Likewise.
+            (re_search_stub): Likewise.  Use internal_function
+            (re_copy_regs): Likewise.
+            (re_set_registers): Convert to prototype-style function
+            definition.
+            (prune_impossible_nodes): Likewise.  Use internal_function.
+            * resolv/inet_net_pton.c (inet_net_pton): Convert to
+            prototype-style function definition.
+            (inet_net_pton_ipv4): Likewise.
+            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
+            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
+            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
+            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
+            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
+            Make variadic.
+            * time/strptime_l.c (localtime_r): Convert to prototype-style
+            function definition.
+            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
+            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
+            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
+            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
+
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/sysdeps/unix/sysv/linux/dl-openat64.c
++++ b/sysdeps/unix/sysv/linux/dl-openat64.c
+@@ -23,10 +23,7 @@
+ 
+ 
+ int
+-openat64 (dfd, file, oflag)
+-     int dfd;
+-     const char *file;
+-     int oflag;
++openat64 (int dfd, const char *file, int oflag, ...)
+ {
+   assert ((oflag & O_CREAT) == 0);
+ 
diff --git a/packages/glibc/2.19/104-unused-variables.patch b/packages/glibc/2.19/0003-unused-variables.patch
similarity index 80%
rename from packages/glibc/2.19/104-unused-variables.patch
rename to packages/glibc/2.19/0003-unused-variables.patch
index 889c9bbc..c09e420d 100644
--- a/packages/glibc/2.19/104-unused-variables.patch
+++ b/packages/glibc/2.19/0003-unused-variables.patch
@@ -19,8 +19,19 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    2 --
+ sysdeps/ieee754/flt-32/s_cosf.c        |    2 --
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ timezone/private.h                     |   10 ----------
+ 10 files changed, 1 insertion(+), 28 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,8 +45,6 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
 @@ -65,10 +65,8 @@
@@ -60,8 +69,6 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
 @@ -29,7 +29,7 @@
@@ -73,8 +80,6 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
 @@ -34,7 +34,6 @@
@@ -93,11 +98,9 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,8 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
+@@ -22,8 +22,6 @@
  log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
@@ -106,11 +109,9 @@ index 96f0e81..1daeef7 100644
  float
  __ieee754_log10f(float x)
  {
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,8 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
+@@ -21,8 +21,6 @@
  #include <math.h>
  #include <math_private.h>
  
@@ -119,11 +120,9 @@ index 864ab27..0affd40 100644
  #ifndef COSF
  # define COSF_FUNC __cosf
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -74,7 +74,6 @@
  static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  static const long double one = 1.0L;
@@ -131,11 +130,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = 1.0e4000L;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -139,7 +139,6 @@
  
  static const long double
  tiny = 1e-4931L,
@@ -143,11 +140,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
@@ -155,11 +150,9 @@ index ff759bc..9609550 100644
  static const long double zero = 0.0L;
  
  long double
-diff --git a/timezone/private.h b/timezone/private.h
-index 4e8f4ae..ed19e06 100644
 --- a/timezone/private.h
 +++ b/timezone/private.h
-@@ -326,16 +326,6 @@ const char *	scheck(const char * string, const char * format);
+@@ -321,16 +321,6 @@
  #define TYPE_SIGNED(type) (((type) -1) < 0)
  #endif /* !defined TYPE_SIGNED */
  
diff --git a/packages/glibc/2.19/0004-misleading-indentation.patch b/packages/glibc/2.19/0004-misleading-indentation.patch
new file mode 100644
index 00000000..8e08259e
--- /dev/null
+++ b/packages/glibc/2.19/0004-misleading-indentation.patch
@@ -0,0 +1,26 @@
+commit 976ef870542580cf5fed896c2c652b3e1a95f9da
+Author: Steve Ellcey <sellcey@mips.com>
+Date:   Fri Dec 11 09:19:37 2015 -0800
+
+    Fix indentation.
+    
+            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
+            Fix indentation.
+
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
++++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
+@@ -65,7 +65,9 @@
+ 
+     /* compute q[0],q[1],...q[jk] */
+ 	for (i=0;i<=jk;i++) {
+-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
++	    for(j=0,fw=0.0;j<=jx;j++)
++		fw += x[j]*f[jx+i-j];
++	    q[i] = fw;
+ 	}
+ 
+ 	jz = jk;
diff --git a/packages/glibc/2.18/106-dl-open-array-bounds.patch b/packages/glibc/2.19/0005-dl-open-array-bounds.patch
similarity index 87%
rename from packages/glibc/2.18/106-dl-open-array-bounds.patch
rename to packages/glibc/2.19/0005-dl-open-array-bounds.patch
index 08a90765..83eb0b3c 100644
--- a/packages/glibc/2.18/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.19/0005-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -211,7 +211,7 @@ dl_open_worker (void *a)
+@@ -211,7 +211,7 @@
        struct link_map *l = _dl_find_dso_for_object ((ElfW(Addr)) caller_dlopen);
  
        if (l)
@@ -17,7 +19,7 @@ index 0dbe07f..2d0e082 100644
  
        if (args->nsid == __LM_ID_CALLER)
  	args->nsid = call_map->l_ns;
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -627,8 +627,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc/2.19/130-arm-unwind.patch b/packages/glibc/2.19/0006-arm-unwind.patch
similarity index 53%
rename from packages/glibc/2.19/130-arm-unwind.patch
rename to packages/glibc/2.19/0006-arm-unwind.patch
index 69cc07ad..85288d0d 100644
--- a/packages/glibc/2.19/130-arm-unwind.patch
+++ b/packages/glibc/2.19/0006-arm-unwind.patch
@@ -1,6 +1,12 @@
-diff -urN glibc-2.18.orig/nptl/sysdeps/pthread/unwind-forcedunwind.c glibc-2.18/nptl/sysdeps/pthread/unwind-forcedunwind.c
---- glibc-2.18.orig/nptl/sysdeps/pthread/unwind-forcedunwind.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/nptl/sysdeps/pthread/unwind-forcedunwind.c	2016-09-15 02:30:09.199939478 +0300
+---
+ nptl/sysdeps/pthread/unwind-forcedunwind.c                   |    2 +-
+ ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c |    2 +-
+ ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c       |    2 +-
+ sysdeps/gnu/unwind-resume.c                                  |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/nptl/sysdeps/pthread/unwind-forcedunwind.c
++++ b/nptl/sysdeps/pthread/unwind-forcedunwind.c
 @@ -24,7 +24,7 @@
  #include <gnu/lib-names.h>
  
@@ -10,9 +16,8 @@ diff -urN glibc-2.18.orig/nptl/sysdeps/pthread/unwind-forcedunwind.c glibc-2.18/
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
-diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
---- glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c	2016-09-15 02:29:07.096945862 +0300
+--- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
++++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -22,7 +22,7 @@
  #include <pthreadP.h>
  
@@ -22,9 +27,8 @@ diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedun
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
---- glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c	2016-09-15 02:29:37.352917115 +0300
+--- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
++++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -20,7 +20,7 @@
  #include <stdio.h>
  #include <unwind.h>
@@ -34,9 +38,8 @@ diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  
-diff -urN glibc-2.18.orig/sysdeps/gnu/unwind-resume.c glibc-2.18/sysdeps/gnu/unwind-resume.c
---- glibc-2.18.orig/sysdeps/gnu/unwind-resume.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/sysdeps/gnu/unwind-resume.c	2016-09-15 02:29:53.376431503 +0300
+--- a/sysdeps/gnu/unwind-resume.c
++++ b/sysdeps/gnu/unwind-resume.c
 @@ -21,7 +21,7 @@
  #include <unwind.h>
  #include <gnu/lib-names.h>
diff --git a/packages/glibc/2.19/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.19/0007-Fix-combreloc-test-BSD-grep.patch
similarity index 77%
rename from packages/glibc/2.19/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.19/0007-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..c352aa88 100644
--- a/packages/glibc/2.19/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.19/0007-Fix-combreloc-test-BSD-grep.patch
@@ -13,16 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
 --- a/configure
 +++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+@@ -6228,7 +6228,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
  then
@@ -31,11 +28,9 @@ index eecd0ac..0118bd1 100755
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
+@@ -1537,7 +1537,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
@@ -44,6 +39,3 @@ index 4a77411..19f6d87 100644
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc/2.19/0008-typedef-caddr.patch b/packages/glibc/2.19/0008-typedef-caddr.patch
new file mode 100644
index 00000000..e38f83d2
--- /dev/null
+++ b/packages/glibc/2.19/0008-typedef-caddr.patch
@@ -0,0 +1,31 @@
+---
+ posix/sys/types.h  |    3 +++
+ sunrpc/rpc/types.h |    3 +++
+ 2 files changed, 6 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
+@@ -113,7 +113,10 @@
+ #ifdef	__USE_BSD
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
+--- a/sunrpc/rpc/types.h
++++ b/sunrpc/rpc/types.h
+@@ -86,7 +86,10 @@
+ #endif
+ #ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#  define __caddr_t_defined
++# endif
+ # define __daddr_t_defined
+ #endif
+ 
diff --git a/packages/glibc/2.19/0009-fix-rpc_parse-format.patch b/packages/glibc/2.19/0009-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.19/0009-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.19/930-explicit-boolean.patch b/packages/glibc/2.19/0010-explicit-boolean.patch
similarity index 85%
rename from packages/glibc/2.19/930-explicit-boolean.patch
rename to packages/glibc/2.19/0010-explicit-boolean.patch
index 780fae63..47b62b0a 100644
--- a/packages/glibc/2.19/930-explicit-boolean.patch
+++ b/packages/glibc/2.19/0010-explicit-boolean.patch
@@ -7,11 +7,13 @@ Date:   Fri Oct 14 12:53:27 2016 -0700
             * sysdeps/ieee754/dbl-64/e_pow.c (checkint) Make conditions explicitly
             boolean.
 
-diff --git a/sysdeps/ieee754/dbl-64/e_pow.c b/sysdeps/ieee754/dbl-64/e_pow.c
-index 663fa392c2..bd758b5979 100644
+---
+ sysdeps/ieee754/dbl-64/e_pow.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 --- a/sysdeps/ieee754/dbl-64/e_pow.c
 +++ b/sysdeps/ieee754/dbl-64/e_pow.c
-@@ -466,15 +466,15 @@ checkint (double x)
+@@ -441,15 +441,15 @@
      return (n & 1) ? -1 : 1;	/* odd or even */
    if (k > 20)
      {
diff --git a/packages/glibc/2.19/0011-nis-bogus-conditional.patch b/packages/glibc/2.19/0011-nis-bogus-conditional.patch
new file mode 100644
index 00000000..e7283681
--- /dev/null
+++ b/packages/glibc/2.19/0011-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -291,7 +291,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.19/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.19/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
deleted file mode 100644
index 6fd663a2..00000000
--- a/packages/glibc/2.19/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
- -Wparentheses
-
----
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-2.7.4
-
diff --git a/packages/glibc/2.19/102-fix-signed-shift-overlow.patch b/packages/glibc/2.19/102-fix-signed-shift-overlow.patch
deleted file mode 100644
index ef49f831..00000000
--- a/packages/glibc/2.19/102-fix-signed-shift-overlow.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-commit 5542236837c5c41435f8282ec92799f480c36f18
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Tue Jul 21 22:50:29 2015 -0700
-
-    Port the 0x7efe...feff pattern to GCC 6.
-    
-    See Steve Ellcey's bug report in:
-    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
-    * string/memrchr.c (MEMRCHR):
-    * string/rawmemchr.c (RAWMEMCHR):
-    * string/strchr.c (strchr):
-    * string/strchrnul.c (STRCHRNUL):
-    Rewrite code to avoid issues with signed shift overflow.
-
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
---- a/string/memrchr.c
-+++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
---- a/string/rawmemchr.c
-+++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
---- a/string/strchr.c
-+++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
---- a/string/strchrnul.c
-+++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
diff --git a/packages/glibc/2.19/103-dl-openat64-variadic.patch b/packages/glibc/2.19/103-dl-openat64-variadic.patch
deleted file mode 100644
index fe94b96d..00000000
--- a/packages/glibc/2.19/103-dl-openat64-variadic.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Oct 20 11:54:09 2015 +0000
-
-    Convert 113 more function definitions to prototype style (files with assertions).
-    
-    This mostly automatically-generated patch converts 113 function
-    definitions in glibc from old-style K&R to prototype-style.  Following
-    my other recent such patches, this one deals with the case of function
-    definitions in files that either contain assertions or where grep
-    suggested they might contain assertions - and thus where it isn't
-    possible to use a simple object code comparison as a sanity check on
-    the correctness of the patch, because line numbers are changed.
-    
-    A few such automatically-generated changes needed to be supplemented
-    by manual changes for the result to compile.  openat64 had a prototype
-    declaration with "..." but an old-style definition in
-    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
-    generated prototype in the definition (I've filed
-    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
-    such cases in GCC; the old state was undefined behavior not requiring
-    a diagnostic, but one seems a good idea).  In addition, as Florian has
-    noted regparm attribute mismatches between declaration and definition
-    are only diagnosed for prototype definitions, and five functions
-    needed internal_function added to their definitions (in the case of
-    __pthread_mutex_cond_lock, via the macro definition of
-    __pthread_mutex_lock) to compile on i386.
-    
-    After this patch is in, remaining old-style definitions are probably
-    most readily fixed manually before we can turn on
-    -Wold-style-definition for all builds.
-    
-    Tested for x86_64 and x86 (testsuite).
-    
-            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
-            function definition.
-            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
-            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
-            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
-            * elf/dl-minimal.c (_itoa): Likewise.
-            * hurd/hurdmalloc.c (malloc): Likewise.
-            (free): Likewise.
-            (realloc): Likewise.
-            * inet/inet6_option.c (inet6_option_space): Likewise.
-            (inet6_option_init): Likewise.
-            (inet6_option_append): Likewise.
-            (inet6_option_alloc): Likewise.
-            (inet6_option_next): Likewise.
-            (inet6_option_find): Likewise.
-            * io/ftw.c (FTW_NAME): Likewise.
-            (NFTW_NAME): Likewise.
-            (NFTW_NEW_NAME): Likewise.
-            (NFTW_OLD_NAME): Likewise.
-            * libio/iofwide.c (_IO_fwide): Likewise.
-            * libio/strops.c (_IO_str_init_static_internal): Likewise.
-            (_IO_str_init_static): Likewise.
-            (_IO_str_init_readonly): Likewise.
-            (_IO_str_overflow): Likewise.
-            (_IO_str_underflow): Likewise.
-            (_IO_str_count): Likewise.
-            (_IO_str_seekoff): Likewise.
-            (_IO_str_pbackfail): Likewise.
-            (_IO_str_finish): Likewise.
-            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
-            (_IO_wstr_overflow): Likewise.
-            (_IO_wstr_underflow): Likewise.
-            (_IO_wstr_count): Likewise.
-            (_IO_wstr_seekoff): Likewise.
-            (_IO_wstr_pbackfail): Likewise.
-            (_IO_wstr_finish): Likewise.
-            * locale/programs/localedef.c (normalize_codeset): Likewise.
-            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
-            (add_locales_to_archive): Likewise.
-            (delete_locales_from_archive): Likewise.
-            * malloc/malloc.c (__libc_mallinfo): Likewise.
-            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
-            * misc/tsearch.c (__tfind): Likewise.
-            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
-            * nptl/pthread_attr_getdetachstate.c
-            (__pthread_attr_getdetachstate): Likewise.
-            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
-            Likewise.
-            * nptl/pthread_attr_getinheritsched.c
-            (__pthread_attr_getinheritsched): Likewise.
-            * nptl/pthread_attr_getschedparam.c
-            (__pthread_attr_getschedparam): Likewise.
-            * nptl/pthread_attr_getschedpolicy.c
-            (__pthread_attr_getschedpolicy): Likewise.
-            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
-            Likewise.
-            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
-            Likewise.
-            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
-            Likewise.
-            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
-            Likewise.
-            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
-            (__pthread_attr_init_2_0): Likewise.
-            * nptl/pthread_attr_setdetachstate.c
-            (__pthread_attr_setdetachstate): Likewise.
-            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
-            Likewise.
-            * nptl/pthread_attr_setinheritsched.c
-            (__pthread_attr_setinheritsched): Likewise.
-            * nptl/pthread_attr_setschedparam.c
-            (__pthread_attr_setschedparam): Likewise.
-            * nptl/pthread_attr_setschedpolicy.c
-            (__pthread_attr_setschedpolicy): Likewise.
-            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
-            Likewise.
-            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
-            Likewise.
-            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
-            Likewise.
-            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
-            Likewise.
-            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
-            Likewise.
-            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
-            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
-            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
-            use internal_function.
-            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
-            prototype-style function definition.
-            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
-            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
-            internal_function.
-            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
-            Convert to prototype-style function definition.
-            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
-            Likewise.
-            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
-            Likewise.
-            (__pthread_mutex_unlock): Likewise.
-            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
-            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
-            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
-            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
-            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
-            * nss/makedb.c (process_input): Likewise.
-            * posix/fnmatch.c (__strchrnul): Likewise.
-            (__wcschrnul): Likewise.
-            (fnmatch): Likewise.
-            * posix/fnmatch_loop.c (FCT): Likewise.
-            * posix/glob.c (globfree): Likewise.
-            (__glob_pattern_type): Likewise.
-            (__glob_pattern_p): Likewise.
-            * posix/regcomp.c (re_compile_pattern): Likewise.
-            (re_set_syntax): Likewise.
-            (re_compile_fastmap): Likewise.
-            (regcomp): Likewise.
-            (regerror): Likewise.
-            (regfree): Likewise.
-            * posix/regexec.c (regexec): Likewise.
-            (re_match): Likewise.
-            (re_search): Likewise.
-            (re_match_2): Likewise.
-            (re_search_2): Likewise.
-            (re_search_stub): Likewise.  Use internal_function
-            (re_copy_regs): Likewise.
-            (re_set_registers): Convert to prototype-style function
-            definition.
-            (prune_impossible_nodes): Likewise.  Use internal_function.
-            * resolv/inet_net_pton.c (inet_net_pton): Convert to
-            prototype-style function definition.
-            (inet_net_pton_ipv4): Likewise.
-            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
-            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
-            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
-            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
-            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
-            Make variadic.
-            * time/strptime_l.c (localtime_r): Convert to prototype-style
-            function definition.
-            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
-            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
-            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
-            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
-
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
---- a/sysdeps/unix/sysv/linux/dl-openat64.c
-+++ b/sysdeps/unix/sysv/linux/dl-openat64.c
-@@ -23,10 +23,7 @@
- 
- 
- int
--openat64 (dfd, file, oflag)
--     int dfd;
--     const char *file;
--     int oflag;
-+openat64 (int dfd, const char *file, int oflag, ...)
- {
-   assert ((oflag & O_CREAT) == 0);
- 
diff --git a/packages/glibc/2.19/105-misleading-indentation.patch b/packages/glibc/2.19/105-misleading-indentation.patch
deleted file mode 100644
index 1dd8d851..00000000
--- a/packages/glibc/2.19/105-misleading-indentation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 976ef870542580cf5fed896c2c652b3e1a95f9da
-Author: Steve Ellcey <sellcey@mips.com>
-Date:   Fri Dec 11 09:19:37 2015 -0800
-
-    Fix indentation.
-    
-            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
-            Fix indentation.
-
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
---- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-+++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
- 
-     /* compute q[0],q[1],...q[jk] */
- 	for (i=0;i<=jk;i++) {
--	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-+	    for(j=0,fw=0.0;j<=jx;j++)
-+		fw += x[j]*f[jx+i-j];
-+	    q[i] = fw;
- 	}
- 
- 	jz = jk;
diff --git a/packages/glibc/2.19/920-fix-rpc_parse-format.patch b/packages/glibc/2.19/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.19/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.19/940-nis-bogus-conditional.patch b/packages/glibc/2.19/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.19/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.20/100-sparc-nptl.patch b/packages/glibc/2.20/0000-sparc-nptl.patch
similarity index 66%
rename from packages/glibc/2.20/100-sparc-nptl.patch
rename to packages/glibc/2.20/0000-sparc-nptl.patch
index 21f03379..4c5a10e4 100644
--- a/packages/glibc/2.20/100-sparc-nptl.patch
+++ b/packages/glibc/2.20/0000-sparc-nptl.patch
@@ -1,5 +1,7 @@
-diff --git a/sysdeps/sparc/sparc32/sem_trywait.c b/sysdeps/sparc/sparc32/sem_trywait.c
-index 7d0fc55..ad9b4ad 100644
+---
+ sysdeps/sparc/sparc32/sem_trywait.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/sysdeps/sparc/sparc32/sem_trywait.c
 +++ b/sysdeps/sparc/sparc32/sem_trywait.c
 @@ -22,6 +22,7 @@
@@ -10,5 +12,3 @@ index 7d0fc55..ad9b4ad 100644
  
  #include <shlib-compat.h>
  
- 
-
diff --git a/packages/glibc/2.20/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.20/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
new file mode 100644
index 00000000..d92014e9
--- /dev/null
+++ b/packages/glibc/2.20/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -0,0 +1,75 @@
+From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
+From: Yvan Roux <yvan.roux@linaro.org>
+Date: Fri, 15 Apr 2016 13:29:26 +0200
+Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
+ -Wparentheses
+
+---
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+--- a/nis/nis_call.c
++++ b/nis/nis_call.c
+@@ -680,16 +680,18 @@
+   /* Choose which entry should be evicted from the cache.  */
+   loc = &nis_server_cache[0];
+   if (*loc != NULL)
+-    for (i = 1; i < 16; ++i)
+-      if (nis_server_cache[i] == NULL)
+-	{
++    {
++      for (i = 1; i < 16; ++i)
++	if (nis_server_cache[i] == NULL)
++	  {
++	    loc = &nis_server_cache[i];
++	    break;
++	  }
++	else if ((*loc)->uses > nis_server_cache[i]->uses
++		 || ((*loc)->uses == nis_server_cache[i]->uses
++		     && (*loc)->expires > nis_server_cache[i]->expires))
+ 	  loc = &nis_server_cache[i];
+-	  break;
+-	}
+-      else if ((*loc)->uses > nis_server_cache[i]->uses
+-	       || ((*loc)->uses == nis_server_cache[i]->uses
+-		   && (*loc)->expires > nis_server_cache[i]->expires))
+-	loc = &nis_server_cache[i];
++    }
+   old = *loc;
+   *loc = new;
+ 
+--- a/stdlib/setenv.c
++++ b/stdlib/setenv.c
+@@ -262,18 +262,20 @@
+   ep = __environ;
+   if (ep != NULL)
+     while (*ep != NULL)
+-      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+-	{
+-	  /* Found it.  Remove this pointer by moving later ones back.  */
+-	  char **dp = ep;
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
+-	  do
+-	    dp[0] = dp[1];
+-	  while (*dp++);
+-	  /* Continue the loop in case NAME appears again.  */
+-	}
+-      else
+-	++ep;
++	    do
++		dp[0] = dp[1];
++	    while (*dp++);
++	    /* Continue the loop in case NAME appears again.  */
++	  }
++	else
++	  ++ep;
++      }
+ 
+   UNLOCK;
+ 
diff --git a/packages/glibc/2.20/0002-fix-signed-shift-overlow.patch b/packages/glibc/2.20/0002-fix-signed-shift-overlow.patch
new file mode 100644
index 00000000..c7cc3302
--- /dev/null
+++ b/packages/glibc/2.20/0002-fix-signed-shift-overlow.patch
@@ -0,0 +1,97 @@
+commit 5542236837c5c41435f8282ec92799f480c36f18
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date:   Tue Jul 21 22:50:29 2015 -0700
+
+    Port the 0x7efe...feff pattern to GCC 6.
+    
+    See Steve Ellcey's bug report in:
+    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
+    * string/memrchr.c (MEMRCHR):
+    * string/rawmemchr.c (RAWMEMCHR):
+    * string/strchr.c (strchr):
+    * string/strchrnul.c (STRCHRNUL):
+    Rewrite code to avoid issues with signed shift overflow.
+
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
+--- a/string/memrchr.c
++++ b/string/memrchr.c
+@@ -96,15 +96,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/rawmemchr.c
++++ b/string/rawmemchr.c
+@@ -86,15 +86,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchr.c
++++ b/string/strchr.c
+@@ -60,13 +60,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchrnul.c
++++ b/string/strchrnul.c
+@@ -66,13 +66,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
diff --git a/packages/glibc/2.20/0003-dl-openat64-variadic.patch b/packages/glibc/2.20/0003-dl-openat64-variadic.patch
new file mode 100644
index 00000000..552db126
--- /dev/null
+++ b/packages/glibc/2.20/0003-dl-openat64-variadic.patch
@@ -0,0 +1,197 @@
+commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Oct 20 11:54:09 2015 +0000
+
+    Convert 113 more function definitions to prototype style (files with assertions).
+    
+    This mostly automatically-generated patch converts 113 function
+    definitions in glibc from old-style K&R to prototype-style.  Following
+    my other recent such patches, this one deals with the case of function
+    definitions in files that either contain assertions or where grep
+    suggested they might contain assertions - and thus where it isn't
+    possible to use a simple object code comparison as a sanity check on
+    the correctness of the patch, because line numbers are changed.
+    
+    A few such automatically-generated changes needed to be supplemented
+    by manual changes for the result to compile.  openat64 had a prototype
+    declaration with "..." but an old-style definition in
+    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
+    generated prototype in the definition (I've filed
+    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
+    such cases in GCC; the old state was undefined behavior not requiring
+    a diagnostic, but one seems a good idea).  In addition, as Florian has
+    noted regparm attribute mismatches between declaration and definition
+    are only diagnosed for prototype definitions, and five functions
+    needed internal_function added to their definitions (in the case of
+    __pthread_mutex_cond_lock, via the macro definition of
+    __pthread_mutex_lock) to compile on i386.
+    
+    After this patch is in, remaining old-style definitions are probably
+    most readily fixed manually before we can turn on
+    -Wold-style-definition for all builds.
+    
+    Tested for x86_64 and x86 (testsuite).
+    
+            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
+            function definition.
+            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
+            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
+            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
+            * elf/dl-minimal.c (_itoa): Likewise.
+            * hurd/hurdmalloc.c (malloc): Likewise.
+            (free): Likewise.
+            (realloc): Likewise.
+            * inet/inet6_option.c (inet6_option_space): Likewise.
+            (inet6_option_init): Likewise.
+            (inet6_option_append): Likewise.
+            (inet6_option_alloc): Likewise.
+            (inet6_option_next): Likewise.
+            (inet6_option_find): Likewise.
+            * io/ftw.c (FTW_NAME): Likewise.
+            (NFTW_NAME): Likewise.
+            (NFTW_NEW_NAME): Likewise.
+            (NFTW_OLD_NAME): Likewise.
+            * libio/iofwide.c (_IO_fwide): Likewise.
+            * libio/strops.c (_IO_str_init_static_internal): Likewise.
+            (_IO_str_init_static): Likewise.
+            (_IO_str_init_readonly): Likewise.
+            (_IO_str_overflow): Likewise.
+            (_IO_str_underflow): Likewise.
+            (_IO_str_count): Likewise.
+            (_IO_str_seekoff): Likewise.
+            (_IO_str_pbackfail): Likewise.
+            (_IO_str_finish): Likewise.
+            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
+            (_IO_wstr_overflow): Likewise.
+            (_IO_wstr_underflow): Likewise.
+            (_IO_wstr_count): Likewise.
+            (_IO_wstr_seekoff): Likewise.
+            (_IO_wstr_pbackfail): Likewise.
+            (_IO_wstr_finish): Likewise.
+            * locale/programs/localedef.c (normalize_codeset): Likewise.
+            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
+            (add_locales_to_archive): Likewise.
+            (delete_locales_from_archive): Likewise.
+            * malloc/malloc.c (__libc_mallinfo): Likewise.
+            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
+            * misc/tsearch.c (__tfind): Likewise.
+            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
+            * nptl/pthread_attr_getdetachstate.c
+            (__pthread_attr_getdetachstate): Likewise.
+            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
+            Likewise.
+            * nptl/pthread_attr_getinheritsched.c
+            (__pthread_attr_getinheritsched): Likewise.
+            * nptl/pthread_attr_getschedparam.c
+            (__pthread_attr_getschedparam): Likewise.
+            * nptl/pthread_attr_getschedpolicy.c
+            (__pthread_attr_getschedpolicy): Likewise.
+            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
+            Likewise.
+            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
+            Likewise.
+            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
+            Likewise.
+            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
+            Likewise.
+            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
+            (__pthread_attr_init_2_0): Likewise.
+            * nptl/pthread_attr_setdetachstate.c
+            (__pthread_attr_setdetachstate): Likewise.
+            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
+            Likewise.
+            * nptl/pthread_attr_setinheritsched.c
+            (__pthread_attr_setinheritsched): Likewise.
+            * nptl/pthread_attr_setschedparam.c
+            (__pthread_attr_setschedparam): Likewise.
+            * nptl/pthread_attr_setschedpolicy.c
+            (__pthread_attr_setschedpolicy): Likewise.
+            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
+            Likewise.
+            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
+            Likewise.
+            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
+            Likewise.
+            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
+            Likewise.
+            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
+            Likewise.
+            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
+            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
+            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
+            use internal_function.
+            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
+            prototype-style function definition.
+            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
+            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
+            internal_function.
+            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
+            Convert to prototype-style function definition.
+            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
+            Likewise.
+            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
+            Likewise.
+            (__pthread_mutex_unlock): Likewise.
+            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
+            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
+            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
+            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
+            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
+            * nss/makedb.c (process_input): Likewise.
+            * posix/fnmatch.c (__strchrnul): Likewise.
+            (__wcschrnul): Likewise.
+            (fnmatch): Likewise.
+            * posix/fnmatch_loop.c (FCT): Likewise.
+            * posix/glob.c (globfree): Likewise.
+            (__glob_pattern_type): Likewise.
+            (__glob_pattern_p): Likewise.
+            * posix/regcomp.c (re_compile_pattern): Likewise.
+            (re_set_syntax): Likewise.
+            (re_compile_fastmap): Likewise.
+            (regcomp): Likewise.
+            (regerror): Likewise.
+            (regfree): Likewise.
+            * posix/regexec.c (regexec): Likewise.
+            (re_match): Likewise.
+            (re_search): Likewise.
+            (re_match_2): Likewise.
+            (re_search_2): Likewise.
+            (re_search_stub): Likewise.  Use internal_function
+            (re_copy_regs): Likewise.
+            (re_set_registers): Convert to prototype-style function
+            definition.
+            (prune_impossible_nodes): Likewise.  Use internal_function.
+            * resolv/inet_net_pton.c (inet_net_pton): Convert to
+            prototype-style function definition.
+            (inet_net_pton_ipv4): Likewise.
+            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
+            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
+            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
+            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
+            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
+            Make variadic.
+            * time/strptime_l.c (localtime_r): Convert to prototype-style
+            function definition.
+            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
+            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
+            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
+            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
+
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/sysdeps/unix/sysv/linux/dl-openat64.c
++++ b/sysdeps/unix/sysv/linux/dl-openat64.c
+@@ -23,10 +23,7 @@
+ 
+ 
+ int
+-openat64 (dfd, file, oflag)
+-     int dfd;
+-     const char *file;
+-     int oflag;
++openat64 (int dfd, const char *file, int oflag, ...)
+ {
+   assert ((oflag & O_CREAT) == 0);
+ 
diff --git a/packages/glibc-linaro/2.20-2014.11/104-unused-variables.patch b/packages/glibc/2.20/0004-unused-variables.patch
similarity index 80%
rename from packages/glibc-linaro/2.20-2014.11/104-unused-variables.patch
rename to packages/glibc/2.20/0004-unused-variables.patch
index 889c9bbc..694bc612 100644
--- a/packages/glibc-linaro/2.20-2014.11/104-unused-variables.patch
+++ b/packages/glibc/2.20/0004-unused-variables.patch
@@ -19,8 +19,19 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    2 --
+ sysdeps/ieee754/flt-32/s_cosf.c        |    2 --
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ timezone/private.h                     |   10 ----------
+ 10 files changed, 1 insertion(+), 28 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,8 +45,6 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
 @@ -65,10 +65,8 @@
@@ -60,8 +69,6 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
 @@ -29,7 +29,7 @@
@@ -73,8 +80,6 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
 @@ -34,7 +34,6 @@
@@ -93,11 +98,9 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,8 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
+@@ -22,8 +22,6 @@
  log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
@@ -106,11 +109,9 @@ index 96f0e81..1daeef7 100644
  float
  __ieee754_log10f(float x)
  {
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,8 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
+@@ -21,8 +21,6 @@
  #include <math.h>
  #include <math_private.h>
  
@@ -119,11 +120,9 @@ index 864ab27..0affd40 100644
  #ifndef COSF
  # define COSF_FUNC __cosf
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -74,7 +74,6 @@
  static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  static const long double one = 1.0L;
@@ -131,11 +130,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = 1.0e4000L;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -140,7 +140,6 @@
  
  static const long double
  tiny = 1e-4931L,
@@ -143,11 +140,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
@@ -155,11 +150,9 @@ index ff759bc..9609550 100644
  static const long double zero = 0.0L;
  
  long double
-diff --git a/timezone/private.h b/timezone/private.h
-index 4e8f4ae..ed19e06 100644
 --- a/timezone/private.h
 +++ b/timezone/private.h
-@@ -326,16 +326,6 @@ const char *	scheck(const char * string, const char * format);
+@@ -326,16 +326,6 @@
  #define TYPE_SIGNED(type) (((type) -1) < 0)
  #endif /* !defined TYPE_SIGNED */
  
diff --git a/packages/glibc/2.20/0005-misleading-indentation.patch b/packages/glibc/2.20/0005-misleading-indentation.patch
new file mode 100644
index 00000000..8e08259e
--- /dev/null
+++ b/packages/glibc/2.20/0005-misleading-indentation.patch
@@ -0,0 +1,26 @@
+commit 976ef870542580cf5fed896c2c652b3e1a95f9da
+Author: Steve Ellcey <sellcey@mips.com>
+Date:   Fri Dec 11 09:19:37 2015 -0800
+
+    Fix indentation.
+    
+            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
+            Fix indentation.
+
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
++++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
+@@ -65,7 +65,9 @@
+ 
+     /* compute q[0],q[1],...q[jk] */
+ 	for (i=0;i<=jk;i++) {
+-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
++	    for(j=0,fw=0.0;j<=jx;j++)
++		fw += x[j]*f[jx+i-j];
++	    q[i] = fw;
+ 	}
+ 
+ 	jz = jk;
diff --git a/packages/glibc-linaro/2.20-2014.11/106-dl-open-array-bounds.patch b/packages/glibc/2.20/0006-dl-open-array-bounds.patch
similarity index 87%
rename from packages/glibc-linaro/2.20-2014.11/106-dl-open-array-bounds.patch
rename to packages/glibc/2.20/0006-dl-open-array-bounds.patch
index 08a90765..83eb0b3c 100644
--- a/packages/glibc-linaro/2.20-2014.11/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.20/0006-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -211,7 +211,7 @@ dl_open_worker (void *a)
+@@ -211,7 +211,7 @@
        struct link_map *l = _dl_find_dso_for_object ((ElfW(Addr)) caller_dlopen);
  
        if (l)
@@ -17,7 +19,7 @@ index 0dbe07f..2d0e082 100644
  
        if (args->nsid == __LM_ID_CALLER)
  	args->nsid = call_map->l_ns;
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -627,8 +627,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc/2.20/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.20/0007-Fix-combreloc-test-BSD-grep.patch
similarity index 77%
rename from packages/glibc/2.20/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.20/0007-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..f56a4ca6 100644
--- a/packages/glibc/2.20/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.20/0007-Fix-combreloc-test-BSD-grep.patch
@@ -13,16 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
 --- a/configure
 +++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+@@ -6025,7 +6025,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
  then
@@ -31,11 +28,9 @@ index eecd0ac..0118bd1 100755
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
+@@ -1397,7 +1397,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
@@ -44,6 +39,3 @@ index 4a77411..19f6d87 100644
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc/2.23/910-typedef-caddr.patch b/packages/glibc/2.20/0008-typedef-caddr.patch
similarity index 50%
rename from packages/glibc/2.23/910-typedef-caddr.patch
rename to packages/glibc/2.20/0008-typedef-caddr.patch
index fc7979b7..980939b9 100644
--- a/packages/glibc/2.23/910-typedef-caddr.patch
+++ b/packages/glibc/2.20/0008-typedef-caddr.patch
@@ -1,8 +1,11 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
+---
+ posix/sys/types.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
 @@ -113,7 +113,10 @@
- #ifdef __USE_MISC
+ #ifdef	__USE_MISC
  # ifndef __daddr_t_defined
  typedef __daddr_t daddr_t;
 +#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
@@ -12,4 +15,3 @@ diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
  #  define __daddr_t_defined
  # endif
  #endif
-
diff --git a/packages/glibc/2.20/0009-fix-rpc_parse-format.patch b/packages/glibc/2.20/0009-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.20/0009-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.20/930-explicit-boolean.patch b/packages/glibc/2.20/0010-explicit-boolean.patch
similarity index 85%
rename from packages/glibc/2.20/930-explicit-boolean.patch
rename to packages/glibc/2.20/0010-explicit-boolean.patch
index 780fae63..ff7cd879 100644
--- a/packages/glibc/2.20/930-explicit-boolean.patch
+++ b/packages/glibc/2.20/0010-explicit-boolean.patch
@@ -7,11 +7,13 @@ Date:   Fri Oct 14 12:53:27 2016 -0700
             * sysdeps/ieee754/dbl-64/e_pow.c (checkint) Make conditions explicitly
             boolean.
 
-diff --git a/sysdeps/ieee754/dbl-64/e_pow.c b/sysdeps/ieee754/dbl-64/e_pow.c
-index 663fa392c2..bd758b5979 100644
+---
+ sysdeps/ieee754/dbl-64/e_pow.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 --- a/sysdeps/ieee754/dbl-64/e_pow.c
 +++ b/sysdeps/ieee754/dbl-64/e_pow.c
-@@ -466,15 +466,15 @@ checkint (double x)
+@@ -462,15 +462,15 @@
      return (n & 1) ? -1 : 1;	/* odd or even */
    if (k > 20)
      {
diff --git a/packages/glibc/2.20/0011-nis-bogus-conditional.patch b/packages/glibc/2.20/0011-nis-bogus-conditional.patch
new file mode 100644
index 00000000..e7283681
--- /dev/null
+++ b/packages/glibc/2.20/0011-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -291,7 +291,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.20/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.20/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
deleted file mode 100644
index 6fd663a2..00000000
--- a/packages/glibc/2.20/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
- -Wparentheses
-
----
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-2.7.4
-
diff --git a/packages/glibc/2.20/102-fix-signed-shift-overlow.patch b/packages/glibc/2.20/102-fix-signed-shift-overlow.patch
deleted file mode 100644
index ef49f831..00000000
--- a/packages/glibc/2.20/102-fix-signed-shift-overlow.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-commit 5542236837c5c41435f8282ec92799f480c36f18
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Tue Jul 21 22:50:29 2015 -0700
-
-    Port the 0x7efe...feff pattern to GCC 6.
-    
-    See Steve Ellcey's bug report in:
-    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
-    * string/memrchr.c (MEMRCHR):
-    * string/rawmemchr.c (RAWMEMCHR):
-    * string/strchr.c (strchr):
-    * string/strchrnul.c (STRCHRNUL):
-    Rewrite code to avoid issues with signed shift overflow.
-
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
---- a/string/memrchr.c
-+++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
---- a/string/rawmemchr.c
-+++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
---- a/string/strchr.c
-+++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
---- a/string/strchrnul.c
-+++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
diff --git a/packages/glibc/2.20/103-dl-openat64-variadic.patch b/packages/glibc/2.20/103-dl-openat64-variadic.patch
deleted file mode 100644
index fe94b96d..00000000
--- a/packages/glibc/2.20/103-dl-openat64-variadic.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Oct 20 11:54:09 2015 +0000
-
-    Convert 113 more function definitions to prototype style (files with assertions).
-    
-    This mostly automatically-generated patch converts 113 function
-    definitions in glibc from old-style K&R to prototype-style.  Following
-    my other recent such patches, this one deals with the case of function
-    definitions in files that either contain assertions or where grep
-    suggested they might contain assertions - and thus where it isn't
-    possible to use a simple object code comparison as a sanity check on
-    the correctness of the patch, because line numbers are changed.
-    
-    A few such automatically-generated changes needed to be supplemented
-    by manual changes for the result to compile.  openat64 had a prototype
-    declaration with "..." but an old-style definition in
-    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
-    generated prototype in the definition (I've filed
-    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
-    such cases in GCC; the old state was undefined behavior not requiring
-    a diagnostic, but one seems a good idea).  In addition, as Florian has
-    noted regparm attribute mismatches between declaration and definition
-    are only diagnosed for prototype definitions, and five functions
-    needed internal_function added to their definitions (in the case of
-    __pthread_mutex_cond_lock, via the macro definition of
-    __pthread_mutex_lock) to compile on i386.
-    
-    After this patch is in, remaining old-style definitions are probably
-    most readily fixed manually before we can turn on
-    -Wold-style-definition for all builds.
-    
-    Tested for x86_64 and x86 (testsuite).
-    
-            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
-            function definition.
-            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
-            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
-            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
-            * elf/dl-minimal.c (_itoa): Likewise.
-            * hurd/hurdmalloc.c (malloc): Likewise.
-            (free): Likewise.
-            (realloc): Likewise.
-            * inet/inet6_option.c (inet6_option_space): Likewise.
-            (inet6_option_init): Likewise.
-            (inet6_option_append): Likewise.
-            (inet6_option_alloc): Likewise.
-            (inet6_option_next): Likewise.
-            (inet6_option_find): Likewise.
-            * io/ftw.c (FTW_NAME): Likewise.
-            (NFTW_NAME): Likewise.
-            (NFTW_NEW_NAME): Likewise.
-            (NFTW_OLD_NAME): Likewise.
-            * libio/iofwide.c (_IO_fwide): Likewise.
-            * libio/strops.c (_IO_str_init_static_internal): Likewise.
-            (_IO_str_init_static): Likewise.
-            (_IO_str_init_readonly): Likewise.
-            (_IO_str_overflow): Likewise.
-            (_IO_str_underflow): Likewise.
-            (_IO_str_count): Likewise.
-            (_IO_str_seekoff): Likewise.
-            (_IO_str_pbackfail): Likewise.
-            (_IO_str_finish): Likewise.
-            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
-            (_IO_wstr_overflow): Likewise.
-            (_IO_wstr_underflow): Likewise.
-            (_IO_wstr_count): Likewise.
-            (_IO_wstr_seekoff): Likewise.
-            (_IO_wstr_pbackfail): Likewise.
-            (_IO_wstr_finish): Likewise.
-            * locale/programs/localedef.c (normalize_codeset): Likewise.
-            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
-            (add_locales_to_archive): Likewise.
-            (delete_locales_from_archive): Likewise.
-            * malloc/malloc.c (__libc_mallinfo): Likewise.
-            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
-            * misc/tsearch.c (__tfind): Likewise.
-            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
-            * nptl/pthread_attr_getdetachstate.c
-            (__pthread_attr_getdetachstate): Likewise.
-            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
-            Likewise.
-            * nptl/pthread_attr_getinheritsched.c
-            (__pthread_attr_getinheritsched): Likewise.
-            * nptl/pthread_attr_getschedparam.c
-            (__pthread_attr_getschedparam): Likewise.
-            * nptl/pthread_attr_getschedpolicy.c
-            (__pthread_attr_getschedpolicy): Likewise.
-            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
-            Likewise.
-            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
-            Likewise.
-            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
-            Likewise.
-            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
-            Likewise.
-            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
-            (__pthread_attr_init_2_0): Likewise.
-            * nptl/pthread_attr_setdetachstate.c
-            (__pthread_attr_setdetachstate): Likewise.
-            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
-            Likewise.
-            * nptl/pthread_attr_setinheritsched.c
-            (__pthread_attr_setinheritsched): Likewise.
-            * nptl/pthread_attr_setschedparam.c
-            (__pthread_attr_setschedparam): Likewise.
-            * nptl/pthread_attr_setschedpolicy.c
-            (__pthread_attr_setschedpolicy): Likewise.
-            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
-            Likewise.
-            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
-            Likewise.
-            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
-            Likewise.
-            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
-            Likewise.
-            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
-            Likewise.
-            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
-            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
-            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
-            use internal_function.
-            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
-            prototype-style function definition.
-            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
-            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
-            internal_function.
-            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
-            Convert to prototype-style function definition.
-            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
-            Likewise.
-            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
-            Likewise.
-            (__pthread_mutex_unlock): Likewise.
-            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
-            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
-            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
-            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
-            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
-            * nss/makedb.c (process_input): Likewise.
-            * posix/fnmatch.c (__strchrnul): Likewise.
-            (__wcschrnul): Likewise.
-            (fnmatch): Likewise.
-            * posix/fnmatch_loop.c (FCT): Likewise.
-            * posix/glob.c (globfree): Likewise.
-            (__glob_pattern_type): Likewise.
-            (__glob_pattern_p): Likewise.
-            * posix/regcomp.c (re_compile_pattern): Likewise.
-            (re_set_syntax): Likewise.
-            (re_compile_fastmap): Likewise.
-            (regcomp): Likewise.
-            (regerror): Likewise.
-            (regfree): Likewise.
-            * posix/regexec.c (regexec): Likewise.
-            (re_match): Likewise.
-            (re_search): Likewise.
-            (re_match_2): Likewise.
-            (re_search_2): Likewise.
-            (re_search_stub): Likewise.  Use internal_function
-            (re_copy_regs): Likewise.
-            (re_set_registers): Convert to prototype-style function
-            definition.
-            (prune_impossible_nodes): Likewise.  Use internal_function.
-            * resolv/inet_net_pton.c (inet_net_pton): Convert to
-            prototype-style function definition.
-            (inet_net_pton_ipv4): Likewise.
-            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
-            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
-            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
-            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
-            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
-            Make variadic.
-            * time/strptime_l.c (localtime_r): Convert to prototype-style
-            function definition.
-            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
-            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
-            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
-            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
-
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
---- a/sysdeps/unix/sysv/linux/dl-openat64.c
-+++ b/sysdeps/unix/sysv/linux/dl-openat64.c
-@@ -23,10 +23,7 @@
- 
- 
- int
--openat64 (dfd, file, oflag)
--     int dfd;
--     const char *file;
--     int oflag;
-+openat64 (int dfd, const char *file, int oflag, ...)
- {
-   assert ((oflag & O_CREAT) == 0);
- 
diff --git a/packages/glibc/2.20/104-unused-variables.patch b/packages/glibc/2.20/104-unused-variables.patch
deleted file mode 100644
index 889c9bbc..00000000
--- a/packages/glibc/2.20/104-unused-variables.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-commit 6565fcb6e189d67b5a3f321453daebb805056d73
-Author: Wilco Dijkstra <wdijkstr@arm.com>
-Date:   Fri Sep 18 20:27:20 2015 +0100
-
-    Fix several build failures with GCC6 due to unused static variables.
-    
-    2015-09-18  Wilco Dijkstra  <wdijkstr@arm.com>
-    
-            * resolv/base64.c (rcsid): Remove unused static.
-            * sysdeps/ieee754/dbl-64/atnat2.h (qpi1): Remove unused
-            static.  (tqpi1): Likewise.
-            * sysdeps/ieee754/dbl-64/uexp.h (one): Likewise.
-            * sysdeps/ieee754/dbl-64/upow.h (sqrt_2): Likewise.
-            * sysdeps/ieee754/flt-32/e_log10f.c (one): Likewise.
-            * sysdeps/ieee754/flt-32/s_cosf.c (one): Likewise.
-            * sysdeps/ieee754/ldbl-128/e_lgammal_r.c (zero): Likewise.
-            * sysdeps/ieee754/ldbl-128/s_erfl.c (half): Likewise.
-            * sysdeps/ieee754/ldbl-128/s_log1pl.c (maxlog): Likewise.
-            * timezone/private.h (time_t_min): Likewise.  (time_t_max):
-            Likewise.
-
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
---- a/resolv/base64.c
-+++ b/resolv/base64.c
-@@ -40,10 +40,6 @@
-  * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
-  */
- 
--#if !defined(LINT) && !defined(CODECENTER)
--static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $";
--#endif /* not lint */
--
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
---- a/sysdeps/ieee754/dbl-64/atnat2.h
-+++ b/sysdeps/ieee754/dbl-64/atnat2.h
-@@ -65,10 +65,8 @@
- /**/ hpi1           = {{0x3c91a626, 0x33145c07} }, /*  pi/2-hpi     */
- /**/ mhpi           = {{0xbff921fb, 0x54442d18} }, /* -pi/2         */
- /**/ qpi            = {{0x3fe921fb, 0x54442d18} }, /*  pi/4         */
--/**/ qpi1           = {{0x3c81a626, 0x33145c07} }, /*  pi/4-qpi     */
- /**/ mqpi           = {{0xbfe921fb, 0x54442d18} }, /* -pi/4         */
- /**/ tqpi           = {{0x4002d97c, 0x7f3321d2} }, /*  3pi/4        */
--/**/ tqpi1          = {{0x3c9a7939, 0x4c9e8a0a} }, /*  3pi/4-tqpi   */
- /**/ mtqpi          = {{0xc002d97c, 0x7f3321d2} }, /* -3pi/4        */
- /**/ u1             = {{0x3c314c2a, 0x00000000} }, /*  9.377e-19    */
- /**/ u2             = {{0x3bf955e4, 0x00000000} }, /*  8.584e-20    */
-@@ -129,10 +127,8 @@
- /**/ hpi1           = {{0x33145c07, 0x3c91a626} }, /*  pi/2-hpi     */
- /**/ mhpi           = {{0x54442d18, 0xbff921fb} }, /* -pi/2         */
- /**/ qpi            = {{0x54442d18, 0x3fe921fb} }, /*  pi/4         */
--/**/ qpi1           = {{0x33145c07, 0x3c81a626} }, /*  pi/4-qpi     */
- /**/ mqpi           = {{0x54442d18, 0xbfe921fb} }, /* -pi/4         */
- /**/ tqpi           = {{0x7f3321d2, 0x4002d97c} }, /*  3pi/4        */
--/**/ tqpi1          = {{0x4c9e8a0a, 0x3c9a7939} }, /*  3pi/4-tqpi   */
- /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
- /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
- /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
---- a/sysdeps/ieee754/dbl-64/uexp.h
-+++ b/sysdeps/ieee754/dbl-64/uexp.h
-@@ -29,7 +29,7 @@
- 
- #include "mydefs.h"
- 
--const static double one = 1.0, zero = 0.0, hhuge = 1.0e300, tiny = 1.0e-300,
-+const static double zero = 0.0, hhuge = 1.0e300, tiny = 1.0e-300,
- err_0 = 1.000014, err_1 = 0.000016;
- const static int4 bigint = 0x40862002,
-              badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
---- a/sysdeps/ieee754/dbl-64/upow.h
-+++ b/sysdeps/ieee754/dbl-64/upow.h
-@@ -34,7 +34,6 @@
- /**/ nZERO	    = {{0x80000000, 0}},	  /* -0.0          */
- /**/ INF            = {{0x7ff00000, 0x00000000}}, /* INF           */
- /**/ nINF           = {{0xfff00000, 0x00000000}}, /* -INF          */
--/**/ sqrt_2         = {{0x3ff6a09e, 0x667f3bcc}}, /* sqrt(2)       */
- /**/ ln2a           = {{0x3fe62e42, 0xfefa3800}}, /* ln(2) 43 bits */
- /**/ ln2b           = {{0x3d2ef357, 0x93c76730}}, /* ln(2)-ln2a    */
- /**/ bigu           = {{0x4297ffff, 0xfffffd2c}}, /* 1.5*2**42 -724*2**-10  */
-@@ -48,7 +47,6 @@
- /**/ nZERO	    = {{0, 0x80000000}},	  /* -0.0          */
- /**/ INF            = {{0x00000000, 0x7ff00000}}, /* INF           */
- /**/ nINF           = {{0x00000000, 0xfff00000}}, /* -INF           */
--/**/ sqrt_2         = {{0x667f3bcc, 0x3ff6a09e}}, /* sqrt(2)       */
- /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
- /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
- /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
---- a/sysdeps/ieee754/flt-32/e_log10f.c
-+++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,8 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
- log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
- log10_2lo  =  7.9034151668e-07; /* 0x355427db */
- 
--static const float zero   =  0.0;
--
- float
- __ieee754_log10f(float x)
- {
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
---- a/sysdeps/ieee754/flt-32/s_cosf.c
-+++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,8 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
- #include <math.h>
- #include <math_private.h>
- 
--static const float one=1.0;
--
- #ifndef COSF
- # define COSF_FUNC __cosf
- #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
---- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-+++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
- static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
- static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
- static const long double one = 1.0L;
--static const long double zero = 0.0L;
- static const long double huge = 1.0e4000L;
- 
- /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
---- a/sysdeps/ieee754/ldbl-128/s_erfl.c
-+++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
- 
- static const long double
- tiny = 1e-4931L,
--  half = 0.5L,
-   one = 1.0L,
-   two = 2.0L,
-   /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
---- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
-+++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
- 
- static const long double sqrth = 0.7071067811865475244008443621048490392848L;
- /* ln (2^16384 * (1 - 2^-113)) */
--static const long double maxlog = 1.1356523406294143949491931077970764891253E4L;
- static const long double zero = 0.0L;
- 
- long double
-diff --git a/timezone/private.h b/timezone/private.h
-index 4e8f4ae..ed19e06 100644
---- a/timezone/private.h
-+++ b/timezone/private.h
-@@ -326,16 +326,6 @@ const char *	scheck(const char * string, const char * format);
- #define TYPE_SIGNED(type) (((type) -1) < 0)
- #endif /* !defined TYPE_SIGNED */
- 
--/* The minimum and maximum finite time values.  */
--static time_t const time_t_min =
--  (TYPE_SIGNED(time_t)
--   ? (time_t) -1 << (CHAR_BIT * sizeof (time_t) - 1)
--   : 0);
--static time_t const time_t_max =
--  (TYPE_SIGNED(time_t)
--   ? - (~ 0 < 0) - ((time_t) -1 << (CHAR_BIT * sizeof (time_t) - 1))
--   : -1);
--
- #ifndef INT_STRLEN_MAXIMUM
- /*
- ** 302 / 1000 is log10(2.0) rounded up.
diff --git a/packages/glibc/2.20/105-misleading-indentation.patch b/packages/glibc/2.20/105-misleading-indentation.patch
deleted file mode 100644
index 1dd8d851..00000000
--- a/packages/glibc/2.20/105-misleading-indentation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 976ef870542580cf5fed896c2c652b3e1a95f9da
-Author: Steve Ellcey <sellcey@mips.com>
-Date:   Fri Dec 11 09:19:37 2015 -0800
-
-    Fix indentation.
-    
-            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
-            Fix indentation.
-
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
---- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-+++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
- 
-     /* compute q[0],q[1],...q[jk] */
- 	for (i=0;i<=jk;i++) {
--	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-+	    for(j=0,fw=0.0;j<=jx;j++)
-+		fw += x[j]*f[jx+i-j];
-+	    q[i] = fw;
- 	}
- 
- 	jz = jk;
diff --git a/packages/glibc/2.20/920-fix-rpc_parse-format.patch b/packages/glibc/2.20/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.20/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.20/940-nis-bogus-conditional.patch b/packages/glibc/2.20/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.20/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.21/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.21/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
new file mode 100644
index 00000000..b9509a35
--- /dev/null
+++ b/packages/glibc/2.21/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -0,0 +1,75 @@
+From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
+From: Yvan Roux <yvan.roux@linaro.org>
+Date: Fri, 15 Apr 2016 13:29:26 +0200
+Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
+ -Wparentheses
+
+---
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+--- a/nis/nis_call.c
++++ b/nis/nis_call.c
+@@ -680,16 +680,18 @@
+   /* Choose which entry should be evicted from the cache.  */
+   loc = &nis_server_cache[0];
+   if (*loc != NULL)
+-    for (i = 1; i < 16; ++i)
+-      if (nis_server_cache[i] == NULL)
+-	{
++    {
++      for (i = 1; i < 16; ++i)
++	if (nis_server_cache[i] == NULL)
++	  {
++	    loc = &nis_server_cache[i];
++	    break;
++	  }
++	else if ((*loc)->uses > nis_server_cache[i]->uses
++		 || ((*loc)->uses == nis_server_cache[i]->uses
++		     && (*loc)->expires > nis_server_cache[i]->expires))
+ 	  loc = &nis_server_cache[i];
+-	  break;
+-	}
+-      else if ((*loc)->uses > nis_server_cache[i]->uses
+-	       || ((*loc)->uses == nis_server_cache[i]->uses
+-		   && (*loc)->expires > nis_server_cache[i]->expires))
+-	loc = &nis_server_cache[i];
++    }
+   old = *loc;
+   *loc = new;
+ 
+--- a/stdlib/setenv.c
++++ b/stdlib/setenv.c
+@@ -269,18 +269,20 @@
+   ep = __environ;
+   if (ep != NULL)
+     while (*ep != NULL)
+-      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+-	{
+-	  /* Found it.  Remove this pointer by moving later ones back.  */
+-	  char **dp = ep;
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
+-	  do
+-	    dp[0] = dp[1];
+-	  while (*dp++);
+-	  /* Continue the loop in case NAME appears again.  */
+-	}
+-      else
+-	++ep;
++	    do
++		dp[0] = dp[1];
++	    while (*dp++);
++	    /* Continue the loop in case NAME appears again.  */
++	  }
++	else
++	  ++ep;
++      }
+ 
+   UNLOCK;
+ 
diff --git a/packages/glibc/2.21/0001-fix-signed-shift-overlow.patch b/packages/glibc/2.21/0001-fix-signed-shift-overlow.patch
new file mode 100644
index 00000000..c7cc3302
--- /dev/null
+++ b/packages/glibc/2.21/0001-fix-signed-shift-overlow.patch
@@ -0,0 +1,97 @@
+commit 5542236837c5c41435f8282ec92799f480c36f18
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date:   Tue Jul 21 22:50:29 2015 -0700
+
+    Port the 0x7efe...feff pattern to GCC 6.
+    
+    See Steve Ellcey's bug report in:
+    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
+    * string/memrchr.c (MEMRCHR):
+    * string/rawmemchr.c (RAWMEMCHR):
+    * string/strchr.c (strchr):
+    * string/strchrnul.c (STRCHRNUL):
+    Rewrite code to avoid issues with signed shift overflow.
+
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
+--- a/string/memrchr.c
++++ b/string/memrchr.c
+@@ -96,15 +96,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/rawmemchr.c
++++ b/string/rawmemchr.c
+@@ -86,15 +86,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchr.c
++++ b/string/strchr.c
+@@ -60,13 +60,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchrnul.c
++++ b/string/strchrnul.c
+@@ -66,13 +66,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
diff --git a/packages/glibc/2.21/0002-dl-openat64-variadic.patch b/packages/glibc/2.21/0002-dl-openat64-variadic.patch
new file mode 100644
index 00000000..552db126
--- /dev/null
+++ b/packages/glibc/2.21/0002-dl-openat64-variadic.patch
@@ -0,0 +1,197 @@
+commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Oct 20 11:54:09 2015 +0000
+
+    Convert 113 more function definitions to prototype style (files with assertions).
+    
+    This mostly automatically-generated patch converts 113 function
+    definitions in glibc from old-style K&R to prototype-style.  Following
+    my other recent such patches, this one deals with the case of function
+    definitions in files that either contain assertions or where grep
+    suggested they might contain assertions - and thus where it isn't
+    possible to use a simple object code comparison as a sanity check on
+    the correctness of the patch, because line numbers are changed.
+    
+    A few such automatically-generated changes needed to be supplemented
+    by manual changes for the result to compile.  openat64 had a prototype
+    declaration with "..." but an old-style definition in
+    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
+    generated prototype in the definition (I've filed
+    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
+    such cases in GCC; the old state was undefined behavior not requiring
+    a diagnostic, but one seems a good idea).  In addition, as Florian has
+    noted regparm attribute mismatches between declaration and definition
+    are only diagnosed for prototype definitions, and five functions
+    needed internal_function added to their definitions (in the case of
+    __pthread_mutex_cond_lock, via the macro definition of
+    __pthread_mutex_lock) to compile on i386.
+    
+    After this patch is in, remaining old-style definitions are probably
+    most readily fixed manually before we can turn on
+    -Wold-style-definition for all builds.
+    
+    Tested for x86_64 and x86 (testsuite).
+    
+            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
+            function definition.
+            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
+            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
+            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
+            * elf/dl-minimal.c (_itoa): Likewise.
+            * hurd/hurdmalloc.c (malloc): Likewise.
+            (free): Likewise.
+            (realloc): Likewise.
+            * inet/inet6_option.c (inet6_option_space): Likewise.
+            (inet6_option_init): Likewise.
+            (inet6_option_append): Likewise.
+            (inet6_option_alloc): Likewise.
+            (inet6_option_next): Likewise.
+            (inet6_option_find): Likewise.
+            * io/ftw.c (FTW_NAME): Likewise.
+            (NFTW_NAME): Likewise.
+            (NFTW_NEW_NAME): Likewise.
+            (NFTW_OLD_NAME): Likewise.
+            * libio/iofwide.c (_IO_fwide): Likewise.
+            * libio/strops.c (_IO_str_init_static_internal): Likewise.
+            (_IO_str_init_static): Likewise.
+            (_IO_str_init_readonly): Likewise.
+            (_IO_str_overflow): Likewise.
+            (_IO_str_underflow): Likewise.
+            (_IO_str_count): Likewise.
+            (_IO_str_seekoff): Likewise.
+            (_IO_str_pbackfail): Likewise.
+            (_IO_str_finish): Likewise.
+            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
+            (_IO_wstr_overflow): Likewise.
+            (_IO_wstr_underflow): Likewise.
+            (_IO_wstr_count): Likewise.
+            (_IO_wstr_seekoff): Likewise.
+            (_IO_wstr_pbackfail): Likewise.
+            (_IO_wstr_finish): Likewise.
+            * locale/programs/localedef.c (normalize_codeset): Likewise.
+            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
+            (add_locales_to_archive): Likewise.
+            (delete_locales_from_archive): Likewise.
+            * malloc/malloc.c (__libc_mallinfo): Likewise.
+            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
+            * misc/tsearch.c (__tfind): Likewise.
+            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
+            * nptl/pthread_attr_getdetachstate.c
+            (__pthread_attr_getdetachstate): Likewise.
+            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
+            Likewise.
+            * nptl/pthread_attr_getinheritsched.c
+            (__pthread_attr_getinheritsched): Likewise.
+            * nptl/pthread_attr_getschedparam.c
+            (__pthread_attr_getschedparam): Likewise.
+            * nptl/pthread_attr_getschedpolicy.c
+            (__pthread_attr_getschedpolicy): Likewise.
+            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
+            Likewise.
+            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
+            Likewise.
+            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
+            Likewise.
+            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
+            Likewise.
+            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
+            (__pthread_attr_init_2_0): Likewise.
+            * nptl/pthread_attr_setdetachstate.c
+            (__pthread_attr_setdetachstate): Likewise.
+            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
+            Likewise.
+            * nptl/pthread_attr_setinheritsched.c
+            (__pthread_attr_setinheritsched): Likewise.
+            * nptl/pthread_attr_setschedparam.c
+            (__pthread_attr_setschedparam): Likewise.
+            * nptl/pthread_attr_setschedpolicy.c
+            (__pthread_attr_setschedpolicy): Likewise.
+            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
+            Likewise.
+            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
+            Likewise.
+            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
+            Likewise.
+            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
+            Likewise.
+            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
+            Likewise.
+            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
+            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
+            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
+            use internal_function.
+            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
+            prototype-style function definition.
+            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
+            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
+            internal_function.
+            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
+            Convert to prototype-style function definition.
+            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
+            Likewise.
+            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
+            Likewise.
+            (__pthread_mutex_unlock): Likewise.
+            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
+            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
+            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
+            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
+            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
+            * nss/makedb.c (process_input): Likewise.
+            * posix/fnmatch.c (__strchrnul): Likewise.
+            (__wcschrnul): Likewise.
+            (fnmatch): Likewise.
+            * posix/fnmatch_loop.c (FCT): Likewise.
+            * posix/glob.c (globfree): Likewise.
+            (__glob_pattern_type): Likewise.
+            (__glob_pattern_p): Likewise.
+            * posix/regcomp.c (re_compile_pattern): Likewise.
+            (re_set_syntax): Likewise.
+            (re_compile_fastmap): Likewise.
+            (regcomp): Likewise.
+            (regerror): Likewise.
+            (regfree): Likewise.
+            * posix/regexec.c (regexec): Likewise.
+            (re_match): Likewise.
+            (re_search): Likewise.
+            (re_match_2): Likewise.
+            (re_search_2): Likewise.
+            (re_search_stub): Likewise.  Use internal_function
+            (re_copy_regs): Likewise.
+            (re_set_registers): Convert to prototype-style function
+            definition.
+            (prune_impossible_nodes): Likewise.  Use internal_function.
+            * resolv/inet_net_pton.c (inet_net_pton): Convert to
+            prototype-style function definition.
+            (inet_net_pton_ipv4): Likewise.
+            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
+            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
+            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
+            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
+            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
+            Make variadic.
+            * time/strptime_l.c (localtime_r): Convert to prototype-style
+            function definition.
+            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
+            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
+            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
+            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
+
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/sysdeps/unix/sysv/linux/dl-openat64.c
++++ b/sysdeps/unix/sysv/linux/dl-openat64.c
+@@ -23,10 +23,7 @@
+ 
+ 
+ int
+-openat64 (dfd, file, oflag)
+-     int dfd;
+-     const char *file;
+-     int oflag;
++openat64 (int dfd, const char *file, int oflag, ...)
+ {
+   assert ((oflag & O_CREAT) == 0);
+ 
diff --git a/packages/glibc/2.21/104-unused-variables.patch b/packages/glibc/2.21/0003-unused-variables.patch
similarity index 80%
rename from packages/glibc/2.21/104-unused-variables.patch
rename to packages/glibc/2.21/0003-unused-variables.patch
index fd4def02..33598346 100644
--- a/packages/glibc/2.21/104-unused-variables.patch
+++ b/packages/glibc/2.21/0003-unused-variables.patch
@@ -19,8 +19,19 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    2 --
+ sysdeps/ieee754/flt-32/s_cosf.c        |    2 --
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ timezone/private.h                     |   10 ----------
+ 10 files changed, 1 insertion(+), 28 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,8 +45,6 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
 @@ -65,10 +65,8 @@
@@ -60,8 +69,6 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
 @@ -29,7 +29,7 @@
@@ -73,8 +80,6 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
 @@ -34,7 +34,6 @@
@@ -93,11 +98,9 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,8 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
+@@ -22,8 +22,6 @@
  log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
@@ -106,11 +109,9 @@ index 96f0e81..1daeef7 100644
  float
  __ieee754_log10f(float x)
  {
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,8 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
+@@ -21,8 +21,6 @@
  #include <math.h>
  #include <math_private.h>
  
@@ -119,11 +120,9 @@ index 864ab27..0affd40 100644
  #ifndef COSF
  # define COSF_FUNC __cosf
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -82,7 +82,6 @@
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  DIAG_POP_NEEDS_COMMENT;
  static const long double one = 1.0L;
@@ -131,11 +130,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = LDBL_MAX;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -140,7 +140,6 @@
  
  static const long double
  tiny = 1e-4931L,
@@ -143,11 +140,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
@@ -155,11 +150,9 @@ index ff759bc..9609550 100644
  static const long double zero = 0.0L;
  
  long double
-diff --git a/timezone/private.h b/timezone/private.h
-index 4e8f4ae..ed19e06 100644
 --- a/timezone/private.h
 +++ b/timezone/private.h
-@@ -326,16 +326,6 @@ const char *	scheck(const char * string, const char * format);
+@@ -326,16 +326,6 @@
  #define TYPE_SIGNED(type) (((type) -1) < 0)
  #endif /* !defined TYPE_SIGNED */
  
diff --git a/packages/glibc/2.21/0004-misleading-indentation.patch b/packages/glibc/2.21/0004-misleading-indentation.patch
new file mode 100644
index 00000000..8e08259e
--- /dev/null
+++ b/packages/glibc/2.21/0004-misleading-indentation.patch
@@ -0,0 +1,26 @@
+commit 976ef870542580cf5fed896c2c652b3e1a95f9da
+Author: Steve Ellcey <sellcey@mips.com>
+Date:   Fri Dec 11 09:19:37 2015 -0800
+
+    Fix indentation.
+    
+            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
+            Fix indentation.
+
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
++++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
+@@ -65,7 +65,9 @@
+ 
+     /* compute q[0],q[1],...q[jk] */
+ 	for (i=0;i<=jk;i++) {
+-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
++	    for(j=0,fw=0.0;j<=jx;j++)
++		fw += x[j]*f[jx+i-j];
++	    q[i] = fw;
+ 	}
+ 
+ 	jz = jk;
diff --git a/packages/glibc/2.21/0005-dl-open-array-bounds.patch b/packages/glibc/2.21/0005-dl-open-array-bounds.patch
new file mode 100644
index 00000000..ae626f13
--- /dev/null
+++ b/packages/glibc/2.21/0005-dl-open-array-bounds.patch
@@ -0,0 +1,38 @@
+commit 328c44c3670ebf6c1bd790acddce65a12998cd6c
+Author: Roland McGrath <roland@hack.frob.com>
+Date:   Fri Apr 17 12:11:58 2015 -0700
+
+    Fuller check for invalid NSID in _dl_open.
+
+---
+ elf/dl-open.c |   12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+--- a/elf/dl-open.c
++++ b/elf/dl-open.c
+@@ -211,7 +211,7 @@
+       struct link_map *l = _dl_find_dso_for_object ((ElfW(Addr)) caller_dlopen);
+ 
+       if (l)
+-        call_map = l;
++	call_map = l;
+ 
+       if (args->nsid == __LM_ID_CALLER)
+ 	args->nsid = call_map->l_ns;
+@@ -629,8 +629,14 @@
+   /* Never allow loading a DSO in a namespace which is empty.  Such
+      direct placements is only causing problems.  Also don't allow
+      loading into a namespace used for auditing.  */
+-  else if (__builtin_expect (nsid != LM_ID_BASE && nsid != __LM_ID_CALLER, 0)
+-	   && (GL(dl_ns)[nsid]._ns_nloaded == 0
++  else if (__glibc_unlikely (nsid != LM_ID_BASE && nsid != __LM_ID_CALLER)
++	   && (__glibc_unlikely (nsid < 0 || nsid >= GL(dl_nns))
++	       /* This prevents the [NSID] index expressions from being
++		  evaluated, so the compiler won't think that we are
++		  accessing an invalid index here in the !SHARED case where
++		  DL_NNS is 1 and so any NSID != 0 is invalid.  */
++	       || DL_NNS == 1
++	       || GL(dl_ns)[nsid]._ns_nloaded == 0
+ 	       || GL(dl_ns)[nsid]._ns_loaded->l_auditing))
+     _dl_signal_error (EINVAL, file, NULL,
+ 		      N_("invalid target namespace in dlmopen()"));
diff --git a/packages/glibc/2.21/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.21/0006-Fix-combreloc-test-BSD-grep.patch
similarity index 77%
rename from packages/glibc/2.21/140-Fix-combreloc-test-BSD-grep.patch
rename to packages/glibc/2.21/0006-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..f90947bb 100644
--- a/packages/glibc/2.21/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.21/0006-Fix-combreloc-test-BSD-grep.patch
@@ -13,16 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
 --- a/configure
 +++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+@@ -6017,7 +6017,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
  then
@@ -31,11 +28,9 @@ index eecd0ac..0118bd1 100755
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
+@@ -1391,7 +1391,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
@@ -44,6 +39,3 @@ index 4a77411..19f6d87 100644
      libc_cv_z_combreloc=yes
    else
      libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc/2.22/910-typedef-caddr.patch b/packages/glibc/2.21/0007-typedef-caddr.patch
similarity index 50%
rename from packages/glibc/2.22/910-typedef-caddr.patch
rename to packages/glibc/2.21/0007-typedef-caddr.patch
index fc7979b7..980939b9 100644
--- a/packages/glibc/2.22/910-typedef-caddr.patch
+++ b/packages/glibc/2.21/0007-typedef-caddr.patch
@@ -1,8 +1,11 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
+---
+ posix/sys/types.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
 @@ -113,7 +113,10 @@
- #ifdef __USE_MISC
+ #ifdef	__USE_MISC
  # ifndef __daddr_t_defined
  typedef __daddr_t daddr_t;
 +#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
@@ -12,4 +15,3 @@ diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
  #  define __daddr_t_defined
  # endif
  #endif
-
diff --git a/packages/glibc/2.21/0008-fix-rpc_parse-format.patch b/packages/glibc/2.21/0008-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.21/0008-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.21/930-explicit-boolean.patch b/packages/glibc/2.21/0009-explicit-boolean.patch
similarity index 85%
rename from packages/glibc/2.21/930-explicit-boolean.patch
rename to packages/glibc/2.21/0009-explicit-boolean.patch
index 780fae63..ff7cd879 100644
--- a/packages/glibc/2.21/930-explicit-boolean.patch
+++ b/packages/glibc/2.21/0009-explicit-boolean.patch
@@ -7,11 +7,13 @@ Date:   Fri Oct 14 12:53:27 2016 -0700
             * sysdeps/ieee754/dbl-64/e_pow.c (checkint) Make conditions explicitly
             boolean.
 
-diff --git a/sysdeps/ieee754/dbl-64/e_pow.c b/sysdeps/ieee754/dbl-64/e_pow.c
-index 663fa392c2..bd758b5979 100644
+---
+ sysdeps/ieee754/dbl-64/e_pow.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 --- a/sysdeps/ieee754/dbl-64/e_pow.c
 +++ b/sysdeps/ieee754/dbl-64/e_pow.c
-@@ -466,15 +466,15 @@ checkint (double x)
+@@ -462,15 +462,15 @@
      return (n & 1) ? -1 : 1;	/* odd or even */
    if (k > 20)
      {
diff --git a/packages/glibc/2.21/0010-nis-bogus-conditional.patch b/packages/glibc/2.21/0010-nis-bogus-conditional.patch
new file mode 100644
index 00000000..e7283681
--- /dev/null
+++ b/packages/glibc/2.21/0010-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -291,7 +291,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.21/950-dlclose-assert.patch b/packages/glibc/2.21/0011-dlclose-assert.patch
similarity index 85%
rename from packages/glibc/2.21/950-dlclose-assert.patch
rename to packages/glibc/2.21/0011-dlclose-assert.patch
index 6e2fcff4..4a9de102 100644
--- a/packages/glibc/2.21/950-dlclose-assert.patch
+++ b/packages/glibc/2.21/0011-dlclose-assert.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 14:29:40 2015 -0700
 
     Avoid confusing compiler with dynamically impossible statically invalid dereference in _dl_close_worker.
 
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index cf8f9e0465..412f71d70b 100644
+---
+ elf/dl-close.c |   16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
 --- a/elf/dl-close.c
 +++ b/elf/dl-close.c
-@@ -641,9 +641,16 @@ _dl_close_worker (struct link_map *map)
+@@ -641,9 +641,16 @@
  	  DL_UNMAP (imap);
  
  	  /* Finally, unlink the data structure and free it.  */
@@ -28,7 +30,7 @@ index cf8f9e0465..412f71d70b 100644
  	    {
  	      assert (nsid != LM_ID_BASE);
  	      ns->_ns_loaded = imap->l_next;
-@@ -652,6 +659,9 @@ _dl_close_worker (struct link_map *map)
+@@ -652,6 +659,9 @@
  		 we leave for debuggers to examine.  */
  	      r->r_map = (void *) ns->_ns_loaded;
  	    }
diff --git a/packages/glibc/2.21/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.21/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
deleted file mode 100644
index 6fd663a2..00000000
--- a/packages/glibc/2.21/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
- -Wparentheses
-
----
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-2.7.4
-
diff --git a/packages/glibc/2.21/102-fix-signed-shift-overlow.patch b/packages/glibc/2.21/102-fix-signed-shift-overlow.patch
deleted file mode 100644
index ef49f831..00000000
--- a/packages/glibc/2.21/102-fix-signed-shift-overlow.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-commit 5542236837c5c41435f8282ec92799f480c36f18
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Tue Jul 21 22:50:29 2015 -0700
-
-    Port the 0x7efe...feff pattern to GCC 6.
-    
-    See Steve Ellcey's bug report in:
-    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
-    * string/memrchr.c (MEMRCHR):
-    * string/rawmemchr.c (RAWMEMCHR):
-    * string/strchr.c (strchr):
-    * string/strchrnul.c (STRCHRNUL):
-    Rewrite code to avoid issues with signed shift overflow.
-
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
---- a/string/memrchr.c
-+++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
---- a/string/rawmemchr.c
-+++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
---- a/string/strchr.c
-+++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
---- a/string/strchrnul.c
-+++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
diff --git a/packages/glibc/2.21/103-dl-openat64-variadic.patch b/packages/glibc/2.21/103-dl-openat64-variadic.patch
deleted file mode 100644
index fe94b96d..00000000
--- a/packages/glibc/2.21/103-dl-openat64-variadic.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Oct 20 11:54:09 2015 +0000
-
-    Convert 113 more function definitions to prototype style (files with assertions).
-    
-    This mostly automatically-generated patch converts 113 function
-    definitions in glibc from old-style K&R to prototype-style.  Following
-    my other recent such patches, this one deals with the case of function
-    definitions in files that either contain assertions or where grep
-    suggested they might contain assertions - and thus where it isn't
-    possible to use a simple object code comparison as a sanity check on
-    the correctness of the patch, because line numbers are changed.
-    
-    A few such automatically-generated changes needed to be supplemented
-    by manual changes for the result to compile.  openat64 had a prototype
-    declaration with "..." but an old-style definition in
-    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
-    generated prototype in the definition (I've filed
-    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
-    such cases in GCC; the old state was undefined behavior not requiring
-    a diagnostic, but one seems a good idea).  In addition, as Florian has
-    noted regparm attribute mismatches between declaration and definition
-    are only diagnosed for prototype definitions, and five functions
-    needed internal_function added to their definitions (in the case of
-    __pthread_mutex_cond_lock, via the macro definition of
-    __pthread_mutex_lock) to compile on i386.
-    
-    After this patch is in, remaining old-style definitions are probably
-    most readily fixed manually before we can turn on
-    -Wold-style-definition for all builds.
-    
-    Tested for x86_64 and x86 (testsuite).
-    
-            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
-            function definition.
-            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
-            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
-            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
-            * elf/dl-minimal.c (_itoa): Likewise.
-            * hurd/hurdmalloc.c (malloc): Likewise.
-            (free): Likewise.
-            (realloc): Likewise.
-            * inet/inet6_option.c (inet6_option_space): Likewise.
-            (inet6_option_init): Likewise.
-            (inet6_option_append): Likewise.
-            (inet6_option_alloc): Likewise.
-            (inet6_option_next): Likewise.
-            (inet6_option_find): Likewise.
-            * io/ftw.c (FTW_NAME): Likewise.
-            (NFTW_NAME): Likewise.
-            (NFTW_NEW_NAME): Likewise.
-            (NFTW_OLD_NAME): Likewise.
-            * libio/iofwide.c (_IO_fwide): Likewise.
-            * libio/strops.c (_IO_str_init_static_internal): Likewise.
-            (_IO_str_init_static): Likewise.
-            (_IO_str_init_readonly): Likewise.
-            (_IO_str_overflow): Likewise.
-            (_IO_str_underflow): Likewise.
-            (_IO_str_count): Likewise.
-            (_IO_str_seekoff): Likewise.
-            (_IO_str_pbackfail): Likewise.
-            (_IO_str_finish): Likewise.
-            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
-            (_IO_wstr_overflow): Likewise.
-            (_IO_wstr_underflow): Likewise.
-            (_IO_wstr_count): Likewise.
-            (_IO_wstr_seekoff): Likewise.
-            (_IO_wstr_pbackfail): Likewise.
-            (_IO_wstr_finish): Likewise.
-            * locale/programs/localedef.c (normalize_codeset): Likewise.
-            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
-            (add_locales_to_archive): Likewise.
-            (delete_locales_from_archive): Likewise.
-            * malloc/malloc.c (__libc_mallinfo): Likewise.
-            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
-            * misc/tsearch.c (__tfind): Likewise.
-            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
-            * nptl/pthread_attr_getdetachstate.c
-            (__pthread_attr_getdetachstate): Likewise.
-            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
-            Likewise.
-            * nptl/pthread_attr_getinheritsched.c
-            (__pthread_attr_getinheritsched): Likewise.
-            * nptl/pthread_attr_getschedparam.c
-            (__pthread_attr_getschedparam): Likewise.
-            * nptl/pthread_attr_getschedpolicy.c
-            (__pthread_attr_getschedpolicy): Likewise.
-            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
-            Likewise.
-            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
-            Likewise.
-            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
-            Likewise.
-            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
-            Likewise.
-            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
-            (__pthread_attr_init_2_0): Likewise.
-            * nptl/pthread_attr_setdetachstate.c
-            (__pthread_attr_setdetachstate): Likewise.
-            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
-            Likewise.
-            * nptl/pthread_attr_setinheritsched.c
-            (__pthread_attr_setinheritsched): Likewise.
-            * nptl/pthread_attr_setschedparam.c
-            (__pthread_attr_setschedparam): Likewise.
-            * nptl/pthread_attr_setschedpolicy.c
-            (__pthread_attr_setschedpolicy): Likewise.
-            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
-            Likewise.
-            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
-            Likewise.
-            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
-            Likewise.
-            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
-            Likewise.
-            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
-            Likewise.
-            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
-            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
-            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
-            use internal_function.
-            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
-            prototype-style function definition.
-            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
-            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
-            internal_function.
-            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
-            Convert to prototype-style function definition.
-            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
-            Likewise.
-            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
-            Likewise.
-            (__pthread_mutex_unlock): Likewise.
-            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
-            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
-            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
-            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
-            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
-            * nss/makedb.c (process_input): Likewise.
-            * posix/fnmatch.c (__strchrnul): Likewise.
-            (__wcschrnul): Likewise.
-            (fnmatch): Likewise.
-            * posix/fnmatch_loop.c (FCT): Likewise.
-            * posix/glob.c (globfree): Likewise.
-            (__glob_pattern_type): Likewise.
-            (__glob_pattern_p): Likewise.
-            * posix/regcomp.c (re_compile_pattern): Likewise.
-            (re_set_syntax): Likewise.
-            (re_compile_fastmap): Likewise.
-            (regcomp): Likewise.
-            (regerror): Likewise.
-            (regfree): Likewise.
-            * posix/regexec.c (regexec): Likewise.
-            (re_match): Likewise.
-            (re_search): Likewise.
-            (re_match_2): Likewise.
-            (re_search_2): Likewise.
-            (re_search_stub): Likewise.  Use internal_function
-            (re_copy_regs): Likewise.
-            (re_set_registers): Convert to prototype-style function
-            definition.
-            (prune_impossible_nodes): Likewise.  Use internal_function.
-            * resolv/inet_net_pton.c (inet_net_pton): Convert to
-            prototype-style function definition.
-            (inet_net_pton_ipv4): Likewise.
-            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
-            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
-            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
-            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
-            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
-            Make variadic.
-            * time/strptime_l.c (localtime_r): Convert to prototype-style
-            function definition.
-            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
-            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
-            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
-            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
-
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
---- a/sysdeps/unix/sysv/linux/dl-openat64.c
-+++ b/sysdeps/unix/sysv/linux/dl-openat64.c
-@@ -23,10 +23,7 @@
- 
- 
- int
--openat64 (dfd, file, oflag)
--     int dfd;
--     const char *file;
--     int oflag;
-+openat64 (int dfd, const char *file, int oflag, ...)
- {
-   assert ((oflag & O_CREAT) == 0);
- 
diff --git a/packages/glibc/2.21/105-misleading-indentation.patch b/packages/glibc/2.21/105-misleading-indentation.patch
deleted file mode 100644
index 1dd8d851..00000000
--- a/packages/glibc/2.21/105-misleading-indentation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 976ef870542580cf5fed896c2c652b3e1a95f9da
-Author: Steve Ellcey <sellcey@mips.com>
-Date:   Fri Dec 11 09:19:37 2015 -0800
-
-    Fix indentation.
-    
-            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
-            Fix indentation.
-
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
---- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-+++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
- 
-     /* compute q[0],q[1],...q[jk] */
- 	for (i=0;i<=jk;i++) {
--	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-+	    for(j=0,fw=0.0;j<=jx;j++)
-+		fw += x[j]*f[jx+i-j];
-+	    q[i] = fw;
- 	}
- 
- 	jz = jk;
diff --git a/packages/glibc/2.21/106-dl-open-array-bounds.patch b/packages/glibc/2.21/106-dl-open-array-bounds.patch
deleted file mode 100644
index 08a90765..00000000
--- a/packages/glibc/2.21/106-dl-open-array-bounds.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 328c44c3670ebf6c1bd790acddce65a12998cd6c
-Author: Roland McGrath <roland@hack.frob.com>
-Date:   Fri Apr 17 12:11:58 2015 -0700
-
-    Fuller check for invalid NSID in _dl_open.
-
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
---- a/elf/dl-open.c
-+++ b/elf/dl-open.c
-@@ -211,7 +211,7 @@ dl_open_worker (void *a)
-       struct link_map *l = _dl_find_dso_for_object ((ElfW(Addr)) caller_dlopen);
- 
-       if (l)
--        call_map = l;
-+	call_map = l;
- 
-       if (args->nsid == __LM_ID_CALLER)
- 	args->nsid = call_map->l_ns;
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
-   /* Never allow loading a DSO in a namespace which is empty.  Such
-      direct placements is only causing problems.  Also don't allow
-      loading into a namespace used for auditing.  */
--  else if (__builtin_expect (nsid != LM_ID_BASE && nsid != __LM_ID_CALLER, 0)
--	   && (GL(dl_ns)[nsid]._ns_nloaded == 0
-+  else if (__glibc_unlikely (nsid != LM_ID_BASE && nsid != __LM_ID_CALLER)
-+	   && (__glibc_unlikely (nsid < 0 || nsid >= GL(dl_nns))
-+	       /* This prevents the [NSID] index expressions from being
-+		  evaluated, so the compiler won't think that we are
-+		  accessing an invalid index here in the !SHARED case where
-+		  DL_NNS is 1 and so any NSID != 0 is invalid.  */
-+	       || DL_NNS == 1
-+	       || GL(dl_ns)[nsid]._ns_nloaded == 0
- 	       || GL(dl_ns)[nsid]._ns_loaded->l_auditing))
-     _dl_signal_error (EINVAL, file, NULL,
- 		      N_("invalid target namespace in dlmopen()"));
diff --git a/packages/glibc/2.21/920-fix-rpc_parse-format.patch b/packages/glibc/2.21/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.21/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.21/940-nis-bogus-conditional.patch b/packages/glibc/2.21/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.21/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.22/100-sparc32-sem_open-missing-include.patch b/packages/glibc/2.22/0000-sparc32-sem_open-missing-include.patch
similarity index 81%
rename from packages/glibc/2.22/100-sparc32-sem_open-missing-include.patch
rename to packages/glibc/2.22/0000-sparc32-sem_open-missing-include.patch
index b481046e..1153d7be 100644
--- a/packages/glibc/2.22/100-sparc32-sem_open-missing-include.patch
+++ b/packages/glibc/2.22/0000-sparc32-sem_open-missing-include.patch
@@ -7,8 +7,10 @@ Date:   Mon Aug 31 15:27:21 2015 -0700
     	[BZ #18870]
     	* sysdeps/sparc/sparc32/sem_open.c: Add missing #include
 
-diff --git a/sysdeps/sparc/sparc32/sem_open.c b/sysdeps/sparc/sparc32/sem_open.c
-index 16cb9ad..59df2d7 100644
+---
+ sysdeps/sparc/sparc32/sem_open.c |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/sysdeps/sparc/sparc32/sem_open.c
 +++ b/sysdeps/sparc/sparc32/sem_open.c
 @@ -29,6 +29,7 @@
diff --git a/packages/glibc/2.22/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.22/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
new file mode 100644
index 00000000..9232b1b0
--- /dev/null
+++ b/packages/glibc/2.22/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -0,0 +1,75 @@
+From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
+From: Yvan Roux <yvan.roux@linaro.org>
+Date: Fri, 15 Apr 2016 13:29:26 +0200
+Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
+ -Wparentheses
+
+---
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+--- a/nis/nis_call.c
++++ b/nis/nis_call.c
+@@ -680,16 +680,18 @@
+   /* Choose which entry should be evicted from the cache.  */
+   loc = &nis_server_cache[0];
+   if (*loc != NULL)
+-    for (i = 1; i < 16; ++i)
+-      if (nis_server_cache[i] == NULL)
+-	{
++    {
++      for (i = 1; i < 16; ++i)
++	if (nis_server_cache[i] == NULL)
++	  {
++	    loc = &nis_server_cache[i];
++	    break;
++	  }
++	else if ((*loc)->uses > nis_server_cache[i]->uses
++		 || ((*loc)->uses == nis_server_cache[i]->uses
++		     && (*loc)->expires > nis_server_cache[i]->expires))
+ 	  loc = &nis_server_cache[i];
+-	  break;
+-	}
+-      else if ((*loc)->uses > nis_server_cache[i]->uses
+-	       || ((*loc)->uses == nis_server_cache[i]->uses
+-		   && (*loc)->expires > nis_server_cache[i]->expires))
+-	loc = &nis_server_cache[i];
++    }
+   old = *loc;
+   *loc = new;
+ 
+--- a/stdlib/setenv.c
++++ b/stdlib/setenv.c
+@@ -289,18 +289,20 @@
+   ep = __environ;
+   if (ep != NULL)
+     while (*ep != NULL)
+-      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+-	{
+-	  /* Found it.  Remove this pointer by moving later ones back.  */
+-	  char **dp = ep;
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
+-	  do
+-	    dp[0] = dp[1];
+-	  while (*dp++);
+-	  /* Continue the loop in case NAME appears again.  */
+-	}
+-      else
+-	++ep;
++	    do
++		dp[0] = dp[1];
++	    while (*dp++);
++	    /* Continue the loop in case NAME appears again.  */
++	  }
++	else
++	  ++ep;
++      }
+ 
+   UNLOCK;
+ 
diff --git a/packages/glibc/2.22/0002-fix-signed-shift-overlow.patch b/packages/glibc/2.22/0002-fix-signed-shift-overlow.patch
new file mode 100644
index 00000000..c7cc3302
--- /dev/null
+++ b/packages/glibc/2.22/0002-fix-signed-shift-overlow.patch
@@ -0,0 +1,97 @@
+commit 5542236837c5c41435f8282ec92799f480c36f18
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date:   Tue Jul 21 22:50:29 2015 -0700
+
+    Port the 0x7efe...feff pattern to GCC 6.
+    
+    See Steve Ellcey's bug report in:
+    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
+    * string/memrchr.c (MEMRCHR):
+    * string/rawmemchr.c (RAWMEMCHR):
+    * string/strchr.c (strchr):
+    * string/strchrnul.c (STRCHRNUL):
+    Rewrite code to avoid issues with signed shift overflow.
+
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
+--- a/string/memrchr.c
++++ b/string/memrchr.c
+@@ -96,15 +96,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/rawmemchr.c
++++ b/string/rawmemchr.c
+@@ -86,15 +86,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-
+-  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+-    abort ();
+-
+-#if LONG_MAX <= LONG_MAX_32_BITS
+-  magic_bits = 0x7efefeff;
+-#else
+-  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
+-#endif
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchr.c
++++ b/string/strchr.c
+@@ -60,13 +60,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
+--- a/string/strchrnul.c
++++ b/string/strchrnul.c
+@@ -66,13 +66,8 @@
+ 
+      The 1-bits make sure that carries propagate to the next 0-bit.
+      The 0-bits provide holes for carries to fall into.  */
+-  switch (sizeof (longword))
+-    {
+-    case 4: magic_bits = 0x7efefeffL; break;
+-    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
+-    default:
+-      abort ();
+-    }
++  magic_bits = -1;
++  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
+ 
+   /* Set up a longword, each of whose bytes is C.  */
+   charmask = c | (c << 8);
diff --git a/packages/glibc/2.22/103-dl-openat64-variadic.patch b/packages/glibc/2.22/0003-dl-openat64-variadic.patch
similarity index 98%
rename from packages/glibc/2.22/103-dl-openat64-variadic.patch
rename to packages/glibc/2.22/0003-dl-openat64-variadic.patch
index 302088e8..f57764fa 100644
--- a/packages/glibc/2.22/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.22/0003-dl-openat64-variadic.patch
@@ -177,8 +177,10 @@ Date:   Tue Oct 20 11:54:09 2015 +0000
             * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
             * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
 
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
 --- a/sysdeps/unix/sysv/linux/dl-openat64.c
 +++ b/sysdeps/unix/sysv/linux/dl-openat64.c
 @@ -23,10 +23,7 @@
diff --git a/packages/glibc/2.22/104-unused-variables.patch b/packages/glibc/2.22/0004-unused-variables.patch
similarity index 80%
rename from packages/glibc/2.22/104-unused-variables.patch
rename to packages/glibc/2.22/0004-unused-variables.patch
index fd4def02..c9211d60 100644
--- a/packages/glibc/2.22/104-unused-variables.patch
+++ b/packages/glibc/2.22/0004-unused-variables.patch
@@ -19,8 +19,19 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    2 --
+ sysdeps/ieee754/flt-32/s_cosf.c        |    2 --
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ timezone/private.h                     |   10 ----------
+ 10 files changed, 1 insertion(+), 28 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,8 +45,6 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
 @@ -65,10 +65,8 @@
@@ -60,8 +69,6 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
 @@ -29,7 +29,7 @@
@@ -73,8 +80,6 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
 @@ -34,7 +34,6 @@
@@ -93,11 +98,9 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,8 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
+@@ -22,8 +22,6 @@
  log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
@@ -106,11 +109,9 @@ index 96f0e81..1daeef7 100644
  float
  __ieee754_log10f(float x)
  {
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,8 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
+@@ -21,8 +21,6 @@
  #include <math.h>
  #include <math_private.h>
  
@@ -119,11 +120,9 @@ index 864ab27..0affd40 100644
  #ifndef COSF
  # define COSF_FUNC __cosf
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -82,7 +82,6 @@
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  DIAG_POP_NEEDS_COMMENT;
  static const long double one = 1.0L;
@@ -131,11 +130,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = LDBL_MAX;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -140,7 +140,6 @@
  
  static const long double
  tiny = 1e-4931L,
@@ -143,11 +140,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -117,7 +117,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
@@ -155,11 +150,9 @@ index ff759bc..9609550 100644
  static const long double zero = 0.0L;
  
  long double
-diff --git a/timezone/private.h b/timezone/private.h
-index 4e8f4ae..ed19e06 100644
 --- a/timezone/private.h
 +++ b/timezone/private.h
-@@ -326,16 +326,6 @@ const char *	scheck(const char * string, const char * format);
+@@ -326,16 +326,6 @@
  #define TYPE_SIGNED(type) (((type) -1) < 0)
  #endif /* !defined TYPE_SIGNED */
  
diff --git a/packages/glibc/2.22/0005-misleading-indentation.patch b/packages/glibc/2.22/0005-misleading-indentation.patch
new file mode 100644
index 00000000..8e08259e
--- /dev/null
+++ b/packages/glibc/2.22/0005-misleading-indentation.patch
@@ -0,0 +1,26 @@
+commit 976ef870542580cf5fed896c2c652b3e1a95f9da
+Author: Steve Ellcey <sellcey@mips.com>
+Date:   Fri Dec 11 09:19:37 2015 -0800
+
+    Fix indentation.
+    
+            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
+            Fix indentation.
+
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
++++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
+@@ -65,7 +65,9 @@
+ 
+     /* compute q[0],q[1],...q[jk] */
+ 	for (i=0;i<=jk;i++) {
+-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
++	    for(j=0,fw=0.0;j<=jx;j++)
++		fw += x[j]*f[jx+i-j];
++	    q[i] = fw;
+ 	}
+ 
+ 	jz = jk;
diff --git a/packages/glibc/2.22/120-cve-2105-7547-getaddrinfo-stack.patch b/packages/glibc/2.22/0006-cve-2105-7547-getaddrinfo-stack.patch
similarity index 96%
rename from packages/glibc/2.22/120-cve-2105-7547-getaddrinfo-stack.patch
rename to packages/glibc/2.22/0006-cve-2105-7547-getaddrinfo-stack.patch
index 257c5f25..504edade 100644
--- a/packages/glibc/2.22/120-cve-2105-7547-getaddrinfo-stack.patch
+++ b/packages/glibc/2.22/0006-cve-2105-7547-getaddrinfo-stack.patch
@@ -1,6 +1,11 @@
-diff -ruN glibc-2.22.orig/resolv/nss_dns/dns-host.c glibc-2.22/resolv/nss_dns/dns-host.c
---- glibc-2.22.orig/resolv/nss_dns/dns-host.c	2015-08-04 23:42:21.000000000 -0700
-+++ glibc-2.22/resolv/nss_dns/dns-host.c	2016-02-16 13:38:38.000000000 -0800
+---
+ resolv/nss_dns/dns-host.c |  111 ++++++++++++++++++-
+ resolv/res_query.c        |    3 
+ resolv/res_send.c         |  264 ++++++++++++++++++++++++++++++++++------------
+ 3 files changed, 309 insertions(+), 69 deletions(-)
+
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
 @@ -1031,7 +1031,10 @@
    int h_namelen = 0;
  
@@ -147,9 +152,8 @@ diff -ruN glibc-2.22.orig/resolv/nss_dns/dns-host.c glibc-2.22/resolv/nss_dns/dn
      }
  
    return status;
-diff -ruN glibc-2.22.orig/resolv/res_query.c glibc-2.22/resolv/res_query.c
---- glibc-2.22.orig/resolv/res_query.c	2015-08-04 23:42:21.000000000 -0700
-+++ glibc-2.22/resolv/res_query.c	2016-02-16 13:38:38.000000000 -0800
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
 @@ -396,6 +396,7 @@
  		  {
  		    free (*answerp2);
@@ -174,9 +178,8 @@ diff -ruN glibc-2.22.orig/resolv/res_query.c glibc-2.22/resolv/res_query.c
  	    *answerp2_malloced = 0;
  	  }
  	if (saved_herrno != -1)
-diff -ruN glibc-2.22.orig/resolv/res_send.c glibc-2.22/resolv/res_send.c
---- glibc-2.22.orig/resolv/res_send.c	2015-08-04 23:42:21.000000000 -0700
-+++ glibc-2.22/resolv/res_send.c	2016-02-16 13:43:59.000000000 -0800
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
 @@ -1,3 +1,20 @@
 +/* Copyright (C) 2016 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
diff --git a/packages/glibc/2.22/0007-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.22/0007-Fix-combreloc-test-BSD-grep.patch
new file mode 100644
index 00000000..c0be460d
--- /dev/null
+++ b/packages/glibc/2.22/0007-Fix-combreloc-test-BSD-grep.patch
@@ -0,0 +1,41 @@
+From 61d5f9c09b3157db76bd1a393e248c262a8d9dd4 Mon Sep 17 00:00:00 2001
+From: Alexey Neyman <stilor@att.net>
+Date: Wed, 8 Mar 2017 14:31:10 -0800
+Subject: [PATCH] Fix combreloc test with BSD grep
+
+The test for "-z combreloc" fails when cross-compiling on a machine
+that uses BSD grep (e.g. on macos). grep complains about empty
+subexpression and exits with non-zero status, which is interpreted
+by configure as "not found". As a result, support for "-z combreloc"
+(HAVE_Z_COMBRELOC) is not detected, leading to link failure on SPARC.
+
+	* configure.ac: Avoid empty subexpression in grep.
+
+Signed-off-by: Alexey Neyman <stilor@att.net>
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -6172,7 +6172,7 @@
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }
+ then
+-  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
+     libc_cv_z_combreloc=yes
+   else
+     libc_cv_z_combreloc=no
+--- a/configure.ac
++++ b/configure.ac
+@@ -1442,7 +1442,7 @@
+ dnl introducing new options this is not easily doable.  Instead use a tool
+ dnl which always is cross-platform: readelf.  To detect whether -z combreloc
+ dnl look for a section named .rel.dyn.
+-  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
+     libc_cv_z_combreloc=yes
+   else
+     libc_cv_z_combreloc=no
diff --git a/packages/glibc/2.20/910-typedef-caddr.patch b/packages/glibc/2.22/0008-typedef-caddr.patch
similarity index 50%
rename from packages/glibc/2.20/910-typedef-caddr.patch
rename to packages/glibc/2.22/0008-typedef-caddr.patch
index fc7979b7..980939b9 100644
--- a/packages/glibc/2.20/910-typedef-caddr.patch
+++ b/packages/glibc/2.22/0008-typedef-caddr.patch
@@ -1,8 +1,11 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
+---
+ posix/sys/types.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
 @@ -113,7 +113,10 @@
- #ifdef __USE_MISC
+ #ifdef	__USE_MISC
  # ifndef __daddr_t_defined
  typedef __daddr_t daddr_t;
 +#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
@@ -12,4 +15,3 @@ diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
  #  define __daddr_t_defined
  # endif
  #endif
-
diff --git a/packages/glibc/2.22/0009-fix-rpc_parse-format.patch b/packages/glibc/2.22/0009-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.22/0009-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.22/0010-explicit-boolean.patch b/packages/glibc/2.22/0010-explicit-boolean.patch
new file mode 100644
index 00000000..ff7cd879
--- /dev/null
+++ b/packages/glibc/2.22/0010-explicit-boolean.patch
@@ -0,0 +1,35 @@
+commit e223d1fe72e820d96f43831412ab267a1ace04d0
+Author: steve ellcey-CA Eng-Software <sellcey@sellcey-thinkpad.caveonetworks.com>
+Date:   Fri Oct 14 12:53:27 2016 -0700
+
+    Fix warnings from latest GCC.
+    
+            * sysdeps/ieee754/dbl-64/e_pow.c (checkint) Make conditions explicitly
+            boolean.
+
+---
+ sysdeps/ieee754/dbl-64/e_pow.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/sysdeps/ieee754/dbl-64/e_pow.c
++++ b/sysdeps/ieee754/dbl-64/e_pow.c
+@@ -462,15 +462,15 @@
+     return (n & 1) ? -1 : 1;	/* odd or even */
+   if (k > 20)
+     {
+-      if (n << (k - 20))
++      if (n << (k - 20) != 0)
+ 	return 0;		/* if not integer */
+-      return (n << (k - 21)) ? -1 : 1;
++      return (n << (k - 21) != 0) ? -1 : 1;
+     }
+   if (n)
+     return 0;			/*if  not integer */
+   if (k == 20)
+     return (m & 1) ? -1 : 1;
+-  if (m << (k + 12))
++  if (m << (k + 12) != 0)
+     return 0;
+-  return (m << (k + 11)) ? -1 : 1;
++  return (m << (k + 11) != 0) ? -1 : 1;
+ }
diff --git a/packages/glibc/2.22/0011-nis-bogus-conditional.patch b/packages/glibc/2.22/0011-nis-bogus-conditional.patch
new file mode 100644
index 00000000..e7283681
--- /dev/null
+++ b/packages/glibc/2.22/0011-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -291,7 +291,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.22/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.22/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
deleted file mode 100644
index 6fd663a2..00000000
--- a/packages/glibc/2.22/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
- -Wparentheses
-
----
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-2.7.4
-
diff --git a/packages/glibc/2.22/102-fix-signed-shift-overlow.patch b/packages/glibc/2.22/102-fix-signed-shift-overlow.patch
deleted file mode 100644
index ef49f831..00000000
--- a/packages/glibc/2.22/102-fix-signed-shift-overlow.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-commit 5542236837c5c41435f8282ec92799f480c36f18
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Tue Jul 21 22:50:29 2015 -0700
-
-    Port the 0x7efe...feff pattern to GCC 6.
-    
-    See Steve Ellcey's bug report in:
-    https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html
-    * string/memrchr.c (MEMRCHR):
-    * string/rawmemchr.c (RAWMEMCHR):
-    * string/strchr.c (strchr):
-    * string/strchrnul.c (STRCHRNUL):
-    Rewrite code to avoid issues with signed shift overflow.
-
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
---- a/string/memrchr.c
-+++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
---- a/string/rawmemchr.c
-+++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--
--  if (sizeof (longword) != 4 && sizeof (longword) != 8)
--    abort ();
--
--#if LONG_MAX <= LONG_MAX_32_BITS
--  magic_bits = 0x7efefeff;
--#else
--  magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff;
--#endif
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
---- a/string/strchr.c
-+++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
---- a/string/strchrnul.c
-+++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
- 
-      The 1-bits make sure that carries propagate to the next 0-bit.
-      The 0-bits provide holes for carries to fall into.  */
--  switch (sizeof (longword))
--    {
--    case 4: magic_bits = 0x7efefeffL; break;
--    case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break;
--    default:
--      abort ();
--    }
-+  magic_bits = -1;
-+  magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1;
- 
-   /* Set up a longword, each of whose bytes is C.  */
-   charmask = c | (c << 8);
diff --git a/packages/glibc/2.22/105-misleading-indentation.patch b/packages/glibc/2.22/105-misleading-indentation.patch
deleted file mode 100644
index 1dd8d851..00000000
--- a/packages/glibc/2.22/105-misleading-indentation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 976ef870542580cf5fed896c2c652b3e1a95f9da
-Author: Steve Ellcey <sellcey@mips.com>
-Date:   Fri Dec 11 09:19:37 2015 -0800
-
-    Fix indentation.
-    
-            * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
-            Fix indentation.
-
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
---- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-+++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
- 
-     /* compute q[0],q[1],...q[jk] */
- 	for (i=0;i<=jk;i++) {
--	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-+	    for(j=0,fw=0.0;j<=jx;j++)
-+		fw += x[j]*f[jx+i-j];
-+	    q[i] = fw;
- 	}
- 
- 	jz = jk;
diff --git a/packages/glibc/2.22/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.22/140-Fix-combreloc-test-BSD-grep.patch
deleted file mode 100644
index fdc3a606..00000000
--- a/packages/glibc/2.22/140-Fix-combreloc-test-BSD-grep.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 61d5f9c09b3157db76bd1a393e248c262a8d9dd4 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Wed, 8 Mar 2017 14:31:10 -0800
-Subject: [PATCH] Fix combreloc test with BSD grep
-
-The test for "-z combreloc" fails when cross-compiling on a machine
-that uses BSD grep (e.g. on macos). grep complains about empty
-subexpression and exits with non-zero status, which is interpreted
-by configure as "not found". As a result, support for "-z combreloc"
-(HAVE_Z_COMBRELOC) is not detected, leading to link failure on SPARC.
-
-	* configure.ac: Avoid empty subexpression in grep.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
---- a/configure
-+++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; }
- then
--  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
-+  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
-     libc_cv_z_combreloc=yes
-   else
-     libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
- dnl introducing new options this is not easily doable.  Instead use a tool
- dnl which always is cross-platform: readelf.  To detect whether -z combreloc
- dnl look for a section named .rel.dyn.
--  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
-+  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
-     libc_cv_z_combreloc=yes
-   else
-     libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc/2.22/920-fix-rpc_parse-format.patch b/packages/glibc/2.22/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.22/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.22/930-explicit-boolean.patch b/packages/glibc/2.22/930-explicit-boolean.patch
deleted file mode 100644
index 780fae63..00000000
--- a/packages/glibc/2.22/930-explicit-boolean.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit e223d1fe72e820d96f43831412ab267a1ace04d0
-Author: steve ellcey-CA Eng-Software <sellcey@sellcey-thinkpad.caveonetworks.com>
-Date:   Fri Oct 14 12:53:27 2016 -0700
-
-    Fix warnings from latest GCC.
-    
-            * sysdeps/ieee754/dbl-64/e_pow.c (checkint) Make conditions explicitly
-            boolean.
-
-diff --git a/sysdeps/ieee754/dbl-64/e_pow.c b/sysdeps/ieee754/dbl-64/e_pow.c
-index 663fa392c2..bd758b5979 100644
---- a/sysdeps/ieee754/dbl-64/e_pow.c
-+++ b/sysdeps/ieee754/dbl-64/e_pow.c
-@@ -466,15 +466,15 @@ checkint (double x)
-     return (n & 1) ? -1 : 1;	/* odd or even */
-   if (k > 20)
-     {
--      if (n << (k - 20))
-+      if (n << (k - 20) != 0)
- 	return 0;		/* if not integer */
--      return (n << (k - 21)) ? -1 : 1;
-+      return (n << (k - 21) != 0) ? -1 : 1;
-     }
-   if (n)
-     return 0;			/*if  not integer */
-   if (k == 20)
-     return (m & 1) ? -1 : 1;
--  if (m << (k + 12))
-+  if (m << (k + 12) != 0)
-     return 0;
--  return (m << (k + 11)) ? -1 : 1;
-+  return (m << (k + 11) != 0) ? -1 : 1;
- }
diff --git a/packages/glibc/2.22/940-nis-bogus-conditional.patch b/packages/glibc/2.22/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.22/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.23/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.23/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
new file mode 100644
index 00000000..49d02048
--- /dev/null
+++ b/packages/glibc/2.23/0000-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -0,0 +1,75 @@
+From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
+From: Yvan Roux <yvan.roux@linaro.org>
+Date: Fri, 15 Apr 2016 13:29:26 +0200
+Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
+ -Wparentheses
+
+---
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
+
+--- a/nis/nis_call.c
++++ b/nis/nis_call.c
+@@ -680,16 +680,18 @@
+   /* Choose which entry should be evicted from the cache.  */
+   loc = &nis_server_cache[0];
+   if (*loc != NULL)
+-    for (i = 1; i < 16; ++i)
+-      if (nis_server_cache[i] == NULL)
+-	{
++    {
++      for (i = 1; i < 16; ++i)
++	if (nis_server_cache[i] == NULL)
++	  {
++	    loc = &nis_server_cache[i];
++	    break;
++	  }
++	else if ((*loc)->uses > nis_server_cache[i]->uses
++		 || ((*loc)->uses == nis_server_cache[i]->uses
++		     && (*loc)->expires > nis_server_cache[i]->expires))
+ 	  loc = &nis_server_cache[i];
+-	  break;
+-	}
+-      else if ((*loc)->uses > nis_server_cache[i]->uses
+-	       || ((*loc)->uses == nis_server_cache[i]->uses
+-		   && (*loc)->expires > nis_server_cache[i]->expires))
+-	loc = &nis_server_cache[i];
++    }
+   old = *loc;
+   *loc = new;
+ 
+--- a/stdlib/setenv.c
++++ b/stdlib/setenv.c
+@@ -278,18 +278,20 @@
+   ep = __environ;
+   if (ep != NULL)
+     while (*ep != NULL)
+-      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+-	{
+-	  /* Found it.  Remove this pointer by moving later ones back.  */
+-	  char **dp = ep;
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
+-	  do
+-	    dp[0] = dp[1];
+-	  while (*dp++);
+-	  /* Continue the loop in case NAME appears again.  */
+-	}
+-      else
+-	++ep;
++	    do
++		dp[0] = dp[1];
++	    while (*dp++);
++	    /* Continue the loop in case NAME appears again.  */
++	  }
++	else
++	  ++ep;
++      }
+ 
+   UNLOCK;
+ 
diff --git a/packages/glibc/2.23/120-Fix-build-with-enable-static-nss.patch b/packages/glibc/2.23/0001-Fix-build-with-enable-static-nss.patch
similarity index 74%
rename from packages/glibc/2.23/120-Fix-build-with-enable-static-nss.patch
rename to packages/glibc/2.23/0001-Fix-build-with-enable-static-nss.patch
index 59ab0870..32c1ca29 100644
--- a/packages/glibc/2.23/120-Fix-build-with-enable-static-nss.patch
+++ b/packages/glibc/2.23/0001-Fix-build-with-enable-static-nss.patch
@@ -8,15 +8,12 @@ Subject: [PATCH] Fix build with --enable-static-nss
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog      | 5 +++++
- nss/nsswitch.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
+ nss/nsswitch.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/nss/nsswitch.c b/nss/nsswitch.c
-index 0a65f6a..8f31658 100644
 --- a/nss/nsswitch.c
 +++ b/nss/nsswitch.c
-@@ -94,7 +94,7 @@ static name_database *service_table;
+@@ -94,7 +94,7 @@
  static name_database_entry *defconfig_entries;
  
  
@@ -25,6 +22,3 @@ index 0a65f6a..8f31658 100644
  /* Nonzero if this is the nscd process.  */
  static bool is_nscd;
  /* The callback passed to the init functions when nscd is used.  */
--- 
-2.9.3
-
diff --git a/packages/glibc/2.23/0002-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.23/0002-Fix-combreloc-test-BSD-grep.patch
new file mode 100644
index 00000000..6c05092b
--- /dev/null
+++ b/packages/glibc/2.23/0002-Fix-combreloc-test-BSD-grep.patch
@@ -0,0 +1,41 @@
+From 61d5f9c09b3157db76bd1a393e248c262a8d9dd4 Mon Sep 17 00:00:00 2001
+From: Alexey Neyman <stilor@att.net>
+Date: Wed, 8 Mar 2017 14:31:10 -0800
+Subject: [PATCH] Fix combreloc test with BSD grep
+
+The test for "-z combreloc" fails when cross-compiling on a machine
+that uses BSD grep (e.g. on macos). grep complains about empty
+subexpression and exits with non-zero status, which is interpreted
+by configure as "not found". As a result, support for "-z combreloc"
+(HAVE_Z_COMBRELOC) is not detected, leading to link failure on SPARC.
+
+	* configure.ac: Avoid empty subexpression in grep.
+
+Signed-off-by: Alexey Neyman <stilor@att.net>
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -5527,7 +5527,7 @@
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }
+ then
+-  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
+     libc_cv_z_combreloc=yes
+   else
+     libc_cv_z_combreloc=no
+--- a/configure.ac
++++ b/configure.ac
+@@ -1243,7 +1243,7 @@
+ dnl introducing new options this is not easily doable.  Instead use a tool
+ dnl which always is cross-platform: readelf.  To detect whether -z combreloc
+ dnl look for a section named .rel.dyn.
+-  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
+     libc_cv_z_combreloc=yes
+   else
+     libc_cv_z_combreloc=no
diff --git a/packages/glibc/2.21/910-typedef-caddr.patch b/packages/glibc/2.23/0003-typedef-caddr.patch
similarity index 50%
rename from packages/glibc/2.21/910-typedef-caddr.patch
rename to packages/glibc/2.23/0003-typedef-caddr.patch
index fc7979b7..980939b9 100644
--- a/packages/glibc/2.21/910-typedef-caddr.patch
+++ b/packages/glibc/2.23/0003-typedef-caddr.patch
@@ -1,8 +1,11 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
+---
+ posix/sys/types.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
 @@ -113,7 +113,10 @@
- #ifdef __USE_MISC
+ #ifdef	__USE_MISC
  # ifndef __daddr_t_defined
  typedef __daddr_t daddr_t;
 +#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
@@ -12,4 +15,3 @@ diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
  #  define __daddr_t_defined
  # endif
  #endif
-
diff --git a/packages/glibc/2.23/0004-fix-rpc_parse-format.patch b/packages/glibc/2.23/0004-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.23/0004-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.23/0005-explicit-boolean.patch b/packages/glibc/2.23/0005-explicit-boolean.patch
new file mode 100644
index 00000000..98dc50d4
--- /dev/null
+++ b/packages/glibc/2.23/0005-explicit-boolean.patch
@@ -0,0 +1,35 @@
+commit e223d1fe72e820d96f43831412ab267a1ace04d0
+Author: steve ellcey-CA Eng-Software <sellcey@sellcey-thinkpad.caveonetworks.com>
+Date:   Fri Oct 14 12:53:27 2016 -0700
+
+    Fix warnings from latest GCC.
+    
+            * sysdeps/ieee754/dbl-64/e_pow.c (checkint) Make conditions explicitly
+            boolean.
+
+---
+ sysdeps/ieee754/dbl-64/e_pow.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/sysdeps/ieee754/dbl-64/e_pow.c
++++ b/sysdeps/ieee754/dbl-64/e_pow.c
+@@ -466,15 +466,15 @@
+     return (n & 1) ? -1 : 1;	/* odd or even */
+   if (k > 20)
+     {
+-      if (n << (k - 20))
++      if (n << (k - 20) != 0)
+ 	return 0;		/* if not integer */
+-      return (n << (k - 21)) ? -1 : 1;
++      return (n << (k - 21) != 0) ? -1 : 1;
+     }
+   if (n)
+     return 0;			/*if  not integer */
+   if (k == 20)
+     return (m & 1) ? -1 : 1;
+-  if (m << (k + 12))
++  if (m << (k + 12) != 0)
+     return 0;
+-  return (m << (k + 11)) ? -1 : 1;
++  return (m << (k + 11) != 0) ? -1 : 1;
+ }
diff --git a/packages/glibc/2.23/0006-nis-bogus-conditional.patch b/packages/glibc/2.23/0006-nis-bogus-conditional.patch
new file mode 100644
index 00000000..e7283681
--- /dev/null
+++ b/packages/glibc/2.23/0006-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -291,7 +291,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.25/997-regexp-common.patch b/packages/glibc/2.23/0007-regexp-common.patch
similarity index 96%
rename from packages/glibc/2.25/997-regexp-common.patch
rename to packages/glibc/2.23/0007-regexp-common.patch
index 7764c99f..89e8371c 100644
--- a/packages/glibc/2.25/997-regexp-common.patch
+++ b/packages/glibc/2.23/0007-regexp-common.patch
@@ -32,8 +32,10 @@ Date:   Fri Jun 23 14:38:46 2017 -0700
             (loc2): Likewise.
             (locs): Likewise.
 
-diff --git a/misc/regexp.c b/misc/regexp.c
-index 19d76c0c37..eaea7c3b89 100644
+---
+ misc/regexp.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
 --- a/misc/regexp.c
 +++ b/misc/regexp.c
 @@ -29,14 +29,15 @@
diff --git a/packages/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
deleted file mode 100644
index 6fd663a2..00000000
--- a/packages/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
- -Wparentheses
-
----
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-2.7.4
-
diff --git a/packages/glibc/2.23/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.23/140-Fix-combreloc-test-BSD-grep.patch
deleted file mode 100644
index fdc3a606..00000000
--- a/packages/glibc/2.23/140-Fix-combreloc-test-BSD-grep.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 61d5f9c09b3157db76bd1a393e248c262a8d9dd4 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Wed, 8 Mar 2017 14:31:10 -0800
-Subject: [PATCH] Fix combreloc test with BSD grep
-
-The test for "-z combreloc" fails when cross-compiling on a machine
-that uses BSD grep (e.g. on macos). grep complains about empty
-subexpression and exits with non-zero status, which is interpreted
-by configure as "not found". As a result, support for "-z combreloc"
-(HAVE_Z_COMBRELOC) is not detected, leading to link failure on SPARC.
-
-	* configure.ac: Avoid empty subexpression in grep.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
---- a/configure
-+++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; }
- then
--  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
-+  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
-     libc_cv_z_combreloc=yes
-   else
-     libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
- dnl introducing new options this is not easily doable.  Instead use a tool
- dnl which always is cross-platform: readelf.  To detect whether -z combreloc
- dnl look for a section named .rel.dyn.
--  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
-+  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
-     libc_cv_z_combreloc=yes
-   else
-     libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc/2.23/920-fix-rpc_parse-format.patch b/packages/glibc/2.23/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.23/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.23/930-explicit-boolean.patch b/packages/glibc/2.23/930-explicit-boolean.patch
deleted file mode 100644
index 780fae63..00000000
--- a/packages/glibc/2.23/930-explicit-boolean.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit e223d1fe72e820d96f43831412ab267a1ace04d0
-Author: steve ellcey-CA Eng-Software <sellcey@sellcey-thinkpad.caveonetworks.com>
-Date:   Fri Oct 14 12:53:27 2016 -0700
-
-    Fix warnings from latest GCC.
-    
-            * sysdeps/ieee754/dbl-64/e_pow.c (checkint) Make conditions explicitly
-            boolean.
-
-diff --git a/sysdeps/ieee754/dbl-64/e_pow.c b/sysdeps/ieee754/dbl-64/e_pow.c
-index 663fa392c2..bd758b5979 100644
---- a/sysdeps/ieee754/dbl-64/e_pow.c
-+++ b/sysdeps/ieee754/dbl-64/e_pow.c
-@@ -466,15 +466,15 @@ checkint (double x)
-     return (n & 1) ? -1 : 1;	/* odd or even */
-   if (k > 20)
-     {
--      if (n << (k - 20))
-+      if (n << (k - 20) != 0)
- 	return 0;		/* if not integer */
--      return (n << (k - 21)) ? -1 : 1;
-+      return (n << (k - 21) != 0) ? -1 : 1;
-     }
-   if (n)
-     return 0;			/*if  not integer */
-   if (k == 20)
-     return (m & 1) ? -1 : 1;
--  if (m << (k + 12))
-+  if (m << (k + 12) != 0)
-     return 0;
--  return (m << (k + 11)) ? -1 : 1;
-+  return (m << (k + 11) != 0) ? -1 : 1;
- }
diff --git a/packages/glibc/2.23/940-nis-bogus-conditional.patch b/packages/glibc/2.23/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.23/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.24/110-sh-fix-gcc6.patch b/packages/glibc/2.24/0000-sh-fix-gcc6.patch
similarity index 76%
rename from packages/glibc/2.24/110-sh-fix-gcc6.patch
rename to packages/glibc/2.24/0000-sh-fix-gcc6.patch
index cacf390d..ef9e31c2 100644
--- a/packages/glibc/2.24/110-sh-fix-gcc6.patch
+++ b/packages/glibc/2.24/0000-sh-fix-gcc6.patch
@@ -7,14 +7,12 @@ Subject: [PATCH] sh: conditional is false in dl-conflict.c
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- sysdeps/sh/dl-machine.h | 2 +-
+ sysdeps/sh/dl-machine.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
-index 449deea..2b468af 100644
 --- a/sysdeps/sh/dl-machine.h
 +++ b/sysdeps/sh/dl-machine.h
-@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
+@@ -389,7 +389,7 @@
  	  break;
  	case R_SH_DIR32:
  	  {
@@ -23,6 +21,3 @@ index 449deea..2b468af 100644
  	   /* This is defined in rtld.c, but nowhere in the static
  	      libc.a; make the reference weak so static programs can
  	      still link.  This declaration cannot be done when
--- 
-2.9.3
-
diff --git a/packages/glibc/2.25/120-Fix-build-with-enable-static-nss.patch b/packages/glibc/2.24/0001-Fix-build-with-enable-static-nss.patch
similarity index 74%
rename from packages/glibc/2.25/120-Fix-build-with-enable-static-nss.patch
rename to packages/glibc/2.24/0001-Fix-build-with-enable-static-nss.patch
index 59ab0870..32c1ca29 100644
--- a/packages/glibc/2.25/120-Fix-build-with-enable-static-nss.patch
+++ b/packages/glibc/2.24/0001-Fix-build-with-enable-static-nss.patch
@@ -8,15 +8,12 @@ Subject: [PATCH] Fix build with --enable-static-nss
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog      | 5 +++++
- nss/nsswitch.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
+ nss/nsswitch.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/nss/nsswitch.c b/nss/nsswitch.c
-index 0a65f6a..8f31658 100644
 --- a/nss/nsswitch.c
 +++ b/nss/nsswitch.c
-@@ -94,7 +94,7 @@ static name_database *service_table;
+@@ -94,7 +94,7 @@
  static name_database_entry *defconfig_entries;
  
  
@@ -25,6 +22,3 @@ index 0a65f6a..8f31658 100644
  /* Nonzero if this is the nscd process.  */
  static bool is_nscd;
  /* The callback passed to the init functions when nscd is used.  */
--- 
-2.9.3
-
diff --git a/packages/glibc/2.24/0002-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.24/0002-Fix-combreloc-test-BSD-grep.patch
new file mode 100644
index 00000000..1108df6e
--- /dev/null
+++ b/packages/glibc/2.24/0002-Fix-combreloc-test-BSD-grep.patch
@@ -0,0 +1,41 @@
+From 61d5f9c09b3157db76bd1a393e248c262a8d9dd4 Mon Sep 17 00:00:00 2001
+From: Alexey Neyman <stilor@att.net>
+Date: Wed, 8 Mar 2017 14:31:10 -0800
+Subject: [PATCH] Fix combreloc test with BSD grep
+
+The test for "-z combreloc" fails when cross-compiling on a machine
+that uses BSD grep (e.g. on macos). grep complains about empty
+subexpression and exits with non-zero status, which is interpreted
+by configure as "not found". As a result, support for "-z combreloc"
+(HAVE_Z_COMBRELOC) is not detected, leading to link failure on SPARC.
+
+	* configure.ac: Avoid empty subexpression in grep.
+
+Signed-off-by: Alexey Neyman <stilor@att.net>
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -5532,7 +5532,7 @@
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }
+ then
+-  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
+     libc_cv_z_combreloc=yes
+   else
+     libc_cv_z_combreloc=no
+--- a/configure.ac
++++ b/configure.ac
+@@ -1246,7 +1246,7 @@
+ dnl introducing new options this is not easily doable.  Instead use a tool
+ dnl which always is cross-platform: readelf.  To detect whether -z combreloc
+ dnl look for a section named .rel.dyn.
+-  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
+     libc_cv_z_combreloc=yes
+   else
+     libc_cv_z_combreloc=no
diff --git a/packages/glibc/2.24/0003-typedef-caddr.patch b/packages/glibc/2.24/0003-typedef-caddr.patch
new file mode 100644
index 00000000..980939b9
--- /dev/null
+++ b/packages/glibc/2.24/0003-typedef-caddr.patch
@@ -0,0 +1,17 @@
+---
+ posix/sys/types.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
+@@ -113,7 +113,10 @@
+ #ifdef	__USE_MISC
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
diff --git a/packages/glibc/2.24/0004-fix-rpc_parse-format.patch b/packages/glibc/2.24/0004-fix-rpc_parse-format.patch
new file mode 100644
index 00000000..341d5413
--- /dev/null
+++ b/packages/glibc/2.24/0004-fix-rpc_parse-format.patch
@@ -0,0 +1,62 @@
+commit 5874510faaf3cbd0bb112aaacab9f225002beed1
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Tue Nov 8 23:44:51 2016 +0000
+
+    Fix rpcgen buffer overrun (bug 20790).
+    
+    Building with GCC 7 produces an error building rpcgen:
+    
+    rpc_parse.c: In function 'get_prog_declaration':
+    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+                         ~~~~^
+    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
+         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
+         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    
+    That buffer overrun is for the case where the .x file declares a
+    program with a million arguments.  The strcpy two lines above can
+    generate a buffer overrun much more simply for a long argument name.
+    
+    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
+    provides a bound on the buffer size needed, so this patch just changes
+    the buffer size to MAXLINESIZE to avoid both possible buffer
+    overruns.  A testcase is added that rpcgen does not crash with a
+    500-character argument name, where it previously crashed.
+    
+    It would not at all surprise me if there are many other ways of
+    crashing rpcgen with either valid or invalid input; fuzz testing would
+    likely find various such bugs, though I don't think they are that
+    important to fix (rpcgen is not that likely to be used with untrusted
+    .x files as input).  (As well as fuzz-findable bugs there are probably
+    also issues when various int variables get overflowed on very large
+    input.)  The test infrastructure for rpcgen-not-crashing tests would
+    need extending if tests are to be added for cases where rpcgen should
+    produce an error, as opposed to cases where it should succeed.
+    
+    Tested for x86_64 and x86.
+    
+            [BZ #20790]
+            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
+            to MAXLINESIZE.
+            * sunrpc/bug20790.x: New file.
+            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
+            variable.
+            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
+            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
+
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -521,7 +521,7 @@
+ get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
+ {
+   token tok;
+-  char name[10];		/* argument name */
++  char name[MAXLINESIZE];		/* argument name */
+ 
+   if (dkind == DEF_PROGRAM)
+     {
diff --git a/packages/glibc/2.24/0005-explicit-boolean.patch b/packages/glibc/2.24/0005-explicit-boolean.patch
new file mode 100644
index 00000000..98dc50d4
--- /dev/null
+++ b/packages/glibc/2.24/0005-explicit-boolean.patch
@@ -0,0 +1,35 @@
+commit e223d1fe72e820d96f43831412ab267a1ace04d0
+Author: steve ellcey-CA Eng-Software <sellcey@sellcey-thinkpad.caveonetworks.com>
+Date:   Fri Oct 14 12:53:27 2016 -0700
+
+    Fix warnings from latest GCC.
+    
+            * sysdeps/ieee754/dbl-64/e_pow.c (checkint) Make conditions explicitly
+            boolean.
+
+---
+ sysdeps/ieee754/dbl-64/e_pow.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/sysdeps/ieee754/dbl-64/e_pow.c
++++ b/sysdeps/ieee754/dbl-64/e_pow.c
+@@ -466,15 +466,15 @@
+     return (n & 1) ? -1 : 1;	/* odd or even */
+   if (k > 20)
+     {
+-      if (n << (k - 20))
++      if (n << (k - 20) != 0)
+ 	return 0;		/* if not integer */
+-      return (n << (k - 21)) ? -1 : 1;
++      return (n << (k - 21) != 0) ? -1 : 1;
+     }
+   if (n)
+     return 0;			/*if  not integer */
+   if (k == 20)
+     return (m & 1) ? -1 : 1;
+-  if (m << (k + 12))
++  if (m << (k + 12) != 0)
+     return 0;
+-  return (m << (k + 11)) ? -1 : 1;
++  return (m << (k + 11) != 0) ? -1 : 1;
+ }
diff --git a/packages/glibc/2.24/0006-nis-bogus-conditional.patch b/packages/glibc/2.24/0006-nis-bogus-conditional.patch
new file mode 100644
index 00000000..e7283681
--- /dev/null
+++ b/packages/glibc/2.24/0006-nis-bogus-conditional.patch
@@ -0,0 +1,64 @@
+commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
+Author: Joseph Myers <joseph@codesourcery.com>
+Date:   Wed Dec 21 23:44:01 2016 +0000
+
+    Fix nss_nisplus build with mainline GCC (bug 20978).
+    
+    glibc build with current mainline GCC fails because
+    nis/nss_nisplus/nisplus-alias.c contains code
+    
+      if (name != NULL)
+        {
+          *errnop = EINVAL;
+          return NSS_STATUS_UNAVAIL;
+        }
+    
+      char buf[strlen (name) + 9 + tablename_len];
+    
+    producing an error about strlen being called on a pointer that is
+    always NULL (and a subsequent use of that pointer with a %s format in
+    snprintf).
+    
+    As Andreas noted, the bogus conditional comes from a 1997 change:
+    
+    -  if (name == NULL || strlen(name) > 8)
+    -    return NSS_STATUS_NOTFOUND;
+    -  else
+    +  if (name != NULL || strlen(name) <= 8)
+    
+    So the intention is clearly to return an error for NULL name.
+    
+    This patch duly inverts the sense of the conditional.  It fixes the
+    build with GCC mainline, and passes usual glibc testsuite testing for
+    x86_64.  However, I have not tried any actual substantive nisplus
+    testing, do not have an environment for such testing, and do not know
+    whether it is possible that strlen (name) or tablename_len might be
+    large so that the VLA for buf is actually a security issue.  However,
+    if it is a security issue, there are plenty of other similar instances
+    in the nisplus code (that haven't been hidden by a bogus comparison
+    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
+    string passed to nis_list, so a local fix in the caller wouldn't
+    suffice anyway (see bug 20987).  (Calls to strdupa and other such
+    macros that use alloca must be considered equally questionable
+    regarding stack overflow issues as direct calls to alloca and VLA
+    declarations.)
+    
+            [BZ #20978]
+            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
+            Compare name == NULL, not name != NULL.
+
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/nis/nss_nisplus/nisplus-alias.c
++++ b/nis/nss_nisplus/nisplus-alias.c
+@@ -291,7 +291,7 @@
+ 	return status;
+     }
+ 
+-  if (name != NULL)
++  if (name == NULL)
+     {
+       *errnop = EINVAL;
+       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.24/997-regexp-common.patch b/packages/glibc/2.24/0007-regexp-common.patch
similarity index 96%
rename from packages/glibc/2.24/997-regexp-common.patch
rename to packages/glibc/2.24/0007-regexp-common.patch
index 7764c99f..89e8371c 100644
--- a/packages/glibc/2.24/997-regexp-common.patch
+++ b/packages/glibc/2.24/0007-regexp-common.patch
@@ -32,8 +32,10 @@ Date:   Fri Jun 23 14:38:46 2017 -0700
             (loc2): Likewise.
             (locs): Likewise.
 
-diff --git a/misc/regexp.c b/misc/regexp.c
-index 19d76c0c37..eaea7c3b89 100644
+---
+ misc/regexp.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
 --- a/misc/regexp.c
 +++ b/misc/regexp.c
 @@ -29,14 +29,15 @@
diff --git a/packages/glibc/2.24/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.24/140-Fix-combreloc-test-BSD-grep.patch
deleted file mode 100644
index fdc3a606..00000000
--- a/packages/glibc/2.24/140-Fix-combreloc-test-BSD-grep.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 61d5f9c09b3157db76bd1a393e248c262a8d9dd4 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Wed, 8 Mar 2017 14:31:10 -0800
-Subject: [PATCH] Fix combreloc test with BSD grep
-
-The test for "-z combreloc" fails when cross-compiling on a machine
-that uses BSD grep (e.g. on macos). grep complains about empty
-subexpression and exits with non-zero status, which is interpreted
-by configure as "not found". As a result, support for "-z combreloc"
-(HAVE_Z_COMBRELOC) is not detected, leading to link failure on SPARC.
-
-	* configure.ac: Avoid empty subexpression in grep.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
---- a/configure
-+++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; }
- then
--  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
-+  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
-     libc_cv_z_combreloc=yes
-   else
-     libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
- dnl introducing new options this is not easily doable.  Instead use a tool
- dnl which always is cross-platform: readelf.  To detect whether -z combreloc
- dnl look for a section named .rel.dyn.
--  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
-+  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
-     libc_cv_z_combreloc=yes
-   else
-     libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc/2.24/910-typedef-caddr.patch b/packages/glibc/2.24/910-typedef-caddr.patch
deleted file mode 100644
index fc7979b7..00000000
--- a/packages/glibc/2.24/910-typedef-caddr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
-@@ -113,7 +113,10 @@
- #ifdef __USE_MISC
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-
diff --git a/packages/glibc/2.24/920-fix-rpc_parse-format.patch b/packages/glibc/2.24/920-fix-rpc_parse-format.patch
deleted file mode 100644
index 37e58dac..00000000
--- a/packages/glibc/2.24/920-fix-rpc_parse-format.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5874510faaf3cbd0bb112aaacab9f225002beed1
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Nov 8 23:44:51 2016 +0000
-
-    Fix rpcgen buffer overrun (bug 20790).
-    
-    Building with GCC 7 produces an error building rpcgen:
-    
-    rpc_parse.c: In function 'get_prog_declaration':
-    rpc_parse.c:543:25: error: may write a terminating nul past the end of the destination [-Werror=format-length=]
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-                         ~~~~^
-    rpc_parse.c:543:5: note: format output between 5 and 14 bytes into a destination of size 10
-         sprintf (name, "%s%d", ARGNAME, num); /* default name of argument */
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    That buffer overrun is for the case where the .x file declares a
-    program with a million arguments.  The strcpy two lines above can
-    generate a buffer overrun much more simply for a long argument name.
-    
-    The limit on length of line read by rpcgen (MAXLINESIZE == 1024)
-    provides a bound on the buffer size needed, so this patch just changes
-    the buffer size to MAXLINESIZE to avoid both possible buffer
-    overruns.  A testcase is added that rpcgen does not crash with a
-    500-character argument name, where it previously crashed.
-    
-    It would not at all surprise me if there are many other ways of
-    crashing rpcgen with either valid or invalid input; fuzz testing would
-    likely find various such bugs, though I don't think they are that
-    important to fix (rpcgen is not that likely to be used with untrusted
-    .x files as input).  (As well as fuzz-findable bugs there are probably
-    also issues when various int variables get overflowed on very large
-    input.)  The test infrastructure for rpcgen-not-crashing tests would
-    need extending if tests are to be added for cases where rpcgen should
-    produce an error, as opposed to cases where it should succeed.
-    
-    Tested for x86_64 and x86.
-    
-            [BZ #20790]
-            * sunrpc/rpc_parse.c (get_prog_declaration): Increase buffer size
-            to MAXLINESIZE.
-            * sunrpc/bug20790.x: New file.
-            * sunrpc/Makefile [$(run-built-tests) = yes] (rpcgen-tests): New
-            variable.
-            [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
-            [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
-
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
- get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
- {
-   token tok;
--  char name[10];		/* argument name */
-+  char name[MAXLINESIZE];		/* argument name */
- 
-   if (dkind == DEF_PROGRAM)
-     {
diff --git a/packages/glibc/2.24/930-explicit-boolean.patch b/packages/glibc/2.24/930-explicit-boolean.patch
deleted file mode 100644
index 780fae63..00000000
--- a/packages/glibc/2.24/930-explicit-boolean.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit e223d1fe72e820d96f43831412ab267a1ace04d0
-Author: steve ellcey-CA Eng-Software <sellcey@sellcey-thinkpad.caveonetworks.com>
-Date:   Fri Oct 14 12:53:27 2016 -0700
-
-    Fix warnings from latest GCC.
-    
-            * sysdeps/ieee754/dbl-64/e_pow.c (checkint) Make conditions explicitly
-            boolean.
-
-diff --git a/sysdeps/ieee754/dbl-64/e_pow.c b/sysdeps/ieee754/dbl-64/e_pow.c
-index 663fa392c2..bd758b5979 100644
---- a/sysdeps/ieee754/dbl-64/e_pow.c
-+++ b/sysdeps/ieee754/dbl-64/e_pow.c
-@@ -466,15 +466,15 @@ checkint (double x)
-     return (n & 1) ? -1 : 1;	/* odd or even */
-   if (k > 20)
-     {
--      if (n << (k - 20))
-+      if (n << (k - 20) != 0)
- 	return 0;		/* if not integer */
--      return (n << (k - 21)) ? -1 : 1;
-+      return (n << (k - 21) != 0) ? -1 : 1;
-     }
-   if (n)
-     return 0;			/*if  not integer */
-   if (k == 20)
-     return (m & 1) ? -1 : 1;
--  if (m << (k + 12))
-+  if (m << (k + 12) != 0)
-     return 0;
--  return (m << (k + 11)) ? -1 : 1;
-+  return (m << (k + 11) != 0) ? -1 : 1;
- }
diff --git a/packages/glibc/2.24/940-nis-bogus-conditional.patch b/packages/glibc/2.24/940-nis-bogus-conditional.patch
deleted file mode 100644
index 09b38cf1..00000000
--- a/packages/glibc/2.24/940-nis-bogus-conditional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit f88759ea9bd3c8d8fef28f123ba9767cb0e421a3
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Wed Dec 21 23:44:01 2016 +0000
-
-    Fix nss_nisplus build with mainline GCC (bug 20978).
-    
-    glibc build with current mainline GCC fails because
-    nis/nss_nisplus/nisplus-alias.c contains code
-    
-      if (name != NULL)
-        {
-          *errnop = EINVAL;
-          return NSS_STATUS_UNAVAIL;
-        }
-    
-      char buf[strlen (name) + 9 + tablename_len];
-    
-    producing an error about strlen being called on a pointer that is
-    always NULL (and a subsequent use of that pointer with a %s format in
-    snprintf).
-    
-    As Andreas noted, the bogus conditional comes from a 1997 change:
-    
-    -  if (name == NULL || strlen(name) > 8)
-    -    return NSS_STATUS_NOTFOUND;
-    -  else
-    +  if (name != NULL || strlen(name) <= 8)
-    
-    So the intention is clearly to return an error for NULL name.
-    
-    This patch duly inverts the sense of the conditional.  It fixes the
-    build with GCC mainline, and passes usual glibc testsuite testing for
-    x86_64.  However, I have not tried any actual substantive nisplus
-    testing, do not have an environment for such testing, and do not know
-    whether it is possible that strlen (name) or tablename_len might be
-    large so that the VLA for buf is actually a security issue.  However,
-    if it is a security issue, there are plenty of other similar instances
-    in the nisplus code (that haven't been hidden by a bogus comparison
-    with NULL) - and nis_table.c:__create_ib_request uses strdupa on the
-    string passed to nis_list, so a local fix in the caller wouldn't
-    suffice anyway (see bug 20987).  (Calls to strdupa and other such
-    macros that use alloca must be considered equally questionable
-    regarding stack overflow issues as direct calls to alloca and VLA
-    declarations.)
-    
-            [BZ #20978]
-            * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
-            Compare name == NULL, not name != NULL.
-
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
---- a/nis/nss_nisplus/nisplus-alias.c
-+++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
- 	return status;
-     }
- 
--  if (name != NULL)
-+  if (name == NULL)
-     {
-       *errnop = EINVAL;
-       return NSS_STATUS_UNAVAIL;
diff --git a/packages/glibc/2.25/110-sh-fix-gcc6.patch b/packages/glibc/2.25/0000-sh-fix-gcc6.patch
similarity index 76%
rename from packages/glibc/2.25/110-sh-fix-gcc6.patch
rename to packages/glibc/2.25/0000-sh-fix-gcc6.patch
index cacf390d..ef9e31c2 100644
--- a/packages/glibc/2.25/110-sh-fix-gcc6.patch
+++ b/packages/glibc/2.25/0000-sh-fix-gcc6.patch
@@ -7,14 +7,12 @@ Subject: [PATCH] sh: conditional is false in dl-conflict.c
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- sysdeps/sh/dl-machine.h | 2 +-
+ sysdeps/sh/dl-machine.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
-index 449deea..2b468af 100644
 --- a/sysdeps/sh/dl-machine.h
 +++ b/sysdeps/sh/dl-machine.h
-@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
+@@ -389,7 +389,7 @@
  	  break;
  	case R_SH_DIR32:
  	  {
@@ -23,6 +21,3 @@ index 449deea..2b468af 100644
  	   /* This is defined in rtld.c, but nowhere in the static
  	      libc.a; make the reference weak so static programs can
  	      still link.  This declaration cannot be done when
--- 
-2.9.3
-
diff --git a/packages/glibc/2.24/120-Fix-build-with-enable-static-nss.patch b/packages/glibc/2.25/0001-Fix-build-with-enable-static-nss.patch
similarity index 74%
rename from packages/glibc/2.24/120-Fix-build-with-enable-static-nss.patch
rename to packages/glibc/2.25/0001-Fix-build-with-enable-static-nss.patch
index 59ab0870..32c1ca29 100644
--- a/packages/glibc/2.24/120-Fix-build-with-enable-static-nss.patch
+++ b/packages/glibc/2.25/0001-Fix-build-with-enable-static-nss.patch
@@ -8,15 +8,12 @@ Subject: [PATCH] Fix build with --enable-static-nss
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog      | 5 +++++
- nss/nsswitch.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
+ nss/nsswitch.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/nss/nsswitch.c b/nss/nsswitch.c
-index 0a65f6a..8f31658 100644
 --- a/nss/nsswitch.c
 +++ b/nss/nsswitch.c
-@@ -94,7 +94,7 @@ static name_database *service_table;
+@@ -94,7 +94,7 @@
  static name_database_entry *defconfig_entries;
  
  
@@ -25,6 +22,3 @@ index 0a65f6a..8f31658 100644
  /* Nonzero if this is the nscd process.  */
  static bool is_nscd;
  /* The callback passed to the init functions when nscd is used.  */
--- 
-2.9.3
-
diff --git a/packages/glibc/2.25/0002-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.25/0002-Fix-combreloc-test-BSD-grep.patch
new file mode 100644
index 00000000..43a2b672
--- /dev/null
+++ b/packages/glibc/2.25/0002-Fix-combreloc-test-BSD-grep.patch
@@ -0,0 +1,41 @@
+From 61d5f9c09b3157db76bd1a393e248c262a8d9dd4 Mon Sep 17 00:00:00 2001
+From: Alexey Neyman <stilor@att.net>
+Date: Wed, 8 Mar 2017 14:31:10 -0800
+Subject: [PATCH] Fix combreloc test with BSD grep
+
+The test for "-z combreloc" fails when cross-compiling on a machine
+that uses BSD grep (e.g. on macos). grep complains about empty
+subexpression and exits with non-zero status, which is interpreted
+by configure as "not found". As a result, support for "-z combreloc"
+(HAVE_Z_COMBRELOC) is not detected, leading to link failure on SPARC.
+
+	* configure.ac: Avoid empty subexpression in grep.
+
+Signed-off-by: Alexey Neyman <stilor@att.net>
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -5804,7 +5804,7 @@
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }
+ then
+-  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
+     libc_cv_z_combreloc=yes
+   else
+     libc_cv_z_combreloc=no
+--- a/configure.ac
++++ b/configure.ac
+@@ -1391,7 +1391,7 @@
+ dnl introducing new options this is not easily doable.  Instead use a tool
+ dnl which always is cross-platform: readelf.  To detect whether -z combreloc
+ dnl look for a section named .rel.dyn.
+-  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
++  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
+     libc_cv_z_combreloc=yes
+   else
+     libc_cv_z_combreloc=no
diff --git a/packages/glibc/2.25/0003-typedef-caddr.patch b/packages/glibc/2.25/0003-typedef-caddr.patch
new file mode 100644
index 00000000..980939b9
--- /dev/null
+++ b/packages/glibc/2.25/0003-typedef-caddr.patch
@@ -0,0 +1,17 @@
+---
+ posix/sys/types.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
+@@ -113,7 +113,10 @@
+ #ifdef	__USE_MISC
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
diff --git a/packages/glibc/2.25/960-sh4-trap-divdi3.patch b/packages/glibc/2.25/0004-sh4-trap-divdi3.patch
similarity index 88%
rename from packages/glibc/2.25/960-sh4-trap-divdi3.patch
rename to packages/glibc/2.25/0004-sh4-trap-divdi3.patch
index 99fad46c..33b6b150 100644
--- a/packages/glibc/2.25/960-sh4-trap-divdi3.patch
+++ b/packages/glibc/2.25/0004-sh4-trap-divdi3.patch
@@ -80,9 +80,20 @@ Date:   Wed Mar 15 15:44:59 2017 -0300
             * sysdeps/wordsize-32/symbol-hacks.h: Definitions move to ...
             * sysdeps/wordsize-32/divdi3-symbol-hacks.h: ... here.
 
-diff --git a/sysdeps/i386/symbol-hacks.h b/sysdeps/i386/symbol-hacks.h
-new file mode 100644
-index 0000000000..36a13c83f7
+---
+ sysdeps/i386/symbol-hacks.h                        |   21 ++++++++++++++
+ sysdeps/m68k/symbol-hacks.h                        |   21 ++++++++++++++
+ sysdeps/powerpc/powerpc32/symbol-hacks.h           |   21 ++++++++++++++
+ sysdeps/s390/s390-32/symbol-hacks.h                |   21 ++++++++++++++
+ sysdeps/unix/sysv/linux/i386/Makefile              |    5 +++
+ sysdeps/unix/sysv/linux/m68k/Makefile              |    5 +++
+ sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile |    8 +++++
+ sysdeps/unix/sysv/linux/s390/s390-32/Makefile      |    8 +++++
+ sysdeps/wordsize-32/Makefile                       |    7 ----
+ sysdeps/wordsize-32/divdi3-symbol-hacks.h          |   31 +++++++++++++++++++++
+ sysdeps/wordsize-32/symbol-hacks.h                 |   31 ---------------------
+ 11 files changed, 141 insertions(+), 38 deletions(-)
+
 --- /dev/null
 +++ b/sysdeps/i386/symbol-hacks.h
 @@ -0,0 +1,21 @@
@@ -107,9 +118,6 @@ index 0000000000..36a13c83f7
 +#include <sysdeps/wordsize-32/divdi3-symbol-hacks.h>
 +
 +#include_next "symbol-hacks.h"
-diff --git a/sysdeps/m68k/symbol-hacks.h b/sysdeps/m68k/symbol-hacks.h
-new file mode 100644
-index 0000000000..e449d29810
 --- /dev/null
 +++ b/sysdeps/m68k/symbol-hacks.h
 @@ -0,0 +1,21 @@
@@ -134,9 +142,6 @@ index 0000000000..e449d29810
 +#include <sysdeps/wordsize-32/divdi3-symbol-hacks.h>
 +
 +#include_next "symbol-hacks.h"
-diff --git a/sysdeps/powerpc/powerpc32/symbol-hacks.h b/sysdeps/powerpc/powerpc32/symbol-hacks.h
-new file mode 100644
-index 0000000000..dbb3141621
 --- /dev/null
 +++ b/sysdeps/powerpc/powerpc32/symbol-hacks.h
 @@ -0,0 +1,21 @@
@@ -161,9 +166,6 @@ index 0000000000..dbb3141621
 +#include <sysdeps/wordsize-32/divdi3-symbol-hacks.h>
 +
 +#include_next "symbol-hacks.h"
-diff --git a/sysdeps/s390/s390-32/symbol-hacks.h b/sysdeps/s390/s390-32/symbol-hacks.h
-new file mode 100644
-index 0000000000..585c42365a
 --- /dev/null
 +++ b/sysdeps/s390/s390-32/symbol-hacks.h
 @@ -0,0 +1,21 @@
@@ -188,11 +190,9 @@ index 0000000000..585c42365a
 +#include <sysdeps/wordsize-32/divdi3-symbol-hacks.h>
 +
 +#include_next "symbol-hacks.h"
-diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
-index 6aac0dfe15..4080b8c966 100644
 --- a/sysdeps/unix/sysv/linux/i386/Makefile
 +++ b/sysdeps/unix/sysv/linux/i386/Makefile
-@@ -26,6 +26,11 @@ endif
+@@ -55,6 +55,11 @@
  
  ifeq ($(subdir),csu)
  sysdep-dl-routines += sysdep
@@ -204,11 +204,9 @@ index 6aac0dfe15..4080b8c966 100644
  endif
  
  ifeq ($(subdir),nptl)
-diff --git a/sysdeps/unix/sysv/linux/m68k/Makefile b/sysdeps/unix/sysv/linux/m68k/Makefile
-index 5c50ce6927..ce1f696a6f 100644
 --- a/sysdeps/unix/sysv/linux/m68k/Makefile
 +++ b/sysdeps/unix/sysv/linux/m68k/Makefile
-@@ -4,6 +4,11 @@ m68k-syntax-flag = -DMOTOROLA_SYNTAX
+@@ -4,6 +4,11 @@
  
  ifeq ($(subdir),csu)
  sysdep_routines += m68k-helpers
@@ -220,8 +218,6 @@ index 5c50ce6927..ce1f696a6f 100644
  endif
  
  ifeq ($(subdir),misc)
-diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
-index 3d6c150582..1f45659ed1 100644
 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
 +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
 @@ -1,2 +1,10 @@
@@ -235,11 +231,9 @@ index 3d6c150582..1f45659ed1 100644
 +CPPFLAGS-divdi3.c = -Din_divdi3_c
 +endif
 +endif
-diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/Makefile b/sysdeps/unix/sysv/linux/s390/s390-32/Makefile
-index da3b3c76b4..fd8cf92633 100644
 --- a/sysdeps/unix/sysv/linux/s390/s390-32/Makefile
 +++ b/sysdeps/unix/sysv/linux/s390/s390-32/Makefile
-@@ -21,3 +21,11 @@ endif
+@@ -21,3 +21,11 @@
  ifeq ($(subdir),stdlib)
  sysdep_routines += __makecontext_ret
  endif
@@ -251,9 +245,6 @@ index da3b3c76b4..fd8cf92633 100644
 +CPPFLAGS-divdi3.c = -Din_divdi3_c
 +endif
 +endif
-diff --git a/sysdeps/wordsize-32/Makefile b/sysdeps/wordsize-32/Makefile
-deleted file mode 100644
-index 82beac44ed..0000000000
 --- a/sysdeps/wordsize-32/Makefile
 +++ /dev/null
 @@ -1,7 +0,0 @@
@@ -264,9 +255,6 @@ index 82beac44ed..0000000000
 -CPPFLAGS-divdi3.c = -Din_divdi3_c
 -endif
 -endif
-diff --git a/sysdeps/wordsize-32/divdi3-symbol-hacks.h b/sysdeps/wordsize-32/divdi3-symbol-hacks.h
-new file mode 100644
-index 0000000000..6c90cb796d
 --- /dev/null
 +++ b/sysdeps/wordsize-32/divdi3-symbol-hacks.h
 @@ -0,0 +1,31 @@
@@ -301,9 +289,6 @@ index 0000000000..6c90cb796d
 +asm ("__moddi3 = __moddi3_internal");
 +asm ("__umoddi3 = __umoddi3_internal");
 +#endif
-diff --git a/sysdeps/wordsize-32/symbol-hacks.h b/sysdeps/wordsize-32/symbol-hacks.h
-deleted file mode 100644
-index 0aec1e0b97..0000000000
 --- a/sysdeps/wordsize-32/symbol-hacks.h
 +++ /dev/null
 @@ -1,31 +0,0 @@
diff --git a/packages/glibc/2.25/961-sparc-extra-plt-call.patch b/packages/glibc/2.25/0005-sparc-extra-plt-call.patch
similarity index 74%
rename from packages/glibc/2.25/961-sparc-extra-plt-call.patch
rename to packages/glibc/2.25/0005-sparc-extra-plt-call.patch
index 3781cf04..7b01b831 100644
--- a/packages/glibc/2.25/961-sparc-extra-plt-call.patch
+++ b/packages/glibc/2.25/0005-sparc-extra-plt-call.patch
@@ -22,11 +22,16 @@ Date:   Thu Mar 16 09:15:57 2017 -0300
             * sysdeps/sparc/sparc32/sparcv9/udiv.S (.udiv): Likewise.
             * sysdeps/sparc/sparc32/udiv.S (.udiv): Likewise.
 
-diff --git a/sysdeps/sparc/sparc32/Makefile b/sysdeps/sparc/sparc32/Makefile
-index da205898cf..14d6e03c6f 100644
+---
+ sysdeps/sparc/sparc32/Makefile       |    6 ++++++
+ sysdeps/sparc/sparc32/sparcv8/udiv.S |    1 +
+ sysdeps/sparc/sparc32/sparcv9/udiv.S |    1 +
+ sysdeps/sparc/sparc32/udiv.S         |    1 +
+ 4 files changed, 9 insertions(+)
+
 --- a/sysdeps/sparc/sparc32/Makefile
 +++ b/sysdeps/sparc/sparc32/Makefile
-@@ -47,3 +47,9 @@ $(divrem:%=$(sysdep_dir)/sparc/sparc32/%.S): $(sysdep_dir)/sparc/sparc32/divrem.
+@@ -47,3 +47,9 @@
  	mv -f $@-tmp $@
  
  sysdep-realclean := $(sysdep-realclean) $(divrem:%=sysdeps/sparc/sparc32/%.S)
@@ -36,29 +41,23 @@ index da205898cf..14d6e03c6f 100644
 +# the exported libc one to __wrap_.udiv and use linker option --wrap to make any
 +# call to .udiv to call the wrapper symbol.
 +libc.so-gnulib += -Wl,--wrap=.udiv
-diff --git a/sysdeps/sparc/sparc32/sparcv8/udiv.S b/sysdeps/sparc/sparc32/sparcv8/udiv.S
-index d71954351e..e9cab4e4ef 100644
 --- a/sysdeps/sparc/sparc32/sparcv8/udiv.S
 +++ b/sysdeps/sparc/sparc32/sparcv8/udiv.S
-@@ -13,3 +13,4 @@ ENTRY(.udiv)
+@@ -13,3 +13,4 @@
  	 udiv	%o0, %o1, %o0
  
  END(.udiv)
 +strong_alias (.udiv, __wrap_.udiv)
-diff --git a/sysdeps/sparc/sparc32/sparcv9/udiv.S b/sysdeps/sparc/sparc32/sparcv9/udiv.S
-index de79899756..368f85ede2 100644
 --- a/sysdeps/sparc/sparc32/sparcv9/udiv.S
 +++ b/sysdeps/sparc/sparc32/sparcv9/udiv.S
-@@ -15,3 +15,4 @@ ENTRY(.udiv)
+@@ -15,3 +15,4 @@
  	 udiv		%o0, %o1, %o0
  
  END(.udiv)
 +strong_alias (.udiv, __wrap_.udiv)
-diff --git a/sysdeps/sparc/sparc32/udiv.S b/sysdeps/sparc/sparc32/udiv.S
-index 8dfff66158..ade0afdf40 100644
 --- a/sysdeps/sparc/sparc32/udiv.S
 +++ b/sysdeps/sparc/sparc32/udiv.S
-@@ -344,3 +344,4 @@ LOC(got_result):
+@@ -344,3 +344,4 @@
  	mov %o2, %o0
  
  END(.udiv)
diff --git a/packages/glibc/2.23/997-regexp-common.patch b/packages/glibc/2.25/0006-regexp-common.patch
similarity index 96%
rename from packages/glibc/2.23/997-regexp-common.patch
rename to packages/glibc/2.25/0006-regexp-common.patch
index 7764c99f..89e8371c 100644
--- a/packages/glibc/2.23/997-regexp-common.patch
+++ b/packages/glibc/2.25/0006-regexp-common.patch
@@ -32,8 +32,10 @@ Date:   Fri Jun 23 14:38:46 2017 -0700
             (loc2): Likewise.
             (locs): Likewise.
 
-diff --git a/misc/regexp.c b/misc/regexp.c
-index 19d76c0c37..eaea7c3b89 100644
+---
+ misc/regexp.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
 --- a/misc/regexp.c
 +++ b/misc/regexp.c
 @@ -29,14 +29,15 @@
diff --git a/packages/glibc/2.25/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.25/140-Fix-combreloc-test-BSD-grep.patch
deleted file mode 100644
index fdc3a606..00000000
--- a/packages/glibc/2.25/140-Fix-combreloc-test-BSD-grep.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 61d5f9c09b3157db76bd1a393e248c262a8d9dd4 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Wed, 8 Mar 2017 14:31:10 -0800
-Subject: [PATCH] Fix combreloc test with BSD grep
-
-The test for "-z combreloc" fails when cross-compiling on a machine
-that uses BSD grep (e.g. on macos). grep complains about empty
-subexpression and exits with non-zero status, which is interpreted
-by configure as "not found". As a result, support for "-z combreloc"
-(HAVE_Z_COMBRELOC) is not detected, leading to link failure on SPARC.
-
-	* configure.ac: Avoid empty subexpression in grep.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index eecd0ac..0118bd1 100755
---- a/configure
-+++ b/configure
-@@ -5804,7 +5804,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; }
- then
--  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
-+  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
-     libc_cv_z_combreloc=yes
-   else
-     libc_cv_z_combreloc=no
-diff --git a/configure.ac b/configure.ac
-index 4a77411..19f6d87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1391,7 +1391,7 @@ dnl cross-platform since the gcc used can be a cross compiler.  Without
- dnl introducing new options this is not easily doable.  Instead use a tool
- dnl which always is cross-platform: readelf.  To detect whether -z combreloc
- dnl look for a section named .rel.dyn.
--  if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
-+  if $READELF -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
-     libc_cv_z_combreloc=yes
-   else
-     libc_cv_z_combreloc=no
--- 
-2.9.3
-
diff --git a/packages/glibc/2.25/910-typedef-caddr.patch b/packages/glibc/2.25/910-typedef-caddr.patch
deleted file mode 100644
index fc7979b7..00000000
--- a/packages/glibc/2.25/910-typedef-caddr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
-@@ -113,7 +113,10 @@
- #ifdef __USE_MISC
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-
diff --git a/packages/glibc/2.26/0000-typedef-caddr.patch b/packages/glibc/2.26/0000-typedef-caddr.patch
new file mode 100644
index 00000000..980939b9
--- /dev/null
+++ b/packages/glibc/2.26/0000-typedef-caddr.patch
@@ -0,0 +1,17 @@
+---
+ posix/sys/types.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
+@@ -113,7 +113,10 @@
+ #ifdef	__USE_MISC
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
diff --git a/packages/glibc/2.26/910-typedef-caddr.patch b/packages/glibc/2.26/910-typedef-caddr.patch
deleted file mode 100644
index fc7979b7..00000000
--- a/packages/glibc/2.26/910-typedef-caddr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
-@@ -113,7 +113,10 @@
- #ifdef __USE_MISC
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-
diff --git a/packages/gmp/5.0.5/120-fix-r0-clobbering-issue.patch b/packages/gmp/5.0.5/0000-fix-r0-clobbering-issue.patch
similarity index 87%
rename from packages/gmp/5.0.5/120-fix-r0-clobbering-issue.patch
rename to packages/gmp/5.0.5/0000-fix-r0-clobbering-issue.patch
index d12d6b2c..f6b8b1f0 100644
--- a/packages/gmp/5.0.5/120-fix-r0-clobbering-issue.patch
+++ b/packages/gmp/5.0.5/0000-fix-r0-clobbering-issue.patch
@@ -7,9 +7,12 @@ Removed ChangeLog part
 # Parent  816c18dbd492050ef8892e91602d9e758abc2988
 Fix r0 clobbering issue with "large" code affecting elf+darwin PIC.
 
-diff -r 816c18dbd492 -r 829215e83ff1 mpn/powerpc32/vmx/mod_34lsub1.asm
---- a/mpn/powerpc32/vmx/mod_34lsub1.asm	Tue Jun 19 15:02:48 2012 +0200
-+++ b/mpn/powerpc32/vmx/mod_34lsub1.asm	Sat Jul 21 19:19:11 2012 +0200
+---
+ mpn/powerpc32/vmx/mod_34lsub1.asm |   17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+--- a/mpn/powerpc32/vmx/mod_34lsub1.asm
++++ b/mpn/powerpc32/vmx/mod_34lsub1.asm
 @@ -1,6 +1,7 @@
  dnl  PowerPC-32 mpn_mod_34lsub1 -- mpn remainder mod 2^24-1.
  
@@ -74,4 +77,3 @@ diff -r 816c18dbd492 -r 829215e83ff1 mpn/powerpc32/vmx/mod_34lsub1.asm
  	srwi	r0, r0, 3		C r0 = floor(n/12)
  	mtctr	r0
  
-
diff --git a/packages/libelf/0.8.13/100-fix-64-bit-detection.patch b/packages/libelf/0.8.13/0000-fix-64-bit-detection.patch
similarity index 51%
rename from packages/libelf/0.8.13/100-fix-64-bit-detection.patch
rename to packages/libelf/0.8.13/0000-fix-64-bit-detection.patch
index 7995443a..4d25f43c 100644
--- a/packages/libelf/0.8.13/100-fix-64-bit-detection.patch
+++ b/packages/libelf/0.8.13/0000-fix-64-bit-detection.patch
@@ -1,6 +1,10 @@
-diff -dur libelf-0.8.10.orig/configure libelf-0.8.10/configure
---- libelf-0.8.10.orig/configure	2007-09-07 14:08:06.000000000 +0200
-+++ libelf-0.8.10/configure	2008-10-23 22:43:19.000000000 +0200
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure
++++ b/configure
 @@ -1595,7 +1595,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -10,9 +14,8 @@ diff -dur libelf-0.8.10.orig/configure libelf-0.8.10/configure
  else
    cat > conftest.$ac_ext <<EOF
  #line 1602 "configure"
-diff -dur libelf-0.8.10.orig/configure.in libelf-0.8.10/configure.in
---- libelf-0.8.10.orig/configure.in	2007-09-07 14:07:59.000000000 +0200
-+++ libelf-0.8.10/configure.in	2008-10-23 22:43:10.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -90,7 +90,7 @@
  AC_CHECK_SIZEOF(short,2)
  AC_CHECK_SIZEOF(int,4)
diff --git a/packages/libiconv/1.14/100-srclib_stdio.in.h-remove-gets-declarations.patch b/packages/libiconv/1.14/0000-srclib_stdio.in.h-remove-gets-declarations.patch
similarity index 78%
rename from packages/libiconv/1.14/100-srclib_stdio.in.h-remove-gets-declarations.patch
rename to packages/libiconv/1.14/0000-srclib_stdio.in.h-remove-gets-declarations.patch
index 382c8413..3eccfe95 100644
--- a/packages/libiconv/1.14/100-srclib_stdio.in.h-remove-gets-declarations.patch
+++ b/packages/libiconv/1.14/0000-srclib_stdio.in.h-remove-gets-declarations.patch
@@ -1,6 +1,9 @@
-diff -r -u libiconv-1.14/srclib/stdio.in.h.orig libiconv-1.14/srclib/stdio.in.h
---- libiconv-1.14/srclib/stdio.in.h.orig	2013-02-22 13:52:46.336327969 -0600
-+++ libiconv-1.14/srclib/stdio.in.h	2013-02-22 13:54:27.948207059 -0600
+---
+ srclib/stdio.in.h |   19 ++++---------------
+ 1 file changed, 4 insertions(+), 15 deletions(-)
+
+--- a/srclib/stdio.in.h
++++ b/srclib/stdio.in.h
 @@ -679,22 +679,11 @@
  # endif
  #endif
diff --git a/packages/libtool/2.4.6/2.4.5-pass-ldflags.patch b/packages/libtool/2.4.6/0000-2.4.5-pass-ldflags.patch
similarity index 74%
rename from packages/libtool/2.4.6/2.4.5-pass-ldflags.patch
rename to packages/libtool/2.4.6/0000-2.4.5-pass-ldflags.patch
index d35e3432..022fcc62 100644
--- a/packages/libtool/2.4.6/2.4.5-pass-ldflags.patch
+++ b/packages/libtool/2.4.6/0000-2.4.5-pass-ldflags.patch
@@ -1,6 +1,10 @@
---- libtool-2.4.5.orig/build-aux/ltmain.in	2015-01-16 12:52:04.000000000 -0600
-+++ libtool-2.4.5/build-aux/ltmain.in	2015-02-07 22:45:14.421079200 -0600
-@@ -5356,7 +5356,8 @@ func_mode_link ()
+---
+ build-aux/ltmain.in |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -5363,7 +5363,8 @@
        # -stdlib=*            select c++ std lib with clang
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
        -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
diff --git a/packages/linux/2.6.32.27/100-unifdef-strclpy.patch b/packages/linux/2.6.32.27/0000-unifdef-strclpy.patch
similarity index 58%
rename from packages/linux/2.6.32.27/100-unifdef-strclpy.patch
rename to packages/linux/2.6.32.27/0000-unifdef-strclpy.patch
index 072fac6f..6b67cf02 100644
--- a/packages/linux/2.6.32.27/100-unifdef-strclpy.patch
+++ b/packages/linux/2.6.32.27/0000-unifdef-strclpy.patch
@@ -1,5 +1,9 @@
---- linux-2.6.32.27/scripts/unifdef.c.orig	2017-03-08 21:42:27.000000000 -0800
-+++ linux-2.6.32.27/scripts/unifdef.c	2017-03-08 21:42:44.000000000 -0800
+---
+ scripts/unifdef.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/scripts/unifdef.c
++++ b/scripts/unifdef.c
 @@ -72,8 +72,6 @@
  #include <string.h>
  #include <unistd.h>
diff --git a/packages/ltrace/0.5.3/100-allow-cross-compile.patch b/packages/ltrace/0.5.3/0000-allow-cross-compile.patch
similarity index 59%
rename from packages/ltrace/0.5.3/100-allow-cross-compile.patch
rename to packages/ltrace/0.5.3/0000-allow-cross-compile.patch
index 58572cd1..6515ebdf 100644
--- a/packages/ltrace/0.5.3/100-allow-cross-compile.patch
+++ b/packages/ltrace/0.5.3/0000-allow-cross-compile.patch
@@ -2,27 +2,29 @@ This patch is courtesy of OpenEmbedded, by Khem Raj <raj.khem@gmail.com>
 
 http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b85b779688f0abc389e3c25d06b54de8b86385c1
 
-Index: ltrace-0.5.3/common.h
-===================================================================
---- ltrace-0.5.3.orig/common.h	2009-10-23 23:13:45.700282578 -0700
-+++ ltrace-0.5.3/common.h	2009-10-23 23:14:13.550371553 -0700
+---
+ common.h  |    4 ++++
+ configure |   11 ++++-------
+ debug.h   |    4 +++-
+ 3 files changed, 11 insertions(+), 8 deletions(-)
+
+--- a/common.h
++++ b/common.h
 @@ -1,3 +1,5 @@
 +#ifndef COMMON_H
 +#define COMMON_H
  #include <sys/types.h>
  #include <sys/time.h>
  #include <stdio.h>
-@@ -251,3 +253,5 @@ extern void * sym2addr(Process *, struct
+@@ -251,3 +253,5 @@
  #if 0				/* not yet */
  extern int umoven(Process * proc, void * addr, int len, void * laddr);
  #endif
 +#endif
 +
-Index: ltrace-0.5.3/configure
-===================================================================
---- ltrace-0.5.3.orig/configure	2009-10-23 23:13:45.630316494 -0700
-+++ ltrace-0.5.3/configure	2009-10-23 23:13:59.672869527 -0700
-@@ -30,7 +30,7 @@ int main () {
+--- a/configure
++++ b/configure
+@@ -30,7 +30,7 @@
    return cplus_demangle();
  }
  EOF
@@ -31,7 +33,7 @@ Index: ltrace-0.5.3/configure
  then
    HAVE_LIBIBERTY=1
    echo "yes"
-@@ -48,7 +48,7 @@ int main () {
+@@ -48,7 +48,7 @@
    return __cxa_demangle();
  }
  EOF
@@ -40,7 +42,7 @@ Index: ltrace-0.5.3/configure
  then
    HAVE_LIBSUPC__=1
    echo "yes"
-@@ -67,7 +67,7 @@ int main () {
+@@ -67,7 +67,7 @@
    return 0;
  }
  EOF
@@ -49,7 +51,7 @@ Index: ltrace-0.5.3/configure
  then
    HAVE_ELF_C_READ_MMAP=1
    echo "yes"
-@@ -77,15 +77,12 @@ else
+@@ -77,15 +77,12 @@
  fi
  rm -f conftest.c a.out
  
@@ -66,17 +68,15 @@ Index: ltrace-0.5.3/configure
  sysconfdir='${prefix}/etc'
  bindir='${prefix}/bin'
  mandir='${prefix}/share/man'
-Index: ltrace-0.5.3/debug.h
-===================================================================
---- ltrace-0.5.3.orig/debug.h	2009-10-23 23:13:45.670276809 -0700
-+++ ltrace-0.5.3/debug.h	2009-10-23 23:14:26.440319785 -0700
+--- a/debug.h
++++ b/debug.h
 @@ -1,3 +1,5 @@
 +#ifndef DEBUG_H
 +#define DEBUG_H
  #include <features.h>
  
  /* debug levels:
-@@ -14,4 +16,4 @@ void debug_(int level, const char *file,
+@@ -14,4 +16,4 @@
  int xinfdump(long, void *, int);
  
  # define debug(level, expr...) debug_(level, __FILE__, __LINE__, expr)
diff --git a/packages/ltrace/0.5.3/0001-alpha-support.patch b/packages/ltrace/0.5.3/0001-alpha-support.patch
new file mode 100644
index 00000000..8a7710c8
--- /dev/null
+++ b/packages/ltrace/0.5.3/0001-alpha-support.patch
@@ -0,0 +1,14 @@
+---
+ sysdeps/linux-gnu/Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sysdeps/linux-gnu/Makefile
++++ b/sysdeps/linux-gnu/Makefile
+@@ -2,6 +2,7 @@
+ 				-e s/i.86/i386/ \
+ 				-e s/sun4u/sparc64/ \
+ 				-e s/sparc64/sparc/ \
++				-e s/alpha.*/alpha/ \
+ 				-e s/arm.*/arm/ \
+ 				-e s/sa110/arm/ \
+ 				-e s/ppc64/ppc/ \
diff --git a/packages/ltrace/0.5.3/120-debian-ltrace_0.5.3-2.patch b/packages/ltrace/0.5.3/0002-debian-ltrace_0.5.3-2.patch
similarity index 68%
rename from packages/ltrace/0.5.3/120-debian-ltrace_0.5.3-2.patch
rename to packages/ltrace/0.5.3/0002-debian-ltrace_0.5.3-2.patch
index 483c7433..651230c2 100644
--- a/packages/ltrace/0.5.3/120-debian-ltrace_0.5.3-2.patch
+++ b/packages/ltrace/0.5.3/0002-debian-ltrace_0.5.3-2.patch
@@ -1,7 +1,15 @@
 Debian patch courtesy of the Debian ltrace maintainer Juan Cespedes <cespedes@debian.org>
 
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/breakpoint.c
-+++ ltrace-0.5.3/sysdeps/linux-gnu/breakpoint.c
+---
+ sysdeps/linux-gnu/arm/breakpoint.c  |    7 +------
+ sysdeps/linux-gnu/breakpoint.c      |    5 +++--
+ sysdeps/linux-gnu/ia64/breakpoint.c |    5 +----
+ sysdeps/linux-gnu/ia64/plt.c        |    1 +
+ sysdeps/linux-gnu/ia64/regs.c       |    1 -
+ 5 files changed, 6 insertions(+), 13 deletions(-)
+
+--- a/sysdeps/linux-gnu/breakpoint.c
++++ b/sysdeps/linux-gnu/breakpoint.c
 @@ -6,8 +6,6 @@
  #include "common.h"
  #include "arch.h"
@@ -21,8 +29,8 @@ Debian patch courtesy of the Debian ltrace maintainer Juan Cespedes <cespedes@de
  void
  enable_breakpoint(pid_t pid, Breakpoint *sbp) {
  	unsigned int i, j;
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/arm/breakpoint.c
-+++ ltrace-0.5.3/sysdeps/linux-gnu/arm/breakpoint.c
+--- a/sysdeps/linux-gnu/arm/breakpoint.c
++++ b/sysdeps/linux-gnu/arm/breakpoint.c
 @@ -24,10 +24,7 @@
  
  #include <sys/ptrace.h>
@@ -44,16 +52,16 @@ Debian patch courtesy of the Debian ltrace maintainer Juan Cespedes <cespedes@de
  
  	debug(1, "arch_disable_breakpoint(%d,%p)", pid, sbp->addr);
  
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/ia64/plt.c
-+++ ltrace-0.5.3/sysdeps/linux-gnu/ia64/plt.c
+--- a/sysdeps/linux-gnu/ia64/plt.c
++++ b/sysdeps/linux-gnu/ia64/plt.c
 @@ -1,4 +1,5 @@
  #include <gelf.h>
 +#include <sys/ptrace.h>
  #include "common.h"
  
  /* A bundle is 128 bits */
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/ia64/breakpoint.c
-+++ ltrace-0.5.3/sysdeps/linux-gnu/ia64/breakpoint.c
+--- a/sysdeps/linux-gnu/ia64/breakpoint.c
++++ b/sysdeps/linux-gnu/ia64/breakpoint.c
 @@ -6,10 +6,7 @@
  
  #include <sys/ptrace.h>
@@ -66,8 +74,8 @@ Debian patch courtesy of the Debian ltrace maintainer Juan Cespedes <cespedes@de
  
  static long long
  extract_bit_field(char *bundle, int from, int len) {
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/ia64/regs.c
-+++ ltrace-0.5.3/sysdeps/linux-gnu/ia64/regs.c
+--- a/sysdeps/linux-gnu/ia64/regs.c
++++ b/sysdeps/linux-gnu/ia64/regs.c
 @@ -7,7 +7,6 @@
  #include <asm/rse.h>
  
diff --git a/packages/ltrace/0.5.3/130-add-sysdep.patch b/packages/ltrace/0.5.3/0003-add-sysdep.patch
similarity index 53%
rename from packages/ltrace/0.5.3/130-add-sysdep.patch
rename to packages/ltrace/0.5.3/0003-add-sysdep.patch
index 6fd8d262..8f17f9d7 100644
--- a/packages/ltrace/0.5.3/130-add-sysdep.patch
+++ b/packages/ltrace/0.5.3/0003-add-sysdep.patch
@@ -2,11 +2,13 @@ This patch is courtesy of OpenEmbedded, by Khem Raj <raj.khem@gmail.com>
 
 http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b85b779688f0abc389e3c25d06b54de8b86385c1
 
-Index: ltrace-0.5.3/Makefile.in
-===================================================================
---- ltrace-0.5.3.orig/Makefile.in	2009-10-23 22:06:08.130304691 -0700
-+++ ltrace-0.5.3/Makefile.in	2009-10-23 22:06:53.160369614 -0700
-@@ -39,6 +39,8 @@ ltrace:		main.o libltrace.a
+---
+ Makefile.in |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -39,6 +39,8 @@
  libltrace.a: 	sysdeps/sysdep.o $(OBJ)
  		$(AR) rcv $@ $^
  
diff --git a/packages/ltrace/0.5.3/140-mips.patch b/packages/ltrace/0.5.3/0004-mips.patch
similarity index 50%
rename from packages/ltrace/0.5.3/140-mips.patch
rename to packages/ltrace/0.5.3/0004-mips.patch
index b01b7a90..f477fa72 100644
--- a/packages/ltrace/0.5.3/140-mips.patch
+++ b/packages/ltrace/0.5.3/0004-mips.patch
@@ -2,20 +2,22 @@ This patch is courtesy of OpenEmbedded, by Khem Raj <raj.khem@gmail.com>
 
 http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b85b779688f0abc389e3c25d06b54de8b86385c1
 
-Index: ltrace-0.5.3/sysdeps/linux-gnu/mipsel/plt.c
-===================================================================
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/mipsel/plt.c	2009-10-23 23:25:59.292780574 -0700
-+++ ltrace-0.5.3/sysdeps/linux-gnu/mipsel/plt.c	2009-10-23 23:26:22.671522220 -0700
+---
+ handle_event.c                  |    3 ++-
+ sysdeps/linux-gnu/mipsel/plt.c  |    2 +-
+ sysdeps/linux-gnu/mipsel/regs.c |    1 -
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/sysdeps/linux-gnu/mipsel/plt.c
++++ b/sysdeps/linux-gnu/mipsel/plt.c
 @@ -1,4 +1,4 @@
 -#include <debug.h>
 +#include "debug.h"
  #include <gelf.h>
  #include <sys/ptrace.h>
  #include "common.h"
-Index: ltrace-0.5.3/sysdeps/linux-gnu/mipsel/regs.c
-===================================================================
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/mipsel/regs.c	2009-10-23 23:25:59.312777529 -0700
-+++ ltrace-0.5.3/sysdeps/linux-gnu/mipsel/regs.c	2009-10-23 23:26:08.190311896 -0700
+--- a/sysdeps/linux-gnu/mipsel/regs.c
++++ b/sysdeps/linux-gnu/mipsel/regs.c
 @@ -4,7 +4,6 @@
  #include <sys/types.h>
  #include <sys/ptrace.h>
@@ -24,11 +26,9 @@ Index: ltrace-0.5.3/sysdeps/linux-gnu/mipsel/regs.c
  
  #include "common.h"
  #include "mipsel.h"
-Index: ltrace-0.5.3/handle_event.c
-===================================================================
---- ltrace-0.5.3.orig/handle_event.c	2009-10-23 23:29:48.780274445 -0700
-+++ ltrace-0.5.3/handle_event.c	2009-10-23 23:37:32.260284055 -0700
-@@ -573,7 +573,8 @@ handle_breakpoint(Event *event) {
+--- a/handle_event.c
++++ b/handle_event.c
+@@ -573,7 +573,8 @@
  			void *old_addr;
  			struct library_symbol *sym= event->proc->callstack[i].c_un.libfunc;
  			assert(sym);
diff --git a/packages/ltrace/0.5.3/0005-mips-remove-CP.patch b/packages/ltrace/0.5.3/0005-mips-remove-CP.patch
new file mode 100644
index 00000000..5ba33403
--- /dev/null
+++ b/packages/ltrace/0.5.3/0005-mips-remove-CP.patch
@@ -0,0 +1,18 @@
+This patch is courtesy of OpenEmbedded, by Khem Raj <raj.khem@gmail.com>
+
+http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b85b779688f0abc389e3c25d06b54de8b86385c1
+
+---
+ sysdeps/linux-gnu/mipsel/trace.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sysdeps/linux-gnu/mipsel/trace.c
++++ b/sysdeps/linux-gnu/mipsel/trace.c
+@@ -127,7 +127,6 @@
+ 			return ret;
+ 		} else {
+ 			// If we need this, I think we can look at [sp+16] for arg_num==4.
+-			CP;
+ 			return 0;
+ 		}
+ 	}
diff --git a/packages/ltrace/0.5.3/150-allow-configurable-arch.patch b/packages/ltrace/0.5.3/0006-allow-configurable-arch.patch
similarity index 55%
rename from packages/ltrace/0.5.3/150-allow-configurable-arch.patch
rename to packages/ltrace/0.5.3/0006-allow-configurable-arch.patch
index 7208ca8c..171d7dd2 100644
--- a/packages/ltrace/0.5.3/150-allow-configurable-arch.patch
+++ b/packages/ltrace/0.5.3/0006-allow-configurable-arch.patch
@@ -4,9 +4,14 @@ the arm sysdeps.
 
 	Joachim Nilsson <jocke@vmlinux.org>
 
-diff -ru ltrace-0.5.3.orig/configure ltrace-0.5.3/configure
---- ltrace-0.5.3.orig/configure	2010-01-02 11:05:55.000000000 +0100
-+++ ltrace-0.5.3/configure	2010-01-02 20:49:11.000000000 +0100
+---
+ Makefile.in                |    6 ++++--
+ configure                  |    2 +-
+ sysdeps/linux-gnu/Makefile |    2 +-
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+--- a/configure
++++ b/configure
 @@ -110,7 +110,7 @@
  #
  # Makefile.in -> Makefile
@@ -16,10 +21,8 @@ diff -ru ltrace-0.5.3.orig/configure ltrace-0.5.3/configure
  
  for i in $x_subst_vars
  do
-Only in ltrace-0.5.3: configure~
-diff -ru ltrace-0.5.3.orig/Makefile.in ltrace-0.5.3/Makefile.in
---- ltrace-0.5.3.orig/Makefile.in	2010-01-02 11:05:55.000000000 +0100
-+++ ltrace-0.5.3/Makefile.in	2010-01-03 01:28:41.000000000 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -1,10 +1,12 @@
  #
  # ltrace's Makefile.in
@@ -35,14 +38,11 @@ diff -ru ltrace-0.5.3.orig/Makefile.in ltrace-0.5.3/Makefile.in
  TOPDIR		= $(shell pwd)
  
  prefix		= @prefix@
-Only in ltrace-0.5.3: Makefile.in~
-diff -ru ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.3/sysdeps/linux-gnu/Makefile
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile	2010-01-02 11:05:55.000000000 +0100
-+++ ltrace-0.5.3/sysdeps/linux-gnu/Makefile	2010-01-02 20:49:51.000000000 +0100
+--- a/sysdeps/linux-gnu/Makefile
++++ b/sysdeps/linux-gnu/Makefile
 @@ -1,4 +1,4 @@
 -ARCH		:=	$(shell uname -m | sed \
 +ARCH		?=	$(shell uname -m | sed \
  				-e s/i.86/i386/ \
  				-e s/sun4u/sparc64/ \
  				-e s/sparc64/sparc/ \
-Only in ltrace-0.5.3/sysdeps/linux-gnu: Makefile~
diff --git a/packages/ltrace/0.5.3/160-fix-missing-ptrace-defines.patch b/packages/ltrace/0.5.3/0007-fix-missing-ptrace-defines.patch
similarity index 68%
rename from packages/ltrace/0.5.3/160-fix-missing-ptrace-defines.patch
rename to packages/ltrace/0.5.3/0007-fix-missing-ptrace-defines.patch
index b57a1665..f4e31d90 100644
--- a/packages/ltrace/0.5.3/160-fix-missing-ptrace-defines.patch
+++ b/packages/ltrace/0.5.3/0007-fix-missing-ptrace-defines.patch
@@ -5,9 +5,15 @@ The latter of which otherwise fails to build on Arm.
 
 	Joachim Nilsson <jocke@vmlinux.org>
 
-diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/events.c ltrace-0.5.3/sysdeps/linux-gnu/events.c
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/events.c	2009-07-25 17:13:02.000000000 +0200
-+++ ltrace-0.5.3/sysdeps/linux-gnu/events.c	2010-01-03 14:33:46.000000000 +0100
+---
+ sysdeps/linux-gnu/events.c  |    3 +--
+ sysdeps/linux-gnu/ppc/plt.c |    1 +
+ sysdeps/linux-gnu/trace.c   |    3 +--
+ sysdeps/linux-gnu/trace.h   |   32 ++++++++++++++++++++++++++++++++
+ 4 files changed, 35 insertions(+), 4 deletions(-)
+
+--- a/sysdeps/linux-gnu/events.c
++++ b/sysdeps/linux-gnu/events.c
 @@ -7,9 +7,8 @@
  #include <errno.h>
  #include <signal.h>
@@ -19,9 +25,8 @@ diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/events.c ltrace-0.5.3/sysdeps/linu
  
  static Event event;
  
-diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.c ltrace-0.5.3/sysdeps/linux-gnu/trace.c
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.c	2009-07-25 17:13:02.000000000 +0200
-+++ ltrace-0.5.3/sysdeps/linux-gnu/trace.c	2010-01-03 14:33:38.000000000 +0100
+--- a/sysdeps/linux-gnu/trace.c
++++ b/sysdeps/linux-gnu/trace.c
 @@ -5,10 +5,9 @@
  #include <unistd.h>
  #include <sys/types.h>
@@ -34,9 +39,8 @@ diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.c ltrace-0.5.3/sysdeps/linux
  
  /* If the system headers did not provide the constants, hard-code the normal
     values.  */
-diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.h ltrace-0.5.3/sysdeps/linux-gnu/trace.h
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.h	1970-01-01 01:00:00.000000000 +0100
-+++ ltrace-0.5.3/sysdeps/linux-gnu/trace.h	2010-01-03 14:33:26.000000000 +0100
+--- /dev/null
++++ b/sysdeps/linux-gnu/trace.h
 @@ -0,0 +1,32 @@
 +/* If the system headers did not provide the constants, hard-code the normal values. */
 +#ifndef __SYSDEPS_TRACE_H__
@@ -70,8 +74,8 @@ diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.h ltrace-0.5.3/sysdeps/linux
 +
 +#endif /* PTRACE_EVENT_FORK */
 +#endif /* __SYSDEPS_TRACE_H__ */
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/ppc/plt.c	2009-07-25 09:13:02.000000000 -0600
-+++ ltrace-0.5.3/sysdeps/linux-gnu/ppc/plt.c	2010-09-28 18:30:07.091618190 -0600
+--- a/sysdeps/linux-gnu/ppc/plt.c
++++ b/sysdeps/linux-gnu/ppc/plt.c
 @@ -1,5 +1,6 @@
  #include <gelf.h>
  #include "common.h"
diff --git a/packages/ltrace/0.5.3/170-lib-supcc.patch b/packages/ltrace/0.5.3/0008-lib-supcc.patch
similarity index 58%
rename from packages/ltrace/0.5.3/170-lib-supcc.patch
rename to packages/ltrace/0.5.3/0008-lib-supcc.patch
index 8842b918..cbb1975c 100644
--- a/packages/ltrace/0.5.3/170-lib-supcc.patch
+++ b/packages/ltrace/0.5.3/0008-lib-supcc.patch
@@ -1,8 +1,10 @@
-Index: ltrace-0.5.3/configure
-===================================================================
---- ltrace-0.5.3/configure
-+++ ltrace-0.5.3/configure
-@@ -78,7 +78,10 @@ fi
+---
+ configure |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/configure
++++ b/configure
+@@ -78,7 +78,10 @@
  rm -f conftest.c a.out
  
  CFLAGS='-g -O2'
diff --git a/packages/ltrace/0.5.3/0009-libltrace-genindex.patch b/packages/ltrace/0.5.3/0009-libltrace-genindex.patch
new file mode 100644
index 00000000..929738fa
--- /dev/null
+++ b/packages/ltrace/0.5.3/0009-libltrace-genindex.patch
@@ -0,0 +1,15 @@
+---
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -39,7 +39,7 @@
+ 		$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ libltrace.a: 	sysdeps/sysdep.o $(OBJ)
+-		$(AR) rcv $@ $^
++		$(AR) rscv $@ $^
+ 
+ $(OBJ):		sysdeps/sysdep.o
+ 
diff --git a/packages/ltrace/0.5.3/190-ar-configurable.patch b/packages/ltrace/0.5.3/0010-ar-configurable.patch
similarity index 58%
rename from packages/ltrace/0.5.3/190-ar-configurable.patch
rename to packages/ltrace/0.5.3/0010-ar-configurable.patch
index 28856a3e..99edbce0 100644
--- a/packages/ltrace/0.5.3/190-ar-configurable.patch
+++ b/packages/ltrace/0.5.3/0010-ar-configurable.patch
@@ -1,6 +1,10 @@
-diff -ru ltrace-0.5.3.org/Makefile.in ltrace-0.5.3/Makefile.in
---- ltrace-0.5.3.org/Makefile.in	2011-08-21 18:55:15.000000000 +0200
-+++ ltrace-0.5.3/Makefile.in	2011-08-21 18:40:53.000000000 +0200
+---
+ Makefile.in |    1 +
+ configure   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -15,6 +15,7 @@
  mandir		= @mandir@
  docdir		= $(prefix)/share/doc/ltrace
@@ -9,11 +13,9 @@ diff -ru ltrace-0.5.3.org/Makefile.in ltrace-0.5.3/Makefile.in
  CC		=	@CC@
  CFLAGS		=	-Wall @CFLAGS@
  CPPFLAGS	=	-iquote $(TOPDIR) -iquote $(TOPDIR)/sysdeps/$(OS) -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@
-
-diff -ru ltrace-0.5.3.org/configure ltrace-0.5.3/configure
---- ltrace-0.5.3.org/configure	2011-08-21 18:55:15.000000000 +0200
-+++ ltrace-0.5.3/configure	2011-08-21 18:54:46.000000000 +0200
-@@ -113,7 +117,7 @@
+--- a/configure
++++ b/configure
+@@ -113,7 +113,7 @@
  #
  # Makefile.in -> Makefile
  #
diff --git a/packages/ltrace/0.5.3/200-configure-hostos.patch b/packages/ltrace/0.5.3/0011-configure-hostos.patch
similarity index 61%
rename from packages/ltrace/0.5.3/200-configure-hostos.patch
rename to packages/ltrace/0.5.3/0011-configure-hostos.patch
index 36563f44..96372128 100644
--- a/packages/ltrace/0.5.3/200-configure-hostos.patch
+++ b/packages/ltrace/0.5.3/0011-configure-hostos.patch
@@ -1,6 +1,9 @@
-diff -ru ltrace-0.5.3.org/configure ltrace-0.5.3/configure
---- ltrace-0.5.3.org/configure	2011-08-21 18:55:15.000000000 +0200
-+++ ltrace-0.5.3/configure	2011-08-21 18:54:46.000000000 +0200
+---
+ configure |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/configure
++++ b/configure
 @@ -15,8 +15,12 @@
  echo $PACKAGE_VERSION
  
diff --git a/packages/ltrace/0.5.3/110-alpha-support.patch b/packages/ltrace/0.5.3/110-alpha-support.patch
deleted file mode 100644
index 838b84b1..00000000
--- a/packages/ltrace/0.5.3/110-alpha-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.3/sysdeps/linux-gnu/Makefile
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile	2009-07-25 17:13:02.000000000 +0200
-+++ ltrace-0.5.3/sysdeps/linux-gnu/Makefile	2010-01-01 22:20:45.000000000 +0100
-@@ -2,6 +2,7 @@
- 				-e s/i.86/i386/ \
- 				-e s/sun4u/sparc64/ \
- 				-e s/sparc64/sparc/ \
-+				-e s/alpha.*/alpha/ \
- 				-e s/arm.*/arm/ \
- 				-e s/sa110/arm/ \
- 				-e s/ppc64/ppc/ \
diff --git a/packages/ltrace/0.5.3/140-mips-remove-CP.patch b/packages/ltrace/0.5.3/140-mips-remove-CP.patch
deleted file mode 100644
index 4532a8f3..00000000
--- a/packages/ltrace/0.5.3/140-mips-remove-CP.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch is courtesy of OpenEmbedded, by Khem Raj <raj.khem@gmail.com>
-
-http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b85b779688f0abc389e3c25d06b54de8b86385c1
-
-Index: ltrace-0.5.3/sysdeps/linux-gnu/mipsel/trace.c
-===================================================================
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/mipsel/trace.c	2009-10-23 23:15:59.822783128 -0700
-+++ ltrace-0.5.3/sysdeps/linux-gnu/mipsel/trace.c	2009-10-23 23:16:10.441268788 -0700
-@@ -127,7 +127,6 @@ gimme_arg(enum tof type, Process *proc, 
- 			return ret;
- 		} else {
- 			// If we need this, I think we can look at [sp+16] for arg_num==4.
--			CP;
- 			return 0;
- 		}
- 	}
diff --git a/packages/ltrace/0.5.3/180-libltrace-genindex.patch b/packages/ltrace/0.5.3/180-libltrace-genindex.patch
deleted file mode 100644
index 0b1629b6..00000000
--- a/packages/ltrace/0.5.3/180-libltrace-genindex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru ltrace-0.5.3.org/Makefile.in ltrace-0.5.3/Makefile.in
---- ltrace-0.5.3.org/Makefile.in	2011-08-21 18:55:15.000000000 +0200
-+++ ltrace-0.5.3/Makefile.in	2011-08-21 18:40:53.000000000 +0200
-@@ -39,7 +40,7 @@
- 		$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- libltrace.a: 	sysdeps/sysdep.o $(OBJ)
--		$(AR) rcv $@ $^
-+		$(AR) rscv $@ $^
- 
- $(OBJ):		sysdeps/sysdep.o
- 
diff --git a/packages/ltrace/0.7.3/001-avoid-libstdc++.patch b/packages/ltrace/0.7.3/0000-avoid-libstdc++.patch
similarity index 76%
rename from packages/ltrace/0.7.3/001-avoid-libstdc++.patch
rename to packages/ltrace/0.7.3/0000-avoid-libstdc++.patch
index 9cbf5575..300fa3a8 100644
--- a/packages/ltrace/0.7.3/001-avoid-libstdc++.patch
+++ b/packages/ltrace/0.7.3/0000-avoid-libstdc++.patch
@@ -5,8 +5,13 @@ Description: avoid warning from dpkg-shlibdeps:
 Last-Update: 2013-12-30
 
  
---- a/configure.ac	2013-09-17 01:04:28.000000000 +0200
-+++ b/configure.ac	2013-12-30 12:24:20.000000000 +0100
+---
+ configure    |    9 +++++++++
+ configure.ac |    9 +++++++++
+ 2 files changed, 18 insertions(+)
+
+--- a/configure.ac
++++ b/configure.ac
 @@ -113,6 +113,15 @@
  	libstdcxx_LIBS=""])
  AC_SUBST(libstdcxx_LIBS)
@@ -23,9 +28,9 @@ Last-Update: 2013-12-30
  
  dnl Check security_get_boolean_active availability.
  AC_CHECK_HEADERS(selinux/selinux.h)
---- a/configure	2013-09-17 01:07:46.000000000 +0100
-+++ b/configure	2013-12-30 12:34:23.000000000 +0100
-@@ -11826,6 +11826,15 @@
+--- a/configure
++++ b/configure
+@@ -11750,6 +11750,15 @@
  
  
  
diff --git a/packages/ltrace/0.7.3/002-printf-p.patch b/packages/ltrace/0.7.3/0001-printf-p.patch
similarity index 80%
rename from packages/ltrace/0.7.3/002-printf-p.patch
rename to packages/ltrace/0.7.3/0001-printf-p.patch
index 10631d9c..6f2b59f3 100644
--- a/packages/ltrace/0.7.3/002-printf-p.patch
+++ b/packages/ltrace/0.7.3/0001-printf-p.patch
@@ -5,9 +5,13 @@ Forwarded: http://lists.alioth.debian.org/pipermail/ltrace-devel/2013-September/
 Last-Update: 2014-01-02
 
 
---- ltrace-0.7.3.orig/printf.c
-+++ ltrace-0.7.3/printf.c
-@@ -168,7 +168,7 @@ form_next_param(struct param_enum *self,
+---
+ printf.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/printf.c
++++ b/printf.c
+@@ -168,7 +168,7 @@
  		type_init_pointer(infop, array, 1);
  
  	} else if (format_type == ARGTYPE_POINTER) {
diff --git a/packages/ltrace/0.7.3/003-alpha-debug.h.patch b/packages/ltrace/0.7.3/0002-alpha-debug.h.patch
similarity index 69%
rename from packages/ltrace/0.7.3/003-alpha-debug.h.patch
rename to packages/ltrace/0.7.3/0002-alpha-debug.h.patch
index 237026dd..f1f0feab 100644
--- a/packages/ltrace/0.7.3/003-alpha-debug.h.patch
+++ b/packages/ltrace/0.7.3/0002-alpha-debug.h.patch
@@ -5,8 +5,12 @@ Last-Update: 2014-01-02
 Bug-Debian: http://bugs.debian.org/678721
 
 
---- ltrace-0.7.3.orig/sysdeps/linux-gnu/alpha/trace.c
-+++ ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c
+---
+ sysdeps/linux-gnu/alpha/trace.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sysdeps/linux-gnu/alpha/trace.c
++++ b/sysdeps/linux-gnu/alpha/trace.c
 @@ -29,7 +29,6 @@
  
  #include "proc.h"
diff --git a/packages/ltrace/0.7.3/004-compile-warning.patch b/packages/ltrace/0.7.3/0003-compile-warning.patch
similarity index 74%
rename from packages/ltrace/0.7.3/004-compile-warning.patch
rename to packages/ltrace/0.7.3/0003-compile-warning.patch
index ad658299..44592c6a 100644
--- a/packages/ltrace/0.7.3/004-compile-warning.patch
+++ b/packages/ltrace/0.7.3/0003-compile-warning.patch
@@ -4,9 +4,14 @@ Last-Update: 2014-01-02
 Forwarded: not-needed
 
 
---- ltrace-0.7.3.orig/value.c
-+++ ltrace-0.7.3/value.c
-@@ -284,7 +284,7 @@ value_init_deref(struct value *ret_val,
+---
+ lens_default.c |    2 +-
+ value.c        |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/value.c
++++ b/value.c
+@@ -284,7 +284,7 @@
  
  	/* We need "long" to be long enough to hold platform
  	 * pointers.  */
@@ -15,9 +20,9 @@ Forwarded: not-needed
  
  	value_common_init(ret_val, valp->inferior, valp,
  			  valp->type->u.ptr_info.info, 0);
---- ltrace-0.7.3.orig/lens_default.c
-+++ ltrace-0.7.3/lens_default.c
-@@ -344,7 +344,7 @@ format_array(FILE *stream, struct value
+--- a/lens_default.c
++++ b/lens_default.c
+@@ -344,7 +344,7 @@
  {
  	/* We need "long" to be long enough to cover the whole address
  	 * space.  */
diff --git a/packages/ltrace/0.7.3/005-sparc-ftbfs.patch b/packages/ltrace/0.7.3/0004-sparc-ftbfs.patch
similarity index 62%
rename from packages/ltrace/0.7.3/005-sparc-ftbfs.patch
rename to packages/ltrace/0.7.3/0004-sparc-ftbfs.patch
index 266a8e68..270e95ed 100644
--- a/packages/ltrace/0.7.3/005-sparc-ftbfs.patch
+++ b/packages/ltrace/0.7.3/0004-sparc-ftbfs.patch
@@ -3,8 +3,13 @@ Description: fixes compilation on sparc
 Last-Update: 2014-01-02
 
 
---- ltrace-0.7.3.orig/sysdeps/linux-gnu/sparc/plt.c
-+++ ltrace-0.7.3/sysdeps/linux-gnu/sparc/plt.c
+---
+ sysdeps/linux-gnu/sparc/plt.c   |    3 ++-
+ sysdeps/linux-gnu/sparc/trace.c |    2 ++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/linux-gnu/sparc/plt.c
++++ b/sysdeps/linux-gnu/sparc/plt.c
 @@ -19,8 +19,9 @@
   */
  
@@ -16,8 +21,8 @@ Last-Update: 2014-01-02
  
  GElf_Addr
  arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela) {
---- ltrace-0.7.3.orig/sysdeps/linux-gnu/sparc/trace.c
-+++ ltrace-0.7.3/sysdeps/linux-gnu/sparc/trace.c
+--- a/sysdeps/linux-gnu/sparc/trace.c
++++ b/sysdeps/linux-gnu/sparc/trace.c
 @@ -26,8 +26,10 @@
  #include <sys/wait.h>
  #include <signal.h>
diff --git a/packages/ltrace/0.7.3/006-unexpected-breakpoint.patch b/packages/ltrace/0.7.3/0005-unexpected-breakpoint.patch
similarity index 80%
rename from packages/ltrace/0.7.3/006-unexpected-breakpoint.patch
rename to packages/ltrace/0.7.3/0005-unexpected-breakpoint.patch
index 443bee42..5827cd86 100644
--- a/packages/ltrace/0.7.3/006-unexpected-breakpoint.patch
+++ b/packages/ltrace/0.7.3/0005-unexpected-breakpoint.patch
@@ -4,9 +4,13 @@ Description: continue after unexpected breakpoint
 Last-Update: 2014-01-03
 
 
---- ltrace-0.7.3.orig/handle_event.c
-+++ ltrace-0.7.3/handle_event.c
-@@ -656,9 +656,12 @@ handle_breakpoint(Event *event)
+---
+ handle_event.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/handle_event.c
++++ b/handle_event.c
+@@ -656,9 +656,12 @@
  
  	if ((sbp = address2bpstruct(leader, brk_addr)) != NULL)
  		breakpoint_on_hit(sbp, event->proc);
diff --git a/packages/ltrace/0.7.3/007-gcc-5.patch b/packages/ltrace/0.7.3/0006-gcc-5.patch
similarity index 79%
rename from packages/ltrace/0.7.3/007-gcc-5.patch
rename to packages/ltrace/0.7.3/0006-gcc-5.patch
index 4c62f851..78b935d8 100644
--- a/packages/ltrace/0.7.3/007-gcc-5.patch
+++ b/packages/ltrace/0.7.3/0006-gcc-5.patch
@@ -7,11 +7,13 @@ Subject: Fix conditions in elf_read_u{16,32,64}
   The condition seems to have it all mixed, using both a ! and a
   comparison.
 
-diff --git a/ltrace-elf.c b/ltrace-elf.c
-index 29c204f..0ecdc38 100644
+---
+ ltrace-elf.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/ltrace-elf.c
 +++ b/ltrace-elf.c
-@@ -219,7 +219,7 @@ need_data(Elf_Data *data, GElf_Xword offset, GElf_Xword size)
+@@ -218,7 +218,7 @@
  	int								\
  	NAME(Elf_Data *data, GElf_Xword offset, uint##SIZE##_t *retp)	\
  	{								\
@@ -20,6 +22,3 @@ index 29c204f..0ecdc38 100644
  			return -1;					\
  									\
  		if (data->d_buf == NULL) /* NODATA section */ {		\
--- 
-cgit v0.10.2
-
diff --git a/packages/ltrace/0.7.3/008-glibc-2.24.patch b/packages/ltrace/0.7.3/0007-glibc-2.24.patch
similarity index 59%
rename from packages/ltrace/0.7.3/008-glibc-2.24.patch
rename to packages/ltrace/0.7.3/0007-glibc-2.24.patch
index 85b008b8..037376f8 100644
--- a/packages/ltrace/0.7.3/008-glibc-2.24.patch
+++ b/packages/ltrace/0.7.3/0007-glibc-2.24.patch
@@ -1,7 +1,10 @@
-diff -urpN ltrace-0.7.3.orig/sysdeps/linux-gnu/proc.c ltrace-0.7.3/sysdeps/linux-gnu/proc.c
---- ltrace-0.7.3.orig/sysdeps/linux-gnu/proc.c	2013-01-02 06:24:46.000000000 -0800
-+++ ltrace-0.7.3/sysdeps/linux-gnu/proc.c	2016-11-13 11:24:32.760365875 -0800
-@@ -240,14 +240,18 @@ process_tasks(pid_t pid, pid_t **ret_tas
+---
+ sysdeps/linux-gnu/proc.c |   16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+--- a/sysdeps/linux-gnu/proc.c
++++ b/sysdeps/linux-gnu/proc.c
+@@ -240,14 +240,18 @@
  	size_t alloc = 0;
  
  	while (1) {
diff --git a/packages/mingw-w64/v2.0.10/0000-mingw64-malloc.patch b/packages/mingw-w64/v2.0.10/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..c43b89e6
--- /dev/null
+++ b/packages/mingw-w64/v2.0.10/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- a/mingw-w64-tools/genidl/src/genidl_cfg.h
++++ b/mingw-w64-tools/genidl/src/genidl_cfg.h
+@@ -51,7 +51,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include <stdarg.h>
+ #include <stdint.h>
+--- a/mingw-w64-tools/genidl/src/genidl_typinfo.c
++++ b/mingw-w64-tools/genidl/src/genidl_typinfo.c
+@@ -46,7 +46,10 @@
+ #include "genidl_cfg.h"
+ #include "genidl_typeinfo.h"
+ #include "genidl_typinfo.h"
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
++#include <stdlib.h>
+ #include <string.h>
+ #include <memory.h>
+ 
diff --git a/packages/mingw-w64/v2.0.10/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v2.0.10/0001-gendef-explicit-fallthrough.patch
similarity index 80%
rename from packages/mingw-w64/v2.0.10/200-gendef-explicit-fallthrough.patch
rename to packages/mingw-w64/v2.0.10/0001-gendef-explicit-fallthrough.patch
index 7cfd5114..405a6cea 100644
--- a/packages/mingw-w64/v2.0.10/200-gendef-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v2.0.10/0001-gendef-explicit-fallthrough.patch
@@ -4,11 +4,13 @@ Date:   Thu Jun 15 09:50:00 2017 +0300
 
     gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
 
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..0c5beaad 100644
+---
+ mingw-w64-tools/gendef/src/gendef.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
 --- a/mingw-w64-tools/gendef/src/gendef.c
 +++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -836,7 +836,7 @@ disassembleRetIntern (uint32_t pc, uint32_t *retpop, sAddresses *seen, sAddresse
+@@ -826,7 +826,7 @@
        if (!sz || code == c_ill)
          {
            PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
@@ -17,7 +19,7 @@ index a935abfe..0c5beaad 100644
  #if ENABLE_DEBUG == 1
        {
          unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
+@@ -1021,10 +1021,10 @@
      PRDEBUG(" 0x%x illegal ", (unsigned int) b);
  #endif
      *aCode=c_ill; return 0;
@@ -31,7 +33,7 @@ index a935abfe..0c5beaad 100644
    case c_retn: case c_retf:
    case c_iret: case c_int3:
    case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
+@@ -1051,7 +1051,7 @@
            p = (unsigned char *) map_va (pc + sz);
            if (!p) { *aCode=c_ill; return 0; }
  #if ENABLE_DEBUG == 1
diff --git a/packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch b/packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:25:26.000000000 -0800
-@@ -26,7 +26,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include <stdarg.h>
- #include <stdint.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:25:49.000000000 -0800
-@@ -21,7 +21,10 @@
- #include "genidl_cfg.h"
- #include "genidl_typeinfo.h"
- #include "genidl_typinfo.h"
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
-+#include <stdlib.h>
- #include <string.h>
- #include <memory.h>
- 
diff --git a/packages/mingw-w64/v3.0.0/0000-mingw64-malloc.patch b/packages/mingw-w64/v3.0.0/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..8e0add1f
--- /dev/null
+++ b/packages/mingw-w64/v3.0.0/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- a/mingw-w64-tools/genidl/src/genidl_cfg.h
++++ b/mingw-w64-tools/genidl/src/genidl_cfg.h
+@@ -26,7 +26,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include <stdarg.h>
+ #include <stdint.h>
+--- a/mingw-w64-tools/genidl/src/genidl_typinfo.c
++++ b/mingw-w64-tools/genidl/src/genidl_typinfo.c
+@@ -21,7 +21,10 @@
+ #include "genidl_cfg.h"
+ #include "genidl_typeinfo.h"
+ #include "genidl_typinfo.h"
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
++#include <stdlib.h>
+ #include <string.h>
+ #include <memory.h>
+ 
diff --git a/packages/mingw-w64/v3.0.0/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v3.0.0/0001-gendef-explicit-fallthrough.patch
similarity index 80%
rename from packages/mingw-w64/v3.0.0/200-gendef-explicit-fallthrough.patch
rename to packages/mingw-w64/v3.0.0/0001-gendef-explicit-fallthrough.patch
index 7cfd5114..0537bab4 100644
--- a/packages/mingw-w64/v3.0.0/200-gendef-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.0.0/0001-gendef-explicit-fallthrough.patch
@@ -4,11 +4,13 @@ Date:   Thu Jun 15 09:50:00 2017 +0300
 
     gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
 
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..0c5beaad 100644
+---
+ mingw-w64-tools/gendef/src/gendef.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
 --- a/mingw-w64-tools/gendef/src/gendef.c
 +++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -836,7 +836,7 @@ disassembleRetIntern (uint32_t pc, uint32_t *retpop, sAddresses *seen, sAddresse
+@@ -820,7 +820,7 @@
        if (!sz || code == c_ill)
          {
            PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
@@ -17,7 +19,7 @@ index a935abfe..0c5beaad 100644
  #if ENABLE_DEBUG == 1
        {
          unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
+@@ -1015,10 +1015,10 @@
      PRDEBUG(" 0x%x illegal ", (unsigned int) b);
  #endif
      *aCode=c_ill; return 0;
@@ -31,7 +33,7 @@ index a935abfe..0c5beaad 100644
    case c_retn: case c_retf:
    case c_iret: case c_int3:
    case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
+@@ -1045,7 +1045,7 @@
            p = (unsigned char *) map_va (pc + sz);
            if (!p) { *aCode=c_ill; return 0; }
  #if ENABLE_DEBUG == 1
diff --git a/packages/mingw-w64/v3.0.0/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v3.0.0/0002-genpeimg-explicit-fallthrough.patch
similarity index 75%
rename from packages/mingw-w64/v3.0.0/300-genpeimg-explicit-fallthrough.patch
rename to packages/mingw-w64/v3.0.0/0002-genpeimg-explicit-fallthrough.patch
index 927c0050..5986aefc 100644
--- a/packages/mingw-w64/v3.0.0/300-genpeimg-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.0.0/0002-genpeimg-explicit-fallthrough.patch
@@ -6,11 +6,13 @@ Date:   Thu Jun 15 09:45:52 2017 +0300
      after show_usage() to avoid -Wimplicit-fallthrough
     (show_usage): mark the function with noreturn attribute.
 
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..1ebe607d 100644
+---
+ mingw-w64-tools/genpeimg/src/genpeimg.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 --- a/mingw-w64-tools/genpeimg/src/genpeimg.c
 +++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -28,7 +28,7 @@ unsigned short mask_pe_opt_hdr_dll_chara = 0xffff;
+@@ -28,7 +28,7 @@
  int dump_information = 0;
  static char *file_name = NULL;
  
@@ -19,7 +21,7 @@ index b2430bbc..1ebe607d 100644
  show_usage (void)
  {
    fprintf (stderr, "genpeimg [options] files...\n");
-@@ -204,6 +204,7 @@ pass_args (int argc, char **argv)
+@@ -204,6 +204,7 @@
  	case 'h':
  	  if (h[2] == 0)
  	    show_usage ();
diff --git a/packages/mingw-w64/v3.0.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.0.0/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v3.0.0/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:25:26.000000000 -0800
-@@ -26,7 +26,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include <stdarg.h>
- #include <stdint.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:25:49.000000000 -0800
-@@ -21,7 +21,10 @@
- #include "genidl_cfg.h"
- #include "genidl_typeinfo.h"
- #include "genidl_typinfo.h"
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
-+#include <stdlib.h>
- #include <string.h>
- #include <memory.h>
- 
diff --git a/packages/mingw-w64/v3.1.0/0000-mingw64-malloc.patch b/packages/mingw-w64/v3.1.0/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..8e0add1f
--- /dev/null
+++ b/packages/mingw-w64/v3.1.0/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- a/mingw-w64-tools/genidl/src/genidl_cfg.h
++++ b/mingw-w64-tools/genidl/src/genidl_cfg.h
+@@ -26,7 +26,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include <stdarg.h>
+ #include <stdint.h>
+--- a/mingw-w64-tools/genidl/src/genidl_typinfo.c
++++ b/mingw-w64-tools/genidl/src/genidl_typinfo.c
+@@ -21,7 +21,10 @@
+ #include "genidl_cfg.h"
+ #include "genidl_typeinfo.h"
+ #include "genidl_typinfo.h"
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
++#include <stdlib.h>
+ #include <string.h>
+ #include <memory.h>
+ 
diff --git a/packages/mingw-w64/v3.1.0/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v3.1.0/0001-gendef-explicit-fallthrough.patch
similarity index 80%
rename from packages/mingw-w64/v3.1.0/200-gendef-explicit-fallthrough.patch
rename to packages/mingw-w64/v3.1.0/0001-gendef-explicit-fallthrough.patch
index 7cfd5114..0537bab4 100644
--- a/packages/mingw-w64/v3.1.0/200-gendef-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.1.0/0001-gendef-explicit-fallthrough.patch
@@ -4,11 +4,13 @@ Date:   Thu Jun 15 09:50:00 2017 +0300
 
     gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
 
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..0c5beaad 100644
+---
+ mingw-w64-tools/gendef/src/gendef.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
 --- a/mingw-w64-tools/gendef/src/gendef.c
 +++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -836,7 +836,7 @@ disassembleRetIntern (uint32_t pc, uint32_t *retpop, sAddresses *seen, sAddresse
+@@ -820,7 +820,7 @@
        if (!sz || code == c_ill)
          {
            PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
@@ -17,7 +19,7 @@ index a935abfe..0c5beaad 100644
  #if ENABLE_DEBUG == 1
        {
          unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
+@@ -1015,10 +1015,10 @@
      PRDEBUG(" 0x%x illegal ", (unsigned int) b);
  #endif
      *aCode=c_ill; return 0;
@@ -31,7 +33,7 @@ index a935abfe..0c5beaad 100644
    case c_retn: case c_retf:
    case c_iret: case c_int3:
    case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
+@@ -1045,7 +1045,7 @@
            p = (unsigned char *) map_va (pc + sz);
            if (!p) { *aCode=c_ill; return 0; }
  #if ENABLE_DEBUG == 1
diff --git a/packages/mingw-w64/v3.1.0/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v3.1.0/0002-genpeimg-explicit-fallthrough.patch
similarity index 75%
rename from packages/mingw-w64/v3.1.0/300-genpeimg-explicit-fallthrough.patch
rename to packages/mingw-w64/v3.1.0/0002-genpeimg-explicit-fallthrough.patch
index 927c0050..5986aefc 100644
--- a/packages/mingw-w64/v3.1.0/300-genpeimg-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.1.0/0002-genpeimg-explicit-fallthrough.patch
@@ -6,11 +6,13 @@ Date:   Thu Jun 15 09:45:52 2017 +0300
      after show_usage() to avoid -Wimplicit-fallthrough
     (show_usage): mark the function with noreturn attribute.
 
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..1ebe607d 100644
+---
+ mingw-w64-tools/genpeimg/src/genpeimg.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 --- a/mingw-w64-tools/genpeimg/src/genpeimg.c
 +++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -28,7 +28,7 @@ unsigned short mask_pe_opt_hdr_dll_chara = 0xffff;
+@@ -28,7 +28,7 @@
  int dump_information = 0;
  static char *file_name = NULL;
  
@@ -19,7 +21,7 @@ index b2430bbc..1ebe607d 100644
  show_usage (void)
  {
    fprintf (stderr, "genpeimg [options] files...\n");
-@@ -204,6 +204,7 @@ pass_args (int argc, char **argv)
+@@ -204,6 +204,7 @@
  	case 'h':
  	  if (h[2] == 0)
  	    show_usage ();
diff --git a/packages/mingw-w64/v3.1.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.1.0/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v3.1.0/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:25:26.000000000 -0800
-@@ -26,7 +26,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include <stdarg.h>
- #include <stdint.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:25:49.000000000 -0800
-@@ -21,7 +21,10 @@
- #include "genidl_cfg.h"
- #include "genidl_typeinfo.h"
- #include "genidl_typinfo.h"
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
-+#include <stdlib.h>
- #include <string.h>
- #include <memory.h>
- 
diff --git a/packages/mingw-w64/v3.2.0/0000-mingw64-malloc.patch b/packages/mingw-w64/v3.2.0/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..8e0add1f
--- /dev/null
+++ b/packages/mingw-w64/v3.2.0/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- a/mingw-w64-tools/genidl/src/genidl_cfg.h
++++ b/mingw-w64-tools/genidl/src/genidl_cfg.h
+@@ -26,7 +26,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include <stdarg.h>
+ #include <stdint.h>
+--- a/mingw-w64-tools/genidl/src/genidl_typinfo.c
++++ b/mingw-w64-tools/genidl/src/genidl_typinfo.c
+@@ -21,7 +21,10 @@
+ #include "genidl_cfg.h"
+ #include "genidl_typeinfo.h"
+ #include "genidl_typinfo.h"
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
++#include <stdlib.h>
+ #include <string.h>
+ #include <memory.h>
+ 
diff --git a/packages/mingw-w64/v3.2.0/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v3.2.0/0001-gendef-explicit-fallthrough.patch
similarity index 80%
rename from packages/mingw-w64/v3.2.0/200-gendef-explicit-fallthrough.patch
rename to packages/mingw-w64/v3.2.0/0001-gendef-explicit-fallthrough.patch
index 7cfd5114..0537bab4 100644
--- a/packages/mingw-w64/v3.2.0/200-gendef-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.2.0/0001-gendef-explicit-fallthrough.patch
@@ -4,11 +4,13 @@ Date:   Thu Jun 15 09:50:00 2017 +0300
 
     gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
 
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..0c5beaad 100644
+---
+ mingw-w64-tools/gendef/src/gendef.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
 --- a/mingw-w64-tools/gendef/src/gendef.c
 +++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -836,7 +836,7 @@ disassembleRetIntern (uint32_t pc, uint32_t *retpop, sAddresses *seen, sAddresse
+@@ -820,7 +820,7 @@
        if (!sz || code == c_ill)
          {
            PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
@@ -17,7 +19,7 @@ index a935abfe..0c5beaad 100644
  #if ENABLE_DEBUG == 1
        {
          unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
+@@ -1015,10 +1015,10 @@
      PRDEBUG(" 0x%x illegal ", (unsigned int) b);
  #endif
      *aCode=c_ill; return 0;
@@ -31,7 +33,7 @@ index a935abfe..0c5beaad 100644
    case c_retn: case c_retf:
    case c_iret: case c_int3:
    case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
+@@ -1045,7 +1045,7 @@
            p = (unsigned char *) map_va (pc + sz);
            if (!p) { *aCode=c_ill; return 0; }
  #if ENABLE_DEBUG == 1
diff --git a/packages/mingw-w64/v3.2.0/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v3.2.0/0002-genpeimg-explicit-fallthrough.patch
similarity index 75%
rename from packages/mingw-w64/v3.2.0/300-genpeimg-explicit-fallthrough.patch
rename to packages/mingw-w64/v3.2.0/0002-genpeimg-explicit-fallthrough.patch
index 927c0050..5986aefc 100644
--- a/packages/mingw-w64/v3.2.0/300-genpeimg-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.2.0/0002-genpeimg-explicit-fallthrough.patch
@@ -6,11 +6,13 @@ Date:   Thu Jun 15 09:45:52 2017 +0300
      after show_usage() to avoid -Wimplicit-fallthrough
     (show_usage): mark the function with noreturn attribute.
 
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..1ebe607d 100644
+---
+ mingw-w64-tools/genpeimg/src/genpeimg.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 --- a/mingw-w64-tools/genpeimg/src/genpeimg.c
 +++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -28,7 +28,7 @@ unsigned short mask_pe_opt_hdr_dll_chara = 0xffff;
+@@ -28,7 +28,7 @@
  int dump_information = 0;
  static char *file_name = NULL;
  
@@ -19,7 +21,7 @@ index b2430bbc..1ebe607d 100644
  show_usage (void)
  {
    fprintf (stderr, "genpeimg [options] files...\n");
-@@ -204,6 +204,7 @@ pass_args (int argc, char **argv)
+@@ -204,6 +204,7 @@
  	case 'h':
  	  if (h[2] == 0)
  	    show_usage ();
diff --git a/packages/mingw-w64/v3.2.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.2.0/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v3.2.0/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:25:26.000000000 -0800
-@@ -26,7 +26,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include <stdarg.h>
- #include <stdint.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:25:49.000000000 -0800
-@@ -21,7 +21,10 @@
- #include "genidl_cfg.h"
- #include "genidl_typeinfo.h"
- #include "genidl_typinfo.h"
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
-+#include <stdlib.h>
- #include <string.h>
- #include <memory.h>
- 
diff --git a/packages/mingw-w64/v3.3.0/0000-mingw64-malloc.patch b/packages/mingw-w64/v3.3.0/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..8e0add1f
--- /dev/null
+++ b/packages/mingw-w64/v3.3.0/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- a/mingw-w64-tools/genidl/src/genidl_cfg.h
++++ b/mingw-w64-tools/genidl/src/genidl_cfg.h
+@@ -26,7 +26,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include <stdarg.h>
+ #include <stdint.h>
+--- a/mingw-w64-tools/genidl/src/genidl_typinfo.c
++++ b/mingw-w64-tools/genidl/src/genidl_typinfo.c
+@@ -21,7 +21,10 @@
+ #include "genidl_cfg.h"
+ #include "genidl_typeinfo.h"
+ #include "genidl_typinfo.h"
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
++#include <stdlib.h>
+ #include <string.h>
+ #include <memory.h>
+ 
diff --git a/packages/mingw-w64/v3.3.0/0001-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v3.3.0/0001-gendef-explicit-fallthrough.patch
new file mode 100644
index 00000000..0537bab4
--- /dev/null
+++ b/packages/mingw-w64/v3.3.0/0001-gendef-explicit-fallthrough.patch
@@ -0,0 +1,44 @@
+commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
+Author: sezero <sezero@users.sourceforge.net>
+Date:   Thu Jun 15 09:50:00 2017 +0300
+
+    gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
+
+---
+ mingw-w64-tools/gendef/src/gendef.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/mingw-w64-tools/gendef/src/gendef.c
++++ b/mingw-w64-tools/gendef/src/gendef.c
+@@ -820,7 +820,7 @@
+       if (!sz || code == c_ill)
+         {
+           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
+-	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
++		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
+ #if ENABLE_DEBUG == 1
+       {
+         unsigned char *ppc = (unsigned char *) map_va (pc);
+@@ -1015,10 +1015,10 @@
+     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
+ #endif
+     *aCode=c_ill; return 0;
+-  case c_4: sz++;
+-  case c_3: sz++;
++  case c_4: sz++;/* fallthru */
++  case c_3: sz++;/* fallthru */
+   case c_lb:
+-  case c_2: sz++;
++  case c_2: sz++;/* fallthru */
+   case c_retn: case c_retf:
+   case c_iret: case c_int3:
+   case c_ad: case c_op:
+@@ -1045,7 +1045,7 @@
+           p = (unsigned char *) map_va (pc + sz);
+           if (!p) { *aCode=c_ill; return 0; }
+ #if ENABLE_DEBUG == 1
+-    enter_save_insn(lw,p[0]);
++	  enter_save_insn(lw,p[0]);
+ #endif
+           b&=~0x7; b|=(p[0]&7);
+ 	  sz+=1;
diff --git a/packages/mingw-w64/v3.3.0/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v3.3.0/0002-genpeimg-explicit-fallthrough.patch
similarity index 75%
rename from packages/mingw-w64/v3.3.0/300-genpeimg-explicit-fallthrough.patch
rename to packages/mingw-w64/v3.3.0/0002-genpeimg-explicit-fallthrough.patch
index 927c0050..5986aefc 100644
--- a/packages/mingw-w64/v3.3.0/300-genpeimg-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.3.0/0002-genpeimg-explicit-fallthrough.patch
@@ -6,11 +6,13 @@ Date:   Thu Jun 15 09:45:52 2017 +0300
      after show_usage() to avoid -Wimplicit-fallthrough
     (show_usage): mark the function with noreturn attribute.
 
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..1ebe607d 100644
+---
+ mingw-w64-tools/genpeimg/src/genpeimg.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 --- a/mingw-w64-tools/genpeimg/src/genpeimg.c
 +++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -28,7 +28,7 @@ unsigned short mask_pe_opt_hdr_dll_chara = 0xffff;
+@@ -28,7 +28,7 @@
  int dump_information = 0;
  static char *file_name = NULL;
  
@@ -19,7 +21,7 @@ index b2430bbc..1ebe607d 100644
  show_usage (void)
  {
    fprintf (stderr, "genpeimg [options] files...\n");
-@@ -204,6 +204,7 @@ pass_args (int argc, char **argv)
+@@ -204,6 +204,7 @@
  	case 'h':
  	  if (h[2] == 0)
  	    show_usage ();
diff --git a/packages/mingw-w64/v3.3.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.3.0/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v3.3.0/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:25:26.000000000 -0800
-@@ -26,7 +26,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include <stdarg.h>
- #include <stdint.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:25:49.000000000 -0800
-@@ -21,7 +21,10 @@
- #include "genidl_cfg.h"
- #include "genidl_typeinfo.h"
- #include "genidl_typinfo.h"
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
-+#include <stdlib.h>
- #include <string.h>
- #include <memory.h>
- 
diff --git a/packages/mingw-w64/v3.3.0/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v3.3.0/200-gendef-explicit-fallthrough.patch
deleted file mode 100644
index 7cfd5114..00000000
--- a/packages/mingw-w64/v3.3.0/200-gendef-explicit-fallthrough.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
-Author: sezero <sezero@users.sourceforge.net>
-Date:   Thu Jun 15 09:50:00 2017 +0300
-
-    gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
-
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..0c5beaad 100644
---- a/mingw-w64-tools/gendef/src/gendef.c
-+++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -836,7 +836,7 @@ disassembleRetIntern (uint32_t pc, uint32_t *retpop, sAddresses *seen, sAddresse
-       if (!sz || code == c_ill)
-         {
-           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
--	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
-+		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
- #if ENABLE_DEBUG == 1
-       {
-         unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
-     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
- #endif
-     *aCode=c_ill; return 0;
--  case c_4: sz++;
--  case c_3: sz++;
-+  case c_4: sz++;/* fallthru */
-+  case c_3: sz++;/* fallthru */
-   case c_lb:
--  case c_2: sz++;
-+  case c_2: sz++;/* fallthru */
-   case c_retn: case c_retf:
-   case c_iret: case c_int3:
-   case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
-           p = (unsigned char *) map_va (pc + sz);
-           if (!p) { *aCode=c_ill; return 0; }
- #if ENABLE_DEBUG == 1
--    enter_save_insn(lw,p[0]);
-+	  enter_save_insn(lw,p[0]);
- #endif
-           b&=~0x7; b|=(p[0]&7);
- 	  sz+=1;
diff --git a/packages/mingw-w64/v4.0.6/0000-mingw64-malloc.patch b/packages/mingw-w64/v4.0.6/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..8e0add1f
--- /dev/null
+++ b/packages/mingw-w64/v4.0.6/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- a/mingw-w64-tools/genidl/src/genidl_cfg.h
++++ b/mingw-w64-tools/genidl/src/genidl_cfg.h
+@@ -26,7 +26,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include <stdarg.h>
+ #include <stdint.h>
+--- a/mingw-w64-tools/genidl/src/genidl_typinfo.c
++++ b/mingw-w64-tools/genidl/src/genidl_typinfo.c
+@@ -21,7 +21,10 @@
+ #include "genidl_cfg.h"
+ #include "genidl_typeinfo.h"
+ #include "genidl_typinfo.h"
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
++#include <stdlib.h>
+ #include <string.h>
+ #include <memory.h>
+ 
diff --git a/packages/mingw-w64/v4.0.6/0001-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v4.0.6/0001-gendef-explicit-fallthrough.patch
new file mode 100644
index 00000000..7027275b
--- /dev/null
+++ b/packages/mingw-w64/v4.0.6/0001-gendef-explicit-fallthrough.patch
@@ -0,0 +1,44 @@
+commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
+Author: sezero <sezero@users.sourceforge.net>
+Date:   Thu Jun 15 09:50:00 2017 +0300
+
+    gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
+
+---
+ mingw-w64-tools/gendef/src/gendef.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/mingw-w64-tools/gendef/src/gendef.c
++++ b/mingw-w64-tools/gendef/src/gendef.c
+@@ -832,7 +832,7 @@
+       if (!sz || code == c_ill)
+         {
+           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
+-	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
++		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
+ #if ENABLE_DEBUG == 1
+       {
+         unsigned char *ppc = (unsigned char *) map_va (pc);
+@@ -1027,10 +1027,10 @@
+     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
+ #endif
+     *aCode=c_ill; return 0;
+-  case c_4: sz++;
+-  case c_3: sz++;
++  case c_4: sz++;/* fallthru */
++  case c_3: sz++;/* fallthru */
+   case c_lb:
+-  case c_2: sz++;
++  case c_2: sz++;/* fallthru */
+   case c_retn: case c_retf:
+   case c_iret: case c_int3:
+   case c_ad: case c_op:
+@@ -1057,7 +1057,7 @@
+           p = (unsigned char *) map_va (pc + sz);
+           if (!p) { *aCode=c_ill; return 0; }
+ #if ENABLE_DEBUG == 1
+-    enter_save_insn(lw,p[0]);
++	  enter_save_insn(lw,p[0]);
+ #endif
+           b&=~0x7; b|=(p[0]&7);
+ 	  sz+=1;
diff --git a/packages/mingw-w64/v4.0.6/0002-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v4.0.6/0002-genpeimg-explicit-fallthrough.patch
new file mode 100644
index 00000000..5986aefc
--- /dev/null
+++ b/packages/mingw-w64/v4.0.6/0002-genpeimg-explicit-fallthrough.patch
@@ -0,0 +1,31 @@
+commit f9f2bd0641b89895ab42b1948f431dadf1e837a4
+Author: sezero <sezero@users.sourceforge.net>
+Date:   Thu Jun 15 09:45:52 2017 +0300
+
+    genpeimg.c (pass_args): add a /* fallthru */ comment in the switch
+     after show_usage() to avoid -Wimplicit-fallthrough
+    (show_usage): mark the function with noreturn attribute.
+
+---
+ mingw-w64-tools/genpeimg/src/genpeimg.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/mingw-w64-tools/genpeimg/src/genpeimg.c
++++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
+@@ -28,7 +28,7 @@
+ int dump_information = 0;
+ static char *file_name = NULL;
+ 
+-static void
++static void __attribute__((noreturn))
+ show_usage (void)
+ {
+   fprintf (stderr, "genpeimg [options] files...\n");
+@@ -204,6 +204,7 @@
+ 	case 'h':
+ 	  if (h[2] == 0)
+ 	    show_usage ();
++	  /* fallthru */
+ 	default:
+ error_point:
+ 	  fprintf (stderr, "Unknown option ,%s'\n", h);
diff --git a/packages/mingw-w64/v4.0.6/100-mingw64-malloc.patch b/packages/mingw-w64/v4.0.6/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v4.0.6/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:25:26.000000000 -0800
-@@ -26,7 +26,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include <stdarg.h>
- #include <stdint.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:25:49.000000000 -0800
-@@ -21,7 +21,10 @@
- #include "genidl_cfg.h"
- #include "genidl_typeinfo.h"
- #include "genidl_typinfo.h"
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
-+#include <stdlib.h>
- #include <string.h>
- #include <memory.h>
- 
diff --git a/packages/mingw-w64/v4.0.6/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v4.0.6/200-gendef-explicit-fallthrough.patch
deleted file mode 100644
index 7cfd5114..00000000
--- a/packages/mingw-w64/v4.0.6/200-gendef-explicit-fallthrough.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
-Author: sezero <sezero@users.sourceforge.net>
-Date:   Thu Jun 15 09:50:00 2017 +0300
-
-    gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
-
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..0c5beaad 100644
---- a/mingw-w64-tools/gendef/src/gendef.c
-+++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -836,7 +836,7 @@ disassembleRetIntern (uint32_t pc, uint32_t *retpop, sAddresses *seen, sAddresse
-       if (!sz || code == c_ill)
-         {
-           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
--	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
-+		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
- #if ENABLE_DEBUG == 1
-       {
-         unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
-     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
- #endif
-     *aCode=c_ill; return 0;
--  case c_4: sz++;
--  case c_3: sz++;
-+  case c_4: sz++;/* fallthru */
-+  case c_3: sz++;/* fallthru */
-   case c_lb:
--  case c_2: sz++;
-+  case c_2: sz++;/* fallthru */
-   case c_retn: case c_retf:
-   case c_iret: case c_int3:
-   case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
-           p = (unsigned char *) map_va (pc + sz);
-           if (!p) { *aCode=c_ill; return 0; }
- #if ENABLE_DEBUG == 1
--    enter_save_insn(lw,p[0]);
-+	  enter_save_insn(lw,p[0]);
- #endif
-           b&=~0x7; b|=(p[0]&7);
- 	  sz+=1;
diff --git a/packages/mingw-w64/v4.0.6/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v4.0.6/300-genpeimg-explicit-fallthrough.patch
deleted file mode 100644
index 927c0050..00000000
--- a/packages/mingw-w64/v4.0.6/300-genpeimg-explicit-fallthrough.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit f9f2bd0641b89895ab42b1948f431dadf1e837a4
-Author: sezero <sezero@users.sourceforge.net>
-Date:   Thu Jun 15 09:45:52 2017 +0300
-
-    genpeimg.c (pass_args): add a /* fallthru */ comment in the switch
-     after show_usage() to avoid -Wimplicit-fallthrough
-    (show_usage): mark the function with noreturn attribute.
-
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..1ebe607d 100644
---- a/mingw-w64-tools/genpeimg/src/genpeimg.c
-+++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -28,7 +28,7 @@ unsigned short mask_pe_opt_hdr_dll_chara = 0xffff;
- int dump_information = 0;
- static char *file_name = NULL;
- 
--static void
-+static void __attribute__((noreturn))
- show_usage (void)
- {
-   fprintf (stderr, "genpeimg [options] files...\n");
-@@ -204,6 +204,7 @@ pass_args (int argc, char **argv)
- 	case 'h':
- 	  if (h[2] == 0)
- 	    show_usage ();
-+	  /* fallthru */
- 	default:
- error_point:
- 	  fprintf (stderr, "Unknown option ,%s'\n", h);
diff --git a/packages/mingw-w64/v5.0.2/0000-mingw64-malloc.patch b/packages/mingw-w64/v5.0.2/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..f19e8ce5
--- /dev/null
+++ b/packages/mingw-w64/v5.0.2/0000-mingw64-malloc.patch
@@ -0,0 +1,58 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ mingw-w64-tools/widl/include/pathtools.h    |    3 +--
+ mingw-w64-tools/widl/src/pathtools.c        |    3 +--
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+
+--- a/mingw-w64-tools/genidl/src/genidl_cfg.h
++++ b/mingw-w64-tools/genidl/src/genidl_cfg.h
+@@ -26,7 +26,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include <stdarg.h>
+ #include <stdint.h>
+--- a/mingw-w64-tools/genidl/src/genidl_typinfo.c
++++ b/mingw-w64-tools/genidl/src/genidl_typinfo.c
+@@ -21,7 +21,10 @@
+ #include "genidl_cfg.h"
+ #include "genidl_typeinfo.h"
+ #include "genidl_typinfo.h"
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
++#include <stdlib.h>
+ #include <string.h>
+ #include <memory.h>
+ 
+--- a/mingw-w64-tools/widl/include/pathtools.h
++++ b/mingw-w64-tools/widl/include/pathtools.h
+@@ -12,9 +12,8 @@
+ #define PATHTOOLS_H
+ 
+ #include <unistd.h>
+-#if defined(__APPLE__)
+ #include <stdlib.h>
+-#else
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
+ #endif
+ #include <stdio.h>
+--- a/mingw-w64-tools/widl/src/pathtools.c
++++ b/mingw-w64-tools/widl/src/pathtools.c
+@@ -8,9 +8,8 @@
+   .email: <mingw.android@gmail.com>.
+  */
+ 
+-#if defined(__APPLE__)
+ #include <stdlib.h>
+-#else
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
+ #endif
+ #include <limits.h>
diff --git a/packages/mingw-w64/v5.0.2/0001-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v5.0.2/0001-gendef-explicit-fallthrough.patch
new file mode 100644
index 00000000..e4c7780d
--- /dev/null
+++ b/packages/mingw-w64/v5.0.2/0001-gendef-explicit-fallthrough.patch
@@ -0,0 +1,44 @@
+commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
+Author: sezero <sezero@users.sourceforge.net>
+Date:   Thu Jun 15 09:50:00 2017 +0300
+
+    gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
+
+---
+ mingw-w64-tools/gendef/src/gendef.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/mingw-w64-tools/gendef/src/gendef.c
++++ b/mingw-w64-tools/gendef/src/gendef.c
+@@ -836,7 +836,7 @@
+       if (!sz || code == c_ill)
+         {
+           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
+-	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
++		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
+ #if ENABLE_DEBUG == 1
+       {
+         unsigned char *ppc = (unsigned char *) map_va (pc);
+@@ -1031,10 +1031,10 @@
+     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
+ #endif
+     *aCode=c_ill; return 0;
+-  case c_4: sz++;
+-  case c_3: sz++;
++  case c_4: sz++;/* fallthru */
++  case c_3: sz++;/* fallthru */
+   case c_lb:
+-  case c_2: sz++;
++  case c_2: sz++;/* fallthru */
+   case c_retn: case c_retf:
+   case c_iret: case c_int3:
+   case c_ad: case c_op:
+@@ -1061,7 +1061,7 @@
+           p = (unsigned char *) map_va (pc + sz);
+           if (!p) { *aCode=c_ill; return 0; }
+ #if ENABLE_DEBUG == 1
+-    enter_save_insn(lw,p[0]);
++	  enter_save_insn(lw,p[0]);
+ #endif
+           b&=~0x7; b|=(p[0]&7);
+ 	  sz+=1;
diff --git a/packages/mingw-w64/v5.0.2/0002-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v5.0.2/0002-genpeimg-explicit-fallthrough.patch
new file mode 100644
index 00000000..5986aefc
--- /dev/null
+++ b/packages/mingw-w64/v5.0.2/0002-genpeimg-explicit-fallthrough.patch
@@ -0,0 +1,31 @@
+commit f9f2bd0641b89895ab42b1948f431dadf1e837a4
+Author: sezero <sezero@users.sourceforge.net>
+Date:   Thu Jun 15 09:45:52 2017 +0300
+
+    genpeimg.c (pass_args): add a /* fallthru */ comment in the switch
+     after show_usage() to avoid -Wimplicit-fallthrough
+    (show_usage): mark the function with noreturn attribute.
+
+---
+ mingw-w64-tools/genpeimg/src/genpeimg.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/mingw-w64-tools/genpeimg/src/genpeimg.c
++++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
+@@ -28,7 +28,7 @@
+ int dump_information = 0;
+ static char *file_name = NULL;
+ 
+-static void
++static void __attribute__((noreturn))
+ show_usage (void)
+ {
+   fprintf (stderr, "genpeimg [options] files...\n");
+@@ -204,6 +204,7 @@
+ 	case 'h':
+ 	  if (h[2] == 0)
+ 	    show_usage ();
++	  /* fallthru */
+ 	default:
+ error_point:
+ 	  fprintf (stderr, "Unknown option ,%s'\n", h);
diff --git a/packages/mingw-w64/v5.0.2/100-mingw64-malloc.patch b/packages/mingw-w64/v5.0.2/100-mingw64-malloc.patch
deleted file mode 100644
index 3d05b63b..00000000
--- a/packages/mingw-w64/v5.0.2/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:25:26.000000000 -0800
-@@ -26,7 +26,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include <stdarg.h>
- #include <stdint.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:25:49.000000000 -0800
-@@ -21,7 +21,10 @@
- #include "genidl_cfg.h"
- #include "genidl_typeinfo.h"
- #include "genidl_typinfo.h"
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
-+#include <stdlib.h>
- #include <string.h>
- #include <memory.h>
- 
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/include/pathtools.h mingw-w64-v5.0.1/mingw-w64-tools/widl/include/pathtools.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/include/pathtools.h	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/widl/include/pathtools.h	2017-03-10 16:26:21.000000000 -0800
-@@ -12,9 +12,8 @@
- #define PATHTOOLS_H
- 
- #include <unistd.h>
--#if defined(__APPLE__)
- #include <stdlib.h>
--#else
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
- #endif
- #include <stdio.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/src/pathtools.c mingw-w64-v5.0.1/mingw-w64-tools/widl/src/pathtools.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/src/pathtools.c	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/widl/src/pathtools.c	2017-03-10 16:26:40.000000000 -0800
-@@ -8,9 +8,8 @@
-   .email: <mingw.android@gmail.com>.
-  */
- 
--#if defined(__APPLE__)
- #include <stdlib.h>
--#else
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
- #endif
- #include <limits.h>
diff --git a/packages/mingw-w64/v5.0.2/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v5.0.2/200-gendef-explicit-fallthrough.patch
deleted file mode 100644
index 7cfd5114..00000000
--- a/packages/mingw-w64/v5.0.2/200-gendef-explicit-fallthrough.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
-Author: sezero <sezero@users.sourceforge.net>
-Date:   Thu Jun 15 09:50:00 2017 +0300
-
-    gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
-
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..0c5beaad 100644
---- a/mingw-w64-tools/gendef/src/gendef.c
-+++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -836,7 +836,7 @@ disassembleRetIntern (uint32_t pc, uint32_t *retpop, sAddresses *seen, sAddresse
-       if (!sz || code == c_ill)
-         {
-           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
--	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
-+		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
- #if ENABLE_DEBUG == 1
-       {
-         unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
-     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
- #endif
-     *aCode=c_ill; return 0;
--  case c_4: sz++;
--  case c_3: sz++;
-+  case c_4: sz++;/* fallthru */
-+  case c_3: sz++;/* fallthru */
-   case c_lb:
--  case c_2: sz++;
-+  case c_2: sz++;/* fallthru */
-   case c_retn: case c_retf:
-   case c_iret: case c_int3:
-   case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
-           p = (unsigned char *) map_va (pc + sz);
-           if (!p) { *aCode=c_ill; return 0; }
- #if ENABLE_DEBUG == 1
--    enter_save_insn(lw,p[0]);
-+	  enter_save_insn(lw,p[0]);
- #endif
-           b&=~0x7; b|=(p[0]&7);
- 	  sz+=1;
diff --git a/packages/mingw-w64/v5.0.2/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v5.0.2/300-genpeimg-explicit-fallthrough.patch
deleted file mode 100644
index 927c0050..00000000
--- a/packages/mingw-w64/v5.0.2/300-genpeimg-explicit-fallthrough.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit f9f2bd0641b89895ab42b1948f431dadf1e837a4
-Author: sezero <sezero@users.sourceforge.net>
-Date:   Thu Jun 15 09:45:52 2017 +0300
-
-    genpeimg.c (pass_args): add a /* fallthru */ comment in the switch
-     after show_usage() to avoid -Wimplicit-fallthrough
-    (show_usage): mark the function with noreturn attribute.
-
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..1ebe607d 100644
---- a/mingw-w64-tools/genpeimg/src/genpeimg.c
-+++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -28,7 +28,7 @@ unsigned short mask_pe_opt_hdr_dll_chara = 0xffff;
- int dump_information = 0;
- static char *file_name = NULL;
- 
--static void
-+static void __attribute__((noreturn))
- show_usage (void)
- {
-   fprintf (stderr, "genpeimg [options] files...\n");
-@@ -204,6 +204,7 @@ pass_args (int argc, char **argv)
- 	case 'h':
- 	  if (h[2] == 0)
- 	    show_usage ();
-+	  /* fallthru */
- 	default:
- error_point:
- 	  fprintf (stderr, "Unknown option ,%s'\n", h);
diff --git a/packages/mpfr/2.4.2/100-sin_cos_underflow.patch b/packages/mpfr/2.4.2/0000-sin_cos_underflow.patch
similarity index 84%
rename from packages/mpfr/2.4.2/100-sin_cos_underflow.patch
rename to packages/mpfr/2.4.2/0000-sin_cos_underflow.patch
index 2721517c..0e902dfc 100644
--- a/packages/mpfr/2.4.2/100-sin_cos_underflow.patch
+++ b/packages/mpfr/2.4.2/0000-sin_cos_underflow.patch
@@ -1,17 +1,23 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2009-12-07 13:37:12.000000000 +0000
+---
+ PATCHES          |    1 
+ VERSION          |    2 -
+ mpfr.h           |    2 -
+ sin_cos.c        |   34 +++++++++++++++++----------------
+ tests/tsin_cos.c |   56 +++++++++++++++++++++++++++++++++++++++++++++++--------
+ version.c        |    2 -
+ 6 files changed, 70 insertions(+), 27 deletions(-)
+
+--- /dev/null
++++ b/PATCHES
 @@ -0,0 +1 @@
 +sin_cos_underflow
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2009-12-07 13:37:12.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -2.4.2
 +2.4.2-p1
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2009-12-07 13:37:12.000000000 +0000
+--- a/mpfr.h
++++ b/mpfr.h
 @@ -27,7 +27,7 @@
  #define MPFR_VERSION_MAJOR 2
  #define MPFR_VERSION_MINOR 4
@@ -21,9 +27,8 @@ diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
  
  /* Macros dealing with MPFR VERSION */
  #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/sin_cos.c mpfr-2.4.2-b/sin_cos.c
---- mpfr-2.4.2-a/sin_cos.c	2009-11-30 02:43:09.000000000 +0000
-+++ mpfr-2.4.2-b/sin_cos.c	2009-12-07 13:37:12.000000000 +0000
+--- a/sin_cos.c
++++ b/sin_cos.c
 @@ -82,17 +82,19 @@
        if (y != x)
          /* y and x differ, thus we can safely try to compute y first */
@@ -87,9 +92,8 @@ diff -Naurd mpfr-2.4.2-a/sin_cos.c mpfr-2.4.2-b/sin_cos.c
    MPFR_SAVE_EXPO_FREE (expo);
    mpfr_check_range (y, inexy, rnd_mode);
    mpfr_check_range (z, inexz, rnd_mode);
-diff -Naurd mpfr-2.4.2-a/tests/tsin_cos.c mpfr-2.4.2-b/tests/tsin_cos.c
---- mpfr-2.4.2-a/tests/tsin_cos.c	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/tests/tsin_cos.c	2009-12-07 13:37:12.000000000 +0000
+--- a/tests/tsin_cos.c
++++ b/tests/tsin_cos.c
 @@ -382,23 +382,56 @@
  consistency (void)
  {
@@ -115,9 +119,7 @@ diff -Naurd mpfr-2.4.2-a/tests/tsin_cos.c mpfr-2.4.2-b/tests/tsin_cos.c
 -      mpfr_sin_cos (s2, c2, x, rnd);
 -      if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)))
 +      if (i < 8 * GMP_RND_MAX)
-         {
--          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,\nx = ",
--                  mpfr_print_rnd_mode (rnd));
++        {
 +          int j = i / GMP_RND_MAX;
 +          if (j & 1)
 +            mpfr_set_emin (MPFR_EMIN_MIN);
@@ -149,7 +151,9 @@ diff -Naurd mpfr-2.4.2-a/tests/tsin_cos.c mpfr-2.4.2-b/tests/tsin_cos.c
 +      flags_ref = flags_sin | flags_cos;
 +      if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)) ||
 +          inex != inex_ref || flags != flags_ref)
-+        {
+         {
+-          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,\nx = ",
+-                  mpfr_print_rnd_mode (rnd));
 +          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,"
 +                  " i = %d\nx = ", mpfr_print_rnd_mode (rnd), i);
            mpfr_dump (x);
@@ -172,9 +176,8 @@ diff -Naurd mpfr-2.4.2-a/tests/tsin_cos.c mpfr-2.4.2-b/tests/tsin_cos.c
      }
  }
  
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2009-12-07 13:37:12.000000000 +0000
+--- a/version.c
++++ b/version.c
 @@ -25,5 +25,5 @@
  const char *
  mpfr_get_version (void)
diff --git a/packages/mpfr/2.4.2/110-longlong.h.patch b/packages/mpfr/2.4.2/0001-longlong.h.patch
similarity index 63%
rename from packages/mpfr/2.4.2/110-longlong.h.patch
rename to packages/mpfr/2.4.2/0001-longlong.h.patch
index fa85d8ef..da3929b2 100644
--- a/packages/mpfr/2.4.2/110-longlong.h.patch
+++ b/packages/mpfr/2.4.2/0001-longlong.h.patch
@@ -1,17 +1,23 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2009-12-18 12:03:30.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2009-12-18 12:05:19.000000000 +0000
-@@ -0,0 +1 @@
+---
+ PATCHES         |    1 +
+ VERSION         |    2 +-
+ mpfr-longlong.h |   21 +++++++++++++++++++--
+ mpfr.h          |    2 +-
+ version.c       |    2 +-
+ 5 files changed, 23 insertions(+), 5 deletions(-)
+
+--- a/PATCHES
++++ b/PATCHES
+@@ -1 +1,2 @@
 +longlong.h
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2009-12-18 12:05:09.000000000 +0000
+ sin_cos_underflow
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -2.4.2-p1
 +2.4.2-p2
-diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h
---- mpfr-2.4.2-a/mpfr-longlong.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr-longlong.h	2009-12-18 12:04:29.000000000 +0000
+--- a/mpfr-longlong.h
++++ b/mpfr-longlong.h
 @@ -1011,7 +1011,15 @@
  #endif /* __m88000__ */
  
@@ -47,9 +53,8 @@ diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h
  #define umul_ppmm(w1, w0, u, v) \
    __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
  #else
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2009-12-18 12:05:09.000000000 +0000
+--- a/mpfr.h
++++ b/mpfr.h
 @@ -27,7 +27,7 @@
  #define MPFR_VERSION_MAJOR 2
  #define MPFR_VERSION_MINOR 4
@@ -59,9 +64,8 @@ diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
  
  /* Macros dealing with MPFR VERSION */
  #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2009-12-18 12:05:09.000000000 +0000
+--- a/version.c
++++ b/version.c
 @@ -25,5 +25,5 @@
  const char *
  mpfr_get_version (void)
diff --git a/packages/mpfr/2.4.2/0002-gmp5.patch b/packages/mpfr/2.4.2/0002-gmp5.patch
new file mode 100644
index 00000000..ce01cc69
--- /dev/null
+++ b/packages/mpfr/2.4.2/0002-gmp5.patch
@@ -0,0 +1,80 @@
+---
+ PATCHES      |    1 +
+ VERSION      |    2 +-
+ configure    |    3 +++
+ configure.in |    3 +++
+ mpfr-impl.h  |    6 ++++++
+ mpfr.h       |    2 +-
+ version.c    |    2 +-
+ 7 files changed, 16 insertions(+), 3 deletions(-)
+
+--- a/PATCHES
++++ b/PATCHES
+@@ -1,2 +1,3 @@
++gmp5
+ longlong.h
+ sin_cos_underflow
+--- a/VERSION
++++ b/VERSION
+@@ -1 +1 @@
+-2.4.2-p2
++2.4.2-p3
+--- a/configure
++++ b/configure
+@@ -20449,6 +20449,9 @@
+ main ()
+ {
+ 
++#ifndef BITS_PER_MP_LIMB
++#define BITS_PER_MP_LIMB GMP_LIMB_BITS
++#endif
+   return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
+          && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
+ 
+--- a/configure.in
++++ b/configure.in
+@@ -424,6 +424,9 @@
+ #include "gmp.h"
+ #include "gmp-impl.h"
+ ]], [[
++#ifndef BITS_PER_MP_LIMB
++#define BITS_PER_MP_LIMB GMP_LIMB_BITS
++#endif
+   return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
+          && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
+ ]])], [AC_MSG_RESULT(yes)], [
+--- a/mpfr-impl.h
++++ b/mpfr-impl.h
+@@ -65,6 +65,12 @@
+ # ifndef __GMP_IMPL_H__
+ #  include "gmp-impl.h"
+ # endif
++# ifndef BITS_PER_MP_LIMB
++#  define BITS_PER_MP_LIMB GMP_LIMB_BITS
++# endif
++#ifndef mpn_sqr_n
++# define mpn_sqr_n mpn_sqr
++#endif
+ # ifdef MPFR_NEED_LONGLONG_H
+ #  include "longlong.h"
+ # endif
+--- a/mpfr.h
++++ b/mpfr.h
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 4
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "2.4.2-p2"
++#define MPFR_VERSION_STRING "2.4.2-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+--- a/version.c
++++ b/version.c
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "2.4.2-p2";
++  return "2.4.2-p3";
+ }
diff --git a/packages/mpfr/2.4.2/120-gmp5.patch b/packages/mpfr/2.4.2/120-gmp5.patch
deleted file mode 100644
index 3ce4952f..00000000
--- a/packages/mpfr/2.4.2/120-gmp5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2010-01-11 15:27:18.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2010-01-11 15:30:31.000000000 +0000
-@@ -0,0 +1 @@
-+gmp5
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2010-01-11 15:29:40.000000000 +0000
-@@ -1 +1 @@
--2.4.2-p2
-+2.4.2-p3
-diff -Naurd mpfr-2.4.2-a/configure mpfr-2.4.2-b/configure
---- mpfr-2.4.2-a/configure	2009-11-30 02:44:35.000000000 +0000
-+++ mpfr-2.4.2-b/configure	2010-01-11 15:28:56.000000000 +0000
-@@ -20449,6 +20449,9 @@
- main ()
- {
- 
-+#ifndef BITS_PER_MP_LIMB
-+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+#endif
-   return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
-          && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
- 
-diff -Naurd mpfr-2.4.2-a/configure.in mpfr-2.4.2-b/configure.in
---- mpfr-2.4.2-a/configure.in	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/configure.in	2009-11-30 02:43:08.000000000 +0000
-@@ -424,6 +424,9 @@
- #include "gmp.h"
- #include "gmp-impl.h"
- ]], [[
-+#ifndef BITS_PER_MP_LIMB
-+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+#endif
-   return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
-          && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
- ]])], [AC_MSG_RESULT(yes)], [
-diff -Naurd mpfr-2.4.2-a/mpfr-impl.h mpfr-2.4.2-b/mpfr-impl.h
---- mpfr-2.4.2-a/mpfr-impl.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr-impl.h	2010-01-11 15:28:01.000000000 +0000
-@@ -65,6 +65,12 @@
- # ifndef __GMP_IMPL_H__
- #  include "gmp-impl.h"
- # endif
-+# ifndef BITS_PER_MP_LIMB
-+#  define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+# endif
-+#ifndef mpn_sqr_n
-+# define mpn_sqr_n mpn_sqr
-+#endif
- # ifdef MPFR_NEED_LONGLONG_H
- #  include "longlong.h"
- # endif
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2010-01-11 15:29:40.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "2.4.2-p2"
-+#define MPFR_VERSION_STRING "2.4.2-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2010-01-11 15:29:40.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.2-p2";
-+  return "2.4.2-p3";
- }
diff --git a/packages/mpfr/3.0.1/110-asin_exprange.patch b/packages/mpfr/3.0.1/0000-asin_exprange.patch
similarity index 72%
rename from packages/mpfr/3.0.1/110-asin_exprange.patch
rename to packages/mpfr/3.0.1/0000-asin_exprange.patch
index d79a6f9f..db153b18 100644
--- a/packages/mpfr/3.0.1/110-asin_exprange.patch
+++ b/packages/mpfr/3.0.1/0000-asin_exprange.patch
@@ -1,17 +1,23 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-04-12 10:50:02.000000000 +0000
+---
+ PATCHES       |    1 +
+ VERSION       |    2 +-
+ asin.c        |   12 +++++++-----
+ mpfr.h        |    2 +-
+ tests/tasin.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
+ version.c     |    2 +-
+ 6 files changed, 55 insertions(+), 8 deletions(-)
+
+--- /dev/null
++++ b/PATCHES
 @@ -0,0 +1 @@
 +asin_exprange
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-04-12 10:50:02.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -3.0.1
 +3.0.1-p1
-diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c
---- mpfr-3.0.1-a/asin.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/asin.c	2011-04-12 10:50:02.000000000 +0000
+--- a/asin.c
++++ b/asin.c
 @@ -63,11 +63,14 @@
  
    compared = mpfr_cmp_ui (xp, 1);
@@ -52,9 +58,8 @@ diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c
  
    MPFR_SAVE_EXPO_FREE (expo);
    return mpfr_check_range (asin, inexact, rnd_mode);
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-04-12 10:50:02.000000000 +0000
+--- a/mpfr.h
++++ b/mpfr.h
 @@ -27,7 +27,7 @@
  #define MPFR_VERSION_MAJOR 3
  #define MPFR_VERSION_MINOR 0
@@ -64,9 +69,8 @@ diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
  
  /* Macros dealing with MPFR VERSION */
  #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c
---- mpfr-3.0.1-a/tests/tasin.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/tasin.c	2011-04-12 10:50:02.000000000 +0000
+--- a/tests/tasin.c
++++ b/tests/tasin.c
 @@ -219,6 +219,49 @@
    mpfr_clear (y);
  }
@@ -125,9 +129,8 @@ diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c
  
    test_generic (2, 100, 15);
  
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-04-12 10:50:02.000000000 +0000
+--- a/version.c
++++ b/version.c
 @@ -25,5 +25,5 @@
  const char *
  mpfr_get_version (void)
diff --git a/packages/mpfr/3.0.1/120-rec_sqrt-carry.patch b/packages/mpfr/3.0.1/0001-rec_sqrt-carry.patch
similarity index 72%
rename from packages/mpfr/3.0.1/120-rec_sqrt-carry.patch
rename to packages/mpfr/3.0.1/0001-rec_sqrt-carry.patch
index 0367d846..2b1ddbc5 100644
--- a/packages/mpfr/3.0.1/120-rec_sqrt-carry.patch
+++ b/packages/mpfr/3.0.1/0001-rec_sqrt-carry.patch
@@ -1,17 +1,23 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-04 11:18:33.000000000 +0000
-@@ -0,0 +1 @@
+---
+ PATCHES    |    1 +
+ VERSION    |    2 +-
+ mpfr.h     |    2 +-
+ rec_sqrt.c |   21 +++++++++++++++++++--
+ version.c  |    2 +-
+ 5 files changed, 23 insertions(+), 5 deletions(-)
+
+--- a/PATCHES
++++ b/PATCHES
+@@ -1 +1,2 @@
 +rec_sqrt-carry
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-04 11:18:33.000000000 +0000
+ asin_exprange
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -3.0.1-p1
 +3.0.1-p2
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-04 11:18:33.000000000 +0000
+--- a/mpfr.h
++++ b/mpfr.h
 @@ -27,7 +27,7 @@
  #define MPFR_VERSION_MAJOR 3
  #define MPFR_VERSION_MINOR 0
@@ -21,9 +27,8 @@ diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
  
  /* Macros dealing with MPFR VERSION */
  #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c
---- mpfr-3.0.1-a/rec_sqrt.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/rec_sqrt.c	2011-05-04 11:18:33.000000000 +0000
+--- a/rec_sqrt.c
++++ b/rec_sqrt.c
 @@ -375,20 +375,37 @@
        MPFR_ASSERTD(un == ln + 1 || un == ln + 2);
        /* the high un-ln limbs of u will overlap the low part of {x+ln,xn},
@@ -64,9 +69,8 @@ diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c
            /* cy cannot be zero, since the most significant bit of Xh is 1,
               and the correction is bounded by 2^{-h+3} */
            MPFR_ASSERTD(cy == 0);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-04 11:18:33.000000000 +0000
+--- a/version.c
++++ b/version.c
 @@ -25,5 +25,5 @@
  const char *
  mpfr_get_version (void)
diff --git a/packages/mpfr/3.0.1/130-atan-expo-range.patch b/packages/mpfr/3.0.1/0002-atan-expo-range.patch
similarity index 67%
rename from packages/mpfr/3.0.1/130-atan-expo-range.patch
rename to packages/mpfr/3.0.1/0002-atan-expo-range.patch
index 251b8373..060d8de1 100644
--- a/packages/mpfr/3.0.1/130-atan-expo-range.patch
+++ b/packages/mpfr/3.0.1/0002-atan-expo-range.patch
@@ -1,17 +1,25 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-05 00:00:35.000000000 +0000
-@@ -0,0 +1 @@
+---
+ PATCHES       |    1 +
+ VERSION       |    2 +-
+ atan.c        |    2 +-
+ mpfr.h        |    2 +-
+ tests/tatan.c |   47 +++++++++++++++++++++++++++++++++++++++++++++++
+ version.c     |    2 +-
+ 6 files changed, 52 insertions(+), 4 deletions(-)
+
+--- a/PATCHES
++++ b/PATCHES
+@@ -1,2 +1,3 @@
 +atan-expo-range
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-05 00:00:35.000000000 +0000
+ rec_sqrt-carry
+ asin_exprange
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -3.0.1-p2
 +3.0.1-p3
-diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c
---- mpfr-3.0.1-a/atan.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/atan.c	2011-05-05 00:00:35.000000000 +0000
+--- a/atan.c
++++ b/atan.c
 @@ -431,5 +431,5 @@
    MPFR_GROUP_CLEAR (group);
  
@@ -19,9 +27,8 @@ diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c
 -  return mpfr_check_range (arctgt, inexact, rnd_mode);
 +  return mpfr_check_range (atan, inexact, rnd_mode);
  }
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-05 00:00:35.000000000 +0000
+--- a/mpfr.h
++++ b/mpfr.h
 @@ -27,7 +27,7 @@
  #define MPFR_VERSION_MAJOR 3
  #define MPFR_VERSION_MINOR 0
@@ -31,9 +38,8 @@ diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
  
  /* Macros dealing with MPFR VERSION */
  #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c
---- mpfr-3.0.1-a/tests/tatan.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/tatan.c	2011-05-05 00:00:35.000000000 +0000
+--- a/tests/tatan.c
++++ b/tests/tatan.c
 @@ -535,6 +535,52 @@
    mpfr_clears (a, x, y, (mpfr_ptr) 0);
  }
@@ -95,9 +101,8 @@ diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c
  
    test_generic_atan  (2, 200, 17);
    test_generic_atan2 (2, 200, 17);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-05 00:00:35.000000000 +0000
+--- a/version.c
++++ b/version.c
 @@ -25,5 +25,5 @@
  const char *
  mpfr_get_version (void)
diff --git a/packages/mpfr/3.0.1/0003-texp-zero.patch b/packages/mpfr/3.0.1/0003-texp-zero.patch
new file mode 100644
index 00000000..a761a5f7
--- /dev/null
+++ b/packages/mpfr/3.0.1/0003-texp-zero.patch
@@ -0,0 +1,53 @@
+---
+ PATCHES      |    1 +
+ VERSION      |    2 +-
+ mpfr.h       |    2 +-
+ tests/texp.c |    4 +++-
+ version.c    |    2 +-
+ 5 files changed, 7 insertions(+), 4 deletions(-)
+
+--- a/PATCHES
++++ b/PATCHES
+@@ -1,3 +1,4 @@
++texp-zero
+ atan-expo-range
+ rec_sqrt-carry
+ asin_exprange
+--- a/VERSION
++++ b/VERSION
+@@ -1 +1 @@
+-3.0.1-p3
++3.0.1-p4
+--- a/mpfr.h
++++ b/mpfr.h
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1-p3"
++#define MPFR_VERSION_STRING "3.0.1-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+--- a/tests/texp.c
++++ b/tests/texp.c
+@@ -170,7 +170,9 @@
+       mpfr_set_prec (x, prec);
+       mpfr_set_prec (y, prec);
+       mpfr_set_prec (z, prec);
+-      mpfr_urandomb (x, RANDS);
++      do
++        mpfr_urandomb (x, RANDS);
++      while (MPFR_IS_ZERO (x));  /* 0 is handled by mpfr_exp only */
+       rnd = RND_RAND ();
+       mpfr_exp_2 (y, x, rnd);
+       mpfr_exp_3 (z, x, rnd);
+--- a/version.c
++++ b/version.c
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1-p3";
++  return "3.0.1-p4";
+ }
diff --git a/packages/mpfr/3.0.1/140-texp-zero.patch b/packages/mpfr/3.0.1/140-texp-zero.patch
deleted file mode 100644
index fd74087d..00000000
--- a/packages/mpfr/3.0.1/140-texp-zero.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-09 14:48:24.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-09 14:48:24.000000000 +0000
-@@ -0,0 +1 @@
-+texp-zero
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-09 14:48:24.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p3
-+3.0.1-p4
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-09 14:48:24.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p3"
-+#define MPFR_VERSION_STRING "3.0.1-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c
---- mpfr-3.0.1-a/tests/texp.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/texp.c	2011-05-09 14:48:24.000000000 +0000
-@@ -170,7 +170,9 @@
-       mpfr_set_prec (x, prec);
-       mpfr_set_prec (y, prec);
-       mpfr_set_prec (z, prec);
--      mpfr_urandomb (x, RANDS);
-+      do
-+        mpfr_urandomb (x, RANDS);
-+      while (MPFR_IS_ZERO (x));  /* 0 is handled by mpfr_exp only */
-       rnd = RND_RAND ();
-       mpfr_exp_2 (y, x, rnd);
-       mpfr_exp_3 (z, x, rnd);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-09 14:48:24.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p3";
-+  return "3.0.1-p4";
- }
diff --git a/packages/ncurses/6.0/100-ncurses-6.0-20150810.patch b/packages/ncurses/6.0/0000-ncurses-6.0-20150810.patch
similarity index 74%
rename from packages/ncurses/6.0/100-ncurses-6.0-20150810.patch
rename to packages/ncurses/6.0/0000-ncurses-6.0-20150810.patch
index 76f238f0..cf0ed2fc 100644
--- a/packages/ncurses/6.0/100-ncurses-6.0-20150810.patch
+++ b/packages/ncurses/6.0/0000-ncurses-6.0-20150810.patch
@@ -25,10 +25,8 @@
 # package/ncurses.spec             |    2 +-
 # 10 files changed, 21 insertions(+), 16 deletions(-)
 # ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2476 
---- ncurses-6.0-20150808+/NEWS	2015-08-08 23:29:51.000000000 +0000
-+++ ncurses-6.0-20150810/NEWS	2015-08-10 09:27:32.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -50,16 +48,13 @@ Prereq:  1.2476
  20150808 6.0 release for upload to ftp.gnu.org
  
  20150808
-Index: VERSION
---- ncurses-6.0-20150808+/VERSION	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/VERSION	2015-08-10 09:10:29.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20150808
 +5:0:9	6.0	20150810
-Index: dist.mk
-Prereq:  1.1064 
---- ncurses-6.0-20150808+/dist.mk	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/dist.mk	2015-08-10 09:10:29.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -78,10 +73,8 @@ Prereq:  1.1064
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/base/MKlib_gen.sh
-Prereq:  1.50 
---- ncurses-6.0-20150808+/ncurses/base/MKlib_gen.sh	2015-08-07 00:48:24.000000000 +0000
-+++ ncurses-6.0-20150810/ncurses/base/MKlib_gen.sh	2015-08-10 08:56:39.000000000 +0000
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
 @@ -2,7 +2,7 @@
  #
  # MKlib_gen.sh -- generate sources from curses.h macro definitions
@@ -100,9 +93,8 @@ Prereq:  1.50
  FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1`
  ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0`
  ONE=`echo "$ALL" | sed -e 's/\..*$//'`
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150808+/package/debian-mingw/changelog	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/debian-mingw/changelog	2015-08-10 09:10:30.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150808) unstable; urgency=low
 +ncurses6 (6.0+20150810) unstable; urgency=low
@@ -114,9 +106,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150808+/package/debian-mingw64/changelog	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/debian-mingw64/changelog	2015-08-10 09:10:30.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150808) unstable; urgency=low
 +ncurses6 (6.0+20150810) unstable; urgency=low
@@ -128,9 +119,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20150808+/package/debian/changelog	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/debian/changelog	2015-08-10 09:10:29.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150808) unstable; urgency=low
 +ncurses6 (6.0+20150810) unstable; urgency=low
@@ -142,10 +132,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.117 
---- ncurses-6.0-20150808+/package/mingw-ncurses.nsi	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/mingw-ncurses.nsi	2015-08-10 09:10:30.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.117 2015/08/06 23:13:39 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.118 2015/08/10 09:10:30 tom Exp $
@@ -161,9 +149,8 @@ Prereq:  1.117
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150808+/package/mingw-ncurses.spec	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/mingw-ncurses.spec	2015-08-10 09:10:29.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -173,9 +160,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150808+/package/ncurses.spec	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/ncurses.spec	2015-08-10 09:10:29.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
diff --git a/packages/ncurses/6.0/110-ncurses-6.0-20150815.patch b/packages/ncurses/6.0/0001-ncurses-6.0-20150815.patch
similarity index 98%
rename from packages/ncurses/6.0/110-ncurses-6.0-20150815.patch
rename to packages/ncurses/6.0/0001-ncurses-6.0-20150815.patch
index 21fe06e1..df2210de 100644
--- a/packages/ncurses/6.0/110-ncurses-6.0-20150815.patch
+++ b/packages/ncurses/6.0/0001-ncurses-6.0-20150815.patch
@@ -17,7 +17,7 @@
 # NEWS                             |    8 
 # VERSION                          |    2 
 # aclocal.m4                       |    9 
-# configure                        | 2920 ++++++++++++++++++-------------------
+# configure                        | 2920 +++++++++++++++++++--------------------
 # dist.mk                          |    4 
 # form/llib-lform                  |    4 
 # form/llib-lformt                 |    6 
@@ -49,10 +49,8 @@
 # panel/llib-lpaneltw              |    2 
 # 34 files changed, 1579 insertions(+), 1828 deletions(-)
 # ------------------------------------------------------------------------------
-Index: INSTALL
-Prereq:  1.187 
---- ncurses-6.0-20150810+/INSTALL	2015-07-16 23:59:08.000000000 +0000
-+++ ncurses-6.0-20150815/INSTALL	2015-08-15 20:11:48.000000000 +0000
+--- a/INSTALL
++++ b/INSTALL
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -191,10 +189,8 @@ Prereq:  1.187
  
  The first time you load a given terminal type from your termcap
  database, the library initialization code will automatically write it
-Index: NEWS
-Prereq:  1.2478 
---- ncurses-6.0-20150810+/NEWS	2015-08-10 09:27:32.000000000 +0000
-+++ ncurses-6.0-20150815/NEWS	2015-08-15 22:33:55.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -217,16 +213,13 @@ Prereq:  1.2478
  20150810
  	+ workaround for Debian #65617, which was fixed in mawk's upstream
  	  releases in 2009 (report by Sven Joachim).  See
-Index: VERSION
---- ncurses-6.0-20150810+/VERSION	2015-08-10 09:10:29.000000000 +0000
-+++ ncurses-6.0-20150815/VERSION	2015-08-15 15:13:47.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20150810
 +5:0:9	6.0	20150815
-Index: aclocal.m4
-Prereq:  1.761 
---- ncurses-6.0-20150810+/aclocal.m4	2015-08-06 00:46:34.000000000 +0000
-+++ ncurses-6.0-20150815/aclocal.m4	2015-08-15 22:39:55.000000000 +0000
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -260,9 +253,8 @@ Prereq:  1.761
  		;;
  	esac
  	],[cf_cv_shlib_version=auto])
-Index: configure
---- ncurses-6.0-20150810+/configure	2015-08-05 09:20:32.000000000 +0000
-+++ ncurses-6.0-20150815/configure	2015-08-15 22:38:44.000000000 +0000
+--- a/configure
++++ b/configure
 @@ -1,5 +1,5 @@
  #! /bin/sh
 -# From configure.in Revision: 1.618 .
@@ -10215,10 +10207,8 @@ Index: configure
  
  					with_shared_cxx=yes
  					;;
-Index: dist.mk
-Prereq:  1.1065 
---- ncurses-6.0-20150810+/dist.mk	2015-08-10 09:10:29.000000000 +0000
-+++ ncurses-6.0-20150815/dist.mk	2015-08-15 15:13:47.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -10237,9 +10227,8 @@ Prereq:  1.1065
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: form/llib-lform
---- ncurses-6.0-20150810+/form/llib-lform	2015-07-25 21:41:42.000000000 +0000
-+++ ncurses-6.0-20150815/form/llib-lform	2015-08-15 17:20:49.000000000 +0000
+--- a/form/llib-lform
++++ b/form/llib-lform
 @@ -795,8 +795,6 @@
  
  /* ./fty_num.c */
@@ -10258,9 +10247,8 @@ Index: form/llib-lform
  typedef struct
    {
      regex_t *pRegExp;
-Index: form/llib-lformt
---- ncurses-6.0-20150810+/form/llib-lformt	2015-07-25 21:44:00.000000000 +0000
-+++ ncurses-6.0-20150815/form/llib-lformt	2015-08-15 17:22:59.000000000 +0000
+--- a/form/llib-lformt
++++ b/form/llib-lformt
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2010-2010,2015 Free Software Foundation, Inc.              *
@@ -10286,9 +10274,8 @@ Index: form/llib-lformt
  typedef struct
    {
      regex_t *pRegExp;
-Index: form/llib-lformtw
---- ncurses-6.0-20150810+/form/llib-lformtw	2015-07-25 21:43:11.000000000 +0000
-+++ ncurses-6.0-20150815/form/llib-lformtw	2015-08-15 17:22:13.000000000 +0000
+--- a/form/llib-lformtw
++++ b/form/llib-lformtw
 @@ -808,8 +808,6 @@
  
  /* ./fty_num.c */
@@ -10307,9 +10294,8 @@ Index: form/llib-lformtw
  typedef struct
    {
      regex_t *pRegExp;
-Index: form/llib-lformw
---- ncurses-6.0-20150810+/form/llib-lformw	2015-07-25 21:42:23.000000000 +0000
-+++ ncurses-6.0-20150815/form/llib-lformw	2015-08-15 17:21:28.000000000 +0000
+--- a/form/llib-lformw
++++ b/form/llib-lformw
 @@ -808,8 +808,6 @@
  
  /* ./fty_num.c */
@@ -10328,9 +10314,8 @@ Index: form/llib-lformw
  typedef struct
    {
      regex_t *pRegExp;
-Index: menu/llib-lmenu
---- ncurses-6.0-20150810+/menu/llib-lmenu	2010-01-09 21:22:33.000000000 +0000
-+++ ncurses-6.0-20150815/menu/llib-lmenu	2015-08-15 17:20:51.000000000 +0000
+--- a/menu/llib-lmenu
++++ b/menu/llib-lmenu
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1999-2005,2010 Free Software Foundation, Inc.              *
@@ -10347,9 +10332,8 @@ Index: menu/llib-lmenu
   ****************************************************************************/
  /* LINTLIBRARY */
  
-Index: menu/llib-lmenut
---- ncurses-6.0-20150810+/menu/llib-lmenut	2010-01-09 22:23:22.000000000 +0000
-+++ ncurses-6.0-20150815/menu/llib-lmenut	2015-08-15 17:23:01.000000000 +0000
+--- a/menu/llib-lmenut
++++ b/menu/llib-lmenut
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2010 Free Software Foundation, Inc.                        *
@@ -10366,9 +10350,8 @@ Index: menu/llib-lmenut
   ****************************************************************************/
  /* LINTLIBRARY */
  
-Index: menu/llib-lmenutw
---- ncurses-6.0-20150810+/menu/llib-lmenutw	2010-01-09 22:03:09.000000000 +0000
-+++ ncurses-6.0-20150815/menu/llib-lmenutw	2015-08-15 17:22:15.000000000 +0000
+--- a/menu/llib-lmenutw
++++ b/menu/llib-lmenutw
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2010 Free Software Foundation, Inc.                        *
@@ -10394,9 +10377,8 @@ Index: menu/llib-lmenutw
  #undef new_item
  ITEM	*new_item(
  		const char *name, 
-Index: menu/llib-lmenuw
---- ncurses-6.0-20150810+/menu/llib-lmenuw	2010-01-09 21:53:58.000000000 +0000
-+++ ncurses-6.0-20150815/menu/llib-lmenuw	2015-08-15 17:21:31.000000000 +0000
+--- a/menu/llib-lmenuw
++++ b/menu/llib-lmenuw
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2002-2005,2010 Free Software Foundation, Inc.              *
@@ -10422,9 +10404,8 @@ Index: menu/llib-lmenuw
  #undef new_item
  ITEM	*new_item(
  		const char *name, 
-Index: ncurses/llib-lncurses
---- ncurses-6.0-20150810+/ncurses/llib-lncurses	2015-07-25 22:52:04.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-lncurses	2015-08-15 19:06:20.000000000 +0000
+--- a/ncurses/llib-lncurses
++++ b/ncurses/llib-lncurses
 @@ -2511,10 +2511,6 @@
  
  /* ./trace/varargs.c */
@@ -10475,9 +10456,8 @@ Index: ncurses/llib-lncurses
  /* ./tinfo/write_entry.c */
  
  #undef _nc_set_writedir
-Index: ncurses/llib-lncursest
---- ncurses-6.0-20150810+/ncurses/llib-lncursest	2015-07-25 23:02:48.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-lncursest	2015-08-15 20:08:58.000000000 +0000
+--- a/ncurses/llib-lncursest
++++ b/ncurses/llib-lncursest
 @@ -2520,10 +2520,6 @@
  
  /* ./trace/varargs.c */
@@ -10528,9 +10508,8 @@ Index: ncurses/llib-lncursest
  /* ./tinfo/write_entry.c */
  
  #undef _nc_set_writedir
-Index: ncurses/llib-lncursestw
---- ncurses-6.0-20150810+/ncurses/llib-lncursestw	2015-07-25 23:03:50.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-lncursestw	2015-08-15 19:07:52.000000000 +0000
+--- a/ncurses/llib-lncursestw
++++ b/ncurses/llib-lncursestw
 @@ -3028,10 +3028,6 @@
  
  /* ./trace/varargs.c */
@@ -10581,9 +10560,8 @@ Index: ncurses/llib-lncursestw
  /* ./tinfo/write_entry.c */
  
  #undef _nc_set_writedir
-Index: ncurses/llib-lncursesw
---- ncurses-6.0-20150810+/ncurses/llib-lncursesw	2015-07-25 23:04:15.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-lncursesw	2015-08-15 20:03:43.000000000 +0000
+--- a/ncurses/llib-lncursesw
++++ b/ncurses/llib-lncursesw
 @@ -1904,13 +1904,6 @@
  
  /* ./base/lib_mouse.c */
@@ -10677,9 +10655,8 @@ Index: ncurses/llib-lncursesw
  /* ./tinfo/write_entry.c */
  
  #undef _nc_set_writedir
-Index: ncurses/llib-ltic
---- ncurses-6.0-20150810+/ncurses/llib-ltic	2015-07-25 22:52:52.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltic	2015-08-15 19:06:29.000000000 +0000
+--- a/ncurses/llib-ltic
++++ b/ncurses/llib-ltic
 @@ -34,8 +34,6 @@
  /* ./tinfo/alloc_entry.c */
  
@@ -10714,9 +10691,8 @@ Index: ncurses/llib-ltic
  #undef _nc_set_writedir
  void	_nc_set_writedir(
  		const char *dir)
-Index: ncurses/llib-ltict
---- ncurses-6.0-20150810+/ncurses/llib-ltict	2015-07-25 22:49:03.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltict	2015-08-15 19:08:45.000000000 +0000
+--- a/ncurses/llib-ltict
++++ b/ncurses/llib-ltict
 @@ -34,8 +34,6 @@
  /* ./tinfo/alloc_entry.c */
  
@@ -10751,9 +10727,8 @@ Index: ncurses/llib-ltict
  #undef _nc_set_writedir
  void	_nc_set_writedir(
  		const char *dir)
-Index: ncurses/llib-ltictw
---- ncurses-6.0-20150810+/ncurses/llib-ltictw	2015-07-25 22:45:20.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltictw	2015-08-15 19:08:02.000000000 +0000
+--- a/ncurses/llib-ltictw
++++ b/ncurses/llib-ltictw
 @@ -34,8 +34,6 @@
  /* ./tinfo/alloc_entry.c */
  
@@ -10788,9 +10763,8 @@ Index: ncurses/llib-ltictw
  #undef _nc_set_writedir
  void	_nc_set_writedir(
  		const char *dir)
-Index: ncurses/llib-lticw
---- ncurses-6.0-20150810+/ncurses/llib-lticw	2015-07-25 22:45:08.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-lticw	2015-08-15 19:07:15.000000000 +0000
+--- a/ncurses/llib-lticw
++++ b/ncurses/llib-lticw
 @@ -34,8 +34,6 @@
  /* ./tinfo/alloc_entry.c */
  
@@ -10825,9 +10799,8 @@ Index: ncurses/llib-lticw
  #undef _nc_set_writedir
  void	_nc_set_writedir(
  		const char *dir)
-Index: ncurses/llib-ltinfo
---- ncurses-6.0-20150810+/ncurses/llib-ltinfo	2015-07-25 21:42:11.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltinfo	2015-08-15 19:06:34.000000000 +0000
+--- a/ncurses/llib-ltinfo
++++ b/ncurses/llib-ltinfo
 @@ -34,9 +34,6 @@
  /* ./tinfo/access.c */
  
@@ -10944,9 +10917,8 @@ Index: ncurses/llib-ltinfo
  #undef _nc_read_termcap
  void	_nc_read_termcap(void)
  		{ /* void */ }
-Index: ncurses/llib-ltinfot
---- ncurses-6.0-20150810+/ncurses/llib-ltinfot	2015-07-25 21:44:32.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltinfot	2015-08-15 19:08:50.000000000 +0000
+--- a/ncurses/llib-ltinfot
++++ b/ncurses/llib-ltinfot
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2013-2013,2015 Free Software Foundation, Inc.              *
@@ -11070,9 +11042,8 @@ Index: ncurses/llib-ltinfot
  #undef _nc_read_termcap
  void	_nc_read_termcap(void)
  		{ /* void */ }
-Index: ncurses/llib-ltinfotw
---- ncurses-6.0-20150810+/ncurses/llib-ltinfotw	2015-07-25 21:43:48.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltinfotw	2015-08-15 19:08:08.000000000 +0000
+--- a/ncurses/llib-ltinfotw
++++ b/ncurses/llib-ltinfotw
 @@ -34,9 +34,6 @@
  /* ./tinfo/access.c */
  
@@ -11189,9 +11160,8 @@ Index: ncurses/llib-ltinfotw
  #undef _nc_read_termcap
  void	_nc_read_termcap(void)
  		{ /* void */ }
-Index: ncurses/llib-ltinfow
---- ncurses-6.0-20150810+/ncurses/llib-ltinfow	2015-07-25 21:42:57.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltinfow	2015-08-15 19:07:20.000000000 +0000
+--- a/ncurses/llib-ltinfow
++++ b/ncurses/llib-ltinfow
 @@ -34,9 +34,6 @@
  /* ./tinfo/access.c */
  
@@ -11308,9 +11278,8 @@ Index: ncurses/llib-ltinfow
  #undef _nc_read_termcap
  void	_nc_read_termcap(void)
  		{ /* void */ }
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150810+/package/debian-mingw/changelog	2015-08-10 09:10:30.000000000 +0000
-+++ ncurses-6.0-20150815/package/debian-mingw/changelog	2015-08-15 15:13:47.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150810) unstable; urgency=low
 +ncurses6 (6.0+20150815) unstable; urgency=low
@@ -11322,9 +11291,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150810+/package/debian-mingw64/changelog	2015-08-10 09:10:30.000000000 +0000
-+++ ncurses-6.0-20150815/package/debian-mingw64/changelog	2015-08-15 15:13:47.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150810) unstable; urgency=low
 +ncurses6 (6.0+20150815) unstable; urgency=low
@@ -11336,9 +11304,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20150810+/package/debian/changelog	2015-08-10 09:10:29.000000000 +0000
-+++ ncurses-6.0-20150815/package/debian/changelog	2015-08-15 15:13:47.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150810) unstable; urgency=low
 +ncurses6 (6.0+20150815) unstable; urgency=low
@@ -11350,10 +11317,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.118 
---- ncurses-6.0-20150810+/package/mingw-ncurses.nsi	2015-08-10 09:10:30.000000000 +0000
-+++ ncurses-6.0-20150815/package/mingw-ncurses.nsi	2015-08-15 15:13:47.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.118 2015/08/10 09:10:30 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.119 2015/08/15 15:13:47 tom Exp $
@@ -11369,9 +11334,8 @@ Prereq:  1.118
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150810+/package/mingw-ncurses.spec	2015-08-10 09:10:29.000000000 +0000
-+++ ncurses-6.0-20150815/package/mingw-ncurses.spec	2015-08-15 15:13:47.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -11381,9 +11345,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150810+/package/ncurses.spec	2015-08-10 09:10:29.000000000 +0000
-+++ ncurses-6.0-20150815/package/ncurses.spec	2015-08-15 15:13:47.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
@@ -11393,9 +11356,8 @@ Index: package/ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: panel/llib-lpanelt
---- ncurses-6.0-20150810+/panel/llib-lpanelt	2015-07-25 21:44:18.000000000 +0000
-+++ ncurses-6.0-20150815/panel/llib-lpanelt	2015-08-15 17:26:01.000000000 +0000
+--- a/panel/llib-lpanelt
++++ b/panel/llib-lpanelt
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2010-2010,2015 Free Software Foundation, Inc.              *
@@ -11403,9 +11365,8 @@ Index: panel/llib-lpanelt
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-Index: panel/llib-lpaneltw
---- ncurses-6.0-20150810+/panel/llib-lpaneltw	2015-07-25 21:43:33.000000000 +0000
-+++ ncurses-6.0-20150815/panel/llib-lpaneltw	2015-08-15 17:22:34.000000000 +0000
+--- a/panel/llib-lpaneltw
++++ b/panel/llib-lpaneltw
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2010-2010,2015 Free Software Foundation, Inc.              *
diff --git a/packages/ncurses/6.0/120-ncurses-6.0-20150822.patch b/packages/ncurses/6.0/0002-ncurses-6.0-20150822.patch
similarity index 99%
rename from packages/ncurses/6.0/120-ncurses-6.0-20150822.patch
rename to packages/ncurses/6.0/0002-ncurses-6.0-20150822.patch
index 202ffe85..b102011e 100644
--- a/packages/ncurses/6.0/120-ncurses-6.0-20150822.patch
+++ b/packages/ncurses/6.0/0002-ncurses-6.0-20150822.patch
@@ -14,11 +14,11 @@
 # created  Sun Aug 23 00:47:10 UTC 2015
 # ------------------------------------------------------------------------------
 # Ada95/aclocal.m4                 |   35 
-# Ada95/configure                  | 2022 +++++++++++----------
+# Ada95/configure                  | 2022 +++++++++++------------
 # NEWS                             |   12 
 # VERSION                          |    2 
 # aclocal.m4                       |   28 
-# configure                        | 3412 ++++++++++++++++++-------------------
+# configure                        | 3412 +++++++++++++++++++--------------------
 # dist.mk                          |    4 
 # include/term_entry.h             |   10 
 # man/curs_variables.3x            |   18 
@@ -35,10 +35,8 @@
 # test/savescreen.c                |    4 
 # 20 files changed, 2823 insertions(+), 2775 deletions(-)
 # ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.105 
---- ncurses-6.0-20150815+/Ada95/aclocal.m4	2015-08-08 14:25:40.000000000 +0000
-+++ ncurses-6.0-20150822/Ada95/aclocal.m4	2015-08-22 21:14:14.000000000 +0000
+--- a/Ada95/aclocal.m4
++++ b/Ada95/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey
@@ -116,9 +114,8 @@ Prereq:  1.105
  	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
  fi
  
-Index: Ada95/configure
---- ncurses-6.0-20150815+/Ada95/configure	2015-08-08 14:26:00.000000000 +0000
-+++ ncurses-6.0-20150822/Ada95/configure	2015-08-22 21:14:42.000000000 +0000
+--- a/Ada95/configure
++++ b/Ada95/configure
 @@ -2547,20 +2547,26 @@
  echo "$as_me: WARNING: pkg-config is not installed" >&2;}
  fi
@@ -6918,10 +6915,8 @@ Index: Ada95/configure
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: NEWS
-Prereq:  1.2481 
---- ncurses-6.0-20150815+/NEWS	2015-08-15 22:33:55.000000000 +0000
-+++ ncurses-6.0-20150822/NEWS	2015-08-22 23:55:21.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -6948,16 +6943,13 @@ Prereq:  1.2481
  20150815
  	+ disallow "no" as a possible value for "--with-shlib-version" option,
  	  overlooked in cleanup-changes for 20000708 (report by Tommy Alex).
-Index: VERSION
---- ncurses-6.0-20150815+/VERSION	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/VERSION	2015-08-17 08:41:12.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20150815
 +5:0:9	6.0	20150822
-Index: aclocal.m4
-Prereq:  1.762 
---- ncurses-6.0-20150815+/aclocal.m4	2015-08-15 22:39:55.000000000 +0000
-+++ ncurses-6.0-20150822/aclocal.m4	2015-08-22 21:12:39.000000000 +0000
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -7011,9 +7003,8 @@ Prereq:  1.762
  	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
  fi
  
-Index: configure
---- ncurses-6.0-20150815+/configure	2015-08-15 22:38:44.000000000 +0000
-+++ ncurses-6.0-20150822/configure	2015-08-22 21:08:03.000000000 +0000
+--- a/configure
++++ b/configure
 @@ -3571,20 +3571,26 @@
  echo "$as_me: WARNING: pkg-config is not installed" >&2;}
  fi
@@ -18735,10 +18726,8 @@ Index: configure
  
  					with_shared_cxx=yes
  					;;
-Index: dist.mk
-Prereq:  1.1066 
---- ncurses-6.0-20150815+/dist.mk	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/dist.mk	2015-08-17 08:41:12.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -18757,10 +18746,8 @@ Prereq:  1.1066
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: include/term_entry.h
-Prereq:  1.45 
---- ncurses-6.0-20150815+/include/term_entry.h	2014-11-01 14:47:00.000000000 +0000
-+++ ncurses-6.0-20150822/include/term_entry.h	2015-08-22 23:04:25.000000000 +0000
+--- a/include/term_entry.h
++++ b/include/term_entry.h
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
@@ -18790,10 +18777,8 @@ Prereq:  1.45
  #endif
  
  #define ExtBoolname(tp,i,names) EXT_NAMES(tp, i, BOOLCOUNT, (i - (tp->num_Booleans - tp->ext_Booleans)), names)
-Index: man/curs_variables.3x
-Prereq:  1.6 
---- ncurses-6.0-20150815+/man/curs_variables.3x	2013-12-21 18:41:32.000000000 +0000
-+++ ncurses-6.0-20150822/man/curs_variables.3x	2015-08-22 23:33:22.000000000 +0000
+--- a/man/curs_variables.3x
++++ b/man/curs_variables.3x
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
 -.\" Copyright (c) 2010,2013 Free Software Foundation, Inc.                   *
@@ -18831,10 +18816,8 @@ Prereq:  1.6
  .SH SEE ALSO
  \fBcurses\fR(3X),
  \fBcurs_opaque\fR(3X),
-Index: ncurses/base/lib_color.c
-Prereq:  1.110 
---- ncurses-6.0-20150815+/ncurses/base/lib_color.c	2014-03-08 20:04:44.000000000 +0000
-+++ ncurses-6.0-20150822/ncurses/base/lib_color.c	2015-08-22 22:38:58.000000000 +0000
+--- a/ncurses/base/lib_color.c
++++ b/ncurses/base/lib_color.c
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
@@ -18860,9 +18843,8 @@ Prereq:  1.110
  
  #ifdef USE_TERM_DRIVER
      CallDriver_3(SP_PARM, td_initpair, pair, f, b);
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150815+/package/debian-mingw/changelog	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/debian-mingw/changelog	2015-08-17 08:41:12.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150815) unstable; urgency=low
 +ncurses6 (6.0+20150822) unstable; urgency=low
@@ -18874,9 +18856,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150815+/package/debian-mingw64/changelog	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/debian-mingw64/changelog	2015-08-17 08:41:12.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150815) unstable; urgency=low
 +ncurses6 (6.0+20150822) unstable; urgency=low
@@ -18888,9 +18869,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20150815+/package/debian/changelog	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/debian/changelog	2015-08-17 08:41:12.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150815) unstable; urgency=low
 +ncurses6 (6.0+20150822) unstable; urgency=low
@@ -18902,10 +18882,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.119 
---- ncurses-6.0-20150815+/package/mingw-ncurses.nsi	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/mingw-ncurses.nsi	2015-08-17 08:41:12.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.119 2015/08/15 15:13:47 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.120 2015/08/17 08:41:12 tom Exp $
@@ -18921,9 +18899,8 @@ Prereq:  1.119
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150815+/package/mingw-ncurses.spec	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/mingw-ncurses.spec	2015-08-17 08:41:12.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -18933,9 +18910,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150815+/package/ncurses.spec	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/ncurses.spec	2015-08-17 08:41:12.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
@@ -18945,10 +18921,8 @@ Index: package/ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: progs/infocmp.c
-Prereq:  1.133 
---- ncurses-6.0-20150815+/progs/infocmp.c	2015-05-27 00:57:41.000000000 +0000
-+++ ncurses-6.0-20150822/progs/infocmp.c	2015-08-22 23:54:25.000000000 +0000
+--- a/progs/infocmp.c
++++ b/progs/infocmp.c
 @@ -42,7 +42,7 @@
  
  #include <dump_entry.h>
@@ -18988,10 +18962,8 @@ Prereq:  1.133
  	,"  -g    format %'char' to %{number}"
  	,"  -i    analyze initialization/reset"
  	,"  -l    output terminfo names"
-Index: progs/tic.c
-Prereq:  1.211 
---- ncurses-6.0-20150815+/progs/tic.c	2015-07-04 21:12:41.000000000 +0000
-+++ ncurses-6.0-20150822/progs/tic.c	2015-08-22 23:49:57.000000000 +0000
+--- a/progs/tic.c
++++ b/progs/tic.c
 @@ -48,7 +48,7 @@
  #include <parametrized.h>
  #include <transform.h>
@@ -19027,10 +18999,8 @@ Prereq:  1.211
  	if (*name == 'k') {
  	    result[used].keycode = -1;
  	    result[used].name = name;
-Index: test/demo_menus.c
-Prereq:  1.54 
---- ncurses-6.0-20150815+/test/demo_menus.c	2014-09-05 08:34:06.000000000 +0000
-+++ ncurses-6.0-20150822/test/demo_menus.c	2015-08-22 22:59:56.000000000 +0000
+--- a/test/demo_menus.c
++++ b/test/demo_menus.c
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 2005-2013,2014 Free Software Foundation, Inc.              *
@@ -19058,10 +19028,8 @@ Prereq:  1.54
  }
  
  static void
-Index: test/savescreen.c
-Prereq:  1.27 
---- ncurses-6.0-20150815+/test/savescreen.c	2015-03-28 23:21:28.000000000 +0000
-+++ ncurses-6.0-20150822/test/savescreen.c	2015-08-22 22:40:22.000000000 +0000
+--- a/test/savescreen.c
++++ b/test/savescreen.c
 @@ -26,7 +26,7 @@
   * authorization.                                                           *
   ****************************************************************************/
diff --git a/packages/ncurses/6.0/130-ncurses-6.0-20150905.patch b/packages/ncurses/6.0/0003-ncurses-6.0-20150905.patch
similarity index 87%
rename from packages/ncurses/6.0/130-ncurses-6.0-20150905.patch
rename to packages/ncurses/6.0/0003-ncurses-6.0-20150905.patch
index 76dd45ca..61d82e2a 100644
--- a/packages/ncurses/6.0/130-ncurses-6.0-20150905.patch
+++ b/packages/ncurses/6.0/0003-ncurses-6.0-20150905.patch
@@ -13,58 +13,56 @@
 # patch by Thomas E. Dickey <dickey@invisible-island.net>
 # created  Sun Sep  6 01:23:48 UTC 2015
 # ------------------------------------------------------------------------------
-# NEWS                                |   12 ++
+# NEWS                                |   12 ++-
 # VERSION                             |    2 
-# dist.mk                             |    4 
+# dist.mk                             |    4 -
 # doc/html/man/captoinfo.1m.html      |    2 
 # doc/html/man/clear.1.html           |    2 
 # doc/html/man/curs_addch.3x.html     |   50 ++++++++----
-# doc/html/man/curs_attr.3x.html      |    4 
+# doc/html/man/curs_attr.3x.html      |    4 -
 # doc/html/man/curs_variables.3x.html |   21 ++++-
 # doc/html/man/form.3x.html           |    2 
-# doc/html/man/infocmp.1m.html        |   77 +++++++++++-------
+# doc/html/man/infocmp.1m.html        |   77 +++++++++++--------
 # doc/html/man/infotocap.1m.html      |    2 
 # doc/html/man/menu.3x.html           |    2 
 # doc/html/man/ncurses.3x.html        |    2 
 # doc/html/man/panel.3x.html          |    2 
 # doc/html/man/tabs.1.html            |    2 
 # doc/html/man/terminfo.5.html        |    2 
-# doc/html/man/tic.1m.html            |  139 ++++++++++++++++++----------------
-# doc/html/man/toe.1m.html            |   39 +++++----
+# doc/html/man/tic.1m.html            |  139 +++++++++++++++++++-----------------
+# doc/html/man/toe.1m.html            |   39 +++++-----
 # doc/html/man/tput.1.html            |    2 
 # doc/html/man/tset.1.html            |    2 
 # include/term_entry.h                |    3 
 # man/curs_addch.3x                   |   19 ++++
 # man/curs_attr.3x                    |    6 -
-# man/curs_threads.3x                 |    4 
-# man/infocmp.1m                      |   26 +++++-
+# man/curs_threads.3x                 |    4 -
+# man/infocmp.1m                      |   26 ++++++
 # man/tic.1m                          |   25 +++++-
 # man/toe.1m                          |    7 +
 # ncurses/tinfo/write_entry.c         |   13 +--
-# package/debian-mingw/changelog      |    4 
-# package/debian-mingw64/changelog    |    4 
-# package/debian/changelog            |    4 
-# package/mingw-ncurses.nsi           |    4 
+# package/debian-mingw/changelog      |    4 -
+# package/debian-mingw64/changelog    |    4 -
+# package/debian/changelog            |    4 -
+# package/mingw-ncurses.nsi           |    4 -
 # package/mingw-ncurses.spec          |    2 
-# package/ncurses.map                 |    9 +-
+# package/ncurses.map                 |    9 ++
 # package/ncurses.spec                |    2 
 # package/ncurses.sym                 |    3 
-# package/ncursest.map                |    9 +-
+# package/ncursest.map                |    9 ++
 # package/ncursest.sym                |    3 
-# package/ncursestw.map               |    9 +-
+# package/ncursestw.map               |    9 ++
 # package/ncursestw.sym               |    3 
-# package/ncursesw.map                |    9 +-
+# package/ncursesw.map                |    9 ++
 # package/ncursesw.sym                |    3 
-# progs/dump_entry.c                  |   96 +++++++++++++++++++++--
+# progs/dump_entry.c                  |   96 ++++++++++++++++++++++--
 # progs/dump_entry.h                  |    5 -
 # progs/infocmp.c                     |   21 +++--
-# progs/tic.c                         |   47 ++++++++---
+# progs/tic.c                         |   47 ++++++++----
 # 46 files changed, 491 insertions(+), 219 deletions(-)
 # ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2487 
---- ncurses-6.0-20150822+/NEWS	2015-08-22 23:55:21.000000000 +0000
-+++ ncurses-6.0-20150905/NEWS	2015-09-05 21:14:36.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -91,16 +89,13 @@ Prereq:  1.2487
  20150822
  	+ sort options in usage message for infocmp, to make it simpler to
  	  see unused letters.
-Index: VERSION
---- ncurses-6.0-20150822+/VERSION	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/VERSION	2015-09-05 21:14:02.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20150822
 +5:0:9	6.0	20150905
-Index: dist.mk
-Prereq:  1.1067 
---- ncurses-6.0-20150822+/dist.mk	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/dist.mk	2015-09-05 21:14:02.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -119,9 +114,8 @@ Prereq:  1.1067
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20150822+/doc/html/man/captoinfo.1m.html	2015-08-08 18:45:46.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/captoinfo.1m.html	2015-09-05 21:19:32.000000000 +0000
+--- a/doc/html/man/captoinfo.1m.html
++++ b/doc/html/man/captoinfo.1m.html
 @@ -205,7 +205,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -131,9 +125,8 @@ Index: doc/html/man/captoinfo.1m.html
  
  
  </PRE>
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20150822+/doc/html/man/clear.1.html	2015-08-08 18:45:46.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/clear.1.html	2015-09-05 21:19:32.000000000 +0000
+--- a/doc/html/man/clear.1.html
++++ b/doc/html/man/clear.1.html
 @@ -71,7 +71,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -143,9 +136,8 @@ Index: doc/html/man/clear.1.html
  
  
  
-Index: doc/html/man/curs_addch.3x.html
---- ncurses-6.0-20150822+/doc/html/man/curs_addch.3x.html	2015-07-16 09:29:40.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/curs_addch.3x.html	2015-09-05 21:19:33.000000000 +0000
+--- a/doc/html/man/curs_addch.3x.html
++++ b/doc/html/man/curs_addch.3x.html
 @@ -136,8 +136,11 @@
         characters to the screen with routines of the  <STRONG>addch</STRONG>  fam-
         ily.   The  default  character listed below is used if the
@@ -230,9 +222,8 @@ Index: doc/html/man/curs_addch.3x.html
         The <STRONG>TABSIZE</STRONG> variable is implemented in  some  versions  of
         curses, but is not part of X/Open curses.
  
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20150822+/doc/html/man/curs_attr.3x.html	2015-07-22 00:49:55.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/curs_attr.3x.html	2015-09-05 23:05:55.000000000 +0000
+--- a/doc/html/man/curs_attr.3x.html
++++ b/doc/html/man/curs_attr.3x.html
 @@ -173,8 +173,8 @@
  <H3><a name="h3-Attributes">Attributes</a></H3><PRE>
         The following video attributes, defined in <STRONG>&lt;curses.h&gt;</STRONG>, can
@@ -244,9 +235,8 @@ Index: doc/html/man/curs_attr.3x.html
  
                <EM>Name</EM>            <EM>Description</EM>
                ------------------------------------------------------------
-Index: doc/html/man/curs_variables.3x.html
---- ncurses-6.0-20150822+/doc/html/man/curs_variables.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/curs_variables.3x.html	2015-09-05 21:19:36.000000000 +0000
+--- a/doc/html/man/curs_variables.3x.html
++++ b/doc/html/man/curs_variables.3x.html
 @@ -1,6 +1,6 @@
  <!-- 
    ****************************************************************************
@@ -291,9 +281,8 @@ Index: doc/html/man/curs_variables.3x.html
         <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
  
  
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20150822+/doc/html/man/form.3x.html	2015-08-08 18:45:50.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/form.3x.html	2015-09-05 21:19:36.000000000 +0000
+--- a/doc/html/man/form.3x.html
++++ b/doc/html/man/form.3x.html
 @@ -245,7 +245,7 @@
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for
         detailed descriptions of the entry points.
@@ -303,9 +292,8 @@ Index: doc/html/man/form.3x.html
  
  
  
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20150822+/doc/html/man/infocmp.1m.html	2015-08-08 18:45:51.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/infocmp.1m.html	2015-09-05 21:19:38.000000000 +0000
+--- a/doc/html/man/infocmp.1m.html
++++ b/doc/html/man/infocmp.1m.html
 @@ -27,7 +27,7 @@
    * sale, use or other dealings in this Software without prior written       *
    * authorization.                                                           *
@@ -464,9 +452,8 @@ Index: doc/html/man/infocmp.1m.html
  
  
  </PRE>
-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20150822+/doc/html/man/infotocap.1m.html	2015-08-08 18:45:51.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/infotocap.1m.html	2015-09-05 21:19:38.000000000 +0000
+--- a/doc/html/man/infotocap.1m.html
++++ b/doc/html/man/infotocap.1m.html
 @@ -94,7 +94,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -476,9 +463,8 @@ Index: doc/html/man/infotocap.1m.html
  
  
  </PRE>
-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20150822+/doc/html/man/menu.3x.html	2015-08-08 18:45:52.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/menu.3x.html	2015-09-05 21:19:38.000000000 +0000
+--- a/doc/html/man/menu.3x.html
++++ b/doc/html/man/menu.3x.html
 @@ -227,7 +227,7 @@
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for
         detailed descriptions of the entry points.
@@ -488,9 +474,8 @@ Index: doc/html/man/menu.3x.html
  
  
  
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20150822+/doc/html/man/ncurses.3x.html	2015-08-08 18:45:53.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/ncurses.3x.html	2015-09-05 21:19:39.000000000 +0000
+--- a/doc/html/man/ncurses.3x.html
++++ b/doc/html/man/ncurses.3x.html
 @@ -63,7 +63,7 @@
         sonable optimization.  This implementation is "new curses"
         (ncurses) and is the approved replacement for 4.4BSD clas-
@@ -500,9 +485,8 @@ Index: doc/html/man/ncurses.3x.html
  
         The <STRONG>ncurses</STRONG> library emulates the curses library of  System
         V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20150822+/doc/html/man/panel.3x.html	2015-08-08 18:45:53.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/panel.3x.html	2015-09-05 21:19:39.000000000 +0000
+--- a/doc/html/man/panel.3x.html
++++ b/doc/html/man/panel.3x.html
 @@ -218,7 +218,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
@@ -512,9 +496,8 @@ Index: doc/html/man/panel.3x.html
  
  
  </PRE>
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20150822+/doc/html/man/tabs.1.html	2015-08-08 18:45:53.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tabs.1.html	2015-09-05 21:19:40.000000000 +0000
+--- a/doc/html/man/tabs.1.html
++++ b/doc/html/man/tabs.1.html
 @@ -168,7 +168,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -524,9 +507,8 @@ Index: doc/html/man/tabs.1.html
  
  
  
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20150822+/doc/html/man/terminfo.5.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/terminfo.5.html	2015-09-05 21:19:40.000000000 +0000
+--- a/doc/html/man/terminfo.5.html
++++ b/doc/html/man/terminfo.5.html
 @@ -78,7 +78,7 @@
         nals by giving a set of capabilities which they  have,  by
         specifying how to perform screen operations, and by speci-
@@ -536,9 +518,8 @@ Index: doc/html/man/terminfo.5.html
  
         Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
         fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20150822+/doc/html/man/tic.1m.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tic.1m.html	2015-09-05 21:19:40.000000000 +0000
+--- a/doc/html/man/tic.1m.html
++++ b/doc/html/man/tic.1m.html
 @@ -1,6 +1,6 @@
  <!-- 
    ****************************************************************************
@@ -798,9 +779,8 @@ Index: doc/html/man/tic.1m.html
  
  
  </PRE>
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20150822+/doc/html/man/toe.1m.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/toe.1m.html	2015-09-05 21:19:40.000000000 +0000
+--- a/doc/html/man/toe.1m.html
++++ b/doc/html/man/toe.1m.html
 @@ -1,6 +1,6 @@
  <!-- 
    ****************************************************************************
@@ -883,9 +863,8 @@ Index: doc/html/man/toe.1m.html
  
  
  
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20150822+/doc/html/man/tput.1.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tput.1.html	2015-09-05 21:19:40.000000000 +0000
+--- a/doc/html/man/tput.1.html
++++ b/doc/html/man/tput.1.html
 @@ -338,7 +338,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
@@ -895,9 +874,8 @@ Index: doc/html/man/tput.1.html
  
  
  
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20150822+/doc/html/man/tset.1.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tset.1.html	2015-09-05 21:19:40.000000000 +0000
+--- a/doc/html/man/tset.1.html
++++ b/doc/html/man/tset.1.html
 @@ -319,7 +319,7 @@
         <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,
         <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
@@ -907,10 +885,8 @@ Index: doc/html/man/tset.1.html
  
  
  
-Index: include/term_entry.h
-Prereq:  1.46 
---- ncurses-6.0-20150822+/include/term_entry.h	2015-08-22 23:04:25.000000000 +0000
-+++ ncurses-6.0-20150905/include/term_entry.h	2015-08-30 00:41:20.000000000 +0000
+--- a/include/term_entry.h
++++ b/include/term_entry.h
 @@ -32,7 +32,7 @@
   *     and: Thomas E. Dickey                        1998-on                 *
   ****************************************************************************/
@@ -928,10 +904,8 @@ Prereq:  1.46
  
  /* comp_parse.c: entry list handling */
  extern NCURSES_EXPORT(void) _nc_read_entry_source (FILE*, char*, int, bool, bool (*)(ENTRY*));
-Index: man/curs_addch.3x
-Prereq:  1.36 
---- ncurses-6.0-20150822+/man/curs_addch.3x	2015-07-16 09:14:44.000000000 +0000
-+++ ncurses-6.0-20150905/man/curs_addch.3x	2015-09-05 21:13:25.000000000 +0000
+--- a/man/curs_addch.3x
++++ b/man/curs_addch.3x
 @@ -27,7 +27,7 @@
  .\" authorization.                                                           *
  .\"***************************************************************************
@@ -972,10 +946,8 @@ Prereq:  1.36
  The \fBTABSIZE\fR variable is implemented in some versions of curses,
  but is not part of X/Open curses.
  .LP
-Index: man/curs_attr.3x
-Prereq:  1.40 
---- ncurses-6.0-20150822+/man/curs_attr.3x	2015-07-20 23:35:38.000000000 +0000
-+++ ncurses-6.0-20150905/man/curs_attr.3x	2015-09-05 21:13:25.000000000 +0000
+--- a/man/curs_attr.3x
++++ b/man/curs_attr.3x
 @@ -27,7 +27,7 @@
  .\" authorization.                                                           *
  .\"***************************************************************************
@@ -1003,10 +975,8 @@ Prereq:  1.40
  .PP
  .RS
  .TS
-Index: man/curs_threads.3x
-Prereq:  1.21 
---- ncurses-6.0-20150822+/man/curs_threads.3x	2015-04-11 10:23:49.000000000 +0000
-+++ ncurses-6.0-20150905/man/curs_threads.3x	2015-09-05 21:13:25.000000000 +0000
+--- a/man/curs_threads.3x
++++ b/man/curs_threads.3x
 @@ -26,7 +26,7 @@
  .\" authorization.                                                           *
  .\"***************************************************************************
@@ -1025,10 +995,8 @@ Prereq:  1.21
  it makes functions of the common global variables,
  e.g.,
  COLORS,
-Index: man/infocmp.1m
-Prereq:  1.56 
---- ncurses-6.0-20150822+/man/infocmp.1m	2015-05-23 20:50:00.000000000 +0000
-+++ ncurses-6.0-20150905/man/infocmp.1m	2015-09-05 20:50:22.000000000 +0000
+--- a/man/infocmp.1m
++++ b/man/infocmp.1m
 @@ -27,7 +27,7 @@
  .\" authorization.                                                           *
  .\"***************************************************************************
@@ -1079,10 +1047,8 @@ Prereq:  1.56
  .TP 5
  \fB\-R\fR\fIsubset\fR
  Restrict output to a given subset.
-Index: man/tic.1m
-Prereq:  1.60 
---- ncurses-6.0-20150822+/man/tic.1m	2014-05-24 22:00:11.000000000 +0000
-+++ ncurses-6.0-20150905/man/tic.1m	2015-09-05 20:45:49.000000000 +0000
+--- a/man/tic.1m
++++ b/man/tic.1m
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
 -.\" Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
@@ -1141,10 +1107,8 @@ Prereq:  1.60
  \fB\-R\fR\fIsubset\fR
  Restrict output to a given subset.
  This option is for use with archaic
-Index: man/toe.1m
-Prereq:  1.26 
---- ncurses-6.0-20150822+/man/toe.1m	2012-01-01 00:40:51.000000000 +0000
-+++ ncurses-6.0-20150905/man/toe.1m	2015-08-29 22:04:48.000000000 +0000
+--- a/man/toe.1m
++++ b/man/toe.1m
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
 -.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
@@ -1171,10 +1135,8 @@ Prereq:  1.26
  .TP
  \fB\-s\fR
  sort the output by the entry names.
-Index: ncurses/tinfo/write_entry.c
-Prereq:  1.92 
---- ncurses-6.0-20150822+/ncurses/tinfo/write_entry.c	2014-11-01 14:47:00.000000000 +0000
-+++ ncurses-6.0-20150905/ncurses/tinfo/write_entry.c	2015-09-05 21:24:29.000000000 +0000
+--- a/ncurses/tinfo/write_entry.c
++++ b/ncurses/tinfo/write_entry.c
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
@@ -1225,9 +1187,8 @@ Prereq:  1.92
  {
      char *namelist;
      size_t namelen, boolmax, nummax, strmax;
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150822+/package/debian-mingw/changelog	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/debian-mingw/changelog	2015-09-05 21:14:03.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150822) unstable; urgency=low
 +ncurses6 (6.0+20150905) unstable; urgency=low
@@ -1239,9 +1200,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150822+/package/debian-mingw64/changelog	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/debian-mingw64/changelog	2015-09-05 21:14:03.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150822) unstable; urgency=low
 +ncurses6 (6.0+20150905) unstable; urgency=low
@@ -1253,9 +1213,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20150822+/package/debian/changelog	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/debian/changelog	2015-09-05 21:14:03.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150822) unstable; urgency=low
 +ncurses6 (6.0+20150905) unstable; urgency=low
@@ -1267,10 +1226,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.120 
---- ncurses-6.0-20150822+/package/mingw-ncurses.nsi	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/mingw-ncurses.nsi	2015-09-05 21:14:03.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.120 2015/08/17 08:41:12 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.122 2015/09/05 21:14:03 tom Exp $
@@ -1286,9 +1243,8 @@ Prereq:  1.120
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150822+/package/mingw-ncurses.spec	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/mingw-ncurses.spec	2015-09-05 21:14:03.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -1298,10 +1254,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.map
-Prereq:  1.34 
---- ncurses-6.0-20150822+/package/ncurses.map	2015-06-27 22:28:50.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncurses.map	2015-09-05 19:27:16.000000000 +0000
+--- a/package/ncurses.map
++++ b/package/ncurses.map
 @@ -1,4 +1,4 @@
 -# $Id: ncurses.map,v 1.34 2015/06/27 22:28:50 tom Exp $
 +# $Id: ncurses.map,v 1.35 2015/09/05 19:27:16 tom Exp $
@@ -1322,9 +1276,8 @@ Prereq:  1.34
  NCURSES_TINFO_5.0.19991023 {
  	global:
  		BC;
-Index: package/ncurses.spec
---- ncurses-6.0-20150822+/package/ncurses.spec	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncurses.spec	2015-09-05 21:14:03.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
@@ -1334,10 +1287,8 @@ Index: package/ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.sym
-Prereq:  1.23 
---- ncurses-6.0-20150822+/package/ncurses.sym	2015-06-27 22:30:44.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncurses.sym	2015-09-05 19:36:49.000000000 +0000
+--- a/package/ncurses.sym
++++ b/package/ncurses.sym
 @@ -1,4 +1,4 @@
 -# $Id: ncurses.sym,v 1.23 2015/06/27 22:30:44 tom Exp $
 +# $Id: ncurses.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
@@ -1352,10 +1303,8 @@ Prereq:  1.23
  _traceattr
  _traceattr2
  _tracechar
-Index: package/ncursest.map
-Prereq:  1.30 
---- ncurses-6.0-20150822+/package/ncursest.map	2015-07-11 13:01:10.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursest.map	2015-09-05 19:35:45.000000000 +0000
+--- a/package/ncursest.map
++++ b/package/ncursest.map
 @@ -1,4 +1,4 @@
 -# $Id: ncursest.map,v 1.30 2015/07/11 13:01:10 tom Exp $
 +# $Id: ncursest.map,v 1.31 2015/09/05 19:35:45 tom Exp $
@@ -1376,10 +1325,8 @@ Prereq:  1.30
  NCURSES_TINFO_5.0.19991023 {
  	global:
  		BC;
-Index: package/ncursest.sym
-Prereq:  1.25 
---- ncurses-6.0-20150822+/package/ncursest.sym	2015-07-11 23:33:50.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursest.sym	2015-09-05 19:36:49.000000000 +0000
+--- a/package/ncursest.sym
++++ b/package/ncursest.sym
 @@ -1,4 +1,4 @@
 -# $Id: ncursest.sym,v 1.25 2015/07/11 23:33:50 tom Exp $
 +# $Id: ncursest.sym,v 1.26 2015/09/05 19:36:49 tom Exp $
@@ -1394,10 +1341,8 @@ Prereq:  1.25
  _traceattr
  _traceattr2
  _tracechtype
-Index: package/ncursestw.map
-Prereq:  1.31 
---- ncurses-6.0-20150822+/package/ncursestw.map	2015-07-11 13:02:44.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursestw.map	2015-09-05 19:35:05.000000000 +0000
+--- a/package/ncursestw.map
++++ b/package/ncursestw.map
 @@ -1,4 +1,4 @@
 -# $Id: ncursestw.map,v 1.31 2015/07/11 13:02:44 tom Exp $
 +# $Id: ncursestw.map,v 1.32 2015/09/05 19:35:05 tom Exp $
@@ -1418,10 +1363,8 @@ Prereq:  1.31
  NCURSES_TINFO_5.0.19991023 {
  	global:
  		BC;
-Index: package/ncursestw.sym
-Prereq:  1.23 
---- ncurses-6.0-20150822+/package/ncursestw.sym	2015-07-11 23:33:35.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursestw.sym	2015-09-05 19:36:49.000000000 +0000
+--- a/package/ncursestw.sym
++++ b/package/ncursestw.sym
 @@ -1,4 +1,4 @@
 -# $Id: ncursestw.sym,v 1.23 2015/07/11 23:33:35 tom Exp $
 +# $Id: ncursestw.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
@@ -1436,10 +1379,8 @@ Prereq:  1.23
  _traceattr
  _traceattr2
  _tracecchar_t
-Index: package/ncursesw.map
-Prereq:  1.36 
---- ncurses-6.0-20150822+/package/ncursesw.map	2015-06-27 22:26:52.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursesw.map	2015-09-05 19:33:48.000000000 +0000
+--- a/package/ncursesw.map
++++ b/package/ncursesw.map
 @@ -1,4 +1,4 @@
 -# $Id: ncursesw.map,v 1.36 2015/06/27 22:26:52 tom Exp $
 +# $Id: ncursesw.map,v 1.37 2015/09/05 19:33:48 tom Exp $
@@ -1460,10 +1401,8 @@ Prereq:  1.36
  NCURSES_TINFO_5.0.19991023 {
  	global:
  		BC;
-Index: package/ncursesw.sym
-Prereq:  1.24 
---- ncurses-6.0-20150822+/package/ncursesw.sym	2015-06-27 22:30:29.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursesw.sym	2015-09-05 19:36:49.000000000 +0000
+--- a/package/ncursesw.sym
++++ b/package/ncursesw.sym
 @@ -1,4 +1,4 @@
 -# $Id: ncursesw.sym,v 1.24 2015/06/27 22:30:29 tom Exp $
 +# $Id: ncursesw.sym,v 1.25 2015/09/05 19:36:49 tom Exp $
@@ -1478,10 +1417,8 @@ Prereq:  1.24
  _traceattr
  _traceattr2
  _tracecchar_t
-Index: progs/dump_entry.c
-Prereq:  1.118 
---- ncurses-6.0-20150822+/progs/dump_entry.c	2015-07-07 08:06:39.000000000 +0000
-+++ ncurses-6.0-20150905/progs/dump_entry.c	2015-09-05 23:31:12.000000000 +0000
+--- a/progs/dump_entry.c
++++ b/progs/dump_entry.c
 @@ -39,9 +39,8 @@
  #include "termsort.c"		/* this C file is generated */
  #include <parametrized.h>	/* so is this */
@@ -1676,10 +1613,8 @@ Prereq:  1.118
      return (int) outbuf.used;
  }
  
-Index: progs/dump_entry.h
-Prereq:  1.35 
---- ncurses-6.0-20150822+/progs/dump_entry.h	2015-05-27 00:56:54.000000000 +0000
-+++ ncurses-6.0-20150905/progs/dump_entry.h	2015-09-05 15:49:58.000000000 +0000
+--- a/progs/dump_entry.h
++++ b/progs/dump_entry.h
 @@ -33,7 +33,7 @@
   ****************************************************************************/
  
@@ -1699,10 +1634,8 @@ Prereq:  1.35
  extern void dump_uses(const char *, bool);
  extern void repair_acsc(TERMTYPE *tp);
  
-Index: progs/infocmp.c
-Prereq:  1.134 
---- ncurses-6.0-20150822+/progs/infocmp.c	2015-08-22 23:54:25.000000000 +0000
-+++ ncurses-6.0-20150905/progs/infocmp.c	2015-09-05 15:49:57.000000000 +0000
+--- a/progs/infocmp.c
++++ b/progs/infocmp.c
 @@ -42,7 +42,7 @@
  
  #include <dump_entry.h>
@@ -1780,10 +1713,8 @@ Prereq:  1.134
  		dump_entry(&entries[0].tterm,
  			   suppress_untranslatable,
  			   limited,
-Index: progs/tic.c
-Prereq:  1.213 
---- ncurses-6.0-20150822+/progs/tic.c	2015-08-22 23:49:57.000000000 +0000
-+++ ncurses-6.0-20150905/progs/tic.c	2015-09-05 19:22:49.000000000 +0000
+--- a/progs/tic.c
++++ b/progs/tic.c
 @@ -48,7 +48,7 @@
  #include <parametrized.h>
  #include <transform.h>
diff --git a/packages/ncurses/6.0/140-ncurses-6.0-20150912.patch b/packages/ncurses/6.0/0004-ncurses-6.0-20150912.patch
similarity index 99%
rename from packages/ncurses/6.0/140-ncurses-6.0-20150912.patch
rename to packages/ncurses/6.0/0004-ncurses-6.0-20150912.patch
index 4d698f49..9678c087 100644
--- a/packages/ncurses/6.0/140-ncurses-6.0-20150912.patch
+++ b/packages/ncurses/6.0/0004-ncurses-6.0-20150912.patch
@@ -16,7 +16,7 @@
 # NEWS                             |   16 
 # VERSION                          |    2 
 # aclocal.m4                       |   68 
-# configure                        | 3106 ++++++++++++++++++-------------------
+# configure                        | 3106 +++++++++++++++++++--------------------
 # dist.mk                          |    4 
 # include/ncurses_cfg.hin          |    8 
 # ncurses/base/lib_screen.c        |    3 
@@ -28,10 +28,8 @@
 # package/ncurses.spec             |    2 
 # 13 files changed, 1651 insertions(+), 1576 deletions(-)
 # ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2490 
---- ncurses-6.0-20150905+/NEWS	2015-09-05 21:14:36.000000000 +0000
-+++ ncurses-6.0-20150912/NEWS	2015-09-12 19:52:57.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -69,16 +67,13 @@ Prereq:  1.2490
  	  Joshua Root).
  
  20150815
-Index: VERSION
---- ncurses-6.0-20150905+/VERSION	2015-09-05 21:14:02.000000000 +0000
-+++ ncurses-6.0-20150912/VERSION	2015-09-12 16:17:30.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20150905
 +5:0:9	6.0	20150912
-Index: aclocal.m4
-Prereq:  1.765 
---- ncurses-6.0-20150905+/aclocal.m4	2015-08-22 21:12:39.000000000 +0000
-+++ ncurses-6.0-20150912/aclocal.m4	2015-09-12 20:00:59.000000000 +0000
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -196,9 +191,8 @@ Prereq:  1.765
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-Index: configure
---- ncurses-6.0-20150905+/configure	2015-08-22 21:08:03.000000000 +0000
-+++ ncurses-6.0-20150912/configure	2015-09-12 20:01:47.000000000 +0000
+--- a/configure
++++ b/configure
 @@ -5456,7 +5456,7 @@
  fi
  
@@ -10606,10 +10600,8 @@ Index: configure
  
  					with_shared_cxx=yes
  					;;
-Index: dist.mk
-Prereq:  1.1069 
---- ncurses-6.0-20150905+/dist.mk	2015-09-05 21:14:02.000000000 +0000
-+++ ncurses-6.0-20150912/dist.mk	2015-09-12 16:17:30.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -10628,10 +10620,8 @@ Prereq:  1.1069
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: include/ncurses_cfg.hin
-Prereq:  1.7 
---- ncurses-6.0-20150905+/include/ncurses_cfg.hin	2005-01-02 01:26:58.000000000 +0000
-+++ ncurses-6.0-20150912/include/ncurses_cfg.hin	2015-09-12 20:49:54.000000000 +0000
+--- a/include/ncurses_cfg.hin
++++ b/include/ncurses_cfg.hin
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
@@ -10661,10 +10651,8 @@ Prereq:  1.7
  #if defined(lint) || defined(TRACE)
  #undef inline
  #define inline /* nothing */
-Index: ncurses/base/lib_screen.c
-Prereq:  1.77 
---- ncurses-6.0-20150905+/ncurses/base/lib_screen.c	2015-07-04 22:54:14.000000000 +0000
-+++ ncurses-6.0-20150912/ncurses/base/lib_screen.c	2015-09-12 20:47:43.000000000 +0000
+--- a/ncurses/base/lib_screen.c
++++ b/ncurses/base/lib_screen.c
 @@ -41,7 +41,7 @@
  #define CUR SP_TERMTYPE
  #endif
@@ -10682,9 +10670,8 @@ Prereq:  1.77
  #endif
  }
  #endif
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150905+/package/debian-mingw/changelog	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/debian-mingw/changelog	2015-09-12 16:17:30.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150905) unstable; urgency=low
 +ncurses6 (6.0+20150912) unstable; urgency=low
@@ -10696,9 +10683,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150905+/package/debian-mingw64/changelog	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/debian-mingw64/changelog	2015-09-12 16:17:30.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150905) unstable; urgency=low
 +ncurses6 (6.0+20150912) unstable; urgency=low
@@ -10710,9 +10696,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20150905+/package/debian/changelog	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/debian/changelog	2015-09-12 16:17:30.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150905) unstable; urgency=low
 +ncurses6 (6.0+20150912) unstable; urgency=low
@@ -10724,10 +10709,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.122 
---- ncurses-6.0-20150905+/package/mingw-ncurses.nsi	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/mingw-ncurses.nsi	2015-09-12 16:17:30.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.122 2015/09/05 21:14:03 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.123 2015/09/12 16:17:30 tom Exp $
@@ -10743,9 +10726,8 @@ Prereq:  1.122
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150905+/package/mingw-ncurses.spec	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/mingw-ncurses.spec	2015-09-12 16:17:30.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -10755,9 +10737,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150905+/package/ncurses.spec	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/ncurses.spec	2015-09-12 16:17:30.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
diff --git a/packages/ncurses/6.0/150-ncurses-6.0-20150919.patch b/packages/ncurses/6.0/0005-ncurses-6.0-20150919.patch
similarity index 97%
rename from packages/ncurses/6.0/150-ncurses-6.0-20150919.patch
rename to packages/ncurses/6.0/0005-ncurses-6.0-20150919.patch
index 13646a76..865c94e7 100644
--- a/packages/ncurses/6.0/150-ncurses-6.0-20150919.patch
+++ b/packages/ncurses/6.0/0005-ncurses-6.0-20150919.patch
@@ -13,7 +13,7 @@
 # patch by Thomas E. Dickey <dickey@invisible-island.net>
 # created  Sun Sep 20 01:24:12 UTC 2015
 # ------------------------------------------------------------------------------
-# Ada95/configure                   | 2807 ++++++++++++++++++++----------------
+# Ada95/configure                   | 2807 ++++++++++++++++++++++----------------
 # Ada95/configure.in                |   13 
 # NEWS                              |   10 
 # VERSION                           |    2 
@@ -46,9 +46,8 @@
 # package/ncurses.spec              |    2 
 # 31 files changed, 1806 insertions(+), 1268 deletions(-)
 # ------------------------------------------------------------------------------
-Index: Ada95/configure
---- ncurses-6.0-20150912+/Ada95/configure	2015-08-22 21:14:42.000000000 +0000
-+++ ncurses-6.0-20150919/Ada95/configure	2015-09-19 20:50:21.000000000 +0000
+--- a/Ada95/configure
++++ b/Ada95/configure
 @@ -1,5 +1,5 @@
  #! /bin/sh
 -# From configure.in Revision: 1.60 .
@@ -8456,10 +8455,8 @@ Index: Ada95/configure
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: Ada95/configure.in
-Prereq:  1.60 
---- ncurses-6.0-20150912+/Ada95/configure.in	2015-04-18 18:49:57.000000000 +0000
-+++ ncurses-6.0-20150919/Ada95/configure.in	2015-09-19 20:33:36.000000000 +0000
+--- a/Ada95/configure.in
++++ b/Ada95/configure.in
 @@ -28,14 +28,14 @@
  dnl
  dnl Author: Thomas E. Dickey
@@ -8500,10 +8497,8 @@ Prereq:  1.60
  AC_OUTPUT( \
  	$SUB_MAKEFILES \
  	doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \
-Index: NEWS
-Prereq:  1.2493 
---- ncurses-6.0-20150912+/NEWS	2015-09-12 19:52:57.000000000 +0000
-+++ ncurses-6.0-20150919/NEWS	2015-09-19 23:04:21.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -8528,16 +8523,13 @@ Prereq:  1.2493
  20150912
  	+ fixes for configure/build using clang on OSX (prompted by report by
  	  William Gallafent).
-Index: VERSION
---- ncurses-6.0-20150912+/VERSION	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/VERSION	2015-09-19 19:40:14.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20150912
 +5:0:9	6.0	20150919
-Index: dist.mk
-Prereq:  1.1070 
---- ncurses-6.0-20150912+/dist.mk	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/dist.mk	2015-09-19 19:40:14.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -8556,9 +8548,8 @@ Prereq:  1.1070
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20150912+/doc/html/man/captoinfo.1m.html	2015-09-05 21:19:32.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/captoinfo.1m.html	2015-09-19 23:18:49.000000000 +0000
+--- a/doc/html/man/captoinfo.1m.html
++++ b/doc/html/man/captoinfo.1m.html
 @@ -205,7 +205,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -8568,9 +8559,8 @@ Index: doc/html/man/captoinfo.1m.html
  
  
  </PRE>
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20150912+/doc/html/man/clear.1.html	2015-09-05 21:19:32.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/clear.1.html	2015-09-19 23:18:49.000000000 +0000
+--- a/doc/html/man/clear.1.html
++++ b/doc/html/man/clear.1.html
 @@ -71,7 +71,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -8580,9 +8570,8 @@ Index: doc/html/man/clear.1.html
  
  
  
-Index: doc/html/man/curs_addch.3x.html
---- ncurses-6.0-20150912+/doc/html/man/curs_addch.3x.html	2015-09-05 21:19:33.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/curs_addch.3x.html	2015-09-19 23:18:49.000000000 +0000
+--- a/doc/html/man/curs_addch.3x.html
++++ b/doc/html/man/curs_addch.3x.html
 @@ -27,7 +27,7 @@
    * sale, use or other dealings in this Software without prior written       *
    * authorization.                                                           *
@@ -8592,9 +8581,8 @@ Index: doc/html/man/curs_addch.3x.html
  -->
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
  <HTML>
-Index: doc/html/man/curs_getch.3x.html
---- ncurses-6.0-20150912+/doc/html/man/curs_getch.3x.html	2015-07-22 00:49:56.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/curs_getch.3x.html	2015-09-19 23:18:50.000000000 +0000
+--- a/doc/html/man/curs_getch.3x.html
++++ b/doc/html/man/curs_getch.3x.html
 @@ -27,7 +27,7 @@
    * sale, use or other dealings in this Software without prior written       *
    * authorization.                                                           *
@@ -8802,9 +8790,8 @@ Index: doc/html/man/curs_getch.3x.html
         brary are described in <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>.
  
  
-Index: doc/html/man/curs_threads.3x.html
---- ncurses-6.0-20150912+/doc/html/man/curs_threads.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/curs_threads.3x.html	2015-09-19 23:18:52.000000000 +0000
+--- a/doc/html/man/curs_threads.3x.html
++++ b/doc/html/man/curs_threads.3x.html
 @@ -26,7 +26,7 @@
    * sale, use or other dealings in this Software without prior written       *
    * authorization.                                                           *
@@ -8814,9 +8801,8 @@ Index: doc/html/man/curs_threads.3x.html
    * ***************************************************************************
    * ***************************************************************************
  -->
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20150912+/doc/html/man/form.3x.html	2015-09-05 21:19:36.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/form.3x.html	2015-09-19 23:18:53.000000000 +0000
+--- a/doc/html/man/form.3x.html
++++ b/doc/html/man/form.3x.html
 @@ -245,7 +245,7 @@
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for
         detailed descriptions of the entry points.
@@ -8826,9 +8812,8 @@ Index: doc/html/man/form.3x.html
  
  
  
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20150912+/doc/html/man/infocmp.1m.html	2015-09-05 21:19:38.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/infocmp.1m.html	2015-09-19 23:18:54.000000000 +0000
+--- a/doc/html/man/infocmp.1m.html
++++ b/doc/html/man/infocmp.1m.html
 @@ -487,7 +487,7 @@
  
         http://invisible-island.net/ncurses/tctest.html
@@ -8838,9 +8823,8 @@ Index: doc/html/man/infocmp.1m.html
  
  
  </PRE>
-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20150912+/doc/html/man/infotocap.1m.html	2015-09-05 21:19:38.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/infotocap.1m.html	2015-09-19 23:18:54.000000000 +0000
+--- a/doc/html/man/infotocap.1m.html
++++ b/doc/html/man/infotocap.1m.html
 @@ -94,7 +94,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -8850,9 +8834,8 @@ Index: doc/html/man/infotocap.1m.html
  
  
  </PRE>
-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20150912+/doc/html/man/menu.3x.html	2015-09-05 21:19:38.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/menu.3x.html	2015-09-19 23:18:55.000000000 +0000
+--- a/doc/html/man/menu.3x.html
++++ b/doc/html/man/menu.3x.html
 @@ -227,7 +227,7 @@
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for
         detailed descriptions of the entry points.
@@ -8862,9 +8845,8 @@ Index: doc/html/man/menu.3x.html
  
  
  
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20150912+/doc/html/man/ncurses.3x.html	2015-09-05 21:19:39.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/ncurses.3x.html	2015-09-19 23:18:56.000000000 +0000
+--- a/doc/html/man/ncurses.3x.html
++++ b/doc/html/man/ncurses.3x.html
 @@ -63,7 +63,7 @@
         sonable optimization.  This implementation is "new curses"
         (ncurses) and is the approved replacement for 4.4BSD clas-
@@ -8874,9 +8856,8 @@ Index: doc/html/man/ncurses.3x.html
  
         The <STRONG>ncurses</STRONG> library emulates the curses library of  System
         V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20150912+/doc/html/man/panel.3x.html	2015-09-05 21:19:39.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/panel.3x.html	2015-09-19 23:18:56.000000000 +0000
+--- a/doc/html/man/panel.3x.html
++++ b/doc/html/man/panel.3x.html
 @@ -218,7 +218,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
@@ -8886,9 +8867,8 @@ Index: doc/html/man/panel.3x.html
  
  
  </PRE>
-Index: doc/html/man/resizeterm.3x.html
---- ncurses-6.0-20150912+/doc/html/man/resizeterm.3x.html	2015-06-06 23:47:48.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/resizeterm.3x.html	2015-09-19 23:18:56.000000000 +0000
+--- a/doc/html/man/resizeterm.3x.html
++++ b/doc/html/man/resizeterm.3x.html
 @@ -27,7 +27,7 @@
    * authorization.                                                           *
    ****************************************************************************
@@ -8938,9 +8918,8 @@ Index: doc/html/man/resizeterm.3x.html
         WINCH is received, no screen size change may be recorded.
  
  
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20150912+/doc/html/man/tabs.1.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tabs.1.html	2015-09-19 23:18:56.000000000 +0000
+--- a/doc/html/man/tabs.1.html
++++ b/doc/html/man/tabs.1.html
 @@ -168,7 +168,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -8950,9 +8929,8 @@ Index: doc/html/man/tabs.1.html
  
  
  
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20150912+/doc/html/man/terminfo.5.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/terminfo.5.html	2015-09-19 23:18:56.000000000 +0000
+--- a/doc/html/man/terminfo.5.html
++++ b/doc/html/man/terminfo.5.html
 @@ -78,7 +78,7 @@
         nals by giving a set of capabilities which they  have,  by
         specifying how to perform screen operations, and by speci-
@@ -8962,9 +8940,8 @@ Index: doc/html/man/terminfo.5.html
  
         Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
         fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20150912+/doc/html/man/tic.1m.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tic.1m.html	2015-09-19 23:18:57.000000000 +0000
+--- a/doc/html/man/tic.1m.html
++++ b/doc/html/man/tic.1m.html
 @@ -408,7 +408,7 @@
         <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -8974,9 +8951,8 @@ Index: doc/html/man/tic.1m.html
  
  
  </PRE>
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20150912+/doc/html/man/toe.1m.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/toe.1m.html	2015-09-19 23:18:57.000000000 +0000
+--- a/doc/html/man/toe.1m.html
++++ b/doc/html/man/toe.1m.html
 @@ -122,7 +122,7 @@
         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -8986,9 +8962,8 @@ Index: doc/html/man/toe.1m.html
  
  
  
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20150912+/doc/html/man/tput.1.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tput.1.html	2015-09-19 23:18:57.000000000 +0000
+--- a/doc/html/man/tput.1.html
++++ b/doc/html/man/tput.1.html
 @@ -338,7 +338,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
@@ -8998,9 +8973,8 @@ Index: doc/html/man/tput.1.html
  
  
  
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20150912+/doc/html/man/tset.1.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tset.1.html	2015-09-19 23:18:57.000000000 +0000
+--- a/doc/html/man/tset.1.html
++++ b/doc/html/man/tset.1.html
 @@ -319,7 +319,7 @@
         <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,
         <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
@@ -9010,10 +8984,8 @@ Index: doc/html/man/tset.1.html
  
  
  
-Index: man/curs_getch.3x
-Prereq:  1.42 
---- ncurses-6.0-20150912+/man/curs_getch.3x	2015-07-21 08:44:04.000000000 +0000
-+++ ncurses-6.0-20150919/man/curs_getch.3x	2015-09-19 22:25:05.000000000 +0000
+--- a/man/curs_getch.3x
++++ b/man/curs_getch.3x
 @@ -27,7 +27,7 @@
  .\" authorization.                                                           *
  .\"***************************************************************************
@@ -9052,10 +9024,8 @@ Prereq:  1.42
  Programmers concerned about portability should be prepared for either of two
  cases: (a) signal receipt does not interrupt \fBgetch\fR; (b) signal receipt
  interrupts \fBgetch\fR and causes it to return ERR with \fBerrno\fR set to
-Index: man/resizeterm.3x
-Prereq:  1.19 
---- ncurses-6.0-20150912+/man/resizeterm.3x	2015-06-06 23:38:18.000000000 +0000
-+++ ncurses-6.0-20150919/man/resizeterm.3x	2015-09-19 22:53:26.000000000 +0000
+--- a/man/resizeterm.3x
++++ b/man/resizeterm.3x
 @@ -28,8 +28,11 @@
  .\"
  .\" Author: Thomas E. Dickey 1996-on
@@ -9097,9 +9067,8 @@ Prereq:  1.19
  .PP
  If the environment variables \fBLINES\fP or \fBCOLUMNS\fP are set,
  this overrides the library's use of the window size obtained from
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150912+/package/debian-mingw/changelog	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/debian-mingw/changelog	2015-09-19 19:40:14.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150912) unstable; urgency=low
 +ncurses6 (6.0+20150919) unstable; urgency=low
@@ -9111,9 +9080,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150912+/package/debian-mingw64/changelog	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/debian-mingw64/changelog	2015-09-19 19:40:14.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150912) unstable; urgency=low
 +ncurses6 (6.0+20150919) unstable; urgency=low
@@ -9125,9 +9093,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20150912+/package/debian/changelog	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/debian/changelog	2015-09-19 19:40:14.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150912) unstable; urgency=low
 +ncurses6 (6.0+20150919) unstable; urgency=low
@@ -9139,10 +9106,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.123 
---- ncurses-6.0-20150912+/package/mingw-ncurses.nsi	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/mingw-ncurses.nsi	2015-09-19 19:40:14.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.123 2015/09/12 16:17:30 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.124 2015/09/19 19:40:14 tom Exp $
@@ -9158,9 +9123,8 @@ Prereq:  1.123
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150912+/package/mingw-ncurses.spec	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/mingw-ncurses.spec	2015-09-19 19:40:14.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -9170,9 +9134,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150912+/package/ncurses.spec	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/ncurses.spec	2015-09-19 19:40:14.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
diff --git a/packages/ncurses/6.0/160-ncurses-6.0-20150926.patch b/packages/ncurses/6.0/0006-ncurses-6.0-20150926.patch
similarity index 75%
rename from packages/ncurses/6.0/160-ncurses-6.0-20150926.patch
rename to packages/ncurses/6.0/0006-ncurses-6.0-20150926.patch
index d675a263..dce60d2a 100644
--- a/packages/ncurses/6.0/160-ncurses-6.0-20150926.patch
+++ b/packages/ncurses/6.0/0006-ncurses-6.0-20150926.patch
@@ -48,10 +48,8 @@
 # package/ncurses.spec             |    2 +-
 # 32 files changed, 93 insertions(+), 40 deletions(-)
 # ------------------------------------------------------------------------------
-Index: INSTALL
-Prereq:  1.192 
---- ncurses-6.0-20150919+/INSTALL	2015-08-15 20:11:48.000000000 +0000
-+++ ncurses-6.0-20150926/INSTALL	2015-09-26 21:34:14.000000000 +0000
+--- a/INSTALL
++++ b/INSTALL
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -71,10 +69,8 @@ Prereq:  1.192
      --with-termlib[=XXX]
  	When building the ncurses library, organize this as two parts:  the
  	curses library (libncurses) and the low-level terminfo library
-Index: NEWS
-Prereq:  1.2496 
---- ncurses-6.0-20150919+/NEWS	2015-09-19 23:04:21.000000000 +0000
-+++ ncurses-6.0-20150926/NEWS	2015-09-26 21:58:14.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -97,16 +93,13 @@ Prereq:  1.2496
  20150919
  	+ clarify in resizeterm.3x how KEY_RESIZE is pushed onto the input
  	  stream.
-Index: VERSION
---- ncurses-6.0-20150919+/VERSION	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/VERSION	2015-09-26 18:50:05.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20150919
 +5:0:9	6.0	20150926
-Index: aclocal.m4
-Prereq:  1.767 
---- ncurses-6.0-20150919+/aclocal.m4	2015-09-12 20:00:59.000000000 +0000
-+++ ncurses-6.0-20150926/aclocal.m4	2015-09-26 21:56:12.000000000 +0000
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -134,9 +127,8 @@ Prereq:  1.767
  	rm -f resulting.map
  CF_EOF
  		fi
-Index: configure
---- ncurses-6.0-20150919+/configure	2015-09-12 20:01:47.000000000 +0000
-+++ ncurses-6.0-20150926/configure	2015-09-26 21:56:47.000000000 +0000
+--- a/configure
++++ b/configure
 @@ -23555,7 +23555,7 @@
  resulting.map: $UNALTERED_SYMS
  	sed $cf_sed_options < $UNALTERED_SYMS >\$@
@@ -146,10 +138,8 @@ Index: configure
  	rm -f resulting.map
  CF_EOF
  		fi
-Index: dist.mk
-Prereq:  1.1071 
---- ncurses-6.0-20150919+/dist.mk	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/dist.mk	2015-09-26 18:50:05.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -168,9 +158,8 @@ Prereq:  1.1071
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20150919+/doc/html/man/captoinfo.1m.html	2015-09-19 23:18:49.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/captoinfo.1m.html	2015-09-26 22:08:45.000000000 +0000
+--- a/doc/html/man/captoinfo.1m.html
++++ b/doc/html/man/captoinfo.1m.html
 @@ -205,7 +205,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -180,9 +169,8 @@ Index: doc/html/man/captoinfo.1m.html
  
  
  </PRE>
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20150919+/doc/html/man/clear.1.html	2015-09-19 23:18:49.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/clear.1.html	2015-09-26 22:08:45.000000000 +0000
+--- a/doc/html/man/clear.1.html
++++ b/doc/html/man/clear.1.html
 @@ -71,7 +71,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -192,9 +180,8 @@ Index: doc/html/man/clear.1.html
  
  
  
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20150919+/doc/html/man/curs_attr.3x.html	2015-09-05 23:05:55.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/curs_attr.3x.html	2015-09-26 23:25:17.000000000 +0000
+--- a/doc/html/man/curs_attr.3x.html
++++ b/doc/html/man/curs_attr.3x.html
 @@ -27,7 +27,7 @@
    * sale, use or other dealings in this Software without prior written       *
    * authorization.                                                           *
@@ -204,9 +191,8 @@ Index: doc/html/man/curs_attr.3x.html
  -->
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
  <HTML>
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20150919+/doc/html/man/form.3x.html	2015-09-19 23:18:53.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/form.3x.html	2015-09-26 22:08:49.000000000 +0000
+--- a/doc/html/man/form.3x.html
++++ b/doc/html/man/form.3x.html
 @@ -245,7 +245,7 @@
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for
         detailed descriptions of the entry points.
@@ -216,9 +202,8 @@ Index: doc/html/man/form.3x.html
  
  
  
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20150919+/doc/html/man/infocmp.1m.html	2015-09-19 23:18:54.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/infocmp.1m.html	2015-09-26 22:08:50.000000000 +0000
+--- a/doc/html/man/infocmp.1m.html
++++ b/doc/html/man/infocmp.1m.html
 @@ -487,7 +487,7 @@
  
         http://invisible-island.net/ncurses/tctest.html
@@ -228,9 +213,8 @@ Index: doc/html/man/infocmp.1m.html
  
  
  </PRE>
-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20150919+/doc/html/man/infotocap.1m.html	2015-09-19 23:18:54.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/infotocap.1m.html	2015-09-26 22:08:50.000000000 +0000
+--- a/doc/html/man/infotocap.1m.html
++++ b/doc/html/man/infotocap.1m.html
 @@ -94,7 +94,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -240,9 +224,8 @@ Index: doc/html/man/infotocap.1m.html
  
  
  </PRE>
-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20150919+/doc/html/man/menu.3x.html	2015-09-19 23:18:55.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/menu.3x.html	2015-09-26 22:08:51.000000000 +0000
+--- a/doc/html/man/menu.3x.html
++++ b/doc/html/man/menu.3x.html
 @@ -227,7 +227,7 @@
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for
         detailed descriptions of the entry points.
@@ -252,9 +235,8 @@ Index: doc/html/man/menu.3x.html
  
  
  
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20150919+/doc/html/man/ncurses.3x.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/ncurses.3x.html	2015-09-26 22:08:52.000000000 +0000
+--- a/doc/html/man/ncurses.3x.html
++++ b/doc/html/man/ncurses.3x.html
 @@ -63,7 +63,7 @@
         sonable optimization.  This implementation is "new curses"
         (ncurses) and is the approved replacement for 4.4BSD clas-
@@ -264,9 +246,8 @@ Index: doc/html/man/ncurses.3x.html
  
         The <STRONG>ncurses</STRONG> library emulates the curses library of  System
         V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20150919+/doc/html/man/panel.3x.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/panel.3x.html	2015-09-26 22:08:52.000000000 +0000
+--- a/doc/html/man/panel.3x.html
++++ b/doc/html/man/panel.3x.html
 @@ -218,7 +218,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
@@ -276,9 +257,8 @@ Index: doc/html/man/panel.3x.html
  
  
  </PRE>
-Index: doc/html/man/resizeterm.3x.html
---- ncurses-6.0-20150919+/doc/html/man/resizeterm.3x.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/resizeterm.3x.html	2015-09-26 22:08:52.000000000 +0000
+--- a/doc/html/man/resizeterm.3x.html
++++ b/doc/html/man/resizeterm.3x.html
 @@ -27,7 +27,7 @@
    * authorization.                                                           *
    ****************************************************************************
@@ -317,9 +297,8 @@ Index: doc/html/man/resizeterm.3x.html
  <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
  <li><a href="#h2-AUTHOR">AUTHOR</a></li>
  </ul>
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20150919+/doc/html/man/tabs.1.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tabs.1.html	2015-09-26 22:08:52.000000000 +0000
+--- a/doc/html/man/tabs.1.html
++++ b/doc/html/man/tabs.1.html
 @@ -168,7 +168,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -329,9 +308,8 @@ Index: doc/html/man/tabs.1.html
  
  
  
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20150919+/doc/html/man/terminfo.5.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/terminfo.5.html	2015-09-26 22:08:53.000000000 +0000
+--- a/doc/html/man/terminfo.5.html
++++ b/doc/html/man/terminfo.5.html
 @@ -78,7 +78,7 @@
         nals by giving a set of capabilities which they  have,  by
         specifying how to perform screen operations, and by speci-
@@ -341,9 +319,8 @@ Index: doc/html/man/terminfo.5.html
  
         Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
         fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20150919+/doc/html/man/tic.1m.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tic.1m.html	2015-09-26 22:08:53.000000000 +0000
+--- a/doc/html/man/tic.1m.html
++++ b/doc/html/man/tic.1m.html
 @@ -408,7 +408,7 @@
         <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -353,9 +330,8 @@ Index: doc/html/man/tic.1m.html
  
  
  </PRE>
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20150919+/doc/html/man/toe.1m.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/toe.1m.html	2015-09-26 22:08:53.000000000 +0000
+--- a/doc/html/man/toe.1m.html
++++ b/doc/html/man/toe.1m.html
 @@ -122,7 +122,7 @@
         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -365,9 +341,8 @@ Index: doc/html/man/toe.1m.html
  
  
  
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20150919+/doc/html/man/tput.1.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tput.1.html	2015-09-26 22:08:53.000000000 +0000
+--- a/doc/html/man/tput.1.html
++++ b/doc/html/man/tput.1.html
 @@ -338,7 +338,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
@@ -377,9 +352,8 @@ Index: doc/html/man/tput.1.html
  
  
  
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20150919+/doc/html/man/tset.1.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tset.1.html	2015-09-26 22:08:53.000000000 +0000
+--- a/doc/html/man/tset.1.html
++++ b/doc/html/man/tset.1.html
 @@ -319,7 +319,7 @@
         <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,
         <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
@@ -389,9 +363,8 @@ Index: doc/html/man/tset.1.html
  
  
  
-Index: doc/html/man/wresize.3x.html
---- ncurses-6.0-20150919+/doc/html/man/wresize.3x.html	2015-05-13 19:27:50.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/wresize.3x.html	2015-09-26 22:08:53.000000000 +0000
+--- a/doc/html/man/wresize.3x.html
++++ b/doc/html/man/wresize.3x.html
 @@ -1,6 +1,6 @@
  <!-- 
    ****************************************************************************
@@ -432,10 +405,8 @@ Index: doc/html/man/wresize.3x.html
  <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
  <li><a href="#h2-AUTHOR">AUTHOR</a></li>
  </ul>
-Index: man/resizeterm.3x
-Prereq:  1.20 
---- ncurses-6.0-20150919+/man/resizeterm.3x	2015-09-19 22:53:26.000000000 +0000
-+++ ncurses-6.0-20150926/man/resizeterm.3x	2015-09-26 19:55:32.000000000 +0000
+--- a/man/resizeterm.3x
++++ b/man/resizeterm.3x
 @@ -28,7 +28,7 @@
  .\"
  .\" Author: Thomas E. Dickey 1996-on
@@ -465,10 +436,8 @@ Prereq:  1.20
  .SH SEE ALSO
  \fBcurs_getch\fR(3X),
  \fBcurs_variables\fR(3X),
-Index: man/wresize.3x
-Prereq:  1.13 
---- ncurses-6.0-20150919+/man/wresize.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20150926/man/wresize.3x	2015-09-26 19:57:24.000000000 +0000
+--- a/man/wresize.3x
++++ b/man/wresize.3x
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
 -.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
@@ -498,9 +467,8 @@ Prereq:  1.13
  .SH SEE ALSO
  \fBresizeterm\fR(3X).
  .SH AUTHOR
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150919+/package/debian-mingw/changelog	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian-mingw/changelog	2015-09-26 18:50:05.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150919) unstable; urgency=low
 +ncurses6 (6.0+20150926) unstable; urgency=low
@@ -512,9 +480,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150919+/package/debian-mingw64/changelog	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian-mingw64/changelog	2015-09-26 18:50:05.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150919) unstable; urgency=low
 +ncurses6 (6.0+20150926) unstable; urgency=low
@@ -526,9 +493,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20150919+/package/debian/changelog	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian/changelog	2015-09-26 18:50:05.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150919) unstable; urgency=low
 +ncurses6 (6.0+20150926) unstable; urgency=low
@@ -540,9 +506,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/debian/rules
---- ncurses-6.0-20150919+/package/debian/rules	2015-07-11 22:42:03.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian/rules	2015-09-26 21:29:58.000000000 +0000
+--- a/package/debian/rules
++++ b/package/debian/rules
 @@ -78,6 +78,7 @@
  		--with-ticlib \
  		--with-trace \
@@ -551,10 +516,8 @@ Index: package/debian/rules
  		--with-versioned-syms \
  		--with-xterm-kbs=DEL \
  		--without-ada \
-Index: package/mingw-ncurses.nsi
-Prereq:  1.124 
---- ncurses-6.0-20150919+/package/mingw-ncurses.nsi	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/mingw-ncurses.nsi	2015-09-26 18:50:05.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.124 2015/09/19 19:40:14 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.125 2015/09/26 18:50:05 tom Exp $
@@ -570,9 +533,8 @@ Prereq:  1.124
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150919+/package/mingw-ncurses.spec	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/mingw-ncurses.spec	2015-09-26 18:50:05.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -582,9 +544,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150919+/package/ncurses.spec	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/ncurses.spec	2015-09-26 18:50:05.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
diff --git a/packages/ncurses/6.0/170-ncurses-6.0-20151010.patch b/packages/ncurses/6.0/0007-ncurses-6.0-20151010.patch
similarity index 97%
rename from packages/ncurses/6.0/170-ncurses-6.0-20151010.patch
rename to packages/ncurses/6.0/0007-ncurses-6.0-20151010.patch
index 1f9e9499..40c25f8e 100644
--- a/packages/ncurses/6.0/170-ncurses-6.0-20151010.patch
+++ b/packages/ncurses/6.0/0007-ncurses-6.0-20151010.patch
@@ -19,7 +19,7 @@
 # NEWS                             |   12 
 # VERSION                          |    2 
 # aclocal.m4                       |   20 
-# configure                        |  861 ++++++++++++++++++++-----------------
+# configure                        |  861 +++++++++++++++++++++------------------
 # dist.mk                          |    4 
 # ncurses/base/MKlib_gen.sh        |    3 
 # ncurses/base/resizeterm.c        |   12 
@@ -30,17 +30,15 @@
 # package/mingw-ncurses.spec       |    2 
 # package/ncurses.spec             |    2 
 # test/aclocal.m4                  |   30 +
-# test/configure                   |  722 +++++++++++++++++++------------
+# test/configure                   |  722 ++++++++++++++++++++------------
 # test/configure.in                |   13 
 # test/demo_termcap.c              |    4 
 # test/demo_terminfo.c             |    6 
 # test/view.c                      |   26 -
 # 21 files changed, 1085 insertions(+), 714 deletions(-)
 # ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.106 
---- ncurses-6.0-20150926+/Ada95/aclocal.m4	2015-08-22 21:14:14.000000000 +0000
-+++ ncurses-6.0-20151010/Ada95/aclocal.m4	2015-10-10 19:52:33.000000000 +0000
+--- a/Ada95/aclocal.m4
++++ b/Ada95/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey
@@ -72,9 +70,8 @@ Prereq:  1.106
  	do
  
  		# check if $ARFLAGS already contains this choice
-Index: Ada95/configure
---- ncurses-6.0-20150926+/Ada95/configure	2015-09-19 20:50:21.000000000 +0000
-+++ ncurses-6.0-20151010/Ada95/configure	2015-10-10 19:53:00.000000000 +0000
+--- a/Ada95/configure
++++ b/Ada95/configure
 @@ -1,7 +1,7 @@
  #! /bin/sh
  # From configure.in Revision: 1.61 .
@@ -250,10 +247,8 @@ Index: Ada95/configure
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: NEWS
-Prereq:  1.2499 
---- ncurses-6.0-20150926+/NEWS	2015-09-26 21:58:14.000000000 +0000
-+++ ncurses-6.0-20151010/NEWS	2015-10-10 20:24:26.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -280,16 +275,13 @@ Prereq:  1.2499
  20150926
  	+ change makefile rule for removing resulting.map to distclean rather
  	  than clean.
-Index: VERSION
---- ncurses-6.0-20150926+/VERSION	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/VERSION	2015-10-10 17:06:12.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20150926
 +5:0:9	6.0	20151010
-Index: aclocal.m4
-Prereq:  1.768 
---- ncurses-6.0-20150926+/aclocal.m4	2015-09-26 21:56:12.000000000 +0000
-+++ ncurses-6.0-20151010/aclocal.m4	2015-10-10 19:27:07.000000000 +0000
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -356,9 +348,8 @@ Prereq:  1.768
  
  		if (fd >= 0) {
  			/* also check with standard input */
-Index: configure
---- ncurses-6.0-20150926+/configure	2015-09-26 21:56:47.000000000 +0000
-+++ ncurses-6.0-20151010/configure	2015-10-10 19:18:37.000000000 +0000
+--- a/configure
++++ b/configure
 @@ -1,7 +1,7 @@
  #! /bin/sh
  # From configure.in Revision: 1.619 .
@@ -3097,10 +3088,8 @@ Index: configure
  
  					with_shared_cxx=yes
  					;;
-Index: dist.mk
-Prereq:  1.1072 
---- ncurses-6.0-20150926+/dist.mk	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/dist.mk	2015-10-10 17:06:12.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -3119,10 +3108,8 @@ Prereq:  1.1072
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/base/MKlib_gen.sh
-Prereq:  1.51 
---- ncurses-6.0-20150926+/ncurses/base/MKlib_gen.sh	2015-08-10 08:56:39.000000000 +0000
-+++ ncurses-6.0-20151010/ncurses/base/MKlib_gen.sh	2015-10-10 19:36:47.000000000 +0000
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
 @@ -2,7 +2,7 @@
  #
  # MKlib_gen.sh -- generate sources from curses.h macro definitions
@@ -3140,10 +3127,8 @@ Prereq:  1.51
  EOF
  else
  cat >$ED4 <<EOF
-Index: ncurses/base/resizeterm.c
-Prereq:  1.47 
---- ncurses-6.0-20150926+/ncurses/base/resizeterm.c	2014-10-13 08:56:49.000000000 +0000
-+++ ncurses-6.0-20151010/ncurses/base/resizeterm.c	2015-10-10 19:47:25.000000000 +0000
+--- a/ncurses/base/resizeterm.c
++++ b/ncurses/base/resizeterm.c
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2011,2014 Free Software Foundation, Inc.              *
@@ -3189,9 +3174,8 @@ Prereq:  1.47
  
      do {
  	found = FALSE;
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150926+/package/debian-mingw/changelog	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/debian-mingw/changelog	2015-10-10 17:06:12.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150926) unstable; urgency=low
 +ncurses6 (6.0+20151010) unstable; urgency=low
@@ -3203,9 +3187,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150926+/package/debian-mingw64/changelog	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/debian-mingw64/changelog	2015-10-10 17:06:12.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150926) unstable; urgency=low
 +ncurses6 (6.0+20151010) unstable; urgency=low
@@ -3217,9 +3200,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20150926+/package/debian/changelog	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/debian/changelog	2015-10-10 17:06:12.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20150926) unstable; urgency=low
 +ncurses6 (6.0+20151010) unstable; urgency=low
@@ -3231,10 +3213,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.125 
---- ncurses-6.0-20150926+/package/mingw-ncurses.nsi	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/mingw-ncurses.nsi	2015-10-10 17:06:12.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.125 2015/09/26 18:50:05 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.126 2015/10/10 17:06:12 tom Exp $
@@ -3250,9 +3230,8 @@ Prereq:  1.125
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150926+/package/mingw-ncurses.spec	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/mingw-ncurses.spec	2015-10-10 17:06:12.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -3262,9 +3241,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150926+/package/ncurses.spec	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/ncurses.spec	2015-10-10 17:06:12.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
@@ -3274,10 +3252,8 @@ Index: package/ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: test/aclocal.m4
-Prereq:  1.120 
---- ncurses-6.0-20150926+/test/aclocal.m4	2015-08-08 14:27:27.000000000 +0000
-+++ ncurses-6.0-20151010/test/aclocal.m4	2015-10-10 20:30:48.000000000 +0000
+--- a/test/aclocal.m4
++++ b/test/aclocal.m4
 @@ -26,7 +26,7 @@
  dnl authorization.                                                           *
  dnl***************************************************************************
@@ -3322,9 +3298,8 @@ Prereq:  1.120
  dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00
  dnl -----------------
  dnl Test for availability of useful gcc __attribute__ directives to quiet
-Index: test/configure
---- ncurses-6.0-20150926+/test/configure	2015-08-08 20:32:27.000000000 +0000
-+++ ncurses-6.0-20151010/test/configure	2015-10-10 20:30:58.000000000 +0000
+--- a/test/configure
++++ b/test/configure
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -5334,10 +5309,8 @@ Index: test/configure
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: test/configure.in
-Prereq:  1.124 
---- ncurses-6.0-20150926+/test/configure.in	2015-08-08 20:24:49.000000000 +0000
-+++ ncurses-6.0-20151010/test/configure.in	2015-10-10 20:23:49.000000000 +0000
+--- a/test/configure.in
++++ b/test/configure.in
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1996, etc.
@@ -5365,10 +5338,8 @@ Prereq:  1.124
  CF_FUNC_CURSES_VERSION
  
  CF_CURSES_ACS_MAP
-Index: test/demo_termcap.c
-Prereq:  1.48 
---- ncurses-6.0-20150926+/test/demo_termcap.c	2015-08-08 20:25:39.000000000 +0000
-+++ ncurses-6.0-20151010/test/demo_termcap.c	2015-10-10 20:41:16.000000000 +0000
+--- a/test/demo_termcap.c
++++ b/test/demo_termcap.c
 @@ -29,7 +29,7 @@
  /*
   * Author: Thomas E. Dickey
@@ -5387,10 +5358,8 @@ Prereq:  1.48
  static void
  failed(const char *msg)
  {
-Index: test/demo_terminfo.c
-Prereq:  1.39 
---- ncurses-6.0-20150926+/test/demo_terminfo.c	2015-07-10 23:45:44.000000000 +0000
-+++ ncurses-6.0-20151010/test/demo_terminfo.c	2015-10-10 20:52:41.000000000 +0000
+--- a/test/demo_terminfo.c
++++ b/test/demo_terminfo.c
 @@ -29,7 +29,7 @@
  /*
   * Author: Thomas E. Dickey
@@ -5418,10 +5387,8 @@ Prereq:  1.39
      ExitProgram(EXIT_FAILURE);
  }
  #endif /* HAVE_TIGETSTR */
-Index: test/view.c
-Prereq:  1.94 
---- ncurses-6.0-20150926+/test/view.c	2013-09-28 21:58:42.000000000 +0000
-+++ ncurses-6.0-20151010/test/view.c	2015-10-10 20:03:58.000000000 +0000
+--- a/test/view.c
++++ b/test/view.c
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
diff --git a/packages/ncurses/6.0/180-ncurses-6.0-20151017.patch b/packages/ncurses/6.0/0008-ncurses-6.0-20151017.patch
similarity index 99%
rename from packages/ncurses/6.0/180-ncurses-6.0-20151017.patch
rename to packages/ncurses/6.0/0008-ncurses-6.0-20151017.patch
index 6bb1cd30..8336af07 100644
--- a/packages/ncurses/6.0/180-ncurses-6.0-20151017.patch
+++ b/packages/ncurses/6.0/0008-ncurses-6.0-20151017.patch
@@ -15,12 +15,12 @@
 # created  Sun Oct 18 00:40:46 UTC 2015
 # ------------------------------------------------------------------------------
 # Ada95/aclocal.m4                 |   15 
-# Ada95/configure                  |  977 +++++------
+# Ada95/configure                  |  977 ++++++------
 # NEWS                             |   16 
 # VERSION                          |    2 
 # aclocal.m4                       |   27 
 # c++/Makefile.in                  |    4 
-# configure                        | 3156 ++++++++++++++++++-------------------
+# configure                        | 3156 +++++++++++++++++++--------------------
 # configure.in                     |   15 
 # dist.mk                          |    4 
 # ncurses/Makefile.in              |    4 
@@ -33,13 +33,11 @@
 # package/mingw-ncurses.spec       |    2 
 # package/ncurses.spec             |    2 
 # test/aclocal.m4                  |    7 
-# test/configure                   | 2585 +++++++++++++++---------------
+# test/configure                   | 2585 +++++++++++++++----------------
 # 20 files changed, 3457 insertions(+), 3383 deletions(-)
 # ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.107 
---- ncurses-6.0-20151010+/Ada95/aclocal.m4	2015-10-10 19:52:33.000000000 +0000
-+++ ncurses-6.0-20151017/Ada95/aclocal.m4	2015-10-17 23:07:06.000000000 +0000
+--- a/Ada95/aclocal.m4
++++ b/Ada95/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey
@@ -90,9 +88,8 @@ Prereq:  1.107
  (osf[[45]]*)
  	cf_xopen_source="-D_OSF_SOURCE"
  	;;
-Index: Ada95/configure
---- ncurses-6.0-20151010+/Ada95/configure	2015-10-10 19:53:00.000000000 +0000
-+++ ncurses-6.0-20151017/Ada95/configure	2015-10-17 23:07:23.000000000 +0000
+--- a/Ada95/configure
++++ b/Ada95/configure
 @@ -8943,7 +8943,11 @@
  
  	case $cf_cv_system_name in
@@ -3411,10 +3408,8 @@ Index: Ada95/configure
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: NEWS
-Prereq:  1.2505 
---- ncurses-6.0-20151010+/NEWS	2015-10-10 20:24:26.000000000 +0000
-+++ ncurses-6.0-20151017/NEWS	2015-10-17 22:02:46.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -3452,16 +3447,13 @@ Prereq:  1.2505
  
  20120114
  	+ several improvements to test/movewindow.c (prompted by discussion on
-Index: VERSION
---- ncurses-6.0-20151010+/VERSION	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/VERSION	2015-10-17 20:29:47.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20151010
 +5:0:9	6.0	20151017
-Index: aclocal.m4
-Prereq:  1.770 
---- ncurses-6.0-20151010+/aclocal.m4	2015-10-10 19:27:07.000000000 +0000
-+++ ncurses-6.0-20151017/aclocal.m4	2015-10-17 23:05:09.000000000 +0000
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -3552,10 +3544,8 @@ Prereq:  1.770
  (osf[[45]]*)
  	cf_xopen_source="-D_OSF_SOURCE"
  	;;
-Index: c++/Makefile.in
-Prereq:  1.111 
---- ncurses-6.0-20151010+/c++/Makefile.in	2015-08-05 23:15:41.000000000 +0000
-+++ ncurses-6.0-20151017/c++/Makefile.in	2015-10-17 22:59:12.000000000 +0000
+--- a/c++/Makefile.in
++++ b/c++/Makefile.in
 @@ -1,4 +1,4 @@
 -# $Id: Makefile.in,v 1.111 2015/08/05 23:15:41 tom Exp $
 +# $Id: Makefile.in,v 1.113 2015/10/17 22:59:12 tom Exp $
@@ -3571,9 +3561,8 @@ Prereq:  1.111
  LIBTOOL_CLEAN	= @LIB_CLEAN@
  LIBTOOL_COMPILE	= @LIB_COMPILE@
  LIBTOOL_LINK	= @LIB_LINK@
-Index: configure
---- ncurses-6.0-20151010+/configure	2015-10-10 19:18:37.000000000 +0000
-+++ ncurses-6.0-20151017/configure	2015-10-17 23:05:27.000000000 +0000
+--- a/configure
++++ b/configure
 @@ -1,5 +1,5 @@
  #! /bin/sh
 -# From configure.in Revision: 1.619 .
@@ -14303,10 +14292,8 @@ Index: configure
  
  					with_shared_cxx=yes
  					;;
-Index: configure.in
-Prereq:  1.619 
---- ncurses-6.0-20151010+/configure.in	2015-08-05 23:32:27.000000000 +0000
-+++ ncurses-6.0-20151017/configure.in	2015-10-17 23:01:54.000000000 +0000
+--- a/configure.in
++++ b/configure.in
 @@ -28,14 +28,14 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -14342,10 +14329,8 @@ Prereq:  1.619
  # workaround for g++ versus Solaris (20131116)
  case $cf_cv_system_name in
  (solaris2*)
-Index: dist.mk
-Prereq:  1.1073 
---- ncurses-6.0-20151010+/dist.mk	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/dist.mk	2015-10-17 20:29:47.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -14364,10 +14349,8 @@ Prereq:  1.1073
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/Makefile.in
-Prereq:  1.147 
---- ncurses-6.0-20151010+/ncurses/Makefile.in	2015-08-05 23:15:41.000000000 +0000
-+++ ncurses-6.0-20151017/ncurses/Makefile.in	2015-10-17 21:48:15.000000000 +0000
+--- a/ncurses/Makefile.in
++++ b/ncurses/Makefile.in
 @@ -1,4 +1,4 @@
 -# $Id: Makefile.in,v 1.147 2015/08/05 23:15:41 tom Exp $
 +# $Id: Makefile.in,v 1.148 2015/10/17 21:48:15 Esa.Peuha Exp $
@@ -14383,10 +14366,8 @@ Prereq:  1.147
  
  make_keys$(BUILD_EXEEXT) : \
  		$(tinfo)/make_keys.c \
-Index: ncurses/base/lib_color.c
-Prereq:  1.111 
---- ncurses-6.0-20151010+/ncurses/base/lib_color.c	2015-08-22 22:38:58.000000000 +0000
-+++ ncurses-6.0-20151017/ncurses/base/lib_color.c	2015-10-17 20:39:18.000000000 +0000
+--- a/ncurses/base/lib_color.c
++++ b/ncurses/base/lib_color.c
 @@ -45,7 +45,7 @@
  #define CUR SP_TERMTYPE
  #endif
@@ -14405,10 +14386,8 @@ Prereq:  1.111
      }
  
  #if NCURSES_EXT_FUNCS
-Index: ncurses/base/lib_mouse.c
-Prereq:  1.166 
---- ncurses-6.0-20151010+/ncurses/base/lib_mouse.c	2015-07-05 00:28:27.000000000 +0000
-+++ ncurses-6.0-20151017/ncurses/base/lib_mouse.c	2015-10-17 22:08:05.000000000 +0000
+--- a/ncurses/base/lib_mouse.c
++++ b/ncurses/base/lib_mouse.c
 @@ -84,7 +84,7 @@
  #define CUR SP_TERMTYPE
  #endif
@@ -14427,9 +14406,8 @@ Prereq:  1.166
  		    eventp->bstate = MASK_RELEASE(n); \
  		    sp->_mouse_bstate &= ~MASK_PRESS(n); \
  	    } \
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151010+/package/debian-mingw/changelog	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/debian-mingw/changelog	2015-10-17 20:29:47.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151010) unstable; urgency=low
 +ncurses6 (6.0+20151017) unstable; urgency=low
@@ -14441,9 +14419,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151010+/package/debian-mingw64/changelog	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/debian-mingw64/changelog	2015-10-17 20:29:47.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151010) unstable; urgency=low
 +ncurses6 (6.0+20151017) unstable; urgency=low
@@ -14455,9 +14432,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20151010+/package/debian/changelog	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/debian/changelog	2015-10-17 20:29:47.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151010) unstable; urgency=low
 +ncurses6 (6.0+20151017) unstable; urgency=low
@@ -14469,10 +14445,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.126 
---- ncurses-6.0-20151010+/package/mingw-ncurses.nsi	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/mingw-ncurses.nsi	2015-10-17 20:29:47.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.126 2015/10/10 17:06:12 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.127 2015/10/17 20:29:47 tom Exp $
@@ -14488,9 +14462,8 @@ Prereq:  1.126
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151010+/package/mingw-ncurses.spec	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/mingw-ncurses.spec	2015-10-17 20:29:47.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -14500,9 +14473,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151010+/package/ncurses.spec	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/ncurses.spec	2015-10-17 20:29:47.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
@@ -14512,10 +14484,8 @@ Index: package/ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: test/aclocal.m4
-Prereq:  1.121 
---- ncurses-6.0-20151010+/test/aclocal.m4	2015-10-10 20:30:48.000000000 +0000
-+++ ncurses-6.0-20151017/test/aclocal.m4	2015-10-17 23:06:10.000000000 +0000
+--- a/test/aclocal.m4
++++ b/test/aclocal.m4
 @@ -26,7 +26,7 @@
  dnl authorization.                                                           *
  dnl***************************************************************************
@@ -14544,9 +14514,8 @@ Prereq:  1.121
  (osf[[45]]*)
  	cf_xopen_source="-D_OSF_SOURCE"
  	;;
-Index: test/configure
---- ncurses-6.0-20151010+/test/configure	2015-10-10 20:30:58.000000000 +0000
-+++ ncurses-6.0-20151017/test/configure	2015-10-17 23:06:33.000000000 +0000
+--- a/test/configure
++++ b/test/configure
 @@ -3173,6 +3173,9 @@
  (openbsd*)
  	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
diff --git a/packages/ncurses/6.0/190-ncurses-6.0-20151024.patch b/packages/ncurses/6.0/0009-ncurses-6.0-20151024.patch
similarity index 83%
rename from packages/ncurses/6.0/190-ncurses-6.0-20151024.patch
rename to packages/ncurses/6.0/0009-ncurses-6.0-20151024.patch
index 61f922f7..321bdcbc 100644
--- a/packages/ncurses/6.0/190-ncurses-6.0-20151024.patch
+++ b/packages/ncurses/6.0/0009-ncurses-6.0-20151024.patch
@@ -15,10 +15,10 @@
 # created  Sun Oct 25 00:51:43 UTC 2015
 # ------------------------------------------------------------------------------
 # INSTALL                          |    4 -
-# NEWS                             |   23 ++++++
+# NEWS                             |   23 ++++++-
 # VERSION                          |    2 
 # aclocal.m4                       |    8 +-
-# config.guess                     |   14 ++--
+# config.guess                     |   14 +++-
 # config.sub                       |   11 ++-
 # configure                        |    8 +-
 # configure.in                     |    6 -
@@ -39,7 +39,7 @@
 # doc/html/man/tput.1.html         |    2 
 # doc/html/man/tset.1.html         |    2 
 # man/curs_attr.3x                 |    4 -
-# misc/terminfo.src                |  124 ++++++++++++++++++++++++++++---------
+# misc/terminfo.src                |  124 ++++++++++++++++++++++++++++++---------
 # ncurses/tty/MKexpanded.sh        |    6 -
 # package/debian-mingw/changelog   |    4 -
 # package/debian-mingw64/changelog |    4 -
@@ -47,13 +47,11 @@
 # package/mingw-ncurses.nsi        |    4 -
 # package/mingw-ncurses.spec       |    2 
 # package/ncurses.spec             |    2 
-# test/ncurses.c                   |   26 +++----
+# test/ncurses.c                   |   26 ++++----
 # 34 files changed, 195 insertions(+), 97 deletions(-)
 # ------------------------------------------------------------------------------
-Index: INSTALL
-Prereq:  1.193 
---- ncurses-6.0-20151017+/INSTALL	2015-09-26 21:34:14.000000000 +0000
-+++ ncurses-6.0-20151024/INSTALL	2015-10-24 19:03:42.000000000 +0000
+--- a/INSTALL
++++ b/INSTALL
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -72,10 +70,8 @@ Prereq:  1.193
  	by running them through tbl to generate tables understandable by
  	nroff.
  
-Index: NEWS
-Prereq:  1.2509 
---- ncurses-6.0-20151017+/NEWS	2015-10-17 22:02:46.000000000 +0000
-+++ ncurses-6.0-20151024/NEWS	2015-10-25 00:17:28.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -113,16 +109,13 @@ Prereq:  1.2509
  20151017
  	+ modify ncurses/Makefile.in to sort keys.list in POSIX locale
  	  (Debian #801864, patch by Esa Peuha).
-Index: VERSION
---- ncurses-6.0-20151017+/VERSION	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/VERSION	2015-10-24 13:10:18.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20151017
 +5:0:9	6.0	20151024
-Index: aclocal.m4
-Prereq:  1.774 
---- ncurses-6.0-20151017+/aclocal.m4	2015-10-17 23:05:09.000000000 +0000
-+++ ncurses-6.0-20151024/aclocal.m4	2015-10-25 00:51:20.000000000 +0000
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -152,9 +145,8 @@ Prereq:  1.774
  			test -n "$cf_missing" && WILDCARD_SYMS=yes
  		fi
  		AC_MSG_RESULT($WILDCARD_SYMS)
-Index: config.guess
---- ncurses-6.0-20151017+/config.guess	2015-05-02 11:52:27.000000000 +0000
-+++ ncurses-6.0-20151024/config.guess	2015-10-24 18:37:54.000000000 +0000
+--- a/config.guess
++++ b/config.guess
 @@ -2,7 +2,7 @@
  # Attempt to guess a canonical system name.
  #   Copyright 1992-2015 Free Software Foundation, Inc.
@@ -211,9 +203,8 @@ Index: config.guess
  	# this is a cross-build.
  	echo i586-pc-msdosdjgpp
  	exit ;;
-Index: config.sub
---- ncurses-6.0-20151017+/config.sub	2015-05-02 11:52:04.000000000 +0000
-+++ ncurses-6.0-20151024/config.sub	2015-10-24 18:37:37.000000000 +0000
+--- a/config.sub
++++ b/config.sub
 @@ -2,7 +2,7 @@
  # Configuration validation subroutine script.
  #   Copyright 1992-2015 Free Software Foundation, Inc.
@@ -272,9 +263,8 @@ Index: config.sub
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-Index: configure
---- ncurses-6.0-20151017+/configure	2015-10-17 23:05:27.000000000 +0000
-+++ ncurses-6.0-20151024/configure	2015-10-24 22:43:05.000000000 +0000
+--- a/configure
++++ b/configure
 @@ -1,5 +1,5 @@
  #! /bin/sh
 -# From configure.in Revision: 1.620 .
@@ -302,10 +292,8 @@ Index: configure
  
  echo "$as_me:7065: checking if you want modern xterm or antique" >&5
  echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
-Index: configure.in
-Prereq:  1.620 
---- ncurses-6.0-20151017+/configure.in	2015-10-17 23:01:54.000000000 +0000
-+++ ncurses-6.0-20151024/configure.in	2015-10-24 17:57:55.000000000 +0000
+--- a/configure.in
++++ b/configure.in
 @@ -28,14 +28,14 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -332,10 +320,8 @@ Prereq:  1.620
  AC_SUBST(FALLBACK_LIST)
  
  AC_MSG_CHECKING(if you want modern xterm or antique)
-Index: dist.mk
-Prereq:  1.1074 
---- ncurses-6.0-20151017+/dist.mk	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/dist.mk	2015-10-24 13:10:18.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -354,9 +340,8 @@ Prereq:  1.1074
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20151017+/doc/html/man/captoinfo.1m.html	2015-09-26 22:08:45.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/captoinfo.1m.html	2015-10-25 00:21:09.000000000 +0000
+--- a/doc/html/man/captoinfo.1m.html
++++ b/doc/html/man/captoinfo.1m.html
 @@ -205,7 +205,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -366,9 +351,8 @@ Index: doc/html/man/captoinfo.1m.html
  
  
  </PRE>
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20151017+/doc/html/man/clear.1.html	2015-09-26 22:08:45.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/clear.1.html	2015-10-25 00:21:09.000000000 +0000
+--- a/doc/html/man/clear.1.html
++++ b/doc/html/man/clear.1.html
 @@ -71,7 +71,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -378,9 +362,8 @@ Index: doc/html/man/clear.1.html
  
  
  
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20151017+/doc/html/man/curs_attr.3x.html	2015-09-26 23:25:17.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/curs_attr.3x.html	2015-10-25 00:23:27.000000000 +0000
+--- a/doc/html/man/curs_attr.3x.html
++++ b/doc/html/man/curs_attr.3x.html
 @@ -27,7 +27,7 @@
    * sale, use or other dealings in this Software without prior written       *
    * authorization.                                                           *
@@ -399,9 +382,8 @@ Index: doc/html/man/curs_attr.3x.html
         <STRONG>tr_set</STRONG> provides for passing a color-pair parameter.
  
         The remaining <STRONG>attr_</STRONG>* functions operate  exactly  like  the
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20151017+/doc/html/man/form.3x.html	2015-09-26 22:08:49.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/form.3x.html	2015-10-25 00:21:13.000000000 +0000
+--- a/doc/html/man/form.3x.html
++++ b/doc/html/man/form.3x.html
 @@ -245,7 +245,7 @@
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for
         detailed descriptions of the entry points.
@@ -411,9 +393,8 @@ Index: doc/html/man/form.3x.html
  
  
  
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20151017+/doc/html/man/infocmp.1m.html	2015-09-26 22:08:50.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/infocmp.1m.html	2015-10-25 00:21:14.000000000 +0000
+--- a/doc/html/man/infocmp.1m.html
++++ b/doc/html/man/infocmp.1m.html
 @@ -487,7 +487,7 @@
  
         http://invisible-island.net/ncurses/tctest.html
@@ -423,9 +404,8 @@ Index: doc/html/man/infocmp.1m.html
  
  
  </PRE>
-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20151017+/doc/html/man/infotocap.1m.html	2015-09-26 22:08:50.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/infotocap.1m.html	2015-10-25 00:21:14.000000000 +0000
+--- a/doc/html/man/infotocap.1m.html
++++ b/doc/html/man/infotocap.1m.html
 @@ -94,7 +94,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
@@ -435,9 +415,8 @@ Index: doc/html/man/infotocap.1m.html
  
  
  </PRE>
-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20151017+/doc/html/man/menu.3x.html	2015-09-26 22:08:51.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/menu.3x.html	2015-10-25 00:21:15.000000000 +0000
+--- a/doc/html/man/menu.3x.html
++++ b/doc/html/man/menu.3x.html
 @@ -227,7 +227,7 @@
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for
         detailed descriptions of the entry points.
@@ -447,9 +426,8 @@ Index: doc/html/man/menu.3x.html
  
  
  
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20151017+/doc/html/man/ncurses.3x.html	2015-09-26 22:08:52.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/ncurses.3x.html	2015-10-25 00:21:16.000000000 +0000
+--- a/doc/html/man/ncurses.3x.html
++++ b/doc/html/man/ncurses.3x.html
 @@ -63,7 +63,7 @@
         sonable optimization.  This implementation is "new curses"
         (ncurses) and is the approved replacement for 4.4BSD clas-
@@ -459,9 +437,8 @@ Index: doc/html/man/ncurses.3x.html
  
         The <STRONG>ncurses</STRONG> library emulates the curses library of  System
         V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20151017+/doc/html/man/panel.3x.html	2015-09-26 22:08:52.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/panel.3x.html	2015-10-25 00:21:16.000000000 +0000
+--- a/doc/html/man/panel.3x.html
++++ b/doc/html/man/panel.3x.html
 @@ -218,7 +218,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
@@ -471,9 +448,8 @@ Index: doc/html/man/panel.3x.html
  
  
  </PRE>
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20151017+/doc/html/man/tabs.1.html	2015-09-26 22:08:52.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tabs.1.html	2015-10-25 00:21:16.000000000 +0000
+--- a/doc/html/man/tabs.1.html
++++ b/doc/html/man/tabs.1.html
 @@ -168,7 +168,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -483,9 +459,8 @@ Index: doc/html/man/tabs.1.html
  
  
  
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20151017+/doc/html/man/terminfo.5.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/terminfo.5.html	2015-10-25 00:21:17.000000000 +0000
+--- a/doc/html/man/terminfo.5.html
++++ b/doc/html/man/terminfo.5.html
 @@ -78,7 +78,7 @@
         nals by giving a set of capabilities which they  have,  by
         specifying how to perform screen operations, and by speci-
@@ -495,9 +470,8 @@ Index: doc/html/man/terminfo.5.html
  
         Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
         fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20151017+/doc/html/man/tic.1m.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tic.1m.html	2015-10-25 00:21:17.000000000 +0000
+--- a/doc/html/man/tic.1m.html
++++ b/doc/html/man/tic.1m.html
 @@ -408,7 +408,7 @@
         <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -507,9 +481,8 @@ Index: doc/html/man/tic.1m.html
  
  
  </PRE>
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20151017+/doc/html/man/toe.1m.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/toe.1m.html	2015-10-25 00:21:17.000000000 +0000
+--- a/doc/html/man/toe.1m.html
++++ b/doc/html/man/toe.1m.html
 @@ -122,7 +122,7 @@
         <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
         <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
@@ -519,9 +492,8 @@ Index: doc/html/man/toe.1m.html
  
  
  
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20151017+/doc/html/man/tput.1.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tput.1.html	2015-10-25 00:21:17.000000000 +0000
+--- a/doc/html/man/tput.1.html
++++ b/doc/html/man/tput.1.html
 @@ -338,7 +338,7 @@
  <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
         <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
@@ -531,9 +503,8 @@ Index: doc/html/man/tput.1.html
  
  
  
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20151017+/doc/html/man/tset.1.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tset.1.html	2015-10-25 00:21:17.000000000 +0000
+--- a/doc/html/man/tset.1.html
++++ b/doc/html/man/tset.1.html
 @@ -319,7 +319,7 @@
         <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,
         <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
@@ -543,10 +514,8 @@ Index: doc/html/man/tset.1.html
  
  
  
-Index: man/curs_attr.3x
-Prereq:  1.41 
---- ncurses-6.0-20151017+/man/curs_attr.3x	2015-09-05 21:13:25.000000000 +0000
-+++ ncurses-6.0-20151024/man/curs_attr.3x	2015-10-24 19:10:42.000000000 +0000
+--- a/man/curs_attr.3x
++++ b/man/curs_attr.3x
 @@ -27,7 +27,7 @@
  .\" authorization.                                                           *
  .\"***************************************************************************
@@ -565,9 +534,8 @@ Prereq:  1.41
  The routine \fBattr_set\fP provides for passing a color-pair parameter.
  .PP
  The remaining \fBattr_\fR* functions operate exactly like the corresponding
-Index: misc/terminfo.src
---- ncurses-6.0-20151017+/misc/terminfo.src	2015-07-25 19:27:20.000000000 +0000
-+++ ncurses-6.0-20151024/misc/terminfo.src	2015-10-24 17:56:55.000000000 +0000
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
 @@ -6,8 +6,8 @@
  # Report bugs and new terminal descriptions to
  #	bug-ncurses@gnu.org
@@ -775,10 +743,8 @@ Index: misc/terminfo.src
 +#	  Internet Archive -TD
 +#
  ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: ncurses/tty/MKexpanded.sh
-Prereq:  1.17 
---- ncurses-6.0-20151017+/ncurses/tty/MKexpanded.sh	2010-01-23 17:57:43.000000000 +0000
-+++ ncurses-6.0-20151024/ncurses/tty/MKexpanded.sh	2015-10-24 23:39:24.000000000 +0000
+--- a/ncurses/tty/MKexpanded.sh
++++ b/ncurses/tty/MKexpanded.sh
 @@ -1,6 +1,6 @@
  #! /bin/sh
  ##############################################################################
@@ -805,9 +771,8 @@ Prereq:  1.17
  
  cat <<EOF
  #else /* ! NCURSES_EXPANDED */
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151017+/package/debian-mingw/changelog	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/debian-mingw/changelog	2015-10-24 13:10:18.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151017) unstable; urgency=low
 +ncurses6 (6.0+20151024) unstable; urgency=low
@@ -819,9 +784,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151017+/package/debian-mingw64/changelog	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/debian-mingw64/changelog	2015-10-24 13:10:18.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151017) unstable; urgency=low
 +ncurses6 (6.0+20151024) unstable; urgency=low
@@ -833,9 +797,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20151017+/package/debian/changelog	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/debian/changelog	2015-10-24 13:10:18.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151017) unstable; urgency=low
 +ncurses6 (6.0+20151024) unstable; urgency=low
@@ -847,10 +810,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.127 
---- ncurses-6.0-20151017+/package/mingw-ncurses.nsi	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/mingw-ncurses.nsi	2015-10-24 13:10:18.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.127 2015/10/17 20:29:47 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.128 2015/10/24 13:10:18 tom Exp $
@@ -866,9 +827,8 @@ Prereq:  1.127
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151017+/package/mingw-ncurses.spec	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/mingw-ncurses.spec	2015-10-24 13:10:18.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -878,9 +838,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151017+/package/ncurses.spec	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/ncurses.spec	2015-10-24 13:10:18.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
@@ -890,10 +849,8 @@ Index: package/ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: test/ncurses.c
-Prereq:  1.420 
---- ncurses-6.0-20151017+/test/ncurses.c	2015-05-23 23:41:25.000000000 +0000
-+++ ncurses-6.0-20151024/test/ncurses.c	2015-10-24 23:32:57.000000000 +0000
+--- a/test/ncurses.c
++++ b/test/ncurses.c
 @@ -40,7 +40,7 @@
     Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
             Thomas E. Dickey (beginning revision 1.27 in 1996).
diff --git a/packages/ncurses/6.0/200-ncurses-6.0-20151101.patch b/packages/ncurses/6.0/0010-ncurses-6.0-20151101.patch
similarity index 99%
rename from packages/ncurses/6.0/200-ncurses-6.0-20151101.patch
rename to packages/ncurses/6.0/0010-ncurses-6.0-20151101.patch
index 7cae2844..1ebd49fa 100644
--- a/packages/ncurses/6.0/200-ncurses-6.0-20151101.patch
+++ b/packages/ncurses/6.0/0010-ncurses-6.0-20151101.patch
@@ -18,7 +18,7 @@
 # NEWS                             |   15 
 # VERSION                          |    2 
 # aclocal.m4                       |   28 
-# configure                        | 3433 ++++++++++++++++++-------------------
+# configure                        | 3433 +++++++++++++++++++--------------------
 # configure.in                     |   10 
 # dist.mk                          |    4 
 # misc/Makefile.in                 |   32 
@@ -32,10 +32,8 @@
 # test/ncurses.c                   |   10 
 # 16 files changed, 1800 insertions(+), 1800 deletions(-)
 # ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.108 
---- ncurses-6.0-20151024+/Ada95/aclocal.m4	2015-10-17 23:07:06.000000000 +0000
-+++ ncurses-6.0-20151101/Ada95/aclocal.m4	2015-11-01 01:03:41.000000000 +0000
+--- a/Ada95/aclocal.m4
++++ b/Ada95/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey
@@ -91,10 +89,8 @@ Prereq:  1.108
  dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
  dnl ---------------
  dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
-Index: NEWS
-Prereq:  1.2516 
---- ncurses-6.0-20151024+/NEWS	2015-10-25 00:17:28.000000000 +0000
-+++ ncurses-6.0-20151101/NEWS	2015-11-01 10:27:24.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -131,16 +127,13 @@ Prereq:  1.2516
  	+ using configure option "--without-fallbacks" incorrectly caused
  	  FALLBACK_LIST to be set to "no" (patch by Tomas Cech).
  	+ updated minitel entries to fix kel problem with emacs, and add
-Index: VERSION
---- ncurses-6.0-20151024+/VERSION	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/VERSION	2015-11-01 10:25:33.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20151024
 +5:0:9	6.0	20151101
-Index: aclocal.m4
-Prereq:  1.779 
---- ncurses-6.0-20151024+/aclocal.m4	2015-10-25 00:51:20.000000000 +0000
-+++ ncurses-6.0-20151101/aclocal.m4	2015-11-01 10:29:05.000000000 +0000
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -223,9 +216,8 @@ Prereq:  1.779
  
  distclean::
  	rm -f resulting.map
-Index: configure
---- ncurses-6.0-20151024+/configure	2015-10-24 22:43:05.000000000 +0000
-+++ ncurses-6.0-20151101/configure	2015-11-01 10:12:02.000000000 +0000
+--- a/configure
++++ b/configure
 @@ -1,5 +1,5 @@
  #! /bin/sh
 -# From configure.in Revision: 1.621 .
@@ -12011,10 +12003,8 @@ Index: configure
  
  					with_shared_cxx=yes
  					;;
-Index: configure.in
-Prereq:  1.621 
---- ncurses-6.0-20151024+/configure.in	2015-10-24 17:57:55.000000000 +0000
-+++ ncurses-6.0-20151101/configure.in	2015-11-01 01:22:57.000000000 +0000
+--- a/configure.in
++++ b/configure.in
 @@ -28,14 +28,14 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -12047,10 +12037,8 @@ Prereq:  1.621
  AC_SUBST(cross_compiling)
  
  AC_PATH_PROG(TIC_PATH,tic,unknown,$PATH:/usr/local/ncurses/bin)
-Index: dist.mk
-Prereq:  1.1075 
---- ncurses-6.0-20151024+/dist.mk	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/dist.mk	2015-11-01 10:25:33.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -12069,10 +12057,8 @@ Prereq:  1.1075
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: misc/Makefile.in
-Prereq:  1.63 
---- ncurses-6.0-20151024+/misc/Makefile.in	2015-08-05 23:15:41.000000000 +0000
-+++ ncurses-6.0-20151101/misc/Makefile.in	2015-11-01 20:01:20.000000000 +0000
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
 @@ -1,4 +1,4 @@
 -# $Id: Makefile.in,v 1.63 2015/08/05 23:15:41 tom Exp $
 +# $Id: Makefile.in,v 1.65 2015/11/01 20:01:20 tom Exp $
@@ -12130,10 +12116,8 @@ Prereq:  1.63
  
  tags :
  
-Index: ncurses/base/lib_mouse.c
-Prereq:  1.167 
---- ncurses-6.0-20151024+/ncurses/base/lib_mouse.c	2015-10-17 22:08:05.000000000 +0000
-+++ ncurses-6.0-20151101/ncurses/base/lib_mouse.c	2015-10-31 20:47:41.000000000 +0000
+--- a/ncurses/base/lib_mouse.c
++++ b/ncurses/base/lib_mouse.c
 @@ -84,7 +84,7 @@
  #define CUR SP_TERMTYPE
  #endif
@@ -12159,9 +12143,8 @@ Prereq:  1.167
  
  	sp->_mouse_fd = open(the_device, O_RDWR);
  
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151024+/package/debian-mingw/changelog	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/debian-mingw/changelog	2015-11-01 10:25:33.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151024) unstable; urgency=low
 +ncurses6 (6.0+20151101) unstable; urgency=low
@@ -12173,9 +12156,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151024+/package/debian-mingw64/changelog	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/debian-mingw64/changelog	2015-11-01 10:25:33.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151024) unstable; urgency=low
 +ncurses6 (6.0+20151101) unstable; urgency=low
@@ -12187,9 +12169,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20151024+/package/debian/changelog	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/debian/changelog	2015-11-01 10:25:33.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151024) unstable; urgency=low
 +ncurses6 (6.0+20151101) unstable; urgency=low
@@ -12201,10 +12182,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.128 
---- ncurses-6.0-20151024+/package/mingw-ncurses.nsi	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/mingw-ncurses.nsi	2015-11-01 10:25:33.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.128 2015/10/24 13:10:18 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.130 2015/11/01 10:25:33 tom Exp $
@@ -12220,9 +12199,8 @@ Prereq:  1.128
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151024+/package/mingw-ncurses.spec	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/mingw-ncurses.spec	2015-11-01 10:25:33.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -12232,9 +12210,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151024+/package/ncurses.spec	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/ncurses.spec	2015-11-01 10:25:33.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
@@ -12244,10 +12221,8 @@ Index: package/ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: test/ncurses.c
-Prereq:  1.421 
---- ncurses-6.0-20151024+/test/ncurses.c	2015-10-24 23:32:57.000000000 +0000
-+++ ncurses-6.0-20151101/test/ncurses.c	2015-10-31 19:53:06.000000000 +0000
+--- a/test/ncurses.c
++++ b/test/ncurses.c
 @@ -40,7 +40,7 @@
     Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
             Thomas E. Dickey (beginning revision 1.27 in 1996).
diff --git a/packages/ncurses/6.0/210-ncurses-6.0-20151107.patch b/packages/ncurses/6.0/0011-ncurses-6.0-20151107.patch
similarity index 89%
rename from packages/ncurses/6.0/210-ncurses-6.0-20151107.patch
rename to packages/ncurses/6.0/0011-ncurses-6.0-20151107.patch
index f2567c98..4d05bff3 100644
--- a/packages/ncurses/6.0/210-ncurses-6.0-20151107.patch
+++ b/packages/ncurses/6.0/0011-ncurses-6.0-20151107.patch
@@ -14,11 +14,11 @@
 # patch by Thomas E. Dickey <dickey@invisible-island.net>
 # created  Sun Nov  8 02:34:05 UTC 2015
 # ------------------------------------------------------------------------------
-# NEWS                             |   15 +++++
+# NEWS                             |   15 +++++-
 # VERSION                          |    2 
-# aclocal.m4                       |   10 +--
-# configure                        |   96 +++++++++++++++++++------------------
-# configure.in                     |   10 ++-
+# aclocal.m4                       |   10 ++--
+# configure                        |   96 ++++++++++++++++++++-------------------
+# configure.in                     |   10 ++--
 # dist.mk                          |    4 -
 # package/debian-mingw/changelog   |    4 -
 # package/debian-mingw64/changelog |    4 -
@@ -29,10 +29,8 @@
 # progs/tset.c                     |    7 --
 # 13 files changed, 91 insertions(+), 73 deletions(-)
 # ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2522 
---- ncurses-6.0-20151101+/NEWS	2015-11-01 10:27:24.000000000 +0000
-+++ ncurses-6.0-20151107/NEWS	2015-11-08 01:57:15.000000000 +0000
+--- a/NEWS
++++ b/NEWS
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
  -- authorization.                                                            --
@@ -62,16 +60,13 @@ Prereq:  1.2522
  20151101
  	+ amend change for pkg-config which allows build of pc-files when no
  	  valid pkg-config library directory was configured to suppress the
-Index: VERSION
---- ncurses-6.0-20151101+/VERSION	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/VERSION	2015-11-06 00:44:10.000000000 +0000
+--- a/VERSION
++++ b/VERSION
 @@ -1 +1 @@
 -5:0:9	6.0	20151101
 +5:0:9	6.0	20151107
-Index: aclocal.m4
-Prereq:  1.783 
---- ncurses-6.0-20151101+/aclocal.m4	2015-11-01 10:29:05.000000000 +0000
-+++ ncurses-6.0-20151107/aclocal.m4	2015-11-08 01:03:06.000000000 +0000
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -28,7 +28,7 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -110,9 +105,8 @@ Prereq:  1.783
  { if ( last != "" && ( skip == 0 || \[$]\[$]0 !~ /}/ ) ) { print last; }\
   skip = 0; last = \[$]\[$]0; } \
  END { print last; }' < $UNALTERED_SYMS >\[$]@
-Index: configure
---- ncurses-6.0-20151101+/configure	2015-11-01 10:12:02.000000000 +0000
-+++ ncurses-6.0-20151107/configure	2015-11-08 01:06:42.000000000 +0000
+--- a/configure
++++ b/configure
 @@ -1,5 +1,5 @@
  #! /bin/sh
 -# From configure.in Revision: 1.622 .
@@ -502,10 +496,8 @@ Index: configure
  
  					with_shared_cxx=yes
  					;;
-Index: configure.in
-Prereq:  1.622 
---- ncurses-6.0-20151101+/configure.in	2015-11-01 01:22:57.000000000 +0000
-+++ ncurses-6.0-20151107/configure.in	2015-11-07 22:41:37.000000000 +0000
+--- a/configure.in
++++ b/configure.in
 @@ -28,14 +28,14 @@
  dnl
  dnl Author: Thomas E. Dickey 1995-on
@@ -553,10 +545,8 @@ Prereq:  1.622
  TIC_PATH="$TIC_PATH"
  TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
  TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
-Index: dist.mk
-Prereq:  1.1077 
---- ncurses-6.0-20151101+/dist.mk	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/dist.mk	2015-11-06 00:44:10.000000000 +0000
+--- a/dist.mk
++++ b/dist.mk
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
  # authorization.                                                             #
@@ -575,9 +565,8 @@ Prereq:  1.1077
  
  # We don't append the patch to the version, since this only applies to releases
  VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151101+/package/debian-mingw/changelog	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/debian-mingw/changelog	2015-11-06 00:44:10.000000000 +0000
+--- a/package/debian-mingw/changelog
++++ b/package/debian-mingw/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151101) unstable; urgency=low
 +ncurses6 (6.0+20151107) unstable; urgency=low
@@ -589,9 +578,8 @@ Index: package/debian-mingw/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151101+/package/debian-mingw64/changelog	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/debian-mingw64/changelog	2015-11-06 00:44:10.000000000 +0000
+--- a/package/debian-mingw64/changelog
++++ b/package/debian-mingw64/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151101) unstable; urgency=low
 +ncurses6 (6.0+20151107) unstable; urgency=low
@@ -603,9 +591,8 @@ Index: package/debian-mingw64/changelog
  
  ncurses6 (5.9-20131005) unstable; urgency=low
  
-Index: package/debian/changelog
---- ncurses-6.0-20151101+/package/debian/changelog	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/debian/changelog	2015-11-06 00:44:10.000000000 +0000
+--- a/package/debian/changelog
++++ b/package/debian/changelog
 @@ -1,8 +1,8 @@
 -ncurses6 (6.0+20151101) unstable; urgency=low
 +ncurses6 (6.0+20151107) unstable; urgency=low
@@ -617,10 +604,8 @@ Index: package/debian/changelog
  
  ncurses6 (5.9-20120608) unstable; urgency=low
  
-Index: package/mingw-ncurses.nsi
-Prereq:  1.130 
---- ncurses-6.0-20151101+/package/mingw-ncurses.nsi	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/mingw-ncurses.nsi	2015-11-06 00:44:10.000000000 +0000
+--- a/package/mingw-ncurses.nsi
++++ b/package/mingw-ncurses.nsi
 @@ -1,4 +1,4 @@
 -; $Id: mingw-ncurses.nsi,v 1.130 2015/11/01 10:25:33 tom Exp $
 +; $Id: mingw-ncurses.nsi,v 1.131 2015/11/06 00:44:10 tom Exp $
@@ -636,9 +621,8 @@ Prereq:  1.130
  !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
  
  !define MY_ABI   "5"
-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151101+/package/mingw-ncurses.spec	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/mingw-ncurses.spec	2015-11-06 00:44:10.000000000 +0000
+--- a/package/mingw-ncurses.spec
++++ b/package/mingw-ncurses.spec
 @@ -3,7 +3,7 @@
  Summary: shared libraries for terminal handling
  Name: mingw32-ncurses6
@@ -648,9 +632,8 @@ Index: package/mingw-ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151101+/package/ncurses.spec	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/ncurses.spec	2015-11-06 00:44:10.000000000 +0000
+--- a/package/ncurses.spec
++++ b/package/ncurses.spec
 @@ -1,7 +1,7 @@
  Summary: shared libraries for terminal handling
  Name: ncurses6
@@ -660,10 +643,8 @@ Index: package/ncurses.spec
  License: X11
  Group: Development/Libraries
  Source: ncurses-%{version}-%{release}.tgz
-Index: progs/tset.c
-Prereq:  1.96 
---- ncurses-6.0-20151101+/progs/tset.c	2015-04-12 15:36:06.000000000 +0000
-+++ ncurses-6.0-20151107/progs/tset.c	2015-11-08 01:45:47.000000000 +0000
+--- a/progs/tset.c
++++ b/progs/tset.c
 @@ -119,7 +119,7 @@
  #include <dump_entry.h>
  #include <transform.h>
diff --git a/packages/ncurses/6.0/999-create-run_tic.patch b/packages/ncurses/6.0/0012-create-run_tic.patch
similarity index 55%
rename from packages/ncurses/6.0/999-create-run_tic.patch
rename to packages/ncurses/6.0/0012-create-run_tic.patch
index 7c4fb0d2..f4639b40 100644
--- a/packages/ncurses/6.0/999-create-run_tic.patch
+++ b/packages/ncurses/6.0/0012-create-run_tic.patch
@@ -1,7 +1,11 @@
-diff -urpN ncurses-6.0.orig/configure ncurses-6.0/configure
---- ncurses-6.0.orig/configure	2017-02-05 11:06:35.342548609 -0800
-+++ ncurses-6.0/configure	2017-02-05 11:07:02.878754676 -0800
-@@ -22254,7 +22254,6 @@ else
+---
+ configure    |    1 -
+ configure.in |    1 -
+ 2 files changed, 2 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -22254,7 +22254,6 @@
  fi
  
  ################################################################################
@@ -9,10 +13,9 @@ diff -urpN ncurses-6.0.orig/configure ncurses-6.0/configure
  SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
  
  SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
-diff -urpN ncurses-6.0.orig/configure.in ncurses-6.0/configure.in
---- ncurses-6.0.orig/configure.in	2017-02-05 11:06:35.326548489 -0800
-+++ ncurses-6.0/configure.in	2017-02-05 11:07:08.926799658 -0800
-@@ -2032,7 +2032,6 @@ CF_SUBST_IF(["x$ac_cv_header_termio_h" =
+--- a/configure.in
++++ b/configure.in
+@@ -2032,7 +2032,6 @@
  CF_SUBST_IF(["x$ac_cv_header_termios_h" = xyes], HAVE_TERMIOS_H, 1, 0)
  
  ################################################################################
diff --git a/packages/newlib-linaro/2.1.0-2014.09/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib-linaro/2.1.0-2014.09/0000-fix-unaligned-access-memcpy-m68k.patch
similarity index 79%
rename from packages/newlib-linaro/2.1.0-2014.09/100-fix-unaligned-access-memcpy-m68k.patch
rename to packages/newlib-linaro/2.1.0-2014.09/0000-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..b6709d5a 100644
--- a/packages/newlib-linaro/2.1.0-2014.09/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib-linaro/2.1.0-2014.09/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -12,10 +12,8 @@ Signed-off-by: Austin Morton <austinpmorton@gmail.com>
  newlib/libc/machine/m68k/memcpy.S |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.20.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
 @@ -15,7 +15,7 @@
  
  #include "m68kasm.h"
diff --git a/packages/newlib-linaro/2.1.0-2014.09/0001-fix-eabihf.patch b/packages/newlib-linaro/2.1.0-2014.09/0001-fix-eabihf.patch
new file mode 100644
index 00000000..f2955930
--- /dev/null
+++ b/packages/newlib-linaro/2.1.0-2014.09/0001-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2531,7 +2531,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi | *-*-tirtos*)
++  *-*-elf | *-*-eabi* | *-*-tirtos*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi | *-*-tirtos*)
++  *-*-elf | *-*-eabi* | *-*-tirtos*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib-linaro/2.1.0-2014.09/0002-fix-mt-cflags.patch b/packages/newlib-linaro/2.1.0-2014.09/0002-fix-mt-cflags.patch
new file mode 100644
index 00000000..22c4642d
--- /dev/null
+++ b/packages/newlib-linaro/2.1.0-2014.09/0002-fix-mt-cflags.patch
@@ -0,0 +1,28 @@
+---
+ config/mt-d30v   |    4 ++--
+ config/mt-gnu    |    2 +-
+ config/mt-ospace |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
+@@ -1,4 +1,4 @@
+ # Build libraries optimizing for space, not speed.
+ # Turn off warnings about symbols named the same as registers
+- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
+- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
++ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
++ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
+--- a/config/mt-gnu
++++ b/config/mt-gnu
+@@ -1 +1 @@
+-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
++CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
+--- a/config/mt-ospace
++++ b/config/mt-ospace
+@@ -1,3 +1,3 @@
+ # Build libraries optimizing for space, not speed.
+- CFLAGS_FOR_TARGET = -g -Os
+- CXXFLAGS_FOR_TARGET = -g -Os
++ CFLAGS_FOR_TARGET += -g -Os
++ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib-linaro/2.1.0-2014.09/110-fix-eabihf.patch b/packages/newlib-linaro/2.1.0-2014.09/110-fix-eabihf.patch
deleted file mode 100644
index 21a31492..00000000
--- a/packages/newlib-linaro/2.1.0-2014.09/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-linaro-2.1.0-2014.09.orig/libgloss/arm/configure newlib-linaro-2.1.0-2014.09/libgloss/arm/configure
---- newlib-linaro-2.1.0-2014.09.orig/libgloss/arm/configure	2017-04-11 00:41:25.484880978 -0700
-+++ newlib-linaro-2.1.0-2014.09/libgloss/arm/configure	2017-04-11 00:43:12.341789130 -0700
-@@ -2531,7 +2531,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi | *-*-tirtos*)
-+  *-*-elf | *-*-eabi* | *-*-tirtos*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-linaro-2.1.0-2014.09.orig/libgloss/arm/configure.in newlib-linaro-2.1.0-2014.09/libgloss/arm/configure.in
---- newlib-linaro-2.1.0-2014.09.orig/libgloss/arm/configure.in	2017-04-11 00:41:25.484880978 -0700
-+++ newlib-linaro-2.1.0-2014.09/libgloss/arm/configure.in	2017-04-11 00:43:12.341789130 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi | *-*-tirtos*)
-+  *-*-elf | *-*-eabi* | *-*-tirtos*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib-linaro/2.1.0-2014.09/200-fix-mt-cflags.patch b/packages/newlib-linaro/2.1.0-2014.09/200-fix-mt-cflags.patch
deleted file mode 100644
index f64c170d..00000000
--- a/packages/newlib-linaro/2.1.0-2014.09/200-fix-mt-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urpN newlib-linaro-2.1.0-2014.09.orig/config/mt-d30v newlib-linaro-2.1.0-2014.09/config/mt-d30v
---- newlib-linaro-2.1.0-2014.09.orig/config/mt-d30v	2017-04-11 00:51:28.188768929 -0700
-+++ newlib-linaro-2.1.0-2014.09/config/mt-d30v	2017-04-11 00:55:51.142626761 -0700
-@@ -1,4 +1,4 @@
- # Build libraries optimizing for space, not speed.
- # Turn off warnings about symbols named the same as registers
-- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
-- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
-+ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
-+ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
-diff -urpN newlib-linaro-2.1.0-2014.09.orig/config/mt-gnu newlib-linaro-2.1.0-2014.09/config/mt-gnu
---- newlib-linaro-2.1.0-2014.09.orig/config/mt-gnu	2017-04-11 00:51:28.188768929 -0700
-+++ newlib-linaro-2.1.0-2014.09/config/mt-gnu	2017-04-11 00:55:51.142626761 -0700
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
-diff -urpN newlib-linaro-2.1.0-2014.09.orig/config/mt-ospace newlib-linaro-2.1.0-2014.09/config/mt-ospace
---- newlib-linaro-2.1.0-2014.09.orig/config/mt-ospace	2017-04-11 00:51:28.188768929 -0700
-+++ newlib-linaro-2.1.0-2014.09/config/mt-ospace	2017-04-11 00:55:51.142626761 -0700
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib-linaro/2.2.0-2015.01/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib-linaro/2.2.0-2015.01/0000-fix-unaligned-access-memcpy-m68k.patch
similarity index 79%
rename from packages/newlib-linaro/2.2.0-2015.01/100-fix-unaligned-access-memcpy-m68k.patch
rename to packages/newlib-linaro/2.2.0-2015.01/0000-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..b6709d5a 100644
--- a/packages/newlib-linaro/2.2.0-2015.01/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib-linaro/2.2.0-2015.01/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -12,10 +12,8 @@ Signed-off-by: Austin Morton <austinpmorton@gmail.com>
  newlib/libc/machine/m68k/memcpy.S |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.20.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
 @@ -15,7 +15,7 @@
  
  #include "m68kasm.h"
diff --git a/packages/newlib-linaro/2.2.0-2015.01/0001-fix-eabihf.patch b/packages/newlib-linaro/2.2.0-2015.01/0001-fix-eabihf.patch
new file mode 100644
index 00000000..f2955930
--- /dev/null
+++ b/packages/newlib-linaro/2.2.0-2015.01/0001-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2531,7 +2531,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi | *-*-tirtos*)
++  *-*-elf | *-*-eabi* | *-*-tirtos*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi | *-*-tirtos*)
++  *-*-elf | *-*-eabi* | *-*-tirtos*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib-linaro/2.2.0-2015.01/0002-fix-mt-cflags.patch b/packages/newlib-linaro/2.2.0-2015.01/0002-fix-mt-cflags.patch
new file mode 100644
index 00000000..22c4642d
--- /dev/null
+++ b/packages/newlib-linaro/2.2.0-2015.01/0002-fix-mt-cflags.patch
@@ -0,0 +1,28 @@
+---
+ config/mt-d30v   |    4 ++--
+ config/mt-gnu    |    2 +-
+ config/mt-ospace |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
+@@ -1,4 +1,4 @@
+ # Build libraries optimizing for space, not speed.
+ # Turn off warnings about symbols named the same as registers
+- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
+- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
++ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
++ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
+--- a/config/mt-gnu
++++ b/config/mt-gnu
+@@ -1 +1 @@
+-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
++CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
+--- a/config/mt-ospace
++++ b/config/mt-ospace
+@@ -1,3 +1,3 @@
+ # Build libraries optimizing for space, not speed.
+- CFLAGS_FOR_TARGET = -g -Os
+- CXXFLAGS_FOR_TARGET = -g -Os
++ CFLAGS_FOR_TARGET += -g -Os
++ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib-linaro/2.2.0-2015.01/110-fix-eabihf.patch b/packages/newlib-linaro/2.2.0-2015.01/110-fix-eabihf.patch
deleted file mode 100644
index 1fa21cc3..00000000
--- a/packages/newlib-linaro/2.2.0-2015.01/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-linaro-2.2.0-2015.01.orig/libgloss/arm/configure newlib-linaro-2.2.0-2015.01/libgloss/arm/configure
---- newlib-linaro-2.2.0-2015.01.orig/libgloss/arm/configure	2017-04-11 00:41:25.672882574 -0700
-+++ newlib-linaro-2.2.0-2015.01/libgloss/arm/configure	2017-04-11 00:43:12.349789198 -0700
-@@ -2531,7 +2531,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi | *-*-tirtos*)
-+  *-*-elf | *-*-eabi* | *-*-tirtos*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-linaro-2.2.0-2015.01.orig/libgloss/arm/configure.in newlib-linaro-2.2.0-2015.01/libgloss/arm/configure.in
---- newlib-linaro-2.2.0-2015.01.orig/libgloss/arm/configure.in	2017-04-11 00:41:25.672882574 -0700
-+++ newlib-linaro-2.2.0-2015.01/libgloss/arm/configure.in	2017-04-11 00:43:12.349789198 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi | *-*-tirtos*)
-+  *-*-elf | *-*-eabi* | *-*-tirtos*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib-linaro/2.2.0-2015.01/200-fix-mt-cflags.patch b/packages/newlib-linaro/2.2.0-2015.01/200-fix-mt-cflags.patch
deleted file mode 100644
index 68e935ba..00000000
--- a/packages/newlib-linaro/2.2.0-2015.01/200-fix-mt-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urpN newlib-linaro-2.2.0-2015.01.orig/config/mt-d30v newlib-linaro-2.2.0-2015.01/config/mt-d30v
---- newlib-linaro-2.2.0-2015.01.orig/config/mt-d30v	2017-04-11 00:51:28.364770125 -0700
-+++ newlib-linaro-2.2.0-2015.01/config/mt-d30v	2017-04-11 00:55:51.142626761 -0700
-@@ -1,4 +1,4 @@
- # Build libraries optimizing for space, not speed.
- # Turn off warnings about symbols named the same as registers
-- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
-- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
-+ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
-+ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
-diff -urpN newlib-linaro-2.2.0-2015.01.orig/config/mt-gnu newlib-linaro-2.2.0-2015.01/config/mt-gnu
---- newlib-linaro-2.2.0-2015.01.orig/config/mt-gnu	2017-04-11 00:51:28.364770125 -0700
-+++ newlib-linaro-2.2.0-2015.01/config/mt-gnu	2017-04-11 00:55:51.142626761 -0700
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
-diff -urpN newlib-linaro-2.2.0-2015.01.orig/config/mt-ospace newlib-linaro-2.2.0-2015.01/config/mt-ospace
---- newlib-linaro-2.2.0-2015.01.orig/config/mt-ospace	2017-04-11 00:51:28.368770153 -0700
-+++ newlib-linaro-2.2.0-2015.01/config/mt-ospace	2017-04-11 00:55:51.142626761 -0700
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/1.17.0/0000-fix-eabihf.patch b/packages/newlib/1.17.0/0000-fix-eabihf.patch
new file mode 100644
index 00000000..66d56a17
--- /dev/null
+++ b/packages/newlib/1.17.0/0000-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2540,7 +2540,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib/1.17.0/200-fix-mt-cflags.patch b/packages/newlib/1.17.0/0001-fix-mt-cflags.patch
similarity index 50%
rename from packages/newlib/1.17.0/200-fix-mt-cflags.patch
rename to packages/newlib/1.17.0/0001-fix-mt-cflags.patch
index f97ba150..9984a7e6 100644
--- a/packages/newlib/1.17.0/200-fix-mt-cflags.patch
+++ b/packages/newlib/1.17.0/0001-fix-mt-cflags.patch
@@ -1,6 +1,11 @@
-diff -urpN newlib-1.17.0.orig/config/mt-d30v newlib-1.17.0/config/mt-d30v
---- newlib-1.17.0.orig/config/mt-d30v	2017-04-11 00:51:26.572757941 -0700
-+++ newlib-1.17.0/config/mt-d30v	2017-04-11 00:55:51.110626527 -0700
+---
+ config/mt-d30v   |    4 ++--
+ config/mt-gnu    |    2 +-
+ config/mt-ospace |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
 @@ -1,4 +1,4 @@
  # Build libraries optimizing for space, not speed.
  # Turn off warnings about symbols named the same as registers
@@ -8,16 +13,14 @@ diff -urpN newlib-1.17.0.orig/config/mt-d30v newlib-1.17.0/config/mt-d30v
 - CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
 + CFLAGS_FOR_TARGET += -g -Os -Wa,-C
 + CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
-diff -urpN newlib-1.17.0.orig/config/mt-gnu newlib-1.17.0/config/mt-gnu
---- newlib-1.17.0.orig/config/mt-gnu	2017-04-11 00:51:26.572757941 -0700
-+++ newlib-1.17.0/config/mt-gnu	2017-04-11 00:55:51.110626527 -0700
+--- a/config/mt-gnu
++++ b/config/mt-gnu
 @@ -1,2 +1,2 @@
 -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
 +CXXFLAGS_FOR_TARGET += $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
  	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET) -D_GNU_SOURCE
-diff -urpN newlib-1.17.0.orig/config/mt-ospace newlib-1.17.0/config/mt-ospace
---- newlib-1.17.0.orig/config/mt-ospace	2017-04-11 00:51:26.572757941 -0700
-+++ newlib-1.17.0/config/mt-ospace	2017-04-11 00:55:51.110626527 -0700
+--- a/config/mt-ospace
++++ b/config/mt-ospace
 @@ -1,3 +1,3 @@
  # Build libraries optimizing for space, not speed.
 - CFLAGS_FOR_TARGET = -g -Os
diff --git a/packages/newlib/1.17.0/999-fix-arm-build.patch b/packages/newlib/1.17.0/0002-fix-arm-build.patch
similarity index 72%
rename from packages/newlib/1.17.0/999-fix-arm-build.patch
rename to packages/newlib/1.17.0/0002-fix-arm-build.patch
index 154a92f5..6b8170cd 100644
--- a/packages/newlib/1.17.0/999-fix-arm-build.patch
+++ b/packages/newlib/1.17.0/0002-fix-arm-build.patch
@@ -1,6 +1,9 @@
-diff -urpN newlib-1.17.0.orig/libgloss/arm/linux-syscalls0.S newlib-1.17.0/libgloss/arm/linux-syscalls0.S
---- newlib-1.17.0.orig/libgloss/arm/linux-syscalls0.S	2017-04-10 23:18:30.559142019 -0700
-+++ newlib-1.17.0/libgloss/arm/linux-syscalls0.S	2017-04-10 23:35:06.422568832 -0700
+---
+ libgloss/arm/linux-syscalls0.S |   44 -----------------------------------------
+ 1 file changed, 44 deletions(-)
+
+--- a/libgloss/arm/linux-syscalls0.S
++++ b/libgloss/arm/linux-syscalls0.S
 @@ -19,47 +19,6 @@
  #define GLOBAL(name) .global name; FUNC(name)
  #define SIZE(name) .size name, .-name
@@ -49,7 +52,7 @@ diff -urpN newlib-1.17.0.orig/libgloss/arm/linux-syscalls0.S newlib-1.17.0/libgl
  # define SYSCALL4(name) \
  	GLOBAL(_ ## name); \
  	swi #SYS_ ## name; \
-@@ -78,9 +37,6 @@ FUNC(_syscall3)
+@@ -78,9 +37,6 @@
  
  #define SYSCALL0(name) SYSCALL3(name)
  #define SYSCALL3(name) SYSCALL4(name)
@@ -59,4 +62,3 @@ diff -urpN newlib-1.17.0.orig/libgloss/arm/linux-syscalls0.S newlib-1.17.0/libgl
  #define SYSCALL1(name) SYSCALL3(name)
  #define SYSCALL2(name) SYSCALL3(name)
  #define SYSCALL5(name) SYSCALL6(name)
-Binary files newlib-1.17.0.orig/libgloss/arm/.linux-syscalls0.S.swp and newlib-1.17.0/libgloss/arm/.linux-syscalls0.S.swp differ
diff --git a/packages/newlib/1.17.0/110-fix-eabihf.patch b/packages/newlib/1.17.0/110-fix-eabihf.patch
deleted file mode 100644
index d896ad01..00000000
--- a/packages/newlib/1.17.0/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-1.17.0.orig/libgloss/arm/configure newlib-1.17.0/libgloss/arm/configure
---- newlib-1.17.0.orig/libgloss/arm/configure	2017-04-11 00:41:23.720866007 -0700
-+++ newlib-1.17.0/libgloss/arm/configure	2017-04-11 00:43:12.265788484 -0700
-@@ -2540,7 +2540,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-1.17.0.orig/libgloss/arm/configure.in newlib-1.17.0/libgloss/arm/configure.in
---- newlib-1.17.0.orig/libgloss/arm/configure.in	2017-04-11 00:41:23.720866007 -0700
-+++ newlib-1.17.0/libgloss/arm/configure.in	2017-04-11 00:43:12.265788484 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib/1.18.0/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/1.18.0/0000-fix-unaligned-access-memcpy-m68k.patch
similarity index 74%
rename from packages/newlib/1.18.0/100-fix-unaligned-access-memcpy-m68k.patch
rename to packages/newlib/1.18.0/0000-fix-unaligned-access-memcpy-m68k.patch
index 6214ee59..78da4e0d 100644
--- a/packages/newlib/1.18.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/1.18.0/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -8,10 +8,8 @@ Signed-off-by: Remy Bohmer <linux@bohmer.net>
  newlib/libc/machine/m68k/memcpy.S |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: newlib-1.18.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.18.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.18.0/newlib/libc/machine/m68k/memcpy.S
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
 @@ -15,7 +15,7 @@
  
  #include "m68kasm.h"
diff --git a/packages/newlib/1.18.0/0001-fix-eabihf.patch b/packages/newlib/1.18.0/0001-fix-eabihf.patch
new file mode 100644
index 00000000..66d56a17
--- /dev/null
+++ b/packages/newlib/1.18.0/0001-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2540,7 +2540,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib/1.18.0/0002-fix-mt-cflags.patch b/packages/newlib/1.18.0/0002-fix-mt-cflags.patch
new file mode 100644
index 00000000..22c4642d
--- /dev/null
+++ b/packages/newlib/1.18.0/0002-fix-mt-cflags.patch
@@ -0,0 +1,28 @@
+---
+ config/mt-d30v   |    4 ++--
+ config/mt-gnu    |    2 +-
+ config/mt-ospace |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
+@@ -1,4 +1,4 @@
+ # Build libraries optimizing for space, not speed.
+ # Turn off warnings about symbols named the same as registers
+- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
+- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
++ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
++ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
+--- a/config/mt-gnu
++++ b/config/mt-gnu
+@@ -1 +1 @@
+-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
++CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
+--- a/config/mt-ospace
++++ b/config/mt-ospace
+@@ -1,3 +1,3 @@
+ # Build libraries optimizing for space, not speed.
+- CFLAGS_FOR_TARGET = -g -Os
+- CXXFLAGS_FOR_TARGET = -g -Os
++ CFLAGS_FOR_TARGET += -g -Os
++ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/1.18.0/110-fix-eabihf.patch b/packages/newlib/1.18.0/110-fix-eabihf.patch
deleted file mode 100644
index c2868b93..00000000
--- a/packages/newlib/1.18.0/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-1.18.0.orig/libgloss/arm/configure newlib-1.18.0/libgloss/arm/configure
---- newlib-1.18.0.orig/libgloss/arm/configure	2017-04-11 00:41:23.864867229 -0700
-+++ newlib-1.18.0/libgloss/arm/configure	2017-04-11 00:43:12.273788551 -0700
-@@ -2540,7 +2540,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-1.18.0.orig/libgloss/arm/configure.in newlib-1.18.0/libgloss/arm/configure.in
---- newlib-1.18.0.orig/libgloss/arm/configure.in	2017-04-11 00:41:23.864867229 -0700
-+++ newlib-1.18.0/libgloss/arm/configure.in	2017-04-11 00:43:12.273788551 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib/1.18.0/200-fix-mt-cflags.patch b/packages/newlib/1.18.0/200-fix-mt-cflags.patch
deleted file mode 100644
index 718e0c98..00000000
--- a/packages/newlib/1.18.0/200-fix-mt-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urpN newlib-1.18.0.orig/config/mt-d30v newlib-1.18.0/config/mt-d30v
---- newlib-1.18.0.orig/config/mt-d30v	2017-04-11 00:51:26.740759083 -0700
-+++ newlib-1.18.0/config/mt-d30v	2017-04-11 00:55:51.114626557 -0700
-@@ -1,4 +1,4 @@
- # Build libraries optimizing for space, not speed.
- # Turn off warnings about symbols named the same as registers
-- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
-- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
-+ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
-+ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
-diff -urpN newlib-1.18.0.orig/config/mt-gnu newlib-1.18.0/config/mt-gnu
---- newlib-1.18.0.orig/config/mt-gnu	2017-04-11 00:51:26.740759083 -0700
-+++ newlib-1.18.0/config/mt-gnu	2017-04-11 00:55:51.114626557 -0700
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
-diff -urpN newlib-1.18.0.orig/config/mt-ospace newlib-1.18.0/config/mt-ospace
---- newlib-1.18.0.orig/config/mt-ospace	2017-04-11 00:51:26.740759083 -0700
-+++ newlib-1.18.0/config/mt-ospace	2017-04-11 00:55:51.114626557 -0700
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/1.19.0/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/1.19.0/0000-fix-unaligned-access-memcpy-m68k.patch
similarity index 77%
rename from packages/newlib/1.19.0/100-fix-unaligned-access-memcpy-m68k.patch
rename to packages/newlib/1.19.0/0000-fix-unaligned-access-memcpy-m68k.patch
index 191363a6..87f16ddb 100644
--- a/packages/newlib/1.19.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/1.19.0/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -10,10 +10,8 @@ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
  newlib/libc/machine/m68k/memcpy.S |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
 @@ -15,7 +15,7 @@
  
  #include "m68kasm.h"
diff --git a/packages/newlib/1.19.0/0001-fix-eabihf.patch b/packages/newlib/1.19.0/0001-fix-eabihf.patch
new file mode 100644
index 00000000..66d56a17
--- /dev/null
+++ b/packages/newlib/1.19.0/0001-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2540,7 +2540,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib/1.19.0/0002-fix-mt-cflags.patch b/packages/newlib/1.19.0/0002-fix-mt-cflags.patch
new file mode 100644
index 00000000..22c4642d
--- /dev/null
+++ b/packages/newlib/1.19.0/0002-fix-mt-cflags.patch
@@ -0,0 +1,28 @@
+---
+ config/mt-d30v   |    4 ++--
+ config/mt-gnu    |    2 +-
+ config/mt-ospace |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
+@@ -1,4 +1,4 @@
+ # Build libraries optimizing for space, not speed.
+ # Turn off warnings about symbols named the same as registers
+- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
+- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
++ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
++ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
+--- a/config/mt-gnu
++++ b/config/mt-gnu
+@@ -1 +1 @@
+-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
++CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
+--- a/config/mt-ospace
++++ b/config/mt-ospace
+@@ -1,3 +1,3 @@
+ # Build libraries optimizing for space, not speed.
+- CFLAGS_FOR_TARGET = -g -Os
+- CXXFLAGS_FOR_TARGET = -g -Os
++ CFLAGS_FOR_TARGET += -g -Os
++ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/1.19.0/110-fix-eabihf.patch b/packages/newlib/1.19.0/110-fix-eabihf.patch
deleted file mode 100644
index 69ddff34..00000000
--- a/packages/newlib/1.19.0/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-1.19.0.orig/libgloss/arm/configure newlib-1.19.0/libgloss/arm/configure
---- newlib-1.19.0.orig/libgloss/arm/configure	2017-04-11 00:41:24.072868994 -0700
-+++ newlib-1.19.0/libgloss/arm/configure	2017-04-11 00:43:12.281788619 -0700
-@@ -2540,7 +2540,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-1.19.0.orig/libgloss/arm/configure.in newlib-1.19.0/libgloss/arm/configure.in
---- newlib-1.19.0.orig/libgloss/arm/configure.in	2017-04-11 00:41:24.072868994 -0700
-+++ newlib-1.19.0/libgloss/arm/configure.in	2017-04-11 00:43:12.281788619 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib/1.19.0/200-fix-mt-cflags.patch b/packages/newlib/1.19.0/200-fix-mt-cflags.patch
deleted file mode 100644
index 9158e907..00000000
--- a/packages/newlib/1.19.0/200-fix-mt-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urpN newlib-1.19.0.orig/config/mt-d30v newlib-1.19.0/config/mt-d30v
---- newlib-1.19.0.orig/config/mt-d30v	2017-04-11 00:51:26.912760252 -0700
-+++ newlib-1.19.0/config/mt-d30v	2017-04-11 00:55:51.118626585 -0700
-@@ -1,4 +1,4 @@
- # Build libraries optimizing for space, not speed.
- # Turn off warnings about symbols named the same as registers
-- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
-- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
-+ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
-+ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
-diff -urpN newlib-1.19.0.orig/config/mt-gnu newlib-1.19.0/config/mt-gnu
---- newlib-1.19.0.orig/config/mt-gnu	2017-04-11 00:51:26.912760252 -0700
-+++ newlib-1.19.0/config/mt-gnu	2017-04-11 00:55:51.118626585 -0700
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
-diff -urpN newlib-1.19.0.orig/config/mt-ospace newlib-1.19.0/config/mt-ospace
---- newlib-1.19.0.orig/config/mt-ospace	2017-04-11 00:51:26.912760252 -0700
-+++ newlib-1.19.0/config/mt-ospace	2017-04-11 00:55:51.118626585 -0700
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/1.20.0/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/1.20.0/0000-fix-unaligned-access-memcpy-m68k.patch
similarity index 79%
rename from packages/newlib/1.20.0/100-fix-unaligned-access-memcpy-m68k.patch
rename to packages/newlib/1.20.0/0000-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..b6709d5a 100644
--- a/packages/newlib/1.20.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/1.20.0/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -12,10 +12,8 @@ Signed-off-by: Austin Morton <austinpmorton@gmail.com>
  newlib/libc/machine/m68k/memcpy.S |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.20.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
 @@ -15,7 +15,7 @@
  
  #include "m68kasm.h"
diff --git a/packages/newlib/1.20.0/0001-fix-eabihf.patch b/packages/newlib/1.20.0/0001-fix-eabihf.patch
new file mode 100644
index 00000000..66d56a17
--- /dev/null
+++ b/packages/newlib/1.20.0/0001-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2540,7 +2540,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib/1.20.0/0002-fix-mt-cflags.patch b/packages/newlib/1.20.0/0002-fix-mt-cflags.patch
new file mode 100644
index 00000000..22c4642d
--- /dev/null
+++ b/packages/newlib/1.20.0/0002-fix-mt-cflags.patch
@@ -0,0 +1,28 @@
+---
+ config/mt-d30v   |    4 ++--
+ config/mt-gnu    |    2 +-
+ config/mt-ospace |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
+@@ -1,4 +1,4 @@
+ # Build libraries optimizing for space, not speed.
+ # Turn off warnings about symbols named the same as registers
+- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
+- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
++ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
++ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
+--- a/config/mt-gnu
++++ b/config/mt-gnu
+@@ -1 +1 @@
+-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
++CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
+--- a/config/mt-ospace
++++ b/config/mt-ospace
+@@ -1,3 +1,3 @@
+ # Build libraries optimizing for space, not speed.
+- CFLAGS_FOR_TARGET = -g -Os
+- CXXFLAGS_FOR_TARGET = -g -Os
++ CFLAGS_FOR_TARGET += -g -Os
++ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/1.20.0/110-fix-eabihf.patch b/packages/newlib/1.20.0/110-fix-eabihf.patch
deleted file mode 100644
index 8e30823b..00000000
--- a/packages/newlib/1.20.0/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-1.20.0.orig/libgloss/arm/configure newlib-1.20.0/libgloss/arm/configure
---- newlib-1.20.0.orig/libgloss/arm/configure	2017-04-11 00:41:24.120869401 -0700
-+++ newlib-1.20.0/libgloss/arm/configure	2017-04-11 00:43:12.289788688 -0700
-@@ -2540,7 +2540,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-1.20.0.orig/libgloss/arm/configure.in newlib-1.20.0/libgloss/arm/configure.in
---- newlib-1.20.0.orig/libgloss/arm/configure.in	2017-04-11 00:41:24.120869401 -0700
-+++ newlib-1.20.0/libgloss/arm/configure.in	2017-04-11 00:43:12.289788688 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib/1.20.0/200-fix-mt-cflags.patch b/packages/newlib/1.20.0/200-fix-mt-cflags.patch
deleted file mode 100644
index b470af7d..00000000
--- a/packages/newlib/1.20.0/200-fix-mt-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urpN newlib-1.20.0.orig/config/mt-d30v newlib-1.20.0/config/mt-d30v
---- newlib-1.20.0.orig/config/mt-d30v	2017-04-11 00:51:27.080761393 -0700
-+++ newlib-1.20.0/config/mt-d30v	2017-04-11 00:55:51.122626615 -0700
-@@ -1,4 +1,4 @@
- # Build libraries optimizing for space, not speed.
- # Turn off warnings about symbols named the same as registers
-- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
-- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
-+ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
-+ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
-diff -urpN newlib-1.20.0.orig/config/mt-gnu newlib-1.20.0/config/mt-gnu
---- newlib-1.20.0.orig/config/mt-gnu	2017-04-11 00:51:27.080761393 -0700
-+++ newlib-1.20.0/config/mt-gnu	2017-04-11 00:55:51.122626615 -0700
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
-diff -urpN newlib-1.20.0.orig/config/mt-ospace newlib-1.20.0/config/mt-ospace
---- newlib-1.20.0.orig/config/mt-ospace	2017-04-11 00:51:27.080761393 -0700
-+++ newlib-1.20.0/config/mt-ospace	2017-04-11 00:55:51.122626615 -0700
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/2.0.0/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.0.0/0000-fix-unaligned-access-memcpy-m68k.patch
similarity index 79%
rename from packages/newlib/2.0.0/100-fix-unaligned-access-memcpy-m68k.patch
rename to packages/newlib/2.0.0/0000-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..b6709d5a 100644
--- a/packages/newlib/2.0.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/2.0.0/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -12,10 +12,8 @@ Signed-off-by: Austin Morton <austinpmorton@gmail.com>
  newlib/libc/machine/m68k/memcpy.S |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.20.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
 @@ -15,7 +15,7 @@
  
  #include "m68kasm.h"
diff --git a/packages/newlib/2.0.0/0001-fix-eabihf.patch b/packages/newlib/2.0.0/0001-fix-eabihf.patch
new file mode 100644
index 00000000..66d56a17
--- /dev/null
+++ b/packages/newlib/2.0.0/0001-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2540,7 +2540,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib/2.0.0/0002-fix-mt-cflags.patch b/packages/newlib/2.0.0/0002-fix-mt-cflags.patch
new file mode 100644
index 00000000..22c4642d
--- /dev/null
+++ b/packages/newlib/2.0.0/0002-fix-mt-cflags.patch
@@ -0,0 +1,28 @@
+---
+ config/mt-d30v   |    4 ++--
+ config/mt-gnu    |    2 +-
+ config/mt-ospace |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
+@@ -1,4 +1,4 @@
+ # Build libraries optimizing for space, not speed.
+ # Turn off warnings about symbols named the same as registers
+- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
+- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
++ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
++ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
+--- a/config/mt-gnu
++++ b/config/mt-gnu
+@@ -1 +1 @@
+-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
++CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
+--- a/config/mt-ospace
++++ b/config/mt-ospace
+@@ -1,3 +1,3 @@
+ # Build libraries optimizing for space, not speed.
+- CFLAGS_FOR_TARGET = -g -Os
+- CXXFLAGS_FOR_TARGET = -g -Os
++ CFLAGS_FOR_TARGET += -g -Os
++ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/2.0.0/110-fix-eabihf.patch b/packages/newlib/2.0.0/110-fix-eabihf.patch
deleted file mode 100644
index 5bb24059..00000000
--- a/packages/newlib/2.0.0/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-2.0.0.orig/libgloss/arm/configure newlib-2.0.0/libgloss/arm/configure
---- newlib-2.0.0.orig/libgloss/arm/configure	2017-04-11 00:41:24.304870963 -0700
-+++ newlib-2.0.0/libgloss/arm/configure	2017-04-11 00:43:12.297788756 -0700
-@@ -2540,7 +2540,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-2.0.0.orig/libgloss/arm/configure.in newlib-2.0.0/libgloss/arm/configure.in
---- newlib-2.0.0.orig/libgloss/arm/configure.in	2017-04-11 00:41:24.304870963 -0700
-+++ newlib-2.0.0/libgloss/arm/configure.in	2017-04-11 00:43:12.297788756 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib/2.0.0/200-fix-mt-cflags.patch b/packages/newlib/2.0.0/200-fix-mt-cflags.patch
deleted file mode 100644
index d2b0529d..00000000
--- a/packages/newlib/2.0.0/200-fix-mt-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urpN newlib-2.0.0.orig/config/mt-d30v newlib-2.0.0/config/mt-d30v
---- newlib-2.0.0.orig/config/mt-d30v	2017-04-11 00:51:27.256762590 -0700
-+++ newlib-2.0.0/config/mt-d30v	2017-04-11 00:55:51.126626644 -0700
-@@ -1,4 +1,4 @@
- # Build libraries optimizing for space, not speed.
- # Turn off warnings about symbols named the same as registers
-- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
-- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
-+ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
-+ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
-diff -urpN newlib-2.0.0.orig/config/mt-gnu newlib-2.0.0/config/mt-gnu
---- newlib-2.0.0.orig/config/mt-gnu	2017-04-11 00:51:27.256762590 -0700
-+++ newlib-2.0.0/config/mt-gnu	2017-04-11 00:55:51.126626644 -0700
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
-diff -urpN newlib-2.0.0.orig/config/mt-ospace newlib-2.0.0/config/mt-ospace
---- newlib-2.0.0.orig/config/mt-ospace	2017-04-11 00:51:27.256762590 -0700
-+++ newlib-2.0.0/config/mt-ospace	2017-04-11 00:55:51.126626644 -0700
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/2.1.0/0000-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.1.0/0000-fix-unaligned-access-memcpy-m68k.patch
new file mode 100644
index 00000000..b6709d5a
--- /dev/null
+++ b/packages/newlib/2.1.0/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -0,0 +1,25 @@
+The m68k mcpu processor does not like unaligned access
+
+Disable at least mcpu32, m68010 and m68020. These processors certainly
+do not like unaligned accesses.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
+Signed-off-by: Austin Morton <austinpmorton@gmail.com>
+---
+ newlib/libc/machine/m68k/memcpy.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
+@@ -15,7 +15,7 @@
+ 
+ #include "m68kasm.h"
+ 
+-#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
++#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
+ # define MISALIGNED_OK 1
+ #else
+ # define MISALIGNED_OK 0
diff --git a/packages/newlib/2.1.0/0001-fix-eabihf.patch b/packages/newlib/2.1.0/0001-fix-eabihf.patch
new file mode 100644
index 00000000..ecb5c373
--- /dev/null
+++ b/packages/newlib/2.1.0/0001-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2541,7 +2541,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi)
++  *-*-elf | *-*-eabi*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib/2.1.0/0002-fix-mt-cflags.patch b/packages/newlib/2.1.0/0002-fix-mt-cflags.patch
new file mode 100644
index 00000000..22c4642d
--- /dev/null
+++ b/packages/newlib/2.1.0/0002-fix-mt-cflags.patch
@@ -0,0 +1,28 @@
+---
+ config/mt-d30v   |    4 ++--
+ config/mt-gnu    |    2 +-
+ config/mt-ospace |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
+@@ -1,4 +1,4 @@
+ # Build libraries optimizing for space, not speed.
+ # Turn off warnings about symbols named the same as registers
+- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
+- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
++ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
++ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
+--- a/config/mt-gnu
++++ b/config/mt-gnu
+@@ -1 +1 @@
+-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
++CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
+--- a/config/mt-ospace
++++ b/config/mt-ospace
+@@ -1,3 +1,3 @@
+ # Build libraries optimizing for space, not speed.
+- CFLAGS_FOR_TARGET = -g -Os
+- CXXFLAGS_FOR_TARGET = -g -Os
++ CFLAGS_FOR_TARGET += -g -Os
++ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/2.1.0/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.1.0/100-fix-unaligned-access-memcpy-m68k.patch
deleted file mode 100644
index 1d0b49be..00000000
--- a/packages/newlib/2.1.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-The m68k mcpu processor does not like unaligned access
-
-Disable at least mcpu32, m68010 and m68020. These processors certainly
-do not like unaligned accesses.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
-[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
-Signed-off-by: Austin Morton <austinpmorton@gmail.com>
----
- newlib/libc/machine/m68k/memcpy.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.20.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
diff --git a/packages/newlib/2.1.0/110-fix-eabihf.patch b/packages/newlib/2.1.0/110-fix-eabihf.patch
deleted file mode 100644
index 5f91a23f..00000000
--- a/packages/newlib/2.1.0/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-2.1.0.orig/libgloss/arm/configure newlib-2.1.0/libgloss/arm/configure
---- newlib-2.1.0.orig/libgloss/arm/configure	2017-04-11 00:41:24.592873407 -0700
-+++ newlib-2.1.0/libgloss/arm/configure	2017-04-11 00:43:12.305788823 -0700
-@@ -2541,7 +2541,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-2.1.0.orig/libgloss/arm/configure.in newlib-2.1.0/libgloss/arm/configure.in
---- newlib-2.1.0.orig/libgloss/arm/configure.in	2017-04-11 00:41:24.592873407 -0700
-+++ newlib-2.1.0/libgloss/arm/configure.in	2017-04-11 00:43:12.305788823 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib/2.1.0/200-fix-mt-cflags.patch b/packages/newlib/2.1.0/200-fix-mt-cflags.patch
deleted file mode 100644
index 57839eda..00000000
--- a/packages/newlib/2.1.0/200-fix-mt-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urpN newlib-2.1.0.orig/config/mt-d30v newlib-2.1.0/config/mt-d30v
---- newlib-2.1.0.orig/config/mt-d30v	2017-04-11 00:51:27.380763434 -0700
-+++ newlib-2.1.0/config/mt-d30v	2017-04-11 00:55:51.130626674 -0700
-@@ -1,4 +1,4 @@
- # Build libraries optimizing for space, not speed.
- # Turn off warnings about symbols named the same as registers
-- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
-- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
-+ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
-+ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
-diff -urpN newlib-2.1.0.orig/config/mt-gnu newlib-2.1.0/config/mt-gnu
---- newlib-2.1.0.orig/config/mt-gnu	2017-04-11 00:51:27.380763434 -0700
-+++ newlib-2.1.0/config/mt-gnu	2017-04-11 00:55:51.130626674 -0700
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
-diff -urpN newlib-2.1.0.orig/config/mt-ospace newlib-2.1.0/config/mt-ospace
---- newlib-2.1.0.orig/config/mt-ospace	2017-04-11 00:51:27.380763434 -0700
-+++ newlib-2.1.0/config/mt-ospace	2017-04-11 00:55:51.130626674 -0700
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/2.2.0.20151023/0000-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.2.0.20151023/0000-fix-unaligned-access-memcpy-m68k.patch
new file mode 100644
index 00000000..b6709d5a
--- /dev/null
+++ b/packages/newlib/2.2.0.20151023/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -0,0 +1,25 @@
+The m68k mcpu processor does not like unaligned access
+
+Disable at least mcpu32, m68010 and m68020. These processors certainly
+do not like unaligned accesses.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
+Signed-off-by: Austin Morton <austinpmorton@gmail.com>
+---
+ newlib/libc/machine/m68k/memcpy.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
+@@ -15,7 +15,7 @@
+ 
+ #include "m68kasm.h"
+ 
+-#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
++#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
+ # define MISALIGNED_OK 1
+ #else
+ # define MISALIGNED_OK 0
diff --git a/packages/newlib/2.2.0.20151023/0001-fix-eabihf.patch b/packages/newlib/2.2.0.20151023/0001-fix-eabihf.patch
new file mode 100644
index 00000000..f2955930
--- /dev/null
+++ b/packages/newlib/2.2.0.20151023/0001-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2531,7 +2531,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi | *-*-tirtos*)
++  *-*-elf | *-*-eabi* | *-*-tirtos*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi | *-*-tirtos*)
++  *-*-elf | *-*-eabi* | *-*-tirtos*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib/2.2.0.20151023/0002-fix-mt-cflags.patch b/packages/newlib/2.2.0.20151023/0002-fix-mt-cflags.patch
new file mode 100644
index 00000000..22c4642d
--- /dev/null
+++ b/packages/newlib/2.2.0.20151023/0002-fix-mt-cflags.patch
@@ -0,0 +1,28 @@
+---
+ config/mt-d30v   |    4 ++--
+ config/mt-gnu    |    2 +-
+ config/mt-ospace |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
+@@ -1,4 +1,4 @@
+ # Build libraries optimizing for space, not speed.
+ # Turn off warnings about symbols named the same as registers
+- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
+- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
++ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
++ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
+--- a/config/mt-gnu
++++ b/config/mt-gnu
+@@ -1 +1 @@
+-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
++CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
+--- a/config/mt-ospace
++++ b/config/mt-ospace
+@@ -1,3 +1,3 @@
+ # Build libraries optimizing for space, not speed.
+- CFLAGS_FOR_TARGET = -g -Os
+- CXXFLAGS_FOR_TARGET = -g -Os
++ CFLAGS_FOR_TARGET += -g -Os
++ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/2.2.0.20151023/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.2.0.20151023/100-fix-unaligned-access-memcpy-m68k.patch
deleted file mode 100644
index 1d0b49be..00000000
--- a/packages/newlib/2.2.0.20151023/100-fix-unaligned-access-memcpy-m68k.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-The m68k mcpu processor does not like unaligned access
-
-Disable at least mcpu32, m68010 and m68020. These processors certainly
-do not like unaligned accesses.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
-[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
-Signed-off-by: Austin Morton <austinpmorton@gmail.com>
----
- newlib/libc/machine/m68k/memcpy.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.20.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
diff --git a/packages/newlib/2.2.0.20151023/110-fix-eabihf.patch b/packages/newlib/2.2.0.20151023/110-fix-eabihf.patch
deleted file mode 100644
index 2d5a3ff9..00000000
--- a/packages/newlib/2.2.0.20151023/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-2.2.0.20151023.orig/libgloss/arm/configure newlib-2.2.0.20151023/libgloss/arm/configure
---- newlib-2.2.0.20151023.orig/libgloss/arm/configure	2017-04-11 00:41:24.816875309 -0700
-+++ newlib-2.2.0.20151023/libgloss/arm/configure	2017-04-11 00:43:12.313788892 -0700
-@@ -2531,7 +2531,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi | *-*-tirtos*)
-+  *-*-elf | *-*-eabi* | *-*-tirtos*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-2.2.0.20151023.orig/libgloss/arm/configure.in newlib-2.2.0.20151023/libgloss/arm/configure.in
---- newlib-2.2.0.20151023.orig/libgloss/arm/configure.in	2017-04-11 00:41:24.816875309 -0700
-+++ newlib-2.2.0.20151023/libgloss/arm/configure.in	2017-04-11 00:43:12.313788892 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi | *-*-tirtos*)
-+  *-*-elf | *-*-eabi* | *-*-tirtos*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib/2.2.0.20151023/200-fix-mt-cflags.patch b/packages/newlib/2.2.0.20151023/200-fix-mt-cflags.patch
deleted file mode 100644
index e1d8c026..00000000
--- a/packages/newlib/2.2.0.20151023/200-fix-mt-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urpN newlib-2.2.0.20151023.orig/config/mt-d30v newlib-2.2.0.20151023/config/mt-d30v
---- newlib-2.2.0.20151023.orig/config/mt-d30v	2017-04-11 00:51:27.580764794 -0700
-+++ newlib-2.2.0.20151023/config/mt-d30v	2017-04-11 00:55:51.130626674 -0700
-@@ -1,4 +1,4 @@
- # Build libraries optimizing for space, not speed.
- # Turn off warnings about symbols named the same as registers
-- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
-- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
-+ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
-+ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
-diff -urpN newlib-2.2.0.20151023.orig/config/mt-gnu newlib-2.2.0.20151023/config/mt-gnu
---- newlib-2.2.0.20151023.orig/config/mt-gnu	2017-04-11 00:51:27.576764766 -0700
-+++ newlib-2.2.0.20151023/config/mt-gnu	2017-04-11 00:55:51.130626674 -0700
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
-diff -urpN newlib-2.2.0.20151023.orig/config/mt-ospace newlib-2.2.0.20151023/config/mt-ospace
---- newlib-2.2.0.20151023.orig/config/mt-ospace	2017-04-11 00:51:27.576764766 -0700
-+++ newlib-2.2.0.20151023/config/mt-ospace	2017-04-11 00:55:51.130626674 -0700
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/2.3.0.20160226/0000-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.3.0.20160226/0000-fix-unaligned-access-memcpy-m68k.patch
new file mode 100644
index 00000000..b6709d5a
--- /dev/null
+++ b/packages/newlib/2.3.0.20160226/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -0,0 +1,25 @@
+The m68k mcpu processor does not like unaligned access
+
+Disable at least mcpu32, m68010 and m68020. These processors certainly
+do not like unaligned accesses.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
+Signed-off-by: Austin Morton <austinpmorton@gmail.com>
+---
+ newlib/libc/machine/m68k/memcpy.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
+@@ -15,7 +15,7 @@
+ 
+ #include "m68kasm.h"
+ 
+-#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
++#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
+ # define MISALIGNED_OK 1
+ #else
+ # define MISALIGNED_OK 0
diff --git a/packages/newlib/2.3.0.20160226/0001-fix-eabihf.patch b/packages/newlib/2.3.0.20160226/0001-fix-eabihf.patch
new file mode 100644
index 00000000..f2955930
--- /dev/null
+++ b/packages/newlib/2.3.0.20160226/0001-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2531,7 +2531,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi | *-*-tirtos*)
++  *-*-elf | *-*-eabi* | *-*-tirtos*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi | *-*-tirtos*)
++  *-*-elf | *-*-eabi* | *-*-tirtos*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib/2.3.0.20160226/0002-fix-mt-cflags.patch b/packages/newlib/2.3.0.20160226/0002-fix-mt-cflags.patch
new file mode 100644
index 00000000..22c4642d
--- /dev/null
+++ b/packages/newlib/2.3.0.20160226/0002-fix-mt-cflags.patch
@@ -0,0 +1,28 @@
+---
+ config/mt-d30v   |    4 ++--
+ config/mt-gnu    |    2 +-
+ config/mt-ospace |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
+@@ -1,4 +1,4 @@
+ # Build libraries optimizing for space, not speed.
+ # Turn off warnings about symbols named the same as registers
+- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
+- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
++ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
++ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
+--- a/config/mt-gnu
++++ b/config/mt-gnu
+@@ -1 +1 @@
+-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
++CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
+--- a/config/mt-ospace
++++ b/config/mt-ospace
+@@ -1,3 +1,3 @@
+ # Build libraries optimizing for space, not speed.
+- CFLAGS_FOR_TARGET = -g -Os
+- CXXFLAGS_FOR_TARGET = -g -Os
++ CFLAGS_FOR_TARGET += -g -Os
++ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/2.3.0.20160226/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.3.0.20160226/100-fix-unaligned-access-memcpy-m68k.patch
deleted file mode 100644
index 1d0b49be..00000000
--- a/packages/newlib/2.3.0.20160226/100-fix-unaligned-access-memcpy-m68k.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-The m68k mcpu processor does not like unaligned access
-
-Disable at least mcpu32, m68010 and m68020. These processors certainly
-do not like unaligned accesses.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
-[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
-Signed-off-by: Austin Morton <austinpmorton@gmail.com>
----
- newlib/libc/machine/m68k/memcpy.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.20.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
diff --git a/packages/newlib/2.3.0.20160226/110-fix-eabihf.patch b/packages/newlib/2.3.0.20160226/110-fix-eabihf.patch
deleted file mode 100644
index 37d8842d..00000000
--- a/packages/newlib/2.3.0.20160226/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-2.3.0.20160226.orig/libgloss/arm/configure newlib-2.3.0.20160226/libgloss/arm/configure
---- newlib-2.3.0.20160226.orig/libgloss/arm/configure	2017-04-11 00:41:25.064877413 -0700
-+++ newlib-2.3.0.20160226/libgloss/arm/configure	2017-04-11 00:43:12.321788960 -0700
-@@ -2531,7 +2531,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi | *-*-tirtos*)
-+  *-*-elf | *-*-eabi* | *-*-tirtos*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-2.3.0.20160226.orig/libgloss/arm/configure.in newlib-2.3.0.20160226/libgloss/arm/configure.in
---- newlib-2.3.0.20160226.orig/libgloss/arm/configure.in	2017-04-11 00:41:25.064877413 -0700
-+++ newlib-2.3.0.20160226/libgloss/arm/configure.in	2017-04-11 00:43:12.321788960 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi | *-*-tirtos*)
-+  *-*-elf | *-*-eabi* | *-*-tirtos*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib/2.3.0.20160226/200-fix-mt-cflags.patch b/packages/newlib/2.3.0.20160226/200-fix-mt-cflags.patch
deleted file mode 100644
index 8c080e47..00000000
--- a/packages/newlib/2.3.0.20160226/200-fix-mt-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urpN newlib-2.3.0.20160226.orig/config/mt-d30v newlib-2.3.0.20160226/config/mt-d30v
---- newlib-2.3.0.20160226.orig/config/mt-d30v	2017-04-11 00:51:27.736765855 -0700
-+++ newlib-2.3.0.20160226/config/mt-d30v	2017-04-11 00:55:51.134626702 -0700
-@@ -1,4 +1,4 @@
- # Build libraries optimizing for space, not speed.
- # Turn off warnings about symbols named the same as registers
-- CFLAGS_FOR_TARGET = -g -Os -Wa,-C
-- CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
-+ CFLAGS_FOR_TARGET += -g -Os -Wa,-C
-+ CXXFLAGS_FOR_TARGET += -g -Os -Wa,-C
-diff -urpN newlib-2.3.0.20160226.orig/config/mt-gnu newlib-2.3.0.20160226/config/mt-gnu
---- newlib-2.3.0.20160226.orig/config/mt-gnu	2017-04-11 00:51:27.736765855 -0700
-+++ newlib-2.3.0.20160226/config/mt-gnu	2017-04-11 00:55:51.134626702 -0700
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += $(CXXFLAGS) -D_GNU_SOURCE
-diff -urpN newlib-2.3.0.20160226.orig/config/mt-ospace newlib-2.3.0.20160226/config/mt-ospace
---- newlib-2.3.0.20160226.orig/config/mt-ospace	2017-04-11 00:51:27.736765855 -0700
-+++ newlib-2.3.0.20160226/config/mt-ospace	2017-04-11 00:55:51.134626702 -0700
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/packages/newlib/2.4.0.20161025/0000-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.4.0.20161025/0000-fix-unaligned-access-memcpy-m68k.patch
new file mode 100644
index 00000000..b6709d5a
--- /dev/null
+++ b/packages/newlib/2.4.0.20161025/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -0,0 +1,25 @@
+The m68k mcpu processor does not like unaligned access
+
+Disable at least mcpu32, m68010 and m68020. These processors certainly
+do not like unaligned accesses.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
+Signed-off-by: Austin Morton <austinpmorton@gmail.com>
+---
+ newlib/libc/machine/m68k/memcpy.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
+@@ -15,7 +15,7 @@
+ 
+ #include "m68kasm.h"
+ 
+-#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
++#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
+ # define MISALIGNED_OK 1
+ #else
+ # define MISALIGNED_OK 0
diff --git a/packages/newlib/2.4.0.20161025/0001-fix-eabihf.patch b/packages/newlib/2.4.0.20161025/0001-fix-eabihf.patch
new file mode 100644
index 00000000..f2955930
--- /dev/null
+++ b/packages/newlib/2.4.0.20161025/0001-fix-eabihf.patch
@@ -0,0 +1,27 @@
+---
+ libgloss/arm/configure    |    2 +-
+ libgloss/arm/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgloss/arm/configure
++++ b/libgloss/arm/configure
+@@ -2531,7 +2531,7 @@
+ 
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi | *-*-tirtos*)
++  *-*-elf | *-*-eabi* | *-*-tirtos*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
+--- a/libgloss/arm/configure.in
++++ b/libgloss/arm/configure.in
+@@ -49,7 +49,7 @@
+ LIB_AM_PROG_AS
+ 
+ case "${target}" in
+-  *-*-elf | *-*-eabi | *-*-tirtos*)
++  *-*-elf | *-*-eabi* | *-*-tirtos*)
+ 	objtype=elf-
+ 	;;
+   *-*-coff)
diff --git a/packages/newlib/2.4.0.20161025/200-fix-mt-cflags.patch b/packages/newlib/2.4.0.20161025/0002-fix-mt-cflags.patch
similarity index 53%
rename from packages/newlib/2.4.0.20161025/200-fix-mt-cflags.patch
rename to packages/newlib/2.4.0.20161025/0002-fix-mt-cflags.patch
index dcf68262..24a9215d 100644
--- a/packages/newlib/2.4.0.20161025/200-fix-mt-cflags.patch
+++ b/packages/newlib/2.4.0.20161025/0002-fix-mt-cflags.patch
@@ -1,6 +1,9 @@
-diff -urpN newlib-2.4.0.20161025.orig/config/mt-d30v newlib-2.4.0.20161025/config/mt-d30v
---- newlib-2.4.0.20161025.orig/config/mt-d30v	2017-04-11 00:51:27.980767513 -0700
-+++ newlib-2.4.0.20161025/config/mt-d30v	2017-04-11 00:55:51.138626731 -0700
+---
+ config/mt-d30v |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
 @@ -1,4 +1,4 @@
  # Build libraries optimizing for space, not speed.
  # Turn off warnings about symbols named the same as registers
diff --git a/packages/newlib/2.4.0.20161025/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.4.0.20161025/100-fix-unaligned-access-memcpy-m68k.patch
deleted file mode 100644
index 1d0b49be..00000000
--- a/packages/newlib/2.4.0.20161025/100-fix-unaligned-access-memcpy-m68k.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-The m68k mcpu processor does not like unaligned access
-
-Disable at least mcpu32, m68010 and m68020. These processors certainly
-do not like unaligned accesses.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
-[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
-Signed-off-by: Austin Morton <austinpmorton@gmail.com>
----
- newlib/libc/machine/m68k/memcpy.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.20.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
diff --git a/packages/newlib/2.4.0.20161025/110-fix-eabihf.patch b/packages/newlib/2.4.0.20161025/110-fix-eabihf.patch
deleted file mode 100644
index 65122f17..00000000
--- a/packages/newlib/2.4.0.20161025/110-fix-eabihf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urpN newlib-2.4.0.20161025.orig/libgloss/arm/configure newlib-2.4.0.20161025/libgloss/arm/configure
---- newlib-2.4.0.20161025.orig/libgloss/arm/configure	2017-04-11 00:41:25.240878908 -0700
-+++ newlib-2.4.0.20161025/libgloss/arm/configure	2017-04-11 00:43:12.325788994 -0700
-@@ -2531,7 +2531,7 @@ test "${CCASFLAGS+set}" = set || CCASFLA
- 
- 
- case "${target}" in
--  *-*-elf | *-*-eabi | *-*-tirtos*)
-+  *-*-elf | *-*-eabi* | *-*-tirtos*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
-diff -urpN newlib-2.4.0.20161025.orig/libgloss/arm/configure.in newlib-2.4.0.20161025/libgloss/arm/configure.in
---- newlib-2.4.0.20161025.orig/libgloss/arm/configure.in	2017-04-11 00:41:25.236878874 -0700
-+++ newlib-2.4.0.20161025/libgloss/arm/configure.in	2017-04-11 00:43:12.325788994 -0700
-@@ -49,7 +49,7 @@ AC_PROG_RANLIB
- LIB_AM_PROG_AS
- 
- case "${target}" in
--  *-*-elf | *-*-eabi | *-*-tirtos*)
-+  *-*-elf | *-*-eabi* | *-*-tirtos*)
- 	objtype=elf-
- 	;;
-   *-*-coff)
diff --git a/packages/newlib/2.5.0.20170922/0000-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.5.0.20170922/0000-fix-unaligned-access-memcpy-m68k.patch
new file mode 100644
index 00000000..b6709d5a
--- /dev/null
+++ b/packages/newlib/2.5.0.20170922/0000-fix-unaligned-access-memcpy-m68k.patch
@@ -0,0 +1,25 @@
+The m68k mcpu processor does not like unaligned access
+
+Disable at least mcpu32, m68010 and m68020. These processors certainly
+do not like unaligned accesses.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
+Signed-off-by: Austin Morton <austinpmorton@gmail.com>
+---
+ newlib/libc/machine/m68k/memcpy.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/newlib/libc/machine/m68k/memcpy.S
++++ b/newlib/libc/machine/m68k/memcpy.S
+@@ -15,7 +15,7 @@
+ 
+ #include "m68kasm.h"
+ 
+-#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
++#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
+ # define MISALIGNED_OK 1
+ #else
+ # define MISALIGNED_OK 0
diff --git a/packages/newlib/2.5.0.20170922/200-fix-mt-cflags.patch b/packages/newlib/2.5.0.20170922/0001-fix-mt-cflags.patch
similarity index 53%
rename from packages/newlib/2.5.0.20170922/200-fix-mt-cflags.patch
rename to packages/newlib/2.5.0.20170922/0001-fix-mt-cflags.patch
index cc155510..24a9215d 100644
--- a/packages/newlib/2.5.0.20170922/200-fix-mt-cflags.patch
+++ b/packages/newlib/2.5.0.20170922/0001-fix-mt-cflags.patch
@@ -1,6 +1,9 @@
-diff -urpN newlib-2.5.0.20170323.orig/config/mt-d30v newlib-2.5.0.20170323/config/mt-d30v
---- newlib-2.5.0.20170323.orig/config/mt-d30v	2017-04-11 00:51:28.180768874 -0700
-+++ newlib-2.5.0.20170323/config/mt-d30v	2017-04-11 00:55:51.138626731 -0700
+---
+ config/mt-d30v |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/config/mt-d30v
++++ b/config/mt-d30v
 @@ -1,4 +1,4 @@
  # Build libraries optimizing for space, not speed.
  # Turn off warnings about symbols named the same as registers
diff --git a/packages/newlib/2.5.0.20170922/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.5.0.20170922/100-fix-unaligned-access-memcpy-m68k.patch
deleted file mode 100644
index 1d0b49be..00000000
--- a/packages/newlib/2.5.0.20170922/100-fix-unaligned-access-memcpy-m68k.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-The m68k mcpu processor does not like unaligned access
-
-Disable at least mcpu32, m68010 and m68020. These processors certainly
-do not like unaligned accesses.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
-[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
-Signed-off-by: Austin Morton <austinpmorton@gmail.com>
----
- newlib/libc/machine/m68k/memcpy.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.20.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
diff --git a/packages/strace/4.10/001_aarch64_rt_sigreturn.patch b/packages/strace/4.10/0000-aarch64_rt_sigreturn.patch
similarity index 82%
rename from packages/strace/4.10/001_aarch64_rt_sigreturn.patch
rename to packages/strace/4.10/0000-aarch64_rt_sigreturn.patch
index 6b7bbe32..e99891de 100644
--- a/packages/strace/4.10/001_aarch64_rt_sigreturn.patch
+++ b/packages/strace/4.10/0000-aarch64_rt_sigreturn.patch
@@ -6,11 +6,13 @@ Date:   Wed Mar 11 14:32:25 2015 +0000
     
     * sigreturn.c (sys_sigreturn) [AARCH64]: Fix personality check.
 
-diff --git a/sigreturn.c b/sigreturn.c
-index 648bd0a..c253a0c 100644
+---
+ sigreturn.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/sigreturn.c
 +++ b/sigreturn.c
-@@ -23,7 +23,7 @@ sys_sigreturn(struct tcb *tcp)
+@@ -23,7 +23,7 @@
  # define OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK (5 * 4 + SIZEOF_STRUCT_SIGCONTEXT)
  		const long addr =
  # ifdef AARCH64
diff --git a/packages/strace/4.10/002_arm_mmap2.patch b/packages/strace/4.10/0001-arm_mmap2.patch
similarity index 88%
rename from packages/strace/4.10/002_arm_mmap2.patch
rename to packages/strace/4.10/0001-arm_mmap2.patch
index 41953e25..d244c0e0 100644
--- a/packages/strace/4.10/002_arm_mmap2.patch
+++ b/packages/strace/4.10/0001-arm_mmap2.patch
@@ -7,8 +7,10 @@ Date:   Mon Mar 9 16:55:06 2015 +0100
     * syscallent.h (mmap2): Decode with sys_mmap_4koff, not
     sys_mmap_pgoff.
 
-diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
-index 52aed9e..b66a5a2 100644
+---
+ linux/arm/syscallent.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/linux/arm/syscallent.h
 +++ b/linux/arm/syscallent.h
 @@ -218,7 +218,7 @@
diff --git a/packages/strace/4.10/003_aarch64_arch_regs.patch b/packages/strace/4.10/0002-aarch64_arch_regs.patch
similarity index 70%
rename from packages/strace/4.10/003_aarch64_arch_regs.patch
rename to packages/strace/4.10/0002-aarch64_arch_regs.patch
index e5153b5e..e4066d9a 100644
--- a/packages/strace/4.10/003_aarch64_arch_regs.patch
+++ b/packages/strace/4.10/0002-aarch64_arch_regs.patch
@@ -6,11 +6,14 @@ Date:   Thu Mar 12 11:54:08 2015 +0100
     
     * Makefile.am (EXTRA_DIST): Add linux/aarch64/arch_regs.h.
 
-diff --git a/Makefile.am b/Makefile.am
-index 2030f9b..48fe1d7 100644
+---
+ Makefile.am               |    1 +
+ linux/aarch64/arch_regs.h |    2 ++
+ 2 files changed, 3 insertions(+)
+
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -164,6 +164,7 @@ EXTRA_DIST =				\
+@@ -164,6 +164,7 @@
  	linux/32/syscallent.h		\
  	linux/64/ioctls_inc.h		\
  	linux/64/syscallent.h		\
@@ -18,8 +21,8 @@ index 2030f9b..48fe1d7 100644
  	linux/aarch64/errnoent1.h	\
  	linux/aarch64/ioctls_arch0.h	\
  	linux/aarch64/ioctls_arch1.h	\
---- a/linux/aarch64/arch_regs.h	2015-06-09 03:27:46.170000000 +0000
-+++ b/linux/aarch64/arch_regs.h	2015-07-01 21:23:17.025202308 +0000
+--- /dev/null
++++ b/linux/aarch64/arch_regs.h
 @@ -0,0 +1,2 @@
 +extern uint64_t *const aarch64_sp_ptr;
 +extern uint32_t *const arm_sp_ptr;
diff --git a/packages/strace/4.10/004_stat64-v.test.patch b/packages/strace/4.10/0003-stat64-v.test.patch
similarity index 92%
rename from packages/strace/4.10/004_stat64-v.test.patch
rename to packages/strace/4.10/0003-stat64-v.test.patch
index 53383e34..acb098b0 100644
--- a/packages/strace/4.10/004_stat64-v.test.patch
+++ b/packages/strace/4.10/0003-stat64-v.test.patch
@@ -13,8 +13,10 @@ Date:   Mon Mar 16 17:18:40 2015 +0000
     
     Reported-by: Andreas Schwab <schwab@suse.de>
 
-diff --git a/tests/stat.c b/tests/stat.c
-index 21e37fb..2b04010 100644
+---
+ tests/stat.c |   24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
 --- a/tests/stat.c
 +++ b/tests/stat.c
 @@ -14,22 +14,22 @@
@@ -58,7 +60,7 @@ index 21e37fb..2b04010 100644
  
  static void
  print_ftype(unsigned int mode)
-@@ -115,7 +115,7 @@ main(int ac, const char **av)
+@@ -115,7 +115,7 @@
  	assert(stat(av[1], &stb) == 0);
  #endif
  
@@ -67,7 +69,7 @@ index 21e37fb..2b04010 100644
  	printf("st_dev=makedev\\(%u, %u\\)",
  	       (unsigned int) major(stb.st_dev),
  	       (unsigned int) minor(stb.st_dev));
-@@ -159,11 +159,15 @@ main(int ac, const char **av)
+@@ -159,11 +159,15 @@
  	printf("(, st_flags=[0-9]+)?");
  	printf("(, st_fstype=[^,]*)?");
  	printf("(, st_gen=[0-9]+)?");
diff --git a/packages/strace/4.10/005_select_test.patch b/packages/strace/4.10/0004-select_test.patch
similarity index 90%
rename from packages/strace/4.10/005_select_test.patch
rename to packages/strace/4.10/0004-select_test.patch
index cb56ec6c..a7783921 100644
--- a/packages/strace/4.10/005_select_test.patch
+++ b/packages/strace/4.10/0004-select_test.patch
@@ -8,8 +8,11 @@ Date:   Thu Mar 12 16:47:38 2015 +0100
     and pselect6 syscalls.
     * tests/select.test: Probe for both select and pselect6 syscall.
 
-diff --git a/tests/select.awk b/tests/select.awk
-index 142504a..688cefe 100644
+---
+ tests/select.awk  |    6 +++---
+ tests/select.test |    7 +++++--
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
 --- a/tests/select.awk
 +++ b/tests/select.awk
 @@ -1,7 +1,7 @@
@@ -23,8 +26,6 @@ index 142504a..688cefe 100644
  	r[4] = "^\\+\\+\\+ exited with 0 \\+\\+\\+$"
  	lines = 4
  	fail = 0
-diff --git a/tests/select.test b/tests/select.test
-index bd3066b..5d5fe54 100755
 --- a/tests/select.test
 +++ b/tests/select.test
 @@ -6,13 +6,16 @@
diff --git a/packages/strace/4.10/006_fix_aarch64_ioctl_decoding.patch b/packages/strace/4.10/0005-fix_aarch64_ioctl_decoding.patch
similarity index 73%
rename from packages/strace/4.10/006_fix_aarch64_ioctl_decoding.patch
rename to packages/strace/4.10/0005-fix_aarch64_ioctl_decoding.patch
index a2703499..9f4c0535 100644
--- a/packages/strace/4.10/006_fix_aarch64_ioctl_decoding.patch
+++ b/packages/strace/4.10/0005-fix_aarch64_ioctl_decoding.patch
@@ -9,29 +9,28 @@ Date:   Thu Mar 12 18:07:00 2015 +0100
     * linux/aarch64/ioctls_arch0.h: Rename from ioctls_arch1.h.
     * linux/aarch64/ioctls_arch1.h: Rename from ioctls_arch0.h.
 
-diff --git a/linux/aarch64/ioctls_arch0.h b/linux/aarch64/ioctls_arch0.h
-index 6a674cc..b722d22 100644
+---
+ linux/aarch64/ioctls_arch0.h |    2 +-
+ linux/aarch64/ioctls_arch1.h |    2 +-
+ linux/aarch64/ioctls_inc0.h  |    2 +-
+ linux/aarch64/ioctls_inc1.h  |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
 --- a/linux/aarch64/ioctls_arch0.h
 +++ b/linux/aarch64/ioctls_arch0.h
 @@ -1 +1 @@
 -/* Generated by ioctls_gen.sh from definitions found in $linux/arch/arm64/include/ tree. */
 +#include "arm/ioctls_arch0.h"
-diff --git a/linux/aarch64/ioctls_arch1.h b/linux/aarch64/ioctls_arch1.h
-index b722d22..6a674cc 100644
 --- a/linux/aarch64/ioctls_arch1.h
 +++ b/linux/aarch64/ioctls_arch1.h
 @@ -1 +1 @@
 -#include "arm/ioctls_arch0.h"
 +/* Generated by ioctls_gen.sh from definitions found in $linux/arch/arm64/include/ tree. */
-diff --git a/linux/aarch64/ioctls_inc0.h b/linux/aarch64/ioctls_inc0.h
-index f9939fa..46c11b1 100644
 --- a/linux/aarch64/ioctls_inc0.h
 +++ b/linux/aarch64/ioctls_inc0.h
 @@ -1 +1 @@
 -#include "64/ioctls_inc.h"
 +#include "arm/ioctls_inc0.h"
-diff --git a/linux/aarch64/ioctls_inc1.h b/linux/aarch64/ioctls_inc1.h
-index 46c11b1..f9939fa 100644
 --- a/linux/aarch64/ioctls_inc1.h
 +++ b/linux/aarch64/ioctls_inc1.h
 @@ -1 +1 @@
diff --git a/packages/strace/4.10/007_fix_bexecve64_test.patch b/packages/strace/4.10/0006-fix_bexecve64_test.patch
similarity index 86%
rename from packages/strace/4.10/007_fix_bexecve64_test.patch
rename to packages/strace/4.10/0006-fix_bexecve64_test.patch
index 6dc9b465..f5b255b1 100644
--- a/packages/strace/4.10/007_fix_bexecve64_test.patch
+++ b/packages/strace/4.10/0006-fix_bexecve64_test.patch
@@ -1,5 +1,9 @@
 commit b704e8fbb4d9cf90ac56f3c889de5b779c444db4
 (loosely based on)
+---
+ tests/bexecve.test |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 --- a/tests/bexecve.test
 +++ b/tests/bexecve.test
 @@ -24,13 +24,14 @@
diff --git a/packages/strace/4.10/008_decode_mips_indirect_syscall.patch b/packages/strace/4.10/0007-decode_mips_indirect_syscall.patch
similarity index 67%
rename from packages/strace/4.10/008_decode_mips_indirect_syscall.patch
rename to packages/strace/4.10/0007-decode_mips_indirect_syscall.patch
index d2d72173..8921dda2 100644
--- a/packages/strace/4.10/008_decode_mips_indirect_syscall.patch
+++ b/packages/strace/4.10/0007-decode_mips_indirect_syscall.patch
@@ -1,8 +1,12 @@
 commit f34b97f89dd3893ef3652a6899487771402fc13c
-Index: strace-4.10/linux/mips/syscallent-o32.h
-===================================================================
---- strace-4.10.orig/linux/mips/syscallent-o32.h
-+++ strace-4.10/linux/mips/syscallent-o32.h
+---
+ linux/mips/syscallent-o32.h |    2 +-
+ linux/syscall.h             |    1 +
+ syscall.c                   |   24 ++++++++++++++++++++++++
+ 3 files changed, 26 insertions(+), 1 deletion(-)
+
+--- a/linux/mips/syscallent-o32.h
++++ b/linux/mips/syscallent-o32.h
 @@ -1,6 +1,6 @@
  #if defined LINUX_MIPSO32
  /* For an O32 strace, decode the o32 syscalls.  */
@@ -11,11 +15,9 @@ Index: strace-4.10/linux/mips/syscallent-o32.h
  [4001] = { 1,	TP|SE,		sys_exit,			"exit"			},
  [4002] = { 0,	TP,		sys_fork,			"fork"			},
  [4003] = { 3,	TD,		sys_read,			"read"			},
-Index: strace-4.10/syscall.c
-===================================================================
---- strace-4.10.orig/syscall.c
-+++ strace-4.10/syscall.c
-@@ -606,6 +606,25 @@ decode_ipc_subcall(struct tcb *tcp)
+--- a/syscall.c
++++ b/syscall.c
+@@ -606,6 +606,25 @@
  }
  #endif
  
@@ -41,7 +43,7 @@ Index: strace-4.10/syscall.c
  int
  printargs(struct tcb *tcp)
  {
-@@ -1774,6 +1793,11 @@ trace_syscall_entering(struct tcb *tcp)
+@@ -1774,6 +1793,11 @@
  		goto ret;
  	}
  
@@ -53,8 +55,8 @@ Index: strace-4.10/syscall.c
  	if (   sys_execve == tcp->s_ent->sys_func
  # if defined(SPARC) || defined(SPARC64)
  	    || sys_execv == tcp->s_ent->sys_func
---- strace-4.10.orig/linux/syscall.h	2015-02-06 01:23:05.000000000 +0000
-+++ strace-4.10/linux/syscall.h	2015-07-09 14:36:49.372494628 +0100
+--- a/linux/syscall.h
++++ b/linux/syscall.h
 @@ -277,6 +277,7 @@
  int sys_symlinkat();
  int sys_sync_file_range();
diff --git a/packages/strace/4.10/009-upstream-musl_includes.patch b/packages/strace/4.10/0008-upstream-musl_includes.patch
similarity index 85%
rename from packages/strace/4.10/009-upstream-musl_includes.patch
rename to packages/strace/4.10/0008-upstream-musl_includes.patch
index c68f8d8d..87717ca8 100644
--- a/packages/strace/4.10/009-upstream-musl_includes.patch
+++ b/packages/strace/4.10/0008-upstream-musl_includes.patch
@@ -1,5 +1,13 @@
 commit 3460dc486d333231998de0f19918204aacee9ae3
 commit d34e00b293942b1012ddc49ed3ab379a32337611
+---
+ evdev.c     |    2 ++
+ ioctl.c     |    2 +-
+ ioctlsort.c |    2 +-
+ mknod.c     |    1 +
+ printmode.c |    1 +
+ 5 files changed, 6 insertions(+), 2 deletions(-)
+
 --- a/evdev.c
 +++ b/evdev.c
 @@ -28,6 +28,8 @@
diff --git a/packages/strace/4.10/010-use-host-ioctl.patch b/packages/strace/4.10/0009-use-host-ioctl.patch
similarity index 82%
rename from packages/strace/4.10/010-use-host-ioctl.patch
rename to packages/strace/4.10/0009-use-host-ioctl.patch
index e9c34d38..857c7c03 100644
--- a/packages/strace/4.10/010-use-host-ioctl.patch
+++ b/packages/strace/4.10/0009-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-diff -urpN strace-4.10.orig/ioctl_iocdef.c strace-4.10/ioctl_iocdef.c
---- strace-4.10.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.10/ioctl_iocdef.c	2017-01-14 15:05:49.505335680 -0800
+---
+ Makefile.am    |   14 ++++++++++++--
+ Makefile.in    |   14 ++++++++++++--
+ ioctl_iocdef.c |   43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c    |    3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.10.orig/ioctl_iocdef.c strace-4.10/ioctl_iocdef.c
 +
 +DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
 +DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.10.orig/ioctlsort.c strace-4.10/ioctlsort.c
---- strace-4.10.orig/ioctlsort.c	2015-02-15 18:35:58.000000000 -0800
-+++ strace-4.10/ioctlsort.c	2017-01-14 15:20:30.597371979 -0800
+--- a/ioctlsort.c
++++ b/ioctlsort.c
 @@ -33,7 +33,8 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.10.orig/ioctlsort.c strace-4.10/ioctlsort.c
  
  struct ioctlent {
  	const char *info;
-diff -urpN strace-4.10.orig/Makefile.am strace-4.10/Makefile.am
---- strace-4.10.orig/Makefile.am	2015-03-05 18:19:01.000000000 -0800
-+++ strace-4.10/Makefile.am	2017-01-14 15:07:28.978244260 -0800
-@@ -159,6 +159,7 @@ EXTRA_DIST =				\
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -159,6 +159,7 @@
  	debian/strace64.manpages	\
  	debian/watch			\
  	errnoent.sh			\
@@ -69,7 +73,7 @@ diff -urpN strace-4.10.orig/Makefile.am strace-4.10/Makefile.am
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/syscallent.h		\
-@@ -416,15 +417,24 @@ ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFL
+@@ -417,15 +418,24 @@
  ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
  ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
  BUILT_SOURCES += $(ioctlent_h)
@@ -96,10 +100,9 @@ diff -urpN strace-4.10.orig/Makefile.am strace-4.10/Makefile.am
  	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
  
  ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-diff -urpN strace-4.10.orig/Makefile.in strace-4.10/Makefile.in
---- strace-4.10.orig/Makefile.in	2015-03-06 07:16:46.000000000 -0800
-+++ strace-4.10/Makefile.in	2017-01-14 15:23:06.718794409 -0800
-@@ -687,6 +687,7 @@ EXTRA_DIST = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -687,6 +687,7 @@
  	debian/strace64.manpages	\
  	debian/watch			\
  	errnoent.sh			\
@@ -107,7 +110,7 @@ diff -urpN strace-4.10.orig/Makefile.in strace-4.10/Makefile.in
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/syscallent.h		\
-@@ -921,7 +922,7 @@ ioctlsort_CFLAGS = $(AM_CFLAGS) $(CFLAGS
+@@ -921,7 +922,7 @@
  ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD)
  ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
  ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
@@ -116,7 +119,7 @@ diff -urpN strace-4.10.orig/Makefile.in strace-4.10/Makefile.in
  @MAINTAINER_MODE_TRUE@gen_changelog_start_date = 2009-07-08 20:00
  all: $(BUILT_SOURCES) config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -3414,13 +3415,22 @@ news-check: NEWS
+@@ -3414,13 +3415,22 @@
  		exit 1;						\
  	fi
  
diff --git a/packages/strace/4.11/010-use-host-ioctl.patch b/packages/strace/4.11/0000-use-host-ioctl.patch
similarity index 83%
rename from packages/strace/4.11/010-use-host-ioctl.patch
rename to packages/strace/4.11/0000-use-host-ioctl.patch
index 51552009..99f8c4c3 100644
--- a/packages/strace/4.11/010-use-host-ioctl.patch
+++ b/packages/strace/4.11/0000-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-diff -urpN strace-4.11.orig/ioctl_iocdef.c strace-4.11/ioctl_iocdef.c
---- strace-4.11.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.11/ioctl_iocdef.c	2017-01-14 15:31:16.925139193 -0800
+---
+ Makefile.am    |   14 ++++++++++++--
+ Makefile.in    |   14 ++++++++++++--
+ ioctl_iocdef.c |   43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c    |    3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.11.orig/ioctl_iocdef.c strace-4.11/ioctl_iocdef.c
 +
 +DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
 +DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.11.orig/ioctlsort.c strace-4.11/ioctlsort.c
---- strace-4.11.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
-+++ strace-4.11/ioctlsort.c	2017-01-14 15:32:13.373831957 -0800
+--- a/ioctlsort.c
++++ b/ioctlsort.c
 @@ -33,7 +33,8 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.11.orig/ioctlsort.c strace-4.11/ioctlsort.c
  
  struct ioctlent {
  	const char *info;
-diff -urpN strace-4.11.orig/Makefile.am strace-4.11/Makefile.am
---- strace-4.11.orig/Makefile.am	2015-12-17 09:56:48.000000000 -0800
-+++ strace-4.11/Makefile.am	2017-01-14 15:33:39.186837242 -0800
-@@ -239,6 +239,7 @@ EXTRA_DIST =				\
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -239,6 +239,7 @@
  	debian/watch			\
  	errnoent.sh			\
  	generate_sen.sh			\
@@ -69,7 +73,7 @@ diff -urpN strace-4.11.orig/Makefile.am strace-4.11/Makefile.am
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/ioctls_inc_align32.h	\
-@@ -666,17 +667,26 @@ ioctlent_h = $(patsubst $(srcdir)/$(OS)/
+@@ -666,17 +667,26 @@
  ioctlent%.h: ioctlsort%
  	./$< > $@
  
@@ -98,10 +102,9 @@ diff -urpN strace-4.11.orig/Makefile.am strace-4.11/Makefile.am
  DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
  
  # defines mpers_source_files
-diff -urpN strace-4.11.orig/Makefile.in strace-4.11/Makefile.in
---- strace-4.11.orig/Makefile.in	2015-12-21 15:24:05.000000000 -0800
-+++ strace-4.11/Makefile.in	2017-01-14 15:34:34.803440359 -0800
-@@ -848,6 +848,7 @@ EXTRA_DIST = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -848,6 +848,7 @@
  	debian/watch			\
  	errnoent.sh			\
  	generate_sen.sh			\
@@ -109,7 +112,7 @@ diff -urpN strace-4.11.orig/Makefile.in strace-4.11/Makefile.in
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/ioctls_inc_align32.h	\
-@@ -1243,7 +1244,7 @@ ioctlent_h = $(patsubst $(srcdir)/$(OS)/
+@@ -1243,7 +1244,7 @@
  BUILT_SOURCES = $(ioctlent_h) native_printer_decls.h \
  	native_printer_defs.h printers.h sen.h sys_func.h .version \
  	$(am__append_7) $(am__append_11)
@@ -118,7 +121,7 @@ diff -urpN strace-4.11.orig/Makefile.in strace-4.11/Makefile.in
  	native_printer_defs.h printers.h sen.h sys_func.h \
  	$(am__append_8) $(am__append_12)
  DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
-@@ -4829,13 +4830,22 @@ news-check: NEWS
+@@ -4829,13 +4830,22 @@
  		exit 1;						\
  	fi
  
diff --git a/packages/strace/4.12/010-use-host-ioctl.patch b/packages/strace/4.12/0000-use-host-ioctl.patch
similarity index 82%
rename from packages/strace/4.12/010-use-host-ioctl.patch
rename to packages/strace/4.12/0000-use-host-ioctl.patch
index bd5a40eb..932ccdae 100644
--- a/packages/strace/4.12/010-use-host-ioctl.patch
+++ b/packages/strace/4.12/0000-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-diff -urpN strace-4.12.orig/ioctl_iocdef.c strace-4.12/ioctl_iocdef.c
---- strace-4.12.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.12/ioctl_iocdef.c	2017-01-14 15:35:21.055924401 -0800
+---
+ Makefile.am    |   14 ++++++++++++--
+ Makefile.in    |   14 ++++++++++++--
+ ioctl_iocdef.c |   43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c    |    3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.12.orig/ioctl_iocdef.c strace-4.12/ioctl_iocdef.c
 +
 +DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
 +DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.12.orig/ioctlsort.c strace-4.12/ioctlsort.c
---- strace-4.12.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
-+++ strace-4.12/ioctlsort.c	2017-01-14 15:35:21.055924401 -0800
+--- a/ioctlsort.c
++++ b/ioctlsort.c
 @@ -33,7 +33,8 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.12.orig/ioctlsort.c strace-4.12/ioctlsort.c
  
  struct ioctlent {
  	const char *info;
-diff -urpN strace-4.12.orig/Makefile.am strace-4.12/Makefile.am
---- strace-4.12.orig/Makefile.am	2016-05-28 03:29:30.000000000 -0700
-+++ strace-4.12/Makefile.am	2017-01-14 15:36:46.916796883 -0800
-@@ -274,6 +274,7 @@ EXTRA_DIST =				\
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -274,6 +274,7 @@
  	debian/watch			\
  	errnoent.sh			\
  	generate_sen.sh			\
@@ -69,7 +73,7 @@ diff -urpN strace-4.12.orig/Makefile.am strace-4.12/Makefile.am
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/ioctls_inc_align32.h	\
-@@ -712,10 +713,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -712,10 +713,19 @@
  ioctlent%.h: ioctlsort%
  	./$< > $@
  
@@ -90,7 +94,7 @@ diff -urpN strace-4.12.orig/Makefile.am strace-4.12/Makefile.am
  	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
  
  ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-@@ -723,7 +733,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
+@@ -723,7 +733,7 @@
  
  BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
  		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
@@ -99,10 +103,9 @@ diff -urpN strace-4.12.orig/Makefile.am strace-4.12/Makefile.am
  		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
  DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
  
-diff -urpN strace-4.12.orig/Makefile.in strace-4.12/Makefile.in
---- strace-4.12.orig/Makefile.in	2016-05-31 04:35:57.000000000 -0700
-+++ strace-4.12/Makefile.in	2017-01-14 15:37:33.353259891 -0800
-@@ -952,6 +952,7 @@ EXTRA_DIST = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -952,6 +952,7 @@
  	debian/watch			\
  	errnoent.sh			\
  	generate_sen.sh			\
@@ -110,7 +113,7 @@ diff -urpN strace-4.12.orig/Makefile.in strace-4.12/Makefile.in
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/ioctls_inc_align32.h	\
-@@ -1351,7 +1352,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+@@ -1351,7 +1352,7 @@
  BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
  	native_printer_defs.h printers.h sen.h sys_func.h .version \
  	$(am__append_7) $(am__append_11)
@@ -119,7 +122,7 @@ diff -urpN strace-4.12.orig/Makefile.in strace-4.12/Makefile.in
  	native_printer_decls.h native_printer_defs.h printers.h sen.h \
  	sys_func.h $(am__append_8) $(am__append_12)
  DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
-@@ -5506,13 +5507,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -5506,13 +5507,22 @@
  	rm -f $<-t
  	mv $@-t $@
  
diff --git a/packages/strace/4.14/010-use-host-ioctl.patch b/packages/strace/4.13/0000-use-host-ioctl.patch
similarity index 82%
rename from packages/strace/4.14/010-use-host-ioctl.patch
rename to packages/strace/4.13/0000-use-host-ioctl.patch
index 2c7671f2..ee596958 100644
--- a/packages/strace/4.14/010-use-host-ioctl.patch
+++ b/packages/strace/4.13/0000-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-diff -urpN strace-4.14.orig/ioctl_iocdef.c strace-4.14/ioctl_iocdef.c
---- strace-4.14.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.14/ioctl_iocdef.c	2017-01-14 15:50:38.748425119 -0800
+---
+ Makefile.am    |   14 ++++++++++++--
+ Makefile.in    |   14 ++++++++++++--
+ ioctl_iocdef.c |   43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c    |    3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.14.orig/ioctl_iocdef.c strace-4.14/ioctl_iocdef.c
 +
 +DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
 +DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.14.orig/ioctlsort.c strace-4.14/ioctlsort.c
---- strace-4.14.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
-+++ strace-4.14/ioctlsort.c	2017-01-14 15:50:38.748425119 -0800
+--- a/ioctlsort.c
++++ b/ioctlsort.c
 @@ -33,7 +33,8 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.14.orig/ioctlsort.c strace-4.14/ioctlsort.c
  
  struct ioctlent {
  	const char *info;
-diff -urpN strace-4.14.orig/Makefile.am strace-4.14/Makefile.am
---- strace-4.14.orig/Makefile.am	2016-09-05 12:52:57.000000000 -0700
-+++ strace-4.14/Makefile.am	2017-01-14 15:50:38.748425119 -0800
-@@ -289,6 +289,7 @@ EXTRA_DIST =				\
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -283,6 +283,7 @@
  	debian/watch			\
  	errnoent.sh			\
  	generate_sen.sh			\
@@ -69,7 +73,7 @@ diff -urpN strace-4.14.orig/Makefile.am strace-4.14/Makefile.am
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/ioctls_inc_align32.h	\
-@@ -739,10 +740,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -721,10 +722,19 @@
  ioctlent%.h: ioctlsort%
  	./$< > $@
  
@@ -90,7 +94,7 @@ diff -urpN strace-4.14.orig/Makefile.am strace-4.14/Makefile.am
  	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
  
  ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-@@ -750,7 +760,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
+@@ -732,7 +742,7 @@
  
  BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
  		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
@@ -99,10 +103,9 @@ diff -urpN strace-4.14.orig/Makefile.am strace-4.14/Makefile.am
  		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
  DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
  
-diff -urpN strace-4.14.orig/Makefile.in strace-4.14/Makefile.in
---- strace-4.14.orig/Makefile.in	2016-10-04 12:13:20.000000000 -0700
-+++ strace-4.14/Makefile.in	2017-01-14 15:50:38.752425155 -0800
-@@ -995,6 +995,7 @@ EXTRA_DIST = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -978,6 +978,7 @@
  	debian/watch			\
  	errnoent.sh			\
  	generate_sen.sh			\
@@ -110,7 +113,7 @@ diff -urpN strace-4.14.orig/Makefile.in strace-4.14/Makefile.in
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/ioctls_inc_align32.h	\
-@@ -1406,7 +1407,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+@@ -1377,7 +1378,7 @@
  BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
  	native_printer_defs.h printers.h sen.h sys_func.h .version \
  	$(am__append_7) $(am__append_11)
@@ -119,7 +122,7 @@ diff -urpN strace-4.14.orig/Makefile.in strace-4.14/Makefile.in
  	native_printer_decls.h native_printer_defs.h printers.h sen.h \
  	sys_func.h $(am__append_8) $(am__append_12)
  DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
-@@ -5896,13 +5897,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -5730,13 +5731,22 @@
  	rm -f $<-t
  	mv $@-t $@
  
diff --git a/packages/strace/4.13/010-use-host-ioctl.patch b/packages/strace/4.14/0000-use-host-ioctl.patch
similarity index 82%
rename from packages/strace/4.13/010-use-host-ioctl.patch
rename to packages/strace/4.14/0000-use-host-ioctl.patch
index 40ebbf37..5e90362e 100644
--- a/packages/strace/4.13/010-use-host-ioctl.patch
+++ b/packages/strace/4.14/0000-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-diff -urpN strace-4.13.orig/ioctl_iocdef.c strace-4.13/ioctl_iocdef.c
---- strace-4.13.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.13/ioctl_iocdef.c	2017-01-14 15:50:14.368196376 -0800
+---
+ Makefile.am    |   14 ++++++++++++--
+ Makefile.in    |   14 ++++++++++++--
+ ioctl_iocdef.c |   43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c    |    3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.13.orig/ioctl_iocdef.c strace-4.13/ioctl_iocdef.c
 +
 +DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
 +DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.13.orig/ioctlsort.c strace-4.13/ioctlsort.c
---- strace-4.13.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
-+++ strace-4.13/ioctlsort.c	2017-01-14 15:50:14.368196376 -0800
+--- a/ioctlsort.c
++++ b/ioctlsort.c
 @@ -33,7 +33,8 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.13.orig/ioctlsort.c strace-4.13/ioctlsort.c
  
  struct ioctlent {
  	const char *info;
-diff -urpN strace-4.13.orig/Makefile.am strace-4.13/Makefile.am
---- strace-4.13.orig/Makefile.am	2016-07-22 12:28:06.000000000 -0700
-+++ strace-4.13/Makefile.am	2017-01-14 15:50:14.368196376 -0800
-@@ -283,6 +283,7 @@ EXTRA_DIST =				\
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -289,6 +289,7 @@
  	debian/watch			\
  	errnoent.sh			\
  	generate_sen.sh			\
@@ -69,7 +73,7 @@ diff -urpN strace-4.13.orig/Makefile.am strace-4.13/Makefile.am
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/ioctls_inc_align32.h	\
-@@ -721,10 +722,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -739,10 +740,19 @@
  ioctlent%.h: ioctlsort%
  	./$< > $@
  
@@ -90,7 +94,7 @@ diff -urpN strace-4.13.orig/Makefile.am strace-4.13/Makefile.am
  	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
  
  ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-@@ -732,7 +742,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
+@@ -750,7 +760,7 @@
  
  BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
  		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
@@ -99,10 +103,9 @@ diff -urpN strace-4.13.orig/Makefile.am strace-4.13/Makefile.am
  		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
  DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
  
-diff -urpN strace-4.13.orig/Makefile.in strace-4.13/Makefile.in
---- strace-4.13.orig/Makefile.in	2016-07-26 09:17:18.000000000 -0700
-+++ strace-4.13/Makefile.in	2017-01-14 15:50:14.368196376 -0800
-@@ -978,6 +978,7 @@ EXTRA_DIST = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -995,6 +995,7 @@
  	debian/watch			\
  	errnoent.sh			\
  	generate_sen.sh			\
@@ -110,7 +113,7 @@ diff -urpN strace-4.13.orig/Makefile.in strace-4.13/Makefile.in
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/ioctls_inc_align32.h	\
-@@ -1377,7 +1378,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+@@ -1406,7 +1407,7 @@
  BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
  	native_printer_defs.h printers.h sen.h sys_func.h .version \
  	$(am__append_7) $(am__append_11)
@@ -119,7 +122,7 @@ diff -urpN strace-4.13.orig/Makefile.in strace-4.13/Makefile.in
  	native_printer_decls.h native_printer_defs.h printers.h sen.h \
  	sys_func.h $(am__append_8) $(am__append_12)
  DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
-@@ -5730,13 +5731,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -5896,13 +5897,22 @@
  	rm -f $<-t
  	mv $@-t $@
  
diff --git a/packages/strace/4.15/010-use-host-ioctl.patch b/packages/strace/4.15/0000-use-host-ioctl.patch
similarity index 82%
rename from packages/strace/4.15/010-use-host-ioctl.patch
rename to packages/strace/4.15/0000-use-host-ioctl.patch
index 71d380a8..74e8c521 100644
--- a/packages/strace/4.15/010-use-host-ioctl.patch
+++ b/packages/strace/4.15/0000-use-host-ioctl.patch
@@ -1,6 +1,12 @@
-diff -urpN strace-4.15.orig/ioctl_iocdef.c strace-4.15/ioctl_iocdef.c
---- strace-4.15.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.15/ioctl_iocdef.c	2017-01-14 15:50:56.388590804 -0800
+---
+ Makefile.am    |   14 ++++++++++++--
+ Makefile.in    |   14 ++++++++++++--
+ ioctl_iocdef.c |   43 +++++++++++++++++++++++++++++++++++++++++++
+ ioctlsort.c    |    3 ++-
+ 4 files changed, 69 insertions(+), 5 deletions(-)
+
+--- /dev/null
++++ b/ioctl_iocdef.c
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
@@ -45,9 +51,8 @@ diff -urpN strace-4.15.orig/ioctl_iocdef.c strace-4.15/ioctl_iocdef.c
 +
 +DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
 +DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.15.orig/ioctlsort.c strace-4.15/ioctlsort.c
---- strace-4.15.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
-+++ strace-4.15/ioctlsort.c	2017-01-14 15:50:56.388590804 -0800
+--- a/ioctlsort.c
++++ b/ioctlsort.c
 @@ -33,7 +33,8 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -58,10 +63,9 @@ diff -urpN strace-4.15.orig/ioctlsort.c strace-4.15/ioctlsort.c
  
  struct ioctlent {
  	const char *info;
-diff -urpN strace-4.15.orig/Makefile.am strace-4.15/Makefile.am
---- strace-4.15.orig/Makefile.am	2016-12-07 07:53:13.000000000 -0800
-+++ strace-4.15/Makefile.am	2017-01-14 15:50:56.392590842 -0800
-@@ -298,6 +298,7 @@ EXTRA_DIST =				\
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -298,6 +298,7 @@
  	debian/watch			\
  	errnoent.sh			\
  	generate_sen.sh			\
@@ -69,7 +73,7 @@ diff -urpN strace-4.15.orig/Makefile.am strace-4.15/Makefile.am
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/ioctls_inc_align16.h	\
-@@ -815,10 +816,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -815,10 +816,19 @@
  ioctlent%.h: ioctlsort%
  	./$< > $@
  
@@ -90,7 +94,7 @@ diff -urpN strace-4.15.orig/Makefile.am strace-4.15/Makefile.am
  	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
  
  ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-@@ -826,7 +836,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
+@@ -826,7 +836,7 @@
  
  BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
  		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
@@ -99,10 +103,9 @@ diff -urpN strace-4.15.orig/Makefile.am strace-4.15/Makefile.am
  		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
  DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
  
-diff -urpN strace-4.15.orig/Makefile.in strace-4.15/Makefile.in
---- strace-4.15.orig/Makefile.in	2016-12-14 01:17:46.000000000 -0800
-+++ strace-4.15/Makefile.in	2017-01-14 15:50:56.392590842 -0800
-@@ -1036,6 +1036,7 @@ EXTRA_DIST = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1036,6 +1036,7 @@
  	debian/watch			\
  	errnoent.sh			\
  	generate_sen.sh			\
@@ -110,7 +113,7 @@ diff -urpN strace-4.15.orig/Makefile.in strace-4.15/Makefile.in
  	ioctlsort.c			\
  	linux/32/ioctls_inc.h		\
  	linux/32/ioctls_inc_align16.h	\
-@@ -1514,7 +1515,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
+@@ -1514,7 +1515,7 @@
  BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
  	native_printer_defs.h printers.h sen.h sys_func.h .version \
  	$(am__append_7) $(am__append_11)
@@ -119,7 +122,7 @@ diff -urpN strace-4.15.orig/Makefile.in strace-4.15/Makefile.in
  	native_printer_decls.h native_printer_defs.h printers.h sen.h \
  	sys_func.h $(am__append_8) $(am__append_12)
  DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
-@@ -6177,13 +6178,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+@@ -6177,13 +6178,22 @@
  	rm -f $<-t
  	mv $@-t $@
  
diff --git a/packages/strace/4.19/100-conflicting-decl.patch b/packages/strace/4.19/0000-conflicting-decl.patch
similarity index 93%
rename from packages/strace/4.19/100-conflicting-decl.patch
rename to packages/strace/4.19/0000-conflicting-decl.patch
index 992eac81..92427e19 100644
--- a/packages/strace/4.19/100-conflicting-decl.patch
+++ b/packages/strace/4.19/0000-conflicting-decl.patch
@@ -18,8 +18,10 @@ Date:   Fri Sep 8 12:12:57 2017 +0300
     * error_prints.c (program_invocation_name): Declare only in case
     of [!HAVE_PROGRAM_INVOCATION_NAME].
 
-diff --git a/error_prints.c b/error_prints.c
-index 8519b924..710e99b0 100644
+---
+ error_prints.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
 --- a/error_prints.c
 +++ b/error_prints.c
 @@ -37,7 +37,9 @@
diff --git a/packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch b/packages/strace/4.8/0000-strace-4.8-glibc_2.18_build_fix-1.patch
similarity index 74%
rename from packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
rename to packages/strace/4.8/0000-strace-4.8-glibc_2.18_build_fix-1.patch
index 49a71e12..042f82ab 100644
--- a/packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
+++ b/packages/strace/4.8/0000-strace-4.8-glibc_2.18_build_fix-1.patch
@@ -12,10 +12,15 @@ Their changelog reports:
    ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>
 
 
-Index: strace-4.8/process.c
-===================================================================
---- strace-4.8.orig/process.c
-+++ strace-4.8/process.c
+---
+ process.c |    2 ++
+ signal.c  |    2 ++
+ syscall.c |    2 ++
+ util.c    |    2 ++
+ 4 files changed, 8 insertions(+)
+
+--- a/process.c
++++ b/process.c
 @@ -63,9 +63,11 @@
  # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
  #  define pt_all_user_regs XXX_pt_all_user_regs
@@ -28,10 +33,8 @@ Index: strace-4.8/process.c
  #endif
  
  #if defined(SPARC64)
-Index: strace-4.8/signal.c
-===================================================================
---- strace-4.8.orig/signal.c
-+++ strace-4.8/signal.c
+--- a/signal.c
++++ b/signal.c
 @@ -51,9 +51,11 @@
  # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
  #  define pt_all_user_regs XXX_pt_all_user_regs
@@ -44,10 +47,8 @@ Index: strace-4.8/signal.c
  #endif
  
  #ifdef IA64
-Index: strace-4.8/syscall.c
-===================================================================
---- strace-4.8.orig/syscall.c
-+++ strace-4.8/syscall.c
+--- a/syscall.c
++++ b/syscall.c
 @@ -48,9 +48,11 @@
  # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
  #  define pt_all_user_regs XXX_pt_all_user_regs
@@ -60,10 +61,8 @@ Index: strace-4.8/syscall.c
  #endif
  
  #if defined(SPARC64)
-Index: strace-4.8/util.c
-===================================================================
---- strace-4.8.orig/util.c
-+++ strace-4.8/util.c
+--- a/util.c
++++ b/util.c
 @@ -55,9 +55,11 @@
  # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
  #  define pt_all_user_regs XXX_pt_all_user_regs
diff --git a/packages/uClibc-ng/1.0.25/0001-gdb8.patch b/packages/uClibc-ng/1.0.25/0000-gdb8.patch
similarity index 79%
rename from packages/uClibc-ng/1.0.25/0001-gdb8.patch
rename to packages/uClibc-ng/1.0.25/0000-gdb8.patch
index b4a70eb2..ad6132bd 100644
--- a/packages/uClibc-ng/1.0.25/0001-gdb8.patch
+++ b/packages/uClibc-ng/1.0.25/0000-gdb8.patch
@@ -16,8 +16,11 @@ Date:   Sat Aug 5 11:28:07 2017 +0200
     thread-db.c:(.text+0x632): undefined reference to `td_symbol_list()'
     ..
 
-diff --git a/libpthread/linuxthreads_db/thread_db.h b/libpthread/linuxthreads_db/thread_db.h
-index 13c30af5b..ec79f6022 100644
+---
+ libpthread/linuxthreads_db/thread_db.h |    7 +++++++
+ libpthread/nptl_db/thread_db.h         |    7 +++++++
+ 2 files changed, 14 insertions(+)
+
 --- a/libpthread/linuxthreads_db/thread_db.h
 +++ b/libpthread/linuxthreads_db/thread_db.h
 @@ -27,6 +27,9 @@
@@ -30,7 +33,7 @@ index 13c30af5b..ec79f6022 100644
  
  /* Error codes of the library.  */
  typedef enum
-@@ -455,4 +458,8 @@ extern td_err_e td_thr_dbsuspend (const td_thrhandle_t *__th);
+@@ -455,4 +458,8 @@
  /* Resume execution of thread TH.  */
  extern td_err_e td_thr_dbresume (const td_thrhandle_t *__th);
  
@@ -39,8 +42,6 @@ index 13c30af5b..ec79f6022 100644
 +#endif
 +
  #endif	/* thread_db.h */
-diff --git a/libpthread/nptl_db/thread_db.h b/libpthread/nptl_db/thread_db.h
-index 27ea69af8..993842ff5 100644
 --- a/libpthread/nptl_db/thread_db.h
 +++ b/libpthread/nptl_db/thread_db.h
 @@ -27,6 +27,9 @@
@@ -53,7 +54,7 @@ index 27ea69af8..993842ff5 100644
  
  /* Error codes of the library.  */
  typedef enum
-@@ -455,4 +458,8 @@ extern td_err_e td_thr_dbsuspend (const td_thrhandle_t *__th);
+@@ -455,4 +458,8 @@
  /* Resume execution of thread TH.  */
  extern td_err_e td_thr_dbresume (const td_thrhandle_t *__th);
  
diff --git a/packages/uClibc-ng/1.0.26/0001-gdb8.patch b/packages/uClibc-ng/1.0.26/0000-gdb8.patch
similarity index 79%
rename from packages/uClibc-ng/1.0.26/0001-gdb8.patch
rename to packages/uClibc-ng/1.0.26/0000-gdb8.patch
index b4a70eb2..ad6132bd 100644
--- a/packages/uClibc-ng/1.0.26/0001-gdb8.patch
+++ b/packages/uClibc-ng/1.0.26/0000-gdb8.patch
@@ -16,8 +16,11 @@ Date:   Sat Aug 5 11:28:07 2017 +0200
     thread-db.c:(.text+0x632): undefined reference to `td_symbol_list()'
     ..
 
-diff --git a/libpthread/linuxthreads_db/thread_db.h b/libpthread/linuxthreads_db/thread_db.h
-index 13c30af5b..ec79f6022 100644
+---
+ libpthread/linuxthreads_db/thread_db.h |    7 +++++++
+ libpthread/nptl_db/thread_db.h         |    7 +++++++
+ 2 files changed, 14 insertions(+)
+
 --- a/libpthread/linuxthreads_db/thread_db.h
 +++ b/libpthread/linuxthreads_db/thread_db.h
 @@ -27,6 +27,9 @@
@@ -30,7 +33,7 @@ index 13c30af5b..ec79f6022 100644
  
  /* Error codes of the library.  */
  typedef enum
-@@ -455,4 +458,8 @@ extern td_err_e td_thr_dbsuspend (const td_thrhandle_t *__th);
+@@ -455,4 +458,8 @@
  /* Resume execution of thread TH.  */
  extern td_err_e td_thr_dbresume (const td_thrhandle_t *__th);
  
@@ -39,8 +42,6 @@ index 13c30af5b..ec79f6022 100644
 +#endif
 +
  #endif	/* thread_db.h */
-diff --git a/libpthread/nptl_db/thread_db.h b/libpthread/nptl_db/thread_db.h
-index 27ea69af8..993842ff5 100644
 --- a/libpthread/nptl_db/thread_db.h
 +++ b/libpthread/nptl_db/thread_db.h
 @@ -27,6 +27,9 @@
@@ -53,7 +54,7 @@ index 27ea69af8..993842ff5 100644
  
  /* Error codes of the library.  */
  typedef enum
-@@ -455,4 +458,8 @@ extern td_err_e td_thr_dbsuspend (const td_thrhandle_t *__th);
+@@ -455,4 +458,8 @@
  /* Resume execution of thread TH.  */
  extern td_err_e td_thr_dbresume (const td_thrhandle_t *__th);
  
diff --git a/packages/uClibc/0.9.33.2/100-m68k-ice.patch b/packages/uClibc/0.9.33.2/0000-m68k-ice.patch
similarity index 70%
rename from packages/uClibc/0.9.33.2/100-m68k-ice.patch
rename to packages/uClibc/0.9.33.2/0000-m68k-ice.patch
index 410f8d60..4f228f07 100644
--- a/packages/uClibc/0.9.33.2/100-m68k-ice.patch
+++ b/packages/uClibc/0.9.33.2/0000-m68k-ice.patch
@@ -1,6 +1,9 @@
-diff -urN uClibc-0.9.33.2~orig/Rules.mak uClibc-0.9.33.2/Rules.mak
---- uClibc-0.9.33.2~orig/Rules.mak	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/Rules.mak	2012-09-24 14:09:51.092953729 +0200
+---
+ Rules.mak |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/Rules.mak
++++ b/Rules.mak
 @@ -226,6 +226,7 @@
  
  OPTIMIZATION:=
diff --git a/packages/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch b/packages/uClibc/0.9.33.2/0001-fix-kernel-3.4plus-build.patch
similarity index 66%
rename from packages/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
rename to packages/uClibc/0.9.33.2/0001-fix-kernel-3.4plus-build.patch
index 0381ba80..8c023991 100644
--- a/packages/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
+++ b/packages/uClibc/0.9.33.2/0001-fix-kernel-3.4plus-build.patch
@@ -52,35 +52,33 @@ Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 ---
- libc/sysdeps/linux/alpha/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/arm/bits/kernel_types.h        | 2 ++
- libc/sysdeps/linux/avr32/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/bfin/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/c6x/bits/kernel_types.h        | 2 ++
- libc/sysdeps/linux/cris/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/e1/bits/kernel_types.h         | 2 ++
- libc/sysdeps/linux/h8300/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/hppa/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/i386/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/ia64/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/m68k/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/mips/bits/kernel_types.h       | 4 ++++
- libc/sysdeps/linux/nios2/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/powerpc/bits/kernel_types.h    | 4 ++++
- libc/sysdeps/linux/sh/bits/kernel_types.h         | 2 ++
- libc/sysdeps/linux/sh64/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/sparc/bits/kernel_types.h      | 4 ++++
- libc/sysdeps/linux/v850/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/x86_64/bits/kernel_types.h     | 2 ++
- libc/sysdeps/linux/xtensa/bits/kernel_types.h     | 2 ++
+ libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
+ libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
+ libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
+ libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
+ libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
+ libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
  22 files changed, 50 insertions(+)
 
-diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
-index d5574c9..cd59b9d 100644
 --- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
-@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
+@@ -33,6 +33,8 @@
  typedef __kernel_uid_t __kernel_uid32_t;
  typedef __kernel_gid_t __kernel_gid32_t;
  typedef __kernel_dev_t __kernel_old_dev_t;
@@ -89,11 +87,9 @@ index d5574c9..cd59b9d 100644
  
  typedef struct {
  	int val[2];
-diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
-index 766a306..6b36f32 100644
 --- a/libc/sysdeps/linux/arm/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short		__kernel_old_uid_t;
+@@ -32,6 +32,8 @@
  typedef unsigned short		__kernel_old_gid_t;
  typedef long long		__kernel_loff_t;
  typedef __kernel_dev_t		__kernel_old_dev_t;
@@ -102,11 +98,9 @@ index 766a306..6b36f32 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-index f7d8b52..c551d57 100644
 --- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-@@ -39,6 +39,8 @@ typedef unsigned int		__kernel_gid32_t;
+@@ -39,6 +39,8 @@
  typedef unsigned short		__kernel_old_uid_t;
  typedef unsigned short		__kernel_old_gid_t;
  typedef unsigned short		__kernel_old_dev_t;
@@ -115,11 +109,9 @@ index f7d8b52..c551d57 100644
  
  #ifdef __GNUC__
  typedef long long		__kernel_loff_t;
-diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
-index d69a875..9fec595 100644
 --- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+@@ -32,6 +32,8 @@
  typedef unsigned short	__kernel_old_gid_t;
  typedef long long	__kernel_loff_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -128,11 +120,9 @@ index d69a875..9fec595 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
-index 7557309..2c363a8 100644
 --- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
-@@ -22,6 +22,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -22,6 +22,8 @@
  typedef unsigned int	__kernel_old_uid_t;
  typedef unsigned int	__kernel_old_gid_t;
  typedef unsigned int	__kernel_old_dev_t;
@@ -141,11 +131,9 @@ index 7557309..2c363a8 100644
  typedef unsigned int	__kernel_size_t;
  typedef int		__kernel_ssize_t;
  typedef int		__kernel_ptrdiff_t;
-diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
-index f122c7f..5d31f7b 100644
 --- a/libc/sysdeps/linux/cris/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
-@@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t;
+@@ -28,6 +28,8 @@
  typedef unsigned short  __kernel_old_uid_t;
  typedef unsigned short  __kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -154,11 +142,9 @@ index f122c7f..5d31f7b 100644
  
  #ifdef __GNUC__
  typedef long long	__kernel_loff_t;
-diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
-index 8017d85..f55a129 100644
 --- a/libc/sysdeps/linux/e1/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
-@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -31,6 +31,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -167,11 +153,9 @@ index 8017d85..f55a129 100644
  typedef long long	__kernel_loff_t;
  
  /*
-diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
-index 0570675..4cfd1bf 100644
 --- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+@@ -32,6 +32,8 @@
  typedef unsigned short	__kernel_old_gid_t;
  typedef long long	__kernel_loff_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -180,11 +164,9 @@ index 0570675..4cfd1bf 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
-index 4441f9b..6b2e794 100644
 --- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
-@@ -45,6 +45,8 @@ typedef long long		__kernel_off64_t;
+@@ -45,6 +45,8 @@
  typedef unsigned long long	__kernel_ino64_t;
  
  typedef unsigned int		__kernel_old_dev_t;
@@ -193,11 +175,9 @@ index 4441f9b..6b2e794 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
-index 9c07c72..59044b8 100644
 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
-@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -40,6 +40,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -206,11 +186,9 @@ index 9c07c72..59044b8 100644
  typedef long long	__kernel_loff_t;
  
  typedef struct {
-diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
-index c8ef86d..e31dc65 100644
 --- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
-@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
+@@ -52,5 +52,7 @@
  
  typedef unsigned int	__kernel_dev_t;
  typedef unsigned int	__kernel_old_dev_t;
@@ -218,11 +196,9 @@ index c8ef86d..e31dc65 100644
 +typedef unsigned long	__kernel_ulong_t;
  
  #endif /* _ASM_IA64_POSIX_TYPES_H */
-diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
-index 0a77a8f..176b968 100644
 --- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
+@@ -32,6 +32,8 @@
  typedef unsigned short	__kernel_old_gid_t;
  typedef long long	__kernel_loff_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -231,11 +207,9 @@ index 0a77a8f..176b968 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-index 2a70575..a9f736b 100644
 --- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-@@ -44,6 +44,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -44,6 +44,8 @@
  typedef unsigned int	__kernel_old_uid_t;
  typedef unsigned int	__kernel_old_gid_t;
  typedef unsigned int	__kernel_old_dev_t;
@@ -244,11 +218,9 @@ index 2a70575..a9f736b 100644
  
  #ifdef __GNUC__
  typedef long long	__kernel_loff_t;
-diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
-index 9fc3b96..97faeac 100644
 --- a/libc/sysdeps/linux/mips/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef int		__kernel_gid32_t;
+@@ -32,6 +32,8 @@
  typedef __kernel_uid_t	__kernel_old_uid_t;
  typedef __kernel_gid_t	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -257,7 +229,7 @@ index 9fc3b96..97faeac 100644
  typedef long long      __kernel_loff_t;
  #else
  typedef unsigned int	__kernel_dev_t;
-@@ -68,6 +70,8 @@ typedef int		__kernel_gid32_t;
+@@ -68,6 +70,8 @@
  typedef __kernel_uid_t	__kernel_old_uid_t;
  typedef __kernel_gid_t	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -266,11 +238,9 @@ index 9fc3b96..97faeac 100644
  typedef long long      __kernel_loff_t;
  #endif
  
-diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
-index 8b86d79..3c030e7 100644
 --- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
-@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -31,6 +31,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef unsigned short	__kernel_old_dev_t;
@@ -279,11 +249,9 @@ index 8b86d79..3c030e7 100644
  typedef long long	__kernel_loff_t;
  
  typedef struct {
-diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-index 3f3b933..1167de2 100644
 --- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-@@ -36,6 +36,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -36,6 +36,8 @@
  typedef unsigned int	__kernel_old_uid_t;
  typedef unsigned int	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -292,7 +260,7 @@ index 3f3b933..1167de2 100644
  #else
  typedef unsigned int	__kernel_dev_t;
  typedef unsigned int	__kernel_ino_t;
-@@ -61,6 +63,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -61,6 +63,8 @@
  typedef unsigned int	__kernel_old_uid_t;
  typedef unsigned int	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -301,11 +269,9 @@ index 3f3b933..1167de2 100644
  typedef long long	__kernel_loff_t;
  #endif
  
-diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
-index f96e9fa..ac97261 100644
 --- a/libc/sysdeps/linux/sh/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -32,6 +32,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -314,11 +280,9 @@ index f96e9fa..ac97261 100644
  typedef long long	__kernel_loff_t;
  
  typedef struct {
-diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
-index 671cc83..8cc6c61 100644
 --- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
-@@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t;
+@@ -43,6 +43,8 @@
  typedef unsigned short  __kernel_old_uid_t;
  typedef unsigned short  __kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -327,11 +291,9 @@ index 671cc83..8cc6c61 100644
  typedef long long       __kernel_loff_t;
  
  typedef struct {
-diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
-index 0cc4bc2..a10e075 100644
 --- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	       __kernel_gid16_t;
+@@ -32,6 +32,8 @@
  typedef __kernel_uid_t 	       __kernel_old_uid_t;
  typedef __kernel_gid_t         __kernel_old_gid_t;
  typedef __kernel_dev_t         __kernel_old_dev_t;
@@ -340,7 +302,7 @@ index 0cc4bc2..a10e075 100644
  typedef __kernel_uid_t	       __kernel_uid32_t;
  typedef __kernel_gid_t	       __kernel_gid32_t;
  typedef int		       __kernel_suseconds_t;
-@@ -62,6 +64,8 @@ typedef unsigned int	       __kernel_gid32_t;
+@@ -62,6 +64,8 @@
  typedef unsigned short	       __kernel_old_uid_t;
  typedef unsigned short	       __kernel_old_gid_t;
  typedef __kernel_dev_t         __kernel_old_dev_t;
@@ -349,11 +311,9 @@ index 0cc4bc2..a10e075 100644
  typedef long long              __kernel_loff_t;
  #endif
  
-diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
-index 3e851ab..780aa8a 100644
 --- a/libc/sysdeps/linux/v850/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
-@@ -41,6 +41,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -41,6 +41,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -362,11 +322,9 @@ index 3e851ab..780aa8a 100644
  
  typedef struct {
  #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-index de800d7..0cae08c 100644
 --- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -40,6 +40,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef __kernel_dev_t	__kernel_old_dev_t;
@@ -375,11 +333,9 @@ index de800d7..0cae08c 100644
  typedef long long	__kernel_loff_t;
  
  typedef struct {
-diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-index 44f1075..ed38f2e 100644
 --- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
 +++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-@@ -33,6 +33,8 @@ typedef unsigned int	__kernel_gid32_t;
+@@ -33,6 +33,8 @@
  typedef unsigned short	__kernel_old_uid_t;
  typedef unsigned short	__kernel_old_gid_t;
  typedef unsigned short	__kernel_old_dev_t;
@@ -388,6 +344,3 @@ index 44f1075..ed38f2e 100644
  typedef long long	__kernel_loff_t;
  
  /* Beginning in 2.6 kernels, which is the first version that includes the
--- 
-1.8.1.2
-
diff --git a/packages/uClibc/0.9.33.2/300-fix-darwin-build.patch b/packages/uClibc/0.9.33.2/0002-fix-darwin-build.patch
similarity index 50%
rename from packages/uClibc/0.9.33.2/300-fix-darwin-build.patch
rename to packages/uClibc/0.9.33.2/0002-fix-darwin-build.patch
index 884307d3..666219c7 100644
--- a/packages/uClibc/0.9.33.2/300-fix-darwin-build.patch
+++ b/packages/uClibc/0.9.33.2/0002-fix-darwin-build.patch
@@ -1,7 +1,10 @@
-diff -Nrupa uClibc-0.9.33.2.orig/extra/scripts/unifdef.c uClibc-0.9.33.2/extra/scripts/unifdef.c
---- uClibc-0.9.33.2.orig/extra/scripts/unifdef.c	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/extra/scripts/unifdef.c	2014-10-25 17:07:33.000000000 +0200
-@@ -78,8 +78,6 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/
+---
+ extra/scripts/unifdef.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/extra/scripts/unifdef.c
++++ b/extra/scripts/unifdef.c
+@@ -78,8 +78,6 @@
  #define errx(exit_code, fmt, args...) ({ warnx(fmt, ## args); exit(exit_code); })
  #define err(exit_code, fmt, args...)  errx(exit_code, fmt ": %s", ## args, strerror(errno))
  
diff --git a/packages/uClibc/0.9.33.2/400-arm-unwind.patch b/packages/uClibc/0.9.33.2/0003-arm-unwind.patch
similarity index 83%
rename from packages/uClibc/0.9.33.2/400-arm-unwind.patch
rename to packages/uClibc/0.9.33.2/0003-arm-unwind.patch
index d31844c0..2635bdd6 100644
--- a/packages/uClibc/0.9.33.2/400-arm-unwind.patch
+++ b/packages/uClibc/0.9.33.2/0003-arm-unwind.patch
@@ -8,11 +8,13 @@ Date:   Thu Oct 1 13:22:37 2015 -0700
     along with the code storing to that data. For assembly blocks like in
     ARM unwind code, the data structures need to be declared used.
 
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index f9a4ffb..f0c3047 100644
+---
+ libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
 +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
  #define __libc_dlclose          dlclose
  #define __libc_fatal(x)         {/*write(STDERR_FILENO, x, strlen(x));*/ abort();}
  
diff --git a/packages/uClibc/0.9.33.2/500-no-install-D.patch b/packages/uClibc/0.9.33.2/0004-no-install-D.patch
similarity index 89%
rename from packages/uClibc/0.9.33.2/500-no-install-D.patch
rename to packages/uClibc/0.9.33.2/0004-no-install-D.patch
index f8c2cc1a..35968bfb 100644
--- a/packages/uClibc/0.9.33.2/500-no-install-D.patch
+++ b/packages/uClibc/0.9.33.2/0004-no-install-D.patch
@@ -1,5 +1,9 @@
---- uClibc-0.9.33.2.orig/utils/Makefile.in	2012-05-15 00:20:09.000000000 -0700
-+++ uClibc-0.9.33.2/utils/Makefile.in	2017-03-01 12:17:56.000000000 -0800
+---
+ utils/Makefile.in |   15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+--- a/utils/Makefile.in
++++ b/utils/Makefile.in
 @@ -118,15 +118,22 @@
  install-y += utils_install
  
diff --git a/packages/uClibc/0.9.33.2/600-prefer-multilib.patch b/packages/uClibc/0.9.33.2/0005-prefer-multilib.patch
similarity index 60%
rename from packages/uClibc/0.9.33.2/600-prefer-multilib.patch
rename to packages/uClibc/0.9.33.2/0005-prefer-multilib.patch
index 677c5998..286e5623 100644
--- a/packages/uClibc/0.9.33.2/600-prefer-multilib.patch
+++ b/packages/uClibc/0.9.33.2/0005-prefer-multilib.patch
@@ -1,7 +1,11 @@
-diff -urpN uClibc-0.9.33.2.orig/ldso/ldso/dl-elf.c uClibc-0.9.33.2/ldso/ldso/dl-elf.c
---- uClibc-0.9.33.2.orig/ldso/ldso/dl-elf.c	2017-03-14 23:40:57.527113741 -0700
-+++ uClibc-0.9.33.2/ldso/ldso/dl-elf.c	2017-03-14 23:42:19.308005691 -0700
-@@ -284,6 +284,19 @@ struct elf_resolve *_dl_load_shared_libr
+---
+ ldso/ldso/Makefile.in |    5 +++++
+ ldso/ldso/dl-elf.c    |   13 +++++++++++++
+ 2 files changed, 18 insertions(+)
+
+--- a/ldso/ldso/dl-elf.c
++++ b/ldso/ldso/dl-elf.c
+@@ -284,6 +284,19 @@
  		}
  	}
  #endif
@@ -21,10 +25,9 @@ diff -urpN uClibc-0.9.33.2.orig/ldso/ldso/dl-elf.c uClibc-0.9.33.2/ldso/ldso/dl-
  #if defined SHARED && defined __LDSO_SEARCH_INTERP_PATH__
  	/* Look for libraries wherever the shared library loader
  	 * was installed */
-diff -urpN uClibc-0.9.33.2.orig/ldso/ldso/Makefile.in uClibc-0.9.33.2/ldso/ldso/Makefile.in
---- uClibc-0.9.33.2.orig/ldso/ldso/Makefile.in	2017-03-14 23:40:57.527113741 -0700
-+++ uClibc-0.9.33.2/ldso/ldso/Makefile.in	2017-03-14 23:41:45.215634328 -0700
-@@ -30,6 +30,11 @@ CFLAGS-ldso/ldso/$(TARGET_ARCH)/ := $(CF
+--- a/ldso/ldso/Makefile.in
++++ b/ldso/ldso/Makefile.in
+@@ -30,6 +30,11 @@
  
  CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\" $(CFLAGS-ldso)
  
diff --git a/packages/uClibc/0.9.33.2/998-dlopen-static.patch b/packages/uClibc/0.9.33.2/0006-dlopen-static.patch
similarity index 85%
rename from packages/uClibc/0.9.33.2/998-dlopen-static.patch
rename to packages/uClibc/0.9.33.2/0006-dlopen-static.patch
index 9d2fa553..6699180f 100644
--- a/packages/uClibc/0.9.33.2/998-dlopen-static.patch
+++ b/packages/uClibc/0.9.33.2/0006-dlopen-static.patch
@@ -15,14 +15,12 @@ preventing to get the actual value of the LD_LIBRARY_PATH.
 Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
 Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
 ---
- ldso/libdl/libdl.c | 11 +++++++++--
+ ldso/libdl/libdl.c |   11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
-diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
-index 4630a59..3a78696 100644
 --- a/ldso/libdl/libdl.c
 +++ b/ldso/libdl/libdl.c
-@@ -374,7 +374,7 @@ static void *do_dlopen(const char *libname, int flag, ElfW(Addr) from)
+@@ -377,7 +377,7 @@
  	if (getenv("LD_BIND_NOW"))
  		now_flag = RTLD_NOW;
  
@@ -31,7 +29,7 @@ index 4630a59..3a78696 100644
  	/* When statically linked, the _dl_library_path is not yet initialized */
  	_dl_library_path = getenv("LD_LIBRARY_PATH");
  #endif
-@@ -541,11 +541,18 @@ static void *do_dlopen(const char *libname, int flag, ElfW(Addr) from)
+@@ -544,11 +544,18 @@
  	 * to the GOT tables.  We need to do this in reverse order so that COPY
  	 * directives work correctly */
  
@@ -51,6 +49,3 @@ index 4630a59..3a78696 100644
  #ifdef __mips__
  	/*
  	 * Relocation of the GOT entries for MIPS have to be done
--- 
-cgit v0.12
-
diff --git a/packages/uClibc/0.9.33.2/999-make-olddefconfig.patch b/packages/uClibc/0.9.33.2/0007-make-olddefconfig.patch
similarity index 56%
rename from packages/uClibc/0.9.33.2/999-make-olddefconfig.patch
rename to packages/uClibc/0.9.33.2/0007-make-olddefconfig.patch
index 8bc87ec1..9c8a5358 100644
--- a/packages/uClibc/0.9.33.2/999-make-olddefconfig.patch
+++ b/packages/uClibc/0.9.33.2/0007-make-olddefconfig.patch
@@ -1,7 +1,11 @@
-diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config/conf.c
---- uClibc-0.9.33.2.orig/extra/config/conf.c	2017-02-04 12:57:38.488808014 -0800
-+++ uClibc-0.9.33.2/extra/config/conf.c	2017-02-04 20:26:28.613244457 -0800
-@@ -435,6 +435,7 @@ int main(int ac, char **av)
+---
+ Makefile.in         |    3 +++
+ extra/config/conf.c |    4 +++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+--- a/extra/config/conf.c
++++ b/extra/config/conf.c
+@@ -435,6 +435,7 @@
  	const char *name;
  	const char *configname = conf_get_configname();
  	struct stat tmpstat;
@@ -9,7 +13,7 @@ diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config
  
  	setlocale(LC_ALL, "");
  	bindtextdomain(PACKAGE, LOCALEDIR);
-@@ -451,6 +452,7 @@ int main(int ac, char **av)
+@@ -451,6 +452,7 @@
  			break;
  		case 'd':
  			input_mode = set_default;
@@ -17,7 +21,7 @@ diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config
  			break;
  		case 'D':
  			input_mode = set_default;
-@@ -514,7 +516,7 @@ int main(int ac, char **av)
+@@ -514,7 +516,7 @@
  	switch (input_mode) {
  	case set_default:
  		if (!defconfig_file)
@@ -26,10 +30,9 @@ diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config
  		if (conf_read(defconfig_file)) {
  			printf(_("***\n"
  				"*** Can't find default configuration \"%s\"!\n"
-diff -urpN uClibc-0.9.33.2.orig/Makefile.in uClibc-0.9.33.2/Makefile.in
---- uClibc-0.9.33.2.orig/Makefile.in	2017-02-04 12:57:38.484807980 -0800
-+++ uClibc-0.9.33.2/Makefile.in	2017-02-04 12:59:34.625789324 -0800
-@@ -460,6 +460,9 @@ allyesconfig: $(conf)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -460,6 +460,9 @@
  allnoconfig: $(conf)
  	$(Q)$< -n extra/Configs/Config.in
  
diff --git a/packages/zlib/1.2.11/100-make-check-fail.patch b/packages/zlib/1.2.11/0000-make-check-fail.patch
similarity index 82%
rename from packages/zlib/1.2.11/100-make-check-fail.patch
rename to packages/zlib/1.2.11/0000-make-check-fail.patch
index 38522063..203a5178 100644
--- a/packages/zlib/1.2.11/100-make-check-fail.patch
+++ b/packages/zlib/1.2.11/0000-make-check-fail.patch
@@ -2,8 +2,12 @@
 
 ... if the test fails.
 
---- zlib-1.2.11/Makefile.in.orig	2017-02-11 12:00:37.768094420 -0800
-+++ zlib-1.2.11/Makefile.in	2017-02-11 12:01:02.088399001 -0800
+---
+ Makefile.in |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -91,7 +91,7 @@
  	  echo '		*** zlib test OK ***'; \
  	else \
diff --git a/packages/zlib/1.2.11/110-no-_wopen-cygwin.patch b/packages/zlib/1.2.11/0001-no-_wopen-cygwin.patch
similarity index 88%
rename from packages/zlib/1.2.11/110-no-_wopen-cygwin.patch
rename to packages/zlib/1.2.11/0001-no-_wopen-cygwin.patch
index 6704e3e1..67085bab 100644
--- a/packages/zlib/1.2.11/110-no-_wopen-cygwin.patch
+++ b/packages/zlib/1.2.11/0001-no-_wopen-cygwin.patch
@@ -9,11 +9,9 @@ compiler does not define __CYGWIN__, it defines _WIN32.
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- gzguts.h | 2 +-
+ gzguts.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gzguts.h b/gzguts.h
-index 990a4d2..6378d46 100644
 --- a/gzguts.h
 +++ b/gzguts.h
 @@ -39,7 +39,7 @@
@@ -25,6 +23,3 @@ index 990a4d2..6378d46 100644
  #  define WIDECHAR
  #endif
  
--- 
-2.9.3
-
diff --git a/packages/zlib/1.2.11/120-mingw-static-only.patch b/packages/zlib/1.2.11/0002-mingw-static-only.patch
similarity index 69%
rename from packages/zlib/1.2.11/120-mingw-static-only.patch
rename to packages/zlib/1.2.11/0002-mingw-static-only.patch
index 9eef00b8..6d5c89c5 100644
--- a/packages/zlib/1.2.11/120-mingw-static-only.patch
+++ b/packages/zlib/1.2.11/0002-mingw-static-only.patch
@@ -1,7 +1,10 @@
-diff -urpN zlib-1.2.11.orig/win32/Makefile.gcc zlib-1.2.11/win32/Makefile.gcc
---- zlib-1.2.11.orig/win32/Makefile.gcc	2017-05-23 18:52:07.937730080 -0700
-+++ zlib-1.2.11/win32/Makefile.gcc	2017-05-23 19:02:24.068666463 -0700
-@@ -71,7 +71,11 @@ OBJS = adler32.o compress.o crc32.o defl
+---
+ win32/Makefile.gcc |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/win32/Makefile.gcc
++++ b/win32/Makefile.gcc
+@@ -71,7 +71,11 @@
         gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
  OBJA =
  
@@ -14,7 +17,7 @@ diff -urpN zlib-1.2.11.orig/win32/Makefile.gcc zlib-1.2.11/win32/Makefile.gcc
  
  test: example.exe minigzip.exe
  	./example
-@@ -125,7 +129,7 @@ zlibrc.o: win32/zlib1.rc
+@@ -125,7 +129,7 @@
  .PHONY: install uninstall clean
  
  install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)