diff --git a/.gitignore b/.gitignore
index 138b7413..225009c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,11 +13,13 @@ config/configure.in
 config/gen/
 config/versions/
 .config
+maintainer/package-versions
 
 # Temporaries
 .*.swp
 build.log
 .config.old
+temp.*
 
 # This is the place where toolchains are built
 .build/
diff --git a/bootstrap b/bootstrap
index d01a7de5..8882a6e0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -570,7 +570,9 @@ gen_packages()
     msg "Master packages: ${pkg_masters[@]}"
 
     # Now for each master, create its kconfig file with version
-    # definitions.
+    # definitions. As a byproduct, generate a list of all package
+    # versions for maintenance purposes.
+    exec 3>"maintainer/package-versions"
     for p in "${pkg_masters[@]}"; do
         msg "Generating '${config_versions_dir}/${p}.in'"
         exec >"${config_versions_dir}/${p}.in"
@@ -586,6 +588,7 @@ gen_packages()
         set_iter milestone ${pkg_milestones[${p}]}
 
         run_template "maintainer/kconfig-versions.template"
+        run_template "maintainer/package-versions.template" >&3
     done
 }
 
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index 4692a254..c16bb772 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -252,10 +252,16 @@ config @@pfx@@_MIRRORS
 
 config @@pfx@@_ARCHIVE_FILENAME
     string
+#!foreach version
+    default "@@archive_filename@@" if @@pfx@@_V_@@kcfg@@
+#!end-foreach
     default "@@archive_filename@@"
 
 config @@pfx@@_ARCHIVE_DIRNAME
     string
+#!foreach version
+    default "@@archive_dirname@@" if @@pfx@@_V_@@kcfg@@
+#!end-foreach
     default "@@archive_dirname@@"
 
 config @@pfx@@_ARCHIVE_FORMATS
diff --git a/maintainer/package-versions.template b/maintainer/package-versions.template
new file mode 100644
index 00000000..36451620
--- /dev/null
+++ b/maintainer/package-versions.template
@@ -0,0 +1,13 @@
+#!foreach fork
+#!foreach version
+run_pkgversion \
+    master=@@master@@ \
+    masterpfx=@@masterpfx@@ \
+    originpfx=@@originpfx@@ \
+    pkg_name=@@pkg_name@@ \
+    pfx=@@pfx@@ \
+    versionlocked=@@versionlocked@@ \
+    ver=@@ver@@ \
+    kcfg=@@kcfg@@
+#!end-foreach
+#!end-foreach
diff --git a/maintainer/test-packages.sh b/maintainer/test-packages.sh
new file mode 100755
index 00000000..7a19651d
--- /dev/null
+++ b/maintainer/test-packages.sh
@@ -0,0 +1,190 @@
+#!/bin/bash
+
+selected=
+
+usage()
+{
+    cat <<EOF
+$0 -- Test packages in crosstool-NG
+
+Verifies that the release tarballs can be downloaded for the packages
+available in crosstoo-NG and check that the patches apply cleanly.
+Requires crosstool-NG to be configured and built prior to running.
+
+Options:
+    --help, -?
+        Display this help message.
+
+    --download, -d
+        Download all packages to the default directory (\$HOME/src).
+
+    --apply-patches, -a
+        Implies -d. Unpack and apply the bundled patches.
+
+    --verify-urls, -u
+        Check *all* the download URLs for accessibility, without
+        actually downloading anything.
+
+    --select MASK, -s MASK
+        Specify the package to operate upon. MASK can be either package
+        name ("-s foo"), or package name + version ("-s foo-1.1").
+
+EOF
+}
+
+while [ -n "${1}" ]; do
+    case "${1}" in
+    --download|-d)
+        download_pkgs=y
+        ;;
+    --verify-urls|-u)
+        verify_urls=y
+        ;;
+    --apply-patches|-a)
+        apply_patches=y
+        download_pkgs=y
+        ;;
+    --select|-s)
+        shift
+        [ -n "${1}" ] || { echo "argument required for --select" >&2; exit 1; }
+        selected="${1}"
+        ;;
+    --help|-?)
+        usage
+        exit 0
+        ;;
+    *)
+        echo "Unknown option ${1}" >&2
+        exit 1
+        ;;
+    esac
+    shift
+done
+
+CT_LIB_DIR=`pwd`
+CT_TOP_DIR=`pwd`
+CT_TARBALLS_DIR=`pwd`/temp.tarballs
+CT_COMMON_SRC_DIR=`pwd`/temp.src
+CT_SRC_DIR=`pwd`/temp.src
+CT_LOG_LEVEL_MAX=EXTRA
+mkdir -p ${CT_TARBALLS_DIR}
+
+# Does not matter, just to make the scripts load
+CT_ARCH=arm
+CT_KERNEL=bare-metal
+CT_BINUTILS=binutils
+CT_LIBC=none
+CT_CC=gcc
+
+. paths.sh
+. scripts/functions
+
+rm -f build.log
+CT_LogEnable
+
+check_pkg_urls()
+{
+    local e m mh url
+
+    for e in ${archive_formats}; do
+        local -A mirror_status=( )
+
+        CT_DoStep EXTRA "Looking for ${archive_filename}${e}"
+        for m in ${mirrors}; do
+            url="${m}/${archive_filename}${e}"
+            mh="${m#*://}"
+            mh="${mh%%[:/]*}"
+            if [ -n "${mirror_status[${mh}]}" ]; then
+                CT_DoLog DEBUG "Skipping '${url}': already found on this host at '${mirror_status[${mh}]}'"
+                continue
+            fi
+            if CT_DoExecLog ALL wget --spider "${url}"; then
+                mirror_status[${mh}]="${url}"
+            else
+                mirror_status[${mh}]=
+            fi
+        done
+        for mh in "${!mirror_status[@]}"; do
+            if [ -n "${mirror_status[${mh}]}" ]; then
+                CT_DoLog EXTRA "OK   ${mh} [${archive_filename}${e}]"
+            else
+                CT_DoLog ERROR "FAIL ${mh} [${archive_filename}${e}]"
+            fi
+        done
+        CT_EndStep
+    done
+}
+
+run_pkgversion()
+{
+    while [ -n "${1}" ]; do
+        eval "local ${1}"
+        shift
+    done
+
+    if [ -n "${selected}" ]; then
+        case "${selected}" in
+        ${pkg_name}|${pkg_name}-${ver})
+            ;;
+        *)
+            return
+            ;;
+        esac
+    fi
+
+    CT_DoStep INFO "Handling ${pkg_name}-${ver}"
+
+    # Create a temporary configuration head file
+    cat >temp.in <<EOF
+config OBSOLETE
+    def_bool y
+
+config EXPERIMENTAL
+    def_bool y
+
+config CONFIGURE_has_wget
+    def_bool y
+
+config CONFIGURE_has_curl
+    def_bool y
+
+config ${versionlocked}_V_${kcfg}
+    def_bool y
+
+source "config/global/paths.in"
+source "config/global/download.in"
+source "config/global/extract.in"
+source "config/versions/${master}.in"
+EOF
+
+    cat >temp.defconfig <<EOF
+CT_${masterpfx}_USE_${originpfx}=y
+CT_${pfx}_SRC_RELEASE=y
+CT_${pfx}_V_${kcfg}=y
+CT_SAVE_TARBALLS=y
+EOF
+
+    ./kconfig/conf --defconfig=temp.defconfig temp.in >/dev/null
+
+    CT_LoadConfig
+    rm -f .config .config.old temp.defconfig temp.in
+    if [ -n "${verify_urls}" ]; then
+        CT_DoLog EXTRA "Verifying URLs for ${pkg_name}-${ver}"
+        CT_PackageRun "${masterpfx}" check_pkg_urls
+    fi
+    if [ -n "${download_pkgs}" ]; then
+        CT_DoLog EXTRA "Downloading ${pkg_name}-${ver}"
+        CT_Fetch "${masterpfx}"
+    fi
+    if [ -n "${apply_patches}" ]; then
+        rm -rf ${CT_COMMON_SRC_DIR}
+        mkdir -p ${CT_COMMON_SRC_DIR}
+        CT_ExtractPatch "${masterpfx}"
+    fi
+
+    CT_EndStep
+}
+
+. maintainer/package-versions
+
+rm -rf ${CT_TARBALLS_DIR} ${CT_COMMON_SRC_DIR}
diff --git a/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch b/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch
deleted file mode 100644
index c0127198..00000000
--- a/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001
-From: kyukhin <kyukhin@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Sat, 3 Sep 2016 10:57:05 +0000
-Subject: [PATCH] gcc/ 	* ubsan.c (ubsan_use_new_style_p): Fix check for empty
- string.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239971 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Upstream-Status: Backport
-Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-
----
- gcc/ubsan.c   | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-Index: gcc-6.3.0/gcc/ubsan.c
-===================================================================
---- gcc-6.3.0.orig/gcc/ubsan.c
-+++ gcc-6.3.0/gcc/ubsan.c
-@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc)
- 
-   expanded_location xloc = expand_location (loc);
-   if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0
--      || xloc.file == '\0' || xloc.file[0] == '\xff'
-+      || xloc.file[0] == '\0' || xloc.file[0] == '\xff'
-       || xloc.file[1] == '\xff')
-     return false;
- 
diff --git a/packages/gdb/6.8a/version.desc b/packages/gdb/6.8a/version.desc
index f26b5a26..f3953c8e 100644
--- a/packages/gdb/6.8a/version.desc
+++ b/packages/gdb/6.8a/version.desc
@@ -1,2 +1,3 @@
 obsolete='yes'
 archive_formats='.tar.bz2 .tar.gz'
+archive_dirname='gdb-6.8'
diff --git a/packages/gdb/7.0.1a/version.desc b/packages/gdb/7.0.1a/version.desc
index f26b5a26..f98f67c5 100644
--- a/packages/gdb/7.0.1a/version.desc
+++ b/packages/gdb/7.0.1a/version.desc
@@ -1,2 +1,3 @@
 obsolete='yes'
 archive_formats='.tar.bz2 .tar.gz'
+archive_dirname='gdb-7.0.1'
diff --git a/packages/gdb/7.0a/version.desc b/packages/gdb/7.0a/version.desc
index f26b5a26..10d8a673 100644
--- a/packages/gdb/7.0a/version.desc
+++ b/packages/gdb/7.0a/version.desc
@@ -1,2 +1,3 @@
 obsolete='yes'
 archive_formats='.tar.bz2 .tar.gz'
+archive_dirname='gdb-7.0'
diff --git a/packages/gdb/7.1a/version.desc b/packages/gdb/7.1a/version.desc
index f26b5a26..009fd5d9 100644
--- a/packages/gdb/7.1a/version.desc
+++ b/packages/gdb/7.1a/version.desc
@@ -1,2 +1,3 @@
 obsolete='yes'
 archive_formats='.tar.bz2 .tar.gz'
+archive_dirname='gdb-7.1'
diff --git a/packages/gdb/7.2a/version.desc b/packages/gdb/7.2a/version.desc
index f26b5a26..094d9372 100644
--- a/packages/gdb/7.2a/version.desc
+++ b/packages/gdb/7.2a/version.desc
@@ -1,2 +1,3 @@
 obsolete='yes'
 archive_formats='.tar.bz2 .tar.gz'
+archive_dirname='gdb-7.2'
diff --git a/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe4..259b2854 100644
--- a/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -20,8 +20,8 @@ Tested that this fixes the build for ARM.
  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(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- 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>
 
@@ -35,8 +35,8 @@ Tested that this fixes the build for ARM.
  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
+--- 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>
@@ -47,8 +47,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -59,8 +59,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch b/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch
index b441691a..c3a9c67c 100644
--- a/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+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
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys
  /* Copyright (C) 2008 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.12.1.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.12.1/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
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
index ea85e99b..879f8db4 100644
--- a/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ 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.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+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/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
index 64382675..65781b41 100644
--- a/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ 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-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+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
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
@@ -53,4 +53,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/io
    return r;
  }
  
-diff -durN glibc-2.12.1.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.12.1/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch
index 621a6f3b..20b2e32e 100644
--- a/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/alpha/Makefile glibc-2.12.1/glibc-ports-2.12.1/sysdeps/alpha/Makefile
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+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
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/alpha/Makefile glibc-2.1
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.12.1.orig/ports/sysdeps/alpha/Makefile glibc-2.12.1/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index fc42a920..7878ab45 100644
--- a/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,9 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -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 +13,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h glibc-
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +50,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S glib
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +108,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h glib
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +123,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h gl
 +#endif
  
  #endif
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +148,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c gli
 +
 +#endif
  }
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +180,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c gli
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +278,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h gl
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +290,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +335,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S glibc-2
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gccframe.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gccframe.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +349,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gccframe.h glibc-2.1
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
@@ -361,14 +361,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h glibc-2
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
  # define IEEE_DOUBLE_BIG_ENDIAN 0
  #else
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/bits/endian.h glibc-2.12.1/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.12.1/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.12.1/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.12.1/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.12.1/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.12.1/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.12.1/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.12.1/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.12.1/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/gccframe.h glibc-2.12.1/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.12.1/ports/sysdeps/arm/gmp-mparam.h
diff --git a/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch
index c243a76b..4d1a51a4 100644
--- a/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ 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-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+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
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
@@ -20,4 +20,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.12.1.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.12.1/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch b/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch
index 7d990de7..deab4195 100644
--- a/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+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
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
@@ -12,4 +12,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h glibc
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.12.1.orig/ports/sysdeps/mips/fpu_control.h glibc-2.12.1/ports/sysdeps/mips/fpu_control.h
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
index 3f2bc0f0..af5dd390 100644
--- 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
@@ -1,6 +1,6 @@
-diff -ur glibc-2.12.1/ports/sysdeps/arm/preconfigure glibc-2.12.1-patched/ports/sysdeps/arm/preconfigure
---- glibc-2.12.1/ports/sysdeps/arm/preconfigure	2017-03-07 15:33:56.410265000 -0700
-+++ glibc-2.12.1-patched/ports/sysdeps/arm/preconfigure	2017-03-07 15:34:42.016840000 -0700
+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
@@ -10,9 +10,9 @@ diff -ur glibc-2.12.1/ports/sysdeps/arm/preconfigure glibc-2.12.1-patched/ports/
  		machine=arm/eabi/$machine
  		;;
  	*)
-diff -ur glibc-2.12.1/ports/sysdeps/arm/shlib-versions glibc-2.12.1-patched/ports/sysdeps/arm/shlib-versions
---- glibc-2.12.1/ports/sysdeps/arm/shlib-versions	2017-03-07 15:33:56.439267000 -0700
-+++ glibc-2.12.1-patched/ports/sysdeps/arm/shlib-versions	2017-03-07 15:34:42.018837000 -0700
+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
diff --git a/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe4..259b2854 100644
--- a/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -20,8 +20,8 @@ Tested that this fixes the build for ARM.
  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(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- 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>
 
@@ -35,8 +35,8 @@ Tested that this fixes the build for ARM.
  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
+--- 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>
@@ -47,8 +47,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -59,8 +59,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.13/330-m68k-sys-user.patch b/packages/glibc-ports/2.13/330-m68k-sys-user.patch
index 191e0c6e..a2b4528a 100644
--- a/packages/glibc-ports/2.13/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.13/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+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
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/use
  /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.13.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.13/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch b/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch
index fd555378..580c16d0 100644
--- a/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch
+++ b/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch
@@ -3,10 +3,10 @@
 	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (F_SETPIPE_SZ,
 	F_GETPIPE_SZ): Define.
 
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
+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-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
+--- glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
++++ glibc-ports-2.13/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.  */
diff --git a/packages/glibc-ports/2.13/420-alpha-statfs.patch b/packages/glibc-ports/2.13/420-alpha-statfs.patch
index 65c925a5..accb5afe 100644
--- a/packages/glibc-ports/2.13/420-alpha-statfs.patch
+++ b/packages/glibc-ports/2.13/420-alpha-statfs.patch
@@ -3,10 +3,10 @@
 	* sysdeps/unix/sysv/linux/mips/bits/statfs.h (struct statfs,
 	struct statfs64): Add f_flags field.
 
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
+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-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
+--- 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
      __fsid_t f_fsid;
      int f_namelen;
diff --git a/packages/glibc-ports/2.13/440-alpha-cache-shape.patch b/packages/glibc-ports/2.13/440-alpha-cache-shape.patch
index 62ade7b1..602c80d4 100644
--- a/packages/glibc-ports/2.13/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.13/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ 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.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+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 @@
 -#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/450-alpha-DEFAULT_STACK_PERMS.patch
index ac3ea9a2..0d85ce59 100644
--- a/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch
+++ b/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch
@@ -2,10 +2,10 @@
 
 	* sysdeps/alpha/stackinfo.h: Define DEFAULT_STACK_PERMS with PF_X.
 
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h
+diff --git glibc-ports-2.13/sysdeps/alpha/stackinfo.h glibc-ports-2.13/sysdeps/alpha/stackinfo.h
 index 0a281bd..d9dbc35 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h
+--- glibc-ports-2.13/sysdeps/alpha/stackinfo.h
++++ glibc-ports-2.13/sysdeps/alpha/stackinfo.h
 @@ -22,7 +22,13 @@
  #ifndef _STACKINFO_H
  #define _STACKINFO_H	1
diff --git a/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch
index 313e0e03..d23ecf96 100644
--- a/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ 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-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+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
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
@@ -53,4 +53,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm
    return r;
  }
  
-diff -durN glibc-2.13.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.13/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch b/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
index 45a7051a..ea1e0562 100644
--- a/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
+++ b/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
@@ -4,20 +4,20 @@
 	libm_hidden_def.
 	* sysdeps/alpha/fpu/ftestexcept.c (fetestexcept): Likewise.
 
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
+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-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
+--- 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-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
+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-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
+--- 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;
diff --git a/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch
index b2ae9b53..38562b6f 100644
--- a/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/alpha/Makefile glibc-2.13/glibc-ports-2.13/sysdeps/alpha/Makefile
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+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
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/alpha/Makefile glibc-2.13/gl
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.13.orig/ports/sysdeps/alpha/Makefile glibc-2.13/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 4f4dbec7..b7d54ac6 100644
--- a/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,9 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/bits/endian.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/bits/endian.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -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 +13,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/bits/endian.h glibc-2.13
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +50,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S glibc-2.
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +108,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h glibc-2.
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +123,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h glibc-
 +#endif
  
  #endif
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +148,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c glibc-2
 +
 +#endif
  }
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +180,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c glibc-2
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +278,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h glibc-
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +290,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h gli
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +335,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S glibc-2.13/
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gccframe.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/gccframe.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +349,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gccframe.h glibc-2.13/gl
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
@@ -361,14 +361,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h glibc-2.13/
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
  # define IEEE_DOUBLE_BIG_ENDIAN 0
  #else
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/bits/endian.h glibc-2.13/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.13/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.13/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.13/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.13/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.13/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.13/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.13/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.13/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/gccframe.h glibc-2.13/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.13/ports/sysdeps/arm/gmp-mparam.h
diff --git a/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch
index 08518e92..9f3fb764 100644
--- a/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ 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-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+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
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
@@ -20,4 +20,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/low
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.13.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.13/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.13/610-fpu-cw-mips.patch b/packages/glibc-ports/2.13/610-fpu-cw-mips.patch
index cd2b4d9a..c6345b36 100644
--- a/packages/glibc-ports/2.13/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.13/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/mips/fpu_control.h glibc-2.13/glibc-ports-2.13/sysdeps/mips/fpu_control.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+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
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
@@ -12,4 +12,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/mips/fpu_control.h glibc-2.1
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.13.orig/ports/sysdeps/mips/fpu_control.h glibc-2.13/ports/sysdeps/mips/fpu_control.h
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
index 589f11e5..ec004056 100644
--- a/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch
+++ b/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch
@@ -1,6 +1,6 @@
-diff -ur glibc-2.13/ports/sysdeps/arm/preconfigure glibc-2.13-patched/ports/sysdeps/arm/preconfigure
---- glibc-2.13/ports/sysdeps/arm/preconfigure	2011-01-25 14:00:16.000000000 -0700
-+++ glibc-2.13-patched/ports/sysdeps/arm/preconfigure	2017-03-07 15:36:50.310454000 -0700
+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
@@ -10,9 +10,9 @@ diff -ur glibc-2.13/ports/sysdeps/arm/preconfigure glibc-2.13-patched/ports/sysd
  		machine=arm/eabi/$machine
  		if [ "${CFLAGS+set}" != "set" ]; then
  		  CFLAGS="-g -O2"
-diff -ur glibc-2.13/ports/sysdeps/arm/shlib-versions glibc-2.13-patched/ports/sysdeps/arm/shlib-versions
---- glibc-2.13/ports/sysdeps/arm/shlib-versions	2011-01-25 14:00:16.000000000 -0700
-+++ glibc-2.13-patched/ports/sysdeps/arm/shlib-versions	2017-03-07 15:36:50.312457000 -0700
+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
diff --git a/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe4..259b2854 100644
--- a/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -20,8 +20,8 @@ Tested that this fixes the build for ARM.
  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(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- 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>
 
@@ -35,8 +35,8 @@ Tested that this fixes the build for ARM.
  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
+--- 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>
@@ -47,8 +47,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -59,8 +59,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch b/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch
index 8fbe2e5a..6476b5c0 100644
--- a/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+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
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys
  /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.14.1.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14.1/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch b/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch
index 8ca0bd68..989bfd73 100644
--- a/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ 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.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+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 @@
 -#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.14.1/460-alpha-fix-gcc-4.1-warnings.patch
index c3e59f45..2ed4118b 100644
--- a/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ 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-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+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
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
@@ -53,4 +53,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/io
    return r;
  }
  
-diff -durN glibc-2.14.1.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14.1/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch
index 2691a99b..56bc5321 100644
--- a/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/alpha/Makefile glibc-2.14.1/glibc-ports-2.14.1/sysdeps/alpha/Makefile
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+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
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/alpha/Makefile glibc-2.1
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.14.1.orig/ports/sysdeps/alpha/Makefile glibc-2.14.1/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 5e456827..80032edc 100644
--- a/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,9 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -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 +13,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h glibc-
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +50,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S glib
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +108,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h glib
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +123,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h gl
 +#endif
  
  #endif
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +148,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c gli
 +
 +#endif
  }
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +180,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c gli
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +278,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h gl
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +290,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +335,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S glibc-2
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gccframe.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gccframe.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +349,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gccframe.h glibc-2.1
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
@@ -361,14 +361,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h glibc-2
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
  # define IEEE_DOUBLE_BIG_ENDIAN 0
  #else
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/bits/endian.h glibc-2.14.1/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.14.1/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.14.1/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14.1/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.14.1/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.14.1/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.14.1/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14.1/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.14.1/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/gccframe.h glibc-2.14.1/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.14.1/ports/sysdeps/arm/gmp-mparam.h
diff --git a/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch
index 6bf52504..62b74d84 100644
--- a/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ 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-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+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
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
@@ -20,4 +20,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.14.1.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14.1/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch b/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch
index e53ac781..4b8365a2 100644
--- a/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+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
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
@@ -12,4 +12,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h glibc
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.14.1.orig/ports/sysdeps/mips/fpu_control.h glibc-2.14.1/ports/sysdeps/mips/fpu_control.h
diff --git a/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe4..259b2854 100644
--- a/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -20,8 +20,8 @@ Tested that this fixes the build for ARM.
  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(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- 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>
 
@@ -35,8 +35,8 @@ Tested that this fixes the build for ARM.
  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
+--- 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>
@@ -47,8 +47,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -59,8 +59,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.14/330-m68k-sys-user.patch b/packages/glibc-ports/2.14/330-m68k-sys-user.patch
index 28bcb116..fbc96d96 100644
--- a/packages/glibc-ports/2.14/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.14/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h
+--- glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/use
  /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.14.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.14/440-alpha-cache-shape.patch b/packages/glibc-ports/2.14/440-alpha-cache-shape.patch
index def0181f..0c24a0de 100644
--- a/packages/glibc-ports/2.14/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.14/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ 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.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c
+--- glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/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.14/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch
index 1569ce40..c757f44b 100644
--- a/packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ 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-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c
+--- glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/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)
@@ -53,4 +53,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm
    return r;
  }
  
-diff -durN glibc-2.14.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch
index 3560e2a2..6f8eb312 100644
--- a/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/alpha/Makefile glibc-2.14/glibc-ports-2.14/sysdeps/alpha/Makefile
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/alpha/Makefile glibc-ports-2.14/sysdeps/alpha/Makefile
+--- glibc-ports-2.14.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/alpha/Makefile glibc-2.14/gl
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.14.orig/ports/sysdeps/alpha/Makefile glibc-2.14/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index b297ff0c..8cd9539f 100644
--- a/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,9 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/bits/endian.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/bits/endian.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/bits/endian.h glibc-ports-2.14/sysdeps/arm/bits/endian.h
+--- glibc-ports-2.14.orig/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
 @@ -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 +13,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/bits/endian.h glibc-2.14
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +50,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S glibc-2.
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +108,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h glibc-2.
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +123,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h glibc-
 +#endif
  
  #endif
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +148,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c glibc-2
 +
 +#endif
  }
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +180,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c glibc-2
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +278,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h glibc-
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +290,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h gli
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +335,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S glibc-2.14/
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gccframe.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/gccframe.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/gccframe.h glibc-ports-2.14/sysdeps/arm/gccframe.h
+--- glibc-ports-2.14.orig/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +349,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gccframe.h glibc-2.14/gl
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.14/sysdeps/arm/gmp-mparam.h
+--- glibc-ports-2.14.orig/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
@@ -361,14 +361,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h glibc-2.14/
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
  # define IEEE_DOUBLE_BIG_ENDIAN 0
  #else
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/bits/endian.h glibc-2.14/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.14/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.14/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.14/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.14/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.14/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.14/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/gccframe.h glibc-2.14/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.14/ports/sysdeps/arm/gmp-mparam.h
diff --git a/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch
index a2a141c0..103727af 100644
--- a/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ 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-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+--- glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/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>
@@ -20,4 +20,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/low
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.14.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.14/610-fpu-cw-mips.patch b/packages/glibc-ports/2.14/610-fpu-cw-mips.patch
index c6245654..549fc5b4 100644
--- a/packages/glibc-ports/2.14/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.14/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/mips/fpu_control.h glibc-2.14/glibc-ports-2.14/sysdeps/mips/fpu_control.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/mips/fpu_control.h glibc-ports-2.14/sysdeps/mips/fpu_control.h
+--- glibc-ports-2.14.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/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
@@ -12,4 +12,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/mips/fpu_control.h glibc-2.1
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.14.orig/ports/sysdeps/mips/fpu_control.h glibc-2.14/ports/sysdeps/mips/fpu_control.h
diff --git a/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe4..259b2854 100644
--- a/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -20,8 +20,8 @@ Tested that this fixes the build for ARM.
  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(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- 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>
 
@@ -35,8 +35,8 @@ Tested that this fixes the build for ARM.
  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
+--- 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>
@@ -47,8 +47,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -59,8 +59,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch b/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch
index 9f9887c3..23d88138 100644
--- a/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch
+++ b/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch
@@ -4,10 +4,10 @@ Date:   Fri Jan 6 20:14:44 2012 +0000
 
     Add ARM dependency of libmemusage.so on libc_nonshared.a.
 
-diff --git a/ports/sysdeps/arm/Makefile b/ports/sysdeps/arm/Makefile
+diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile
 index 5651161..1a88430 100644
---- a/ports/sysdeps/arm/Makefile
-+++ b/ports/sysdeps/arm/Makefile
+--- a/sysdeps/arm/Makefile
++++ b/sysdeps/arm/Makefile
 @@ -7,3 +7,8 @@ endif
  ifeq ($(subdir),csu)
  gen-as-const-headers += tlsdesc.sym
diff --git a/packages/glibc-ports/2.15/330-m68k-sys-user.patch b/packages/glibc-ports/2.15/330-m68k-sys-user.patch
index faee18f3..388bc624 100644
--- a/packages/glibc-ports/2.15/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.15/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+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
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/use
  /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.15.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.15/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.15/440-alpha-cache-shape.patch b/packages/glibc-ports/2.15/440-alpha-cache-shape.patch
index b3158da6..a9c9db0c 100644
--- a/packages/glibc-ports/2.15/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.15/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ 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.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+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 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch
index a54d823b..05a197e5 100644
--- a/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ 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-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+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
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
@@ -53,4 +53,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm
    return r;
  }
  
-diff -durN glibc-2.15.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.15/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch
index 800a7891..8f9ce0db 100644
--- a/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/alpha/Makefile glibc-2.15/glibc-ports-2.15/sysdeps/alpha/Makefile
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+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
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/alpha/Makefile glibc-2.15/gl
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.15.orig/ports/sysdeps/alpha/Makefile glibc-2.15/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 8a05574b..427fb032 100644
--- a/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,9 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/bits/endian.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/bits/endian.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -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 +13,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/bits/endian.h glibc-2.15
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +50,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S glibc-2.
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +108,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h glibc-2.
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +123,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h glibc-
 +#endif
  
  #endif
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +148,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c glibc-2
 +
 +#endif
  }
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +180,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c glibc-2
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +278,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h glibc-
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +290,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h gli
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +335,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S glibc-2.15/
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gccframe.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/gccframe.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +349,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gccframe.h glibc-2.15/gl
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+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
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
@@ -361,14 +361,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h glibc-2.15/
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
  # define IEEE_DOUBLE_BIG_ENDIAN 0
  #else
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/bits/endian.h glibc-2.15/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.15/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.15/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.15/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.15/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.15/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.15/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.15/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.15/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/gccframe.h glibc-2.15/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.15/ports/sysdeps/arm/gmp-mparam.h
diff --git a/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch
index a39e4638..8a841be0 100644
--- a/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ 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-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+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
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
@@ -20,4 +20,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/low
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.15.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.15/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.15/610-fpu-cw-mips.patch b/packages/glibc-ports/2.15/610-fpu-cw-mips.patch
index 8692a1ff..388e4d67 100644
--- a/packages/glibc-ports/2.15/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.15/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/mips/fpu_control.h glibc-2.15/glibc-ports-2.15/sysdeps/mips/fpu_control.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+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
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
@@ -12,4 +12,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/mips/fpu_control.h glibc-2.1
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.15.orig/ports/sysdeps/mips/fpu_control.h glibc-2.15/ports/sysdeps/mips/fpu_control.h
diff --git a/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
index 59f95aad..1f08ba16 100644
--- a/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -23,8 +23,8 @@ Tested that this fixes the build for ARM.
 
 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
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -22,7 +22,8 @@
  #include <pthreadP.h>
  
@@ -37,8 +37,8 @@ index 6ccd9b4..660d148 100644
  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
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -20,7 +20,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch b/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
index f1139967..932d917a 100644
--- a/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+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
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys
  /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.16.0.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.16.0/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch b/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
index 5b1a2983..76128723 100644
--- a/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ 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/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+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 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
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
index f2ff04f7..96f1646b 100644
--- 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
@@ -16,9 +16,9 @@ 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-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+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)
@@ -53,4 +53,3 @@ diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/io
    return r;
  }
  
-diff -durN glibc-2.16.0.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.16.0/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
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
index 42faaa58..db9c8900 100644
--- 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
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/alpha/Makefile glibc-2.16.0/glibc-ports-2.16.0/sysdeps/alpha/Makefile
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+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)
@@ -18,4 +18,3 @@ diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/alpha/Makefile glibc-2.1
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.16.0.orig/ports/sysdeps/alpha/Makefile glibc-2.16.0/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
index 185331c8..a1c6c7ab 100644
--- a/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ 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-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+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>
@@ -20,4 +20,3 @@ diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.16.0.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.16.0/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
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
index 0c0daf3e..ef42c8fd 100644
--- a/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h glibc-2.16.0/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+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
@@ -12,4 +12,3 @@ diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h glibc
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.16.0.orig/ports/sysdeps/mips/fpu_control.h glibc-2.16.0/ports/sysdeps/mips/fpu_control.h
diff --git a/packages/glibc-ports/2.12.1/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.12.1/100-respect-env-CPPFLAGS.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.12.1/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/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
similarity index 100%
rename from packages/glibc-ports/2.12.1/120-i386-x86_64-revert-clone-cfi.patch
rename to packages/glibc/2.12.1/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.12.1/140-disable-ldconfig.patch b/packages/glibc/2.12.1/140-disable-ldconfig.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/140-disable-ldconfig.patch
rename to packages/glibc/2.12.1/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.12.1/150-queue-header-updates.patch b/packages/glibc/2.12.1/150-queue-header-updates.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/150-queue-header-updates.patch
rename to packages/glibc/2.12.1/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.12.1/160-manual-no-perl.patch b/packages/glibc/2.12.1/160-manual-no-perl.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/160-manual-no-perl.patch
rename to packages/glibc/2.12.1/160-manual-no-perl.patch
diff --git a/packages/glibc-ports/2.12.1/170-localedef-fix-trampoline.patch b/packages/glibc/2.12.1/170-localedef-fix-trampoline.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/170-localedef-fix-trampoline.patch
rename to packages/glibc/2.12.1/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.12.1/180-resolv-dynamic.patch b/packages/glibc/2.12.1/180-resolv-dynamic.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/180-resolv-dynamic.patch
rename to packages/glibc/2.12.1/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.12.1/190-localedef-mmap.patch b/packages/glibc/2.12.1/190-localedef-mmap.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/190-localedef-mmap.patch
rename to packages/glibc/2.12.1/190-localedef-mmap.patch
diff --git a/packages/glibc-ports/2.12.1/200-fadvise64_64.patch b/packages/glibc/2.12.1/200-fadvise64_64.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/200-fadvise64_64.patch
rename to packages/glibc/2.12.1/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.12.1/220-section-comments.patch b/packages/glibc/2.12.1/220-section-comments.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/220-section-comments.patch
rename to packages/glibc/2.12.1/220-section-comments.patch
diff --git a/packages/glibc-ports/2.12.1/230-no-inline-gmon.patch b/packages/glibc/2.12.1/230-no-inline-gmon.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/230-no-inline-gmon.patch
rename to packages/glibc/2.12.1/230-no-inline-gmon.patch
diff --git a/packages/glibc-ports/2.12.1/240-check_native-headers.patch b/packages/glibc/2.12.1/240-check_native-headers.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/240-check_native-headers.patch
rename to packages/glibc/2.12.1/240-check_native-headers.patch
diff --git a/packages/glibc-ports/2.12.1/250-fix-pr631.patch b/packages/glibc/2.12.1/250-fix-pr631.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/250-fix-pr631.patch
rename to packages/glibc/2.12.1/250-fix-pr631.patch
diff --git a/packages/glibc-ports/2.12.1/260-assume-pipe2.patch b/packages/glibc/2.12.1/260-assume-pipe2.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/260-assume-pipe2.patch
rename to packages/glibc/2.12.1/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.12.1/270-china.patch b/packages/glibc/2.12.1/270-china.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/270-china.patch
rename to packages/glibc/2.12.1/270-china.patch
diff --git a/packages/glibc-ports/2.12.1/280-new-valencian-locale.patch b/packages/glibc/2.12.1/280-new-valencian-locale.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/280-new-valencian-locale.patch
rename to packages/glibc/2.12.1/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.12.1/300-nscd-one-fork.patch b/packages/glibc/2.12.1/300-nscd-one-fork.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/300-nscd-one-fork.patch
rename to packages/glibc/2.12.1/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.12.1/310-hppa-nptl-carlos.patch b/packages/glibc/2.12.1/310-hppa-nptl-carlos.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.12.1/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.12.1/340-dl_execstack-PaX-support.patch b/packages/glibc/2.12.1/340-dl_execstack-PaX-support.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/340-dl_execstack-PaX-support.patch
rename to packages/glibc/2.12.1/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.12.1/350-pre20040117-pt_pax.patch b/packages/glibc/2.12.1/350-pre20040117-pt_pax.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/350-pre20040117-pt_pax.patch
rename to packages/glibc/2.12.1/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.12.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.12.1/360-tests-sandbox-libdl-paths.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/360-tests-sandbox-libdl-paths.patch
rename to packages/glibc/2.12.1/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.12.1/370-fnmatch.patch b/packages/glibc/2.12.1/370-fnmatch.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/370-fnmatch.patch
rename to packages/glibc/2.12.1/370-fnmatch.patch
diff --git a/packages/glibc-ports/2.12.1/380-dont-build-timezone.patch b/packages/glibc/2.12.1/380-dont-build-timezone.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/380-dont-build-timezone.patch
rename to packages/glibc/2.12.1/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.12.1/400-alpha-xstat.patch b/packages/glibc/2.12.1/400-alpha-xstat.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/400-alpha-xstat.patch
rename to packages/glibc/2.12.1/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.12.1/430-alpha-creat.patch b/packages/glibc/2.12.1/430-alpha-creat.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/430-alpha-creat.patch
rename to packages/glibc/2.12.1/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.12.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.12.1/490-alpha_alpha-add-fdatasync-support.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.12.1/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.12.1/560-ppc-atomic.patch b/packages/glibc/2.12.1/560-ppc-atomic.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/560-ppc-atomic.patch
rename to packages/glibc/2.12.1/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.12.1/630-mips_shn_undef-hack.patch b/packages/glibc/2.12.1/630-mips_shn_undef-hack.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/630-mips_shn_undef-hack.patch
rename to packages/glibc/2.12.1/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.12.1/640-alpha-atfcts.patch b/packages/glibc/2.12.1/640-alpha-atfcts.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/640-alpha-atfcts.patch
rename to packages/glibc/2.12.1/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.12.1/650-syslog.patch b/packages/glibc/2.12.1/650-syslog.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/650-syslog.patch
rename to packages/glibc/2.12.1/650-syslog.patch
diff --git a/packages/glibc-ports/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
similarity index 100%
rename from packages/glibc-ports/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
rename to packages/glibc/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.13/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.13/100-respect-env-CPPFLAGS.patch
similarity index 100%
rename from packages/glibc-ports/2.13/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.13/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.13/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.13/120-i386-x86_64-revert-clone-cfi.patch
similarity index 100%
rename from packages/glibc-ports/2.13/120-i386-x86_64-revert-clone-cfi.patch
rename to packages/glibc/2.13/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.13/140-disable-ldconfig.patch b/packages/glibc/2.13/140-disable-ldconfig.patch
similarity index 100%
rename from packages/glibc-ports/2.13/140-disable-ldconfig.patch
rename to packages/glibc/2.13/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.13/150-queue-header-updates.patch b/packages/glibc/2.13/150-queue-header-updates.patch
similarity index 100%
rename from packages/glibc-ports/2.13/150-queue-header-updates.patch
rename to packages/glibc/2.13/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.13/160-manual-no-perl.patch b/packages/glibc/2.13/160-manual-no-perl.patch
similarity index 100%
rename from packages/glibc-ports/2.13/160-manual-no-perl.patch
rename to packages/glibc/2.13/160-manual-no-perl.patch
diff --git a/packages/glibc-ports/2.13/170-localedef-fix-trampoline.patch b/packages/glibc/2.13/170-localedef-fix-trampoline.patch
similarity index 100%
rename from packages/glibc-ports/2.13/170-localedef-fix-trampoline.patch
rename to packages/glibc/2.13/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.13/180-resolv-dynamic.patch b/packages/glibc/2.13/180-resolv-dynamic.patch
similarity index 100%
rename from packages/glibc-ports/2.13/180-resolv-dynamic.patch
rename to packages/glibc/2.13/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.13/190-localedef-mmap.patch b/packages/glibc/2.13/190-localedef-mmap.patch
similarity index 100%
rename from packages/glibc-ports/2.13/190-localedef-mmap.patch
rename to packages/glibc/2.13/190-localedef-mmap.patch
diff --git a/packages/glibc-ports/2.13/200-fadvise64_64.patch b/packages/glibc/2.13/200-fadvise64_64.patch
similarity index 100%
rename from packages/glibc-ports/2.13/200-fadvise64_64.patch
rename to packages/glibc/2.13/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.13/220-section-comments.patch b/packages/glibc/2.13/220-section-comments.patch
similarity index 100%
rename from packages/glibc-ports/2.13/220-section-comments.patch
rename to packages/glibc/2.13/220-section-comments.patch
diff --git a/packages/glibc-ports/2.13/230-no-inline-gmon.patch b/packages/glibc/2.13/230-no-inline-gmon.patch
similarity index 100%
rename from packages/glibc-ports/2.13/230-no-inline-gmon.patch
rename to packages/glibc/2.13/230-no-inline-gmon.patch
diff --git a/packages/glibc-ports/2.13/240-check_native-headers.patch b/packages/glibc/2.13/240-check_native-headers.patch
similarity index 100%
rename from packages/glibc-ports/2.13/240-check_native-headers.patch
rename to packages/glibc/2.13/240-check_native-headers.patch
diff --git a/packages/glibc-ports/2.13/250-fix-pr631.patch b/packages/glibc/2.13/250-fix-pr631.patch
similarity index 100%
rename from packages/glibc-ports/2.13/250-fix-pr631.patch
rename to packages/glibc/2.13/250-fix-pr631.patch
diff --git a/packages/glibc-ports/2.13/260-assume-pipe2.patch b/packages/glibc/2.13/260-assume-pipe2.patch
similarity index 100%
rename from packages/glibc-ports/2.13/260-assume-pipe2.patch
rename to packages/glibc/2.13/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.13/270-china.patch b/packages/glibc/2.13/270-china.patch
similarity index 100%
rename from packages/glibc-ports/2.13/270-china.patch
rename to packages/glibc/2.13/270-china.patch
diff --git a/packages/glibc-ports/2.13/280-new-valencian-locale.patch b/packages/glibc/2.13/280-new-valencian-locale.patch
similarity index 100%
rename from packages/glibc-ports/2.13/280-new-valencian-locale.patch
rename to packages/glibc/2.13/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.13/300-nscd-one-fork.patch b/packages/glibc/2.13/300-nscd-one-fork.patch
similarity index 100%
rename from packages/glibc-ports/2.13/300-nscd-one-fork.patch
rename to packages/glibc/2.13/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.13/310-hppa-nptl-carlos.patch b/packages/glibc/2.13/310-hppa-nptl-carlos.patch
similarity index 100%
rename from packages/glibc-ports/2.13/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.13/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.13/340-dl_execstack-PaX-support.patch b/packages/glibc/2.13/340-dl_execstack-PaX-support.patch
similarity index 100%
rename from packages/glibc-ports/2.13/340-dl_execstack-PaX-support.patch
rename to packages/glibc/2.13/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.13/350-pre20040117-pt_pax.patch b/packages/glibc/2.13/350-pre20040117-pt_pax.patch
similarity index 100%
rename from packages/glibc-ports/2.13/350-pre20040117-pt_pax.patch
rename to packages/glibc/2.13/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.13/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.13/360-tests-sandbox-libdl-paths.patch
similarity index 100%
rename from packages/glibc-ports/2.13/360-tests-sandbox-libdl-paths.patch
rename to packages/glibc/2.13/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.13/380-dont-build-timezone.patch b/packages/glibc/2.13/380-dont-build-timezone.patch
similarity index 100%
rename from packages/glibc-ports/2.13/380-dont-build-timezone.patch
rename to packages/glibc/2.13/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.13/400-alpha-xstat.patch b/packages/glibc/2.13/400-alpha-xstat.patch
similarity index 100%
rename from packages/glibc-ports/2.13/400-alpha-xstat.patch
rename to packages/glibc/2.13/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.13/430-alpha-creat.patch b/packages/glibc/2.13/430-alpha-creat.patch
similarity index 100%
rename from packages/glibc-ports/2.13/430-alpha-creat.patch
rename to packages/glibc/2.13/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.13/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.13/490-alpha_alpha-add-fdatasync-support.patch
similarity index 100%
rename from packages/glibc-ports/2.13/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.13/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.13/560-ppc-atomic.patch b/packages/glibc/2.13/560-ppc-atomic.patch
similarity index 100%
rename from packages/glibc-ports/2.13/560-ppc-atomic.patch
rename to packages/glibc/2.13/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.13/630-mips_shn_undef-hack.patch b/packages/glibc/2.13/630-mips_shn_undef-hack.patch
similarity index 100%
rename from packages/glibc-ports/2.13/630-mips_shn_undef-hack.patch
rename to packages/glibc/2.13/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.13/640-alpha-atfcts.patch b/packages/glibc/2.13/640-alpha-atfcts.patch
similarity index 100%
rename from packages/glibc-ports/2.13/640-alpha-atfcts.patch
rename to packages/glibc/2.13/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.13/650-syslog.patch b/packages/glibc/2.13/650-syslog.patch
similarity index 100%
rename from packages/glibc-ports/2.13/650-syslog.patch
rename to packages/glibc/2.13/650-syslog.patch
diff --git a/packages/glibc-ports/2.13/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.13/660-debug-readlink_chk-readklinkat_chk.patch
similarity index 100%
rename from packages/glibc-ports/2.13/660-debug-readlink_chk-readklinkat_chk.patch
rename to packages/glibc/2.13/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.14.1/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.14.1/100-respect-env-CPPFLAGS.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.14.1/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.14.1/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
rename to packages/glibc/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.14.1/140-disable-ldconfig.patch b/packages/glibc/2.14.1/140-disable-ldconfig.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/140-disable-ldconfig.patch
rename to packages/glibc/2.14.1/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.14.1/150-queue-header-updates.patch b/packages/glibc/2.14.1/150-queue-header-updates.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/150-queue-header-updates.patch
rename to packages/glibc/2.14.1/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.14.1/160-manual-no-perl.patch b/packages/glibc/2.14.1/160-manual-no-perl.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/160-manual-no-perl.patch
rename to packages/glibc/2.14.1/160-manual-no-perl.patch
diff --git a/packages/glibc-ports/2.14.1/170-localedef-fix-trampoline.patch b/packages/glibc/2.14.1/170-localedef-fix-trampoline.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/170-localedef-fix-trampoline.patch
rename to packages/glibc/2.14.1/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.14.1/180-resolv-dynamic.patch b/packages/glibc/2.14.1/180-resolv-dynamic.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/180-resolv-dynamic.patch
rename to packages/glibc/2.14.1/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.14.1/190-localedef-mmap.patch b/packages/glibc/2.14.1/190-localedef-mmap.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/190-localedef-mmap.patch
rename to packages/glibc/2.14.1/190-localedef-mmap.patch
diff --git a/packages/glibc-ports/2.14.1/200-fadvise64_64.patch b/packages/glibc/2.14.1/200-fadvise64_64.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/200-fadvise64_64.patch
rename to packages/glibc/2.14.1/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.14.1/220-section-comments.patch b/packages/glibc/2.14.1/220-section-comments.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/220-section-comments.patch
rename to packages/glibc/2.14.1/220-section-comments.patch
diff --git a/packages/glibc-ports/2.14.1/230-no-inline-gmon.patch b/packages/glibc/2.14.1/230-no-inline-gmon.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/230-no-inline-gmon.patch
rename to packages/glibc/2.14.1/230-no-inline-gmon.patch
diff --git a/packages/glibc-ports/2.14.1/260-assume-pipe2.patch b/packages/glibc/2.14.1/260-assume-pipe2.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/260-assume-pipe2.patch
rename to packages/glibc/2.14.1/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.14.1/270-china.patch b/packages/glibc/2.14.1/270-china.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/270-china.patch
rename to packages/glibc/2.14.1/270-china.patch
diff --git a/packages/glibc-ports/2.14.1/280-new-valencian-locale.patch b/packages/glibc/2.14.1/280-new-valencian-locale.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/280-new-valencian-locale.patch
rename to packages/glibc/2.14.1/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.14.1/300-nscd-one-fork.patch b/packages/glibc/2.14.1/300-nscd-one-fork.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/300-nscd-one-fork.patch
rename to packages/glibc/2.14.1/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.14.1/310-hppa-nptl-carlos.patch b/packages/glibc/2.14.1/310-hppa-nptl-carlos.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.14.1/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.14.1/340-dl_execstack-PaX-support.patch b/packages/glibc/2.14.1/340-dl_execstack-PaX-support.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/340-dl_execstack-PaX-support.patch
rename to packages/glibc/2.14.1/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.14.1/350-pre20040117-pt_pax.patch b/packages/glibc/2.14.1/350-pre20040117-pt_pax.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/350-pre20040117-pt_pax.patch
rename to packages/glibc/2.14.1/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.14.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.14.1/360-tests-sandbox-libdl-paths.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/360-tests-sandbox-libdl-paths.patch
rename to packages/glibc/2.14.1/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.14.1/380-dont-build-timezone.patch b/packages/glibc/2.14.1/380-dont-build-timezone.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/380-dont-build-timezone.patch
rename to packages/glibc/2.14.1/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.14.1/400-alpha-xstat.patch b/packages/glibc/2.14.1/400-alpha-xstat.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/400-alpha-xstat.patch
rename to packages/glibc/2.14.1/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.14.1/430-alpha-creat.patch b/packages/glibc/2.14.1/430-alpha-creat.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/430-alpha-creat.patch
rename to packages/glibc/2.14.1/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.14.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.14.1/560-ppc-atomic.patch b/packages/glibc/2.14.1/560-ppc-atomic.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/560-ppc-atomic.patch
rename to packages/glibc/2.14.1/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.14.1/630-mips_shn_undef-hack.patch b/packages/glibc/2.14.1/630-mips_shn_undef-hack.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/630-mips_shn_undef-hack.patch
rename to packages/glibc/2.14.1/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.14.1/640-alpha-atfcts.patch b/packages/glibc/2.14.1/640-alpha-atfcts.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/640-alpha-atfcts.patch
rename to packages/glibc/2.14.1/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.14.1/650-syslog.patch b/packages/glibc/2.14.1/650-syslog.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/650-syslog.patch
rename to packages/glibc/2.14.1/650-syslog.patch
diff --git a/packages/glibc-ports/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
similarity index 100%
rename from packages/glibc-ports/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
rename to packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.14/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.14/100-respect-env-CPPFLAGS.patch
similarity index 100%
rename from packages/glibc-ports/2.14/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.14/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.14/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.14/120-i386-x86_64-revert-clone-cfi.patch
similarity index 100%
rename from packages/glibc-ports/2.14/120-i386-x86_64-revert-clone-cfi.patch
rename to packages/glibc/2.14/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.14/140-disable-ldconfig.patch b/packages/glibc/2.14/140-disable-ldconfig.patch
similarity index 100%
rename from packages/glibc-ports/2.14/140-disable-ldconfig.patch
rename to packages/glibc/2.14/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.14/150-queue-header-updates.patch b/packages/glibc/2.14/150-queue-header-updates.patch
similarity index 100%
rename from packages/glibc-ports/2.14/150-queue-header-updates.patch
rename to packages/glibc/2.14/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.14/160-manual-no-perl.patch b/packages/glibc/2.14/160-manual-no-perl.patch
similarity index 100%
rename from packages/glibc-ports/2.14/160-manual-no-perl.patch
rename to packages/glibc/2.14/160-manual-no-perl.patch
diff --git a/packages/glibc-ports/2.14/170-localedef-fix-trampoline.patch b/packages/glibc/2.14/170-localedef-fix-trampoline.patch
similarity index 100%
rename from packages/glibc-ports/2.14/170-localedef-fix-trampoline.patch
rename to packages/glibc/2.14/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.14/180-resolv-dynamic.patch b/packages/glibc/2.14/180-resolv-dynamic.patch
similarity index 100%
rename from packages/glibc-ports/2.14/180-resolv-dynamic.patch
rename to packages/glibc/2.14/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.14/190-localedef-mmap.patch b/packages/glibc/2.14/190-localedef-mmap.patch
similarity index 100%
rename from packages/glibc-ports/2.14/190-localedef-mmap.patch
rename to packages/glibc/2.14/190-localedef-mmap.patch
diff --git a/packages/glibc-ports/2.14/200-fadvise64_64.patch b/packages/glibc/2.14/200-fadvise64_64.patch
similarity index 100%
rename from packages/glibc-ports/2.14/200-fadvise64_64.patch
rename to packages/glibc/2.14/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.14/220-section-comments.patch b/packages/glibc/2.14/220-section-comments.patch
similarity index 100%
rename from packages/glibc-ports/2.14/220-section-comments.patch
rename to packages/glibc/2.14/220-section-comments.patch
diff --git a/packages/glibc-ports/2.14/230-no-inline-gmon.patch b/packages/glibc/2.14/230-no-inline-gmon.patch
similarity index 100%
rename from packages/glibc-ports/2.14/230-no-inline-gmon.patch
rename to packages/glibc/2.14/230-no-inline-gmon.patch
diff --git a/packages/glibc-ports/2.14/240-check_native-headers.patch b/packages/glibc/2.14/240-check_native-headers.patch
similarity index 100%
rename from packages/glibc-ports/2.14/240-check_native-headers.patch
rename to packages/glibc/2.14/240-check_native-headers.patch
diff --git a/packages/glibc-ports/2.14/260-assume-pipe2.patch b/packages/glibc/2.14/260-assume-pipe2.patch
similarity index 100%
rename from packages/glibc-ports/2.14/260-assume-pipe2.patch
rename to packages/glibc/2.14/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.14/270-china.patch b/packages/glibc/2.14/270-china.patch
similarity index 100%
rename from packages/glibc-ports/2.14/270-china.patch
rename to packages/glibc/2.14/270-china.patch
diff --git a/packages/glibc-ports/2.14/280-new-valencian-locale.patch b/packages/glibc/2.14/280-new-valencian-locale.patch
similarity index 100%
rename from packages/glibc-ports/2.14/280-new-valencian-locale.patch
rename to packages/glibc/2.14/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.14/300-nscd-one-fork.patch b/packages/glibc/2.14/300-nscd-one-fork.patch
similarity index 100%
rename from packages/glibc-ports/2.14/300-nscd-one-fork.patch
rename to packages/glibc/2.14/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.14/310-hppa-nptl-carlos.patch b/packages/glibc/2.14/310-hppa-nptl-carlos.patch
similarity index 100%
rename from packages/glibc-ports/2.14/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.14/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.14/340-dl_execstack-PaX-support.patch b/packages/glibc/2.14/340-dl_execstack-PaX-support.patch
similarity index 100%
rename from packages/glibc-ports/2.14/340-dl_execstack-PaX-support.patch
rename to packages/glibc/2.14/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.14/350-pre20040117-pt_pax.patch b/packages/glibc/2.14/350-pre20040117-pt_pax.patch
similarity index 100%
rename from packages/glibc-ports/2.14/350-pre20040117-pt_pax.patch
rename to packages/glibc/2.14/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.14/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.14/360-tests-sandbox-libdl-paths.patch
similarity index 100%
rename from packages/glibc-ports/2.14/360-tests-sandbox-libdl-paths.patch
rename to packages/glibc/2.14/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.14/380-dont-build-timezone.patch b/packages/glibc/2.14/380-dont-build-timezone.patch
similarity index 100%
rename from packages/glibc-ports/2.14/380-dont-build-timezone.patch
rename to packages/glibc/2.14/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.14/400-alpha-xstat.patch b/packages/glibc/2.14/400-alpha-xstat.patch
similarity index 100%
rename from packages/glibc-ports/2.14/400-alpha-xstat.patch
rename to packages/glibc/2.14/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.14/430-alpha-creat.patch b/packages/glibc/2.14/430-alpha-creat.patch
similarity index 100%
rename from packages/glibc-ports/2.14/430-alpha-creat.patch
rename to packages/glibc/2.14/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.14/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.14/490-alpha_alpha-add-fdatasync-support.patch
similarity index 100%
rename from packages/glibc-ports/2.14/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.14/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.14/560-ppc-atomic.patch b/packages/glibc/2.14/560-ppc-atomic.patch
similarity index 100%
rename from packages/glibc-ports/2.14/560-ppc-atomic.patch
rename to packages/glibc/2.14/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.14/630-mips_shn_undef-hack.patch b/packages/glibc/2.14/630-mips_shn_undef-hack.patch
similarity index 100%
rename from packages/glibc-ports/2.14/630-mips_shn_undef-hack.patch
rename to packages/glibc/2.14/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.14/640-alpha-atfcts.patch b/packages/glibc/2.14/640-alpha-atfcts.patch
similarity index 100%
rename from packages/glibc-ports/2.14/640-alpha-atfcts.patch
rename to packages/glibc/2.14/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.14/650-syslog.patch b/packages/glibc/2.14/650-syslog.patch
similarity index 100%
rename from packages/glibc-ports/2.14/650-syslog.patch
rename to packages/glibc/2.14/650-syslog.patch
diff --git a/packages/glibc-ports/2.14/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.14/660-debug-readlink_chk-readklinkat_chk.patch
similarity index 100%
rename from packages/glibc-ports/2.14/660-debug-readlink_chk-readklinkat_chk.patch
rename to packages/glibc/2.14/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.15/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.15/100-respect-env-CPPFLAGS.patch
similarity index 100%
rename from packages/glibc-ports/2.15/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.15/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.15/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.15/120-i386-x86_64-revert-clone-cfi.patch
similarity index 100%
rename from packages/glibc-ports/2.15/120-i386-x86_64-revert-clone-cfi.patch
rename to packages/glibc/2.15/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.15/140-disable-ldconfig.patch b/packages/glibc/2.15/140-disable-ldconfig.patch
similarity index 100%
rename from packages/glibc-ports/2.15/140-disable-ldconfig.patch
rename to packages/glibc/2.15/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.15/150-queue-header-updates.patch b/packages/glibc/2.15/150-queue-header-updates.patch
similarity index 100%
rename from packages/glibc-ports/2.15/150-queue-header-updates.patch
rename to packages/glibc/2.15/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.15/160-manual-no-perl.patch b/packages/glibc/2.15/160-manual-no-perl.patch
similarity index 100%
rename from packages/glibc-ports/2.15/160-manual-no-perl.patch
rename to packages/glibc/2.15/160-manual-no-perl.patch
diff --git a/packages/glibc-ports/2.15/170-localedef-fix-trampoline.patch b/packages/glibc/2.15/170-localedef-fix-trampoline.patch
similarity index 100%
rename from packages/glibc-ports/2.15/170-localedef-fix-trampoline.patch
rename to packages/glibc/2.15/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.15/180-resolv-dynamic.patch b/packages/glibc/2.15/180-resolv-dynamic.patch
similarity index 100%
rename from packages/glibc-ports/2.15/180-resolv-dynamic.patch
rename to packages/glibc/2.15/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.15/200-fadvise64_64.patch b/packages/glibc/2.15/200-fadvise64_64.patch
similarity index 100%
rename from packages/glibc-ports/2.15/200-fadvise64_64.patch
rename to packages/glibc/2.15/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.15/220-section-comments.patch b/packages/glibc/2.15/220-section-comments.patch
similarity index 100%
rename from packages/glibc-ports/2.15/220-section-comments.patch
rename to packages/glibc/2.15/220-section-comments.patch
diff --git a/packages/glibc-ports/2.15/230-no-inline-gmon.patch b/packages/glibc/2.15/230-no-inline-gmon.patch
similarity index 100%
rename from packages/glibc-ports/2.15/230-no-inline-gmon.patch
rename to packages/glibc/2.15/230-no-inline-gmon.patch
diff --git a/packages/glibc-ports/2.15/260-assume-pipe2.patch b/packages/glibc/2.15/260-assume-pipe2.patch
similarity index 100%
rename from packages/glibc-ports/2.15/260-assume-pipe2.patch
rename to packages/glibc/2.15/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.15/270-china.patch b/packages/glibc/2.15/270-china.patch
similarity index 100%
rename from packages/glibc-ports/2.15/270-china.patch
rename to packages/glibc/2.15/270-china.patch
diff --git a/packages/glibc-ports/2.15/280-new-valencian-locale.patch b/packages/glibc/2.15/280-new-valencian-locale.patch
similarity index 100%
rename from packages/glibc-ports/2.15/280-new-valencian-locale.patch
rename to packages/glibc/2.15/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.15/300-nscd-one-fork.patch b/packages/glibc/2.15/300-nscd-one-fork.patch
similarity index 100%
rename from packages/glibc-ports/2.15/300-nscd-one-fork.patch
rename to packages/glibc/2.15/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.15/310-hppa-nptl-carlos.patch b/packages/glibc/2.15/310-hppa-nptl-carlos.patch
similarity index 100%
rename from packages/glibc-ports/2.15/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.15/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.15/340-dl_execstack-PaX-support.patch b/packages/glibc/2.15/340-dl_execstack-PaX-support.patch
similarity index 100%
rename from packages/glibc-ports/2.15/340-dl_execstack-PaX-support.patch
rename to packages/glibc/2.15/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.15/350-pre20040117-pt_pax.patch b/packages/glibc/2.15/350-pre20040117-pt_pax.patch
similarity index 100%
rename from packages/glibc-ports/2.15/350-pre20040117-pt_pax.patch
rename to packages/glibc/2.15/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.15/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.15/360-tests-sandbox-libdl-paths.patch
similarity index 100%
rename from packages/glibc-ports/2.15/360-tests-sandbox-libdl-paths.patch
rename to packages/glibc/2.15/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.15/380-dont-build-timezone.patch b/packages/glibc/2.15/380-dont-build-timezone.patch
similarity index 100%
rename from packages/glibc-ports/2.15/380-dont-build-timezone.patch
rename to packages/glibc/2.15/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.15/400-alpha-xstat.patch b/packages/glibc/2.15/400-alpha-xstat.patch
similarity index 100%
rename from packages/glibc-ports/2.15/400-alpha-xstat.patch
rename to packages/glibc/2.15/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.15/430-alpha-creat.patch b/packages/glibc/2.15/430-alpha-creat.patch
similarity index 100%
rename from packages/glibc-ports/2.15/430-alpha-creat.patch
rename to packages/glibc/2.15/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.15/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.15/490-alpha_alpha-add-fdatasync-support.patch
similarity index 100%
rename from packages/glibc-ports/2.15/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.15/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.15/560-ppc-atomic.patch b/packages/glibc/2.15/560-ppc-atomic.patch
similarity index 100%
rename from packages/glibc-ports/2.15/560-ppc-atomic.patch
rename to packages/glibc/2.15/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.15/630-mips_shn_undef-hack.patch b/packages/glibc/2.15/630-mips_shn_undef-hack.patch
similarity index 100%
rename from packages/glibc-ports/2.15/630-mips_shn_undef-hack.patch
rename to packages/glibc/2.15/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.15/640-alpha-atfcts.patch b/packages/glibc/2.15/640-alpha-atfcts.patch
similarity index 100%
rename from packages/glibc-ports/2.15/640-alpha-atfcts.patch
rename to packages/glibc/2.15/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.15/650-syslog.patch b/packages/glibc/2.15/650-syslog.patch
similarity index 100%
rename from packages/glibc-ports/2.15/650-syslog.patch
rename to packages/glibc/2.15/650-syslog.patch
diff --git a/packages/glibc-ports/2.15/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.15/660-debug-readlink_chk-readklinkat_chk.patch
similarity index 100%
rename from packages/glibc-ports/2.15/660-debug-readlink_chk-readklinkat_chk.patch
rename to packages/glibc/2.15/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.16.0/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.16.0/100-respect-env-CPPFLAGS.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/100-respect-env-CPPFLAGS.patch
rename to packages/glibc/2.16.0/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.16.0/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.16.0/120-i386-x86_64-revert-clone-cfi.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/120-i386-x86_64-revert-clone-cfi.patch
rename to packages/glibc/2.16.0/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.16.0/140-disable-ldconfig.patch b/packages/glibc/2.16.0/140-disable-ldconfig.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/140-disable-ldconfig.patch
rename to packages/glibc/2.16.0/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.16.0/150-queue-header-updates.patch b/packages/glibc/2.16.0/150-queue-header-updates.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/150-queue-header-updates.patch
rename to packages/glibc/2.16.0/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.16.0/170-localedef-fix-trampoline.patch b/packages/glibc/2.16.0/170-localedef-fix-trampoline.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/170-localedef-fix-trampoline.patch
rename to packages/glibc/2.16.0/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.16.0/180-resolv-dynamic.patch b/packages/glibc/2.16.0/180-resolv-dynamic.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/180-resolv-dynamic.patch
rename to packages/glibc/2.16.0/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.16.0/200-fadvise64_64.patch b/packages/glibc/2.16.0/200-fadvise64_64.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/200-fadvise64_64.patch
rename to packages/glibc/2.16.0/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.16.0/260-assume-pipe2.patch b/packages/glibc/2.16.0/260-assume-pipe2.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/260-assume-pipe2.patch
rename to packages/glibc/2.16.0/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.16.0/270-china.patch b/packages/glibc/2.16.0/270-china.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/270-china.patch
rename to packages/glibc/2.16.0/270-china.patch
diff --git a/packages/glibc-ports/2.16.0/280-new-valencian-locale.patch b/packages/glibc/2.16.0/280-new-valencian-locale.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/280-new-valencian-locale.patch
rename to packages/glibc/2.16.0/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.16.0/300-nscd-one-fork.patch b/packages/glibc/2.16.0/300-nscd-one-fork.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/300-nscd-one-fork.patch
rename to packages/glibc/2.16.0/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.16.0/310-hppa-nptl-carlos.patch b/packages/glibc/2.16.0/310-hppa-nptl-carlos.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/310-hppa-nptl-carlos.patch
rename to packages/glibc/2.16.0/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.16.0/340-dl_execstack-PaX-support.patch b/packages/glibc/2.16.0/340-dl_execstack-PaX-support.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/340-dl_execstack-PaX-support.patch
rename to packages/glibc/2.16.0/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.16.0/350-pre20040117-pt_pax.patch b/packages/glibc/2.16.0/350-pre20040117-pt_pax.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/350-pre20040117-pt_pax.patch
rename to packages/glibc/2.16.0/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.16.0/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.16.0/360-tests-sandbox-libdl-paths.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/360-tests-sandbox-libdl-paths.patch
rename to packages/glibc/2.16.0/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.16.0/380-dont-build-timezone.patch b/packages/glibc/2.16.0/380-dont-build-timezone.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/380-dont-build-timezone.patch
rename to packages/glibc/2.16.0/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.16.0/400-alpha-xstat.patch b/packages/glibc/2.16.0/400-alpha-xstat.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/400-alpha-xstat.patch
rename to packages/glibc/2.16.0/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.16.0/430-alpha-creat.patch b/packages/glibc/2.16.0/430-alpha-creat.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/430-alpha-creat.patch
rename to packages/glibc/2.16.0/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.16.0/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.16.0/490-alpha_alpha-add-fdatasync-support.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/490-alpha_alpha-add-fdatasync-support.patch
rename to packages/glibc/2.16.0/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.16.0/560-ppc-atomic.patch b/packages/glibc/2.16.0/560-ppc-atomic.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/560-ppc-atomic.patch
rename to packages/glibc/2.16.0/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.16.0/630-mips_shn_undef-hack.patch b/packages/glibc/2.16.0/630-mips_shn_undef-hack.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/630-mips_shn_undef-hack.patch
rename to packages/glibc/2.16.0/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.16.0/640-alpha-atfcts.patch b/packages/glibc/2.16.0/640-alpha-atfcts.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/640-alpha-atfcts.patch
rename to packages/glibc/2.16.0/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.16.0/650-syslog.patch b/packages/glibc/2.16.0/650-syslog.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/650-syslog.patch
rename to packages/glibc/2.16.0/650-syslog.patch
diff --git a/packages/glibc-ports/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
similarity index 100%
rename from packages/glibc-ports/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
rename to packages/glibc/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch b/packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch
deleted file mode 100644
index 2e0a1af5..00000000
--- a/packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1310730221 -7200
-# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
-# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
-(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
-
-diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
---- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
-+++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
-@@ -7,7 +7,7 @@
-    SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
-    GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
- 
--Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -28,7 +28,6 @@
- #include "gmp-impl.h"
- 
- 
--
- mp_size_t
- mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
- {
-@@ -130,7 +129,7 @@
-       qn = nn - qn;
-       while (qn > dn)
- 	{
--	  mpn_sub_1 (np + dn, np + dn, qn, cy);
-+	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
- 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
- 	  qp += dn;
- 	  np += dn;
-
diff --git a/packages/gmp/6.0.0a/version.desc b/packages/gmp/6.0.0a/version.desc
index fcfe3891..71fe2fa8 100644
--- a/packages/gmp/6.0.0a/version.desc
+++ b/packages/gmp/6.0.0a/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_dirname='gmp-6.0.0'
diff --git a/scripts/functions b/scripts/functions
index 26ff88aa..1be7af44 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -2019,8 +2019,5 @@ CT_DoGetPkgVersion()
 # Get the version of the package (main or fork)
 CT_GetPkgVersion()
 {
-    local pkg="${1}"
-    shift
-
-    CT_PackageRun "${pkg}" CT_DoGetPkgVersion
+    CT_PackageRun "${1}" CT_DoGetPkgVersion
 }