[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4472 - in glibc-package/branches/eglibc-2.13/debian: . debhelper.in patches patches/all patches/alpha patches/amd64 patches/any patches/arm patches/hppa patches/hurd-i386 patches/i386 patches/locale patches/localedata patches/m68k patches/mips patches/s390 patches/sh4 patches/sparc sysdeps



Author: aurel32
Date: 2011-02-06 20:15:18 +0000 (Sun, 06 Feb 2011)
New Revision: 4472

Added:
   glibc-package/branches/eglibc-2.13/debian/patches/all/local-nis-shadow.diff
Removed:
   glibc-package/branches/eglibc-2.13/debian/patches/alpha/cvs-timer_settime.diff
   glibc-package/branches/eglibc-2.13/debian/patches/alpha/local-fcntl_h.diff
   glibc-package/branches/eglibc-2.13/debian/patches/alpha/local-longjmp-chk.diff
   glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-PTR_MANGLE.diff
   glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-asm-memchr.diff
   glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-dl-procinfo.diff
   glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-fpu-round.diff
   glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-sock_nonblock.diff
   glibc-package/branches/eglibc-2.13/debian/patches/amd64/cvs-avx-tcb-alignment.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-__block.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-audit-suid.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dont-expand-dst-twice.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-flush-cache-textrels.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-futimens.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-getaddrinfo.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glob.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-ignore-origin-privileged.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-malloc_info-init.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-redirect-throw.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-remove.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-resolv-bindv6only.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-stat-issock.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-sunrpc-license.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-umount-nofollow.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-ntp-update.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-etc-resolv.conf.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-group_member.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-nis-shadow.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-resolv.conf-thread.diff
   glibc-package/branches/eglibc-2.13/debian/patches/arm/local-no-hwcap.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hppa/cvs-nptl-compat.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hppa/cvs-vfork.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-getcwd.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-getnprocs.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-linkat.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-sched_param.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-select.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-sendmsg-leak.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-setsid.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-ttyname.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/fr_BE-first_weekday.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-es_CR.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/submitted-pt_BR.diff
   glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-define-m68k-tls-relocations.patch
   glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-tls-support.patch
   glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-versions-def-2-12.patch
   glibc-package/branches/eglibc-2.13/debian/patches/mips/cvs-mips-atomic_h.diff
   glibc-package/branches/eglibc-2.13/debian/patches/mips/cvs-non-pic-n32-64-syscall.diff
   glibc-package/branches/eglibc-2.13/debian/patches/s390/cvs-makecontext.diff
   glibc-package/branches/eglibc-2.13/debian/patches/sh4/local-fpscr_values.diff
   glibc-package/branches/eglibc-2.13/debian/patches/sh4/submitted-set_fpscr.diff
   glibc-package/branches/eglibc-2.13/debian/patches/sparc/cvs-sparcv9-memchr.diff
   glibc-package/branches/eglibc-2.13/debian/patches/sparc/submitted-epoll.diff
   glibc-package/branches/eglibc-2.13/debian/patches/sparc/submitted-msgrcv.diff
Modified:
   glibc-package/branches/eglibc-2.13/debian/changelog
   glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.install
   glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.preinst
   glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-fdatasync.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-disable-test-tgmath2.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-ldso-disable-hwcap.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-pagesize.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-bits-fcntl_h-at.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-futex_robust_pi.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-longdouble.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-stack-grows-up.diff
   glibc-package/branches/eglibc-2.13/debian/patches/i386/local-pthread_cond_wait.diff
   glibc-package/branches/eglibc-2.13/debian/patches/locale/locale-print-LANGUAGE.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/first_weekday.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-et_EE.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locales-fr.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/sort-UTF8-first.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/tailor-iso14651_t1.diff
   glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-nexttowardf.diff
   glibc-package/branches/eglibc-2.13/debian/patches/series
   glibc-package/branches/eglibc-2.13/debian/sysdeps/alpha.mk
   glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk
   glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd.mk
   glibc-package/branches/eglibc-2.13/debian/sysdeps/linux.mk
   glibc-package/branches/eglibc-2.13/debian/sysdeps/m68k.mk
Log:
    - Fix spurious warning in bswap_16() with -Wconversion.  Closes: 
      #561249.
    - Add back support for m68k.  Closes: #446503, #601126.
    - Add support for NTP API 4.  Closes: #558314.
    - Update patches/locale/locale-print-LANGUAGE.diff.
    - Update patches/localedata/sort-UTF8-first.diff.
    - Remove patches/localedata/submitted-pt_BR.diff (merged upstream).
    - Update patches/localedata/locale-et_EE.diff (partially merged upstream).
    - Remove patches/localedata/locale-es_CR.diff (merged upstream).
    - Update patches/localedata/locales-fr.diff.
    - Update patches/localedata/tailor-iso14651_t1.diff.
    - Remove patches/localedata/fr_BE-first_weekday.diff (merged upstream).
    - Update localedata/first_weekday.diff.
    - Remove patches/alpha/submitted-dl-procinfo.diff (merged upstream).
    - Remove patches/alpha/submitted-fpu-round.diff (merged upstream).
    - Update patches/alpha/submitted-fdatasync.diff.
    - Remove patches/alpha/submitted-asm-memchr.diff (merged upstream).
    - Remove patches/alpha/submitted-sock_nonblock.diff (merged upstream).
    - Remove patches/alpha/cvs-timer_settime.diff (merged upstream).
    - Remove patches/alpha/submitted-PTR_MANGLE.diff (obsolete).
    - Remove patches/alpha/local-fcntl_h.diff (obsolete).
    - Remove patches/alpha/local-longjmp-chk.diff (obsolete).
    - Remove patches/amd64/cvs-avx-tcb-alignment.diff (merged upstream).
    - Remove patches/arm/local-no-hwcap.diff (merged upstream).
    - Remove patches/arm/local-hwcap-updates.diff (merged upstream).
    - Remove patches/hppa/cvs-nptl-compat.diff (merged upstream).
    - Update patches/hppa/local-stack-grows-up.diff.
    - Remove patches/hppa/cvs-vfork.diff (merged upstream).
    - Remove patches/hurd-i386/submitted-rtld_lock_recursive.diff (merged 
      upstream).
    - Remove patches/hurd-i386/cvs-getcwd.diff (merged upstream).
    - Remove patches/hurd-i386/cvs-setsid.diff (merged upstream).
    - Remove patches/hurd-i386/cvs-linkat.diff (merged upstream).
    - Remove patches/hurd-i386/cvs-ttyname.diff (merged upstream).
    - Remove patches/hurd-i386/cvs-getnprocs.diff (merged upstream).
    - Remove patches/hurd-i386/cvs-select.diff (merged upstream).
    - Remove patches/hurd-i386/cvs-sched_param.diff (merged upstream).
    - Remove patches/hurd-i386/cvs-sendmsg-leak.diff (merged upstream).
    - Update patches/i386/local-pthread_cond_wait.diff.
    - Remove patches/m68k/cvs-define-m68k-tls-relocations.patch (merged 
      upstream).
    - Remove patches/m68k/cvs-tls-support.patch (merged upstream).
    - Remove patches/m68k/cvs-versions-def-2-12.patch (merged upstream).
    - Remove patches/mips/cvs-mips-atomic_h.diff (merged upstream).
    - Remove patches/mips/cvs-non-pic-n32-64-syscall.diff (merged upstream).
    - Remove patches/s390/cvs-makecontext.diff (merged upstream).
    - Update patches/s390/submitted-nexttowardf.diff.
    - Remove patches/sh4/local-fpscr_values.diff (merged upstream).
    - Remove patches/sh4/submitted-set_fpscr.diff (merged upstream).
    - Remove patches/sparc/cvs-sparcv9-memchr.diff (merged upstream).


Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/changelog	2011-02-06 20:15:18 UTC (rev 4472)
@@ -3,6 +3,89 @@
   * New upstream release:
     - Fix spurious warning in bswap_16() with -Wconversion.  Closes: 
       #561249.
+    - Add back support for m68k.  Closes: #446503, #601126.
+    - Add support for NTP API 4.  Closes: #558314.
+    - Update patches/locale/locale-print-LANGUAGE.diff.
+    - Update patches/localedata/sort-UTF8-first.diff.
+    - Remove patches/localedata/submitted-pt_BR.diff (merged upstream).
+    - Update patches/localedata/locale-et_EE.diff (partially merged upstream).
+    - Remove patches/localedata/locale-es_CR.diff (merged upstream).
+    - Update patches/localedata/locales-fr.diff.
+    - Update patches/localedata/tailor-iso14651_t1.diff.
+    - Remove patches/localedata/fr_BE-first_weekday.diff (merged upstream).
+    - Update localedata/first_weekday.diff.
+    - Remove patches/alpha/submitted-dl-procinfo.diff (merged upstream).
+    - Remove patches/alpha/submitted-fpu-round.diff (merged upstream).
+    - Update patches/alpha/submitted-fdatasync.diff.
+    - Remove patches/alpha/submitted-asm-memchr.diff (merged upstream).
+    - Remove patches/alpha/submitted-sock_nonblock.diff (merged upstream).
+    - Remove patches/alpha/cvs-timer_settime.diff (merged upstream).
+    - Remove patches/alpha/submitted-PTR_MANGLE.diff (obsolete).
+    - Remove patches/alpha/local-fcntl_h.diff (obsolete).
+    - Remove patches/alpha/local-longjmp-chk.diff (obsolete).
+    - Remove patches/amd64/cvs-avx-tcb-alignment.diff (merged upstream).
+    - Remove patches/arm/local-no-hwcap.diff (merged upstream).
+    - Remove patches/arm/local-hwcap-updates.diff (merged upstream).
+    - Remove patches/hppa/cvs-nptl-compat.diff (merged upstream).
+    - Update patches/hppa/local-stack-grows-up.diff.
+    - Remove patches/hppa/cvs-vfork.diff (merged upstream).
+    - Remove patches/hurd-i386/submitted-rtld_lock_recursive.diff (merged 
+      upstream).
+    - Remove patches/hurd-i386/cvs-getcwd.diff (merged upstream).
+    - Remove patches/hurd-i386/cvs-setsid.diff (merged upstream).
+    - Remove patches/hurd-i386/cvs-linkat.diff (merged upstream).
+    - Remove patches/hurd-i386/cvs-ttyname.diff (merged upstream).
+    - Remove patches/hurd-i386/cvs-getnprocs.diff (merged upstream).
+    - Remove patches/hurd-i386/cvs-select.diff (merged upstream).
+    - Remove patches/hurd-i386/cvs-sched_param.diff (merged upstream).
+    - Remove patches/hurd-i386/cvs-sendmsg-leak.diff (merged upstream).
+    - Update patches/i386/local-pthread_cond_wait.diff.
+    - Remove patches/m68k/cvs-define-m68k-tls-relocations.patch (merged 
+      upstream).
+    - Remove patches/m68k/cvs-tls-support.patch (merged upstream).
+    - Remove patches/m68k/cvs-versions-def-2-12.patch (merged upstream).
+    - Remove patches/mips/cvs-mips-atomic_h.diff (merged upstream).
+    - Remove patches/mips/cvs-non-pic-n32-64-syscall.diff (merged upstream).
+    - Remove patches/s390/cvs-makecontext.diff (merged upstream).
+    - Update patches/s390/submitted-nexttowardf.diff.
+    - Remove patches/sh4/local-fpscr_values.diff (merged upstream).
+    - Remove patches/sh4/submitted-set_fpscr.diff (merged upstream).
+    - Remove patches/sparc/cvs-sparcv9-memchr.diff (merged upstream).
+    - Remove patches/sparc/submitted-epoll.diff (merged upstream).
+    - Remove patches/sparc/submitted-msgrcv.diff (merged upstream).
+    - Update patches/any/local-ldso-disable-hwcap.diff.
+    - Remove patches/any/local-ntp-update.diff (obsolete).
+    - Update patches/any/local-no-pagesize.diff.
+    - Update patches/any/submitted-longdouble.diff.
+    - Remove patches/any/cvs-resolv-bindv6only.diff (merged upstream).
+    - Remove patches/any/cvs-futimens.diff (merged upstream).
+    - Remove patches/any/cvs-malloc_info-init.diff (merged upstream).
+    - Remove patches/any/cvs-stat-issock.diff (merged upstream).
+    - Remove patches/any/cvs-remove.diff (merged upstream).
+    - Remove patches/any/cvs-getaddrinfo.diff (merged upstream).
+    - Remove patches/any/cvs-umount-nofollow.diff (merged upstream).
+    - Update patches/any/submitted-futex_robust_pi.diff.
+    - Remove patches/any/cvs-glob.diff (merged upstream).
+    - Remove patches/any/cvs-flush-cache-textrels.diff (merged upstream).
+    - Remove patches/any/submitted-group_member.diff (merged upstream).
+    - Remove patches/any/cvs-redirect-throw.diff (merged upstream).
+    - Remove patches/any/cvs-__block.diff (merged upstream).
+    - Remove patches/any/cvs-sunrpc-license.diff (merged upstream).
+    - Remove patches/any/submitted-resolv.conf-thread.diff (merged upstream).
+    - Remove patches/any/cvs-audit-suid.diff (merged upstream).
+    - Remove patches/any/cvs-dont-expand-dst-twice.diff (merged upstream).
+    - Remove patches/any/cvs-ignore-origin-privileged.diff (merged upstream).
+    - Remove patches/any/submitted-etc-resolv.conf.diff (obsolete).
+    - Update patches/any/submitted-bits-fcntl_h-at.diff.
+    - Remove patches/any/submitted-nis-shadow.diff (obsolete).
+  * debian/sysdeps/*.mk, debhelper.in/libc.preinst: bump minimal Linux
+    kernel version to 2.6.26, and minimal FreeBSD kernel version to 
+    8.0.0.  Closes: #610475.
+  * Add /etc/default/nss.
+  * Add patches/all/local-nis-shadow.diff to change default value of
+    ADJUNCT_AS_SHADOW to TRUE. This avoid NIS password leakage 
+    (CVE-2010-0015), but can be changed to FALSE to accomomdate some
+    NIS installations.  Closes: #566297, #566844.
 
  -- Aurelien Jarno <aurel32@debian.org>  Sun, 06 Feb 2011 16:52:51 +0100
 

Modified: glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.install
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.install	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.install	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,4 +1,5 @@
 debian/local/etc/* /etc
+nis/nss /etc/defaults
 posix/gai.conf /etc
 debian/tmp-libc/sbin/ldconfig sbin
 debian/tmp-libc/usr/bin/catchsegv usr/bin

Modified: glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.preinst	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.preinst	2011-02-06 20:15:18 UTC (rev 4472)
@@ -292,33 +292,22 @@
         mips*) realarch="mips";;
       esac
 
-      # The GNU libc requires a >= 2.6.18 kernel (except on m68k)
+      # The GNU libc requires a >= 2.6.26 kernel, except on m68k where a
+      # 2.6.32 kernel is needed.
       if [ "$realarch" != m68k ]
       then
-          if linux_compare_versions "$kernel_ver" lt 2.6.18
-          then
-              echo WARNING: this version of the GNU libc requires kernel version
-              echo 2.6.18 or later.  Please upgrade your kernel before installing
-              echo glibc.
-              kernel26_help
-
-              exit 1
-          fi
+          vmin=2.6.26
+      else
+          vmin=2.6.32
       fi
-
-      # The GNU libc is now built with --with-kernel= >= 2.4.1 on m68k
-      if [ "$realarch" = m68k ]
+      if linux_compare_versions "$kernel_ver" lt ${vmin}
       then
-          if linux_compare_versions "$kernel_ver" lt 2.4.1
-          then
-              echo WARNING: This version of glibc requires that you be running
-              echo kernel version 2.4.1 or later.  Earlier kernels contained
-              echo bugs that may render the system unusable if a modern version
-              echo of glibc is installed.
-              kernel26_help
+          echo WARNING: this version of the GNU libc requires kernel version
+          echo ${vmin} or later.  Please upgrade your kernel before installing
+          echo glibc.
+          kernel26_help
 
-              exit 1
-          fi
+          exit 1
       fi
 
       # From glibc 2.6-3 SPARC V8 support is dropped.
@@ -345,11 +334,11 @@
       fi
   elif [ $system = "GNU/kFreeBSD" ] ; then
       kernel_ver=`uname -r`
-      if kfreebsd_compare_versions "$kernel_ver" lt 6.0
+      if kfreebsd_compare_versions "$kernel_ver" lt 8.0
       then
           echo WARNING: This version of glibc uses UMTX_OP_WAIT and UMTX_OP_WAKE
 	    echo syscalls that are not present in the current running kernel. They
-	    echo have been added in kFreeBSD 6.0.  Your system should still work,
+	    echo have been added in kFreeBSD 8.0.  Your system should still work,
 	    echo but it is recommended to upgrade to a more recent version.
       fi
   fi

Added: glibc-package/branches/eglibc-2.13/debian/patches/all/local-nis-shadow.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/all/local-nis-shadow.diff	                        (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/all/local-nis-shadow.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -0,0 +1,10 @@
+diff --git a/nis/nss b/nis/nss
+index 0ac6774..c43e88b 100644
+--- a/nis/nss
++++ b/nis/nss
+@@ -34,4 +34,4 @@
+ #  server cannot be trusted to send the passwd.adjuct table only to
+ #  privileged clients.  Instead the passwd.adjunct.byname table is
+ #  used to synthesize the shadow.byname table if it does not exist.
+-#ADJUNCT_AS_SHADOW=TRUE
++ADJUNCT_AS_SHADOW=TRUE

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/alpha/cvs-timer_settime.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/cvs-timer_settime.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/cvs-timer_settime.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,14 +0,0 @@
-2009-12-02  Mike Frysinger <vapier@gentoo.org>
-
-	* sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c: Fix typo in
-	include timer_gettime.c -> timer_settime.c.
-
----
- ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c
-@@ -1 +1 @@
--#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
-+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c>

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/alpha/local-fcntl_h.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/local-fcntl_h.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/local-fcntl_h.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,28 +0,0 @@
----
- ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h |   15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
---- a/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-@@ -87,6 +87,21 @@
- #ifdef __USE_GNU
- # define F_SETSIG	10	/* Set number of signal to be sent.  */
- # define F_GETSIG	11	/* Get number of signal to be sent.  */
-+
-+# define F_SETOWN_EX     15
-+# define F_GETOWN_EX     16
-+
-+enum __pid_type
-+  {
-+    F_OWNER_TID = 0,    /* Kernel thread.  */
-+    F_OWNER_PID,        /* Process.  */
-+    F_OWNER_GID         /* Process group.  */
-+  };
-+
-+struct f_owner_ex {
-+        int     type;
-+        pid_t   pid;
-+};
- #endif
- 
- #ifdef __USE_GNU

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/alpha/local-longjmp-chk.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/local-longjmp-chk.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/local-longjmp-chk.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,14 +0,0 @@
----
- ports/sysdeps/unix/sysv/linux/alpha/____longjmp_chk.S |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/____longjmp_chk.S
-@@ -0,0 +1,7 @@
-+/* Jump to the position specified by ENV, causing the
-+   setjmp call there to return VAL, or 1 if VAL is 0.
-+   void __longjmp (__jmp_buf env, int val).  */
-+      
-+#warning longjmp_chk unimplemented
-+#define __longjmp ____longjmp_chk
-+#include<__longjmp.S>

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-PTR_MANGLE.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-PTR_MANGLE.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-PTR_MANGLE.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,99 +0,0 @@
----
- ports/sysdeps/unix/alpha/sysdep.h            |   38 ------------------------
- ports/sysdeps/unix/sysv/linux/alpha/sysdep.h |   42 +++++++++++++++++++++++++++
- 2 files changed, 42 insertions(+), 38 deletions(-)
-
---- a/ports/sysdeps/unix/alpha/sysdep.h
-+++ b/ports/sysdeps/unix/alpha/sysdep.h
-@@ -397,42 +397,4 @@
- 	_sc_ret = _sc_0, _sc_err = _sc_19;			\
- }
- 
--/* Pointer mangling support.  Note that tls access is slow enough that
--   we don't deoptimize things by placing the pointer check value there.  */
--
--#include <stdint.h>
--
--#if defined NOT_IN_libc && defined IS_IN_rtld
--# ifdef __ASSEMBLER__
--#  define PTR_MANGLE(dst, src, tmp)				\
--	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
--	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
--	xor	src, tmp, dst
--#  define PTR_MANGLE2(dst, src, tmp)				\
--	xor	src, tmp, dst
--#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
--#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
--# else
--extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
--#  define PTR_MANGLE(var)	\
--  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
--#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
--# endif
--#elif defined PIC
--# ifdef __ASSEMBLER__
--#  define PTR_MANGLE(dst, src, tmp)		\
--	ldq	tmp, __pointer_chk_guard;	\
--	xor	src, tmp, dst
--#  define PTR_MANGLE2(dst, src, tmp)		\
--	xor	src, tmp, dst
--#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
--#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
--# else
--extern uintptr_t __pointer_chk_guard attribute_relro;
--#  define PTR_MANGLE(var)	\
--	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
--#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
--# endif
--#endif
--
- #endif /* ASSEMBLER */
---- a/ports/sysdeps/unix/sysv/linux/alpha/sysdep.h
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/sysdep.h
-@@ -98,4 +98,46 @@
- 	INTERNAL_SYSCALL1(name, err_out, nr, args);			\
- })
- 
-+/* Pointer mangling support.  Note that tls access is slow enough that
-+   we don't deoptimize things by placing the pointer check value there.  */
-+
-+#if defined NOT_IN_libc && defined IS_IN_rtld
-+# ifdef __ASSEMBLER__
-+#  define PTR_MANGLE(dst, src, tmp)				\
-+	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
-+	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
-+	xor	src, tmp, dst
-+#  define PTR_MANGLE2(dst, src, tmp)				\
-+	xor	src, tmp, dst
-+#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
-+#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
-+# else
-+extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
-+#  define PTR_MANGLE(var)	\
-+  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
-+#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
-+# endif
-+#elif defined PIC
-+# ifdef __ASSEMBLER__
-+#  define PTR_MANGLE(dst, src, tmp)		\
-+	ldq	tmp, __pointer_chk_guard;	\
-+	xor	src, tmp, dst
-+#  define PTR_MANGLE2(dst, src, tmp)		\
-+	xor	src, tmp, dst
-+#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
-+#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
-+# else
-+extern uintptr_t __pointer_chk_guard attribute_relro;
-+#  define PTR_MANGLE(var)	\
-+	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
-+#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
-+# endif
-+#else
-+/* Pointer mangling is not yet supported for static libc on alpha.  */
-+# ifndef __ASSEMBLER__
-+#  define PTR_MANGLE(var)   (void) (var)
-+#  define PTR_DEMANGLE(var) (void) (var)
-+# endif
-+#endif
-+
- #endif /* _LINUX_ALPHA_SYSDEP_H */

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-asm-memchr.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-asm-memchr.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-asm-memchr.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,122 +0,0 @@
-2009-07-27  Aurelien Jarno  <aurelien@aurel32.net>
-
-        * sysdeps/alpha/memchr.S: Use prefetch load.
-        * sysdeps/alpha/alphaev6/memchr.S: Likewise.
-
----
- ports/sysdeps/alpha/alphaev6/memchr.S |   26 +++++++++++++-------------
- ports/sysdeps/alpha/memchr.S          |   22 +++++++++++-----------
- 2 files changed, 24 insertions(+), 24 deletions(-)
-
---- a/ports/sysdeps/alpha/alphaev6/memchr.S
-+++ b/ports/sysdeps/alpha/alphaev6/memchr.S
-@@ -127,7 +127,7 @@
-         cmpbge  $31, $1, $2	# E :
-         bne     $2, $found_it	# U :
- 	# At least one byte left to process.
--	ldq	$1, 8($0)	# L :
-+	ldq	$31, 8($0)	# L :
- 	subq	$5, 1, $18	# E : U L U L
- 
- 	addq	$0, 8, $0	# E :
-@@ -143,38 +143,38 @@
- 	and	$4, 8, $4	# E : odd number of quads?
- 	bne	$4, $odd_quad_count # U :
- 	# At least three quads remain to be accessed
--	mov	$1, $4		# E : L U L U : move prefetched value to correct reg
-+	nop			# E : L U L U : move prefetched value to correct reg
- 
- 	.align	4
- $unrolled_loop:
--	ldq	$1, 8($0)	# L : prefetch $1
--	xor	$17, $4, $2	# E :
--	cmpbge	$31, $2, $2	# E :
--	bne	$2, $found_it	# U : U L U L
-+	ldq	$1, 0($0)	# L : load quad
-+	xor	$17, $1, $2	# E :
-+	ldq	$31, 8($0)	# L : prefetch next quad
-+	cmpbge	$31, $2, $2	# E : U L U L
- 
-+	bne	$2, $found_it	# U :
- 	addq	$0, 8, $0	# E :
- 	nop			# E :
- 	nop			# E :
--	nop			# E :
- 
- $odd_quad_count:
-+	ldq	$1, 0($0)	# L : load quad
- 	xor	$17, $1, $2	# E :
--	ldq	$4, 8($0)	# L : prefetch $4
-+	ldq	$31, 8($0)	# L : prefetch $4
- 	cmpbge	$31, $2, $2	# E :
--	addq	$0, 8, $6	# E :
- 
-+	addq	$0, 8, $6	# E :
- 	bne	$2, $found_it	# U :
- 	cmpult	$6, $18, $6	# E :
- 	addq	$0, 8, $0	# E :
--	nop			# E :
- 
- 	bne	$6, $unrolled_loop # U :
--	mov	$4, $1		# E : move prefetched value into $1
- 	nop			# E :
- 	nop			# E :
--
--$final:	subq	$5, $0, $18	# E : $18 <- number of bytes left to do
- 	nop			# E :
-+
-+$final:	ldq	$1, 0($0)	# L : load last quad
-+	subq	$5, $0, $18	# E : $18 <- number of bytes left to do
- 	nop			# E :
- 	bne	$18, $last_quad	# U :
- 
---- a/ports/sysdeps/alpha/memchr.S
-+++ b/ports/sysdeps/alpha/memchr.S
-@@ -119,7 +119,7 @@
- 
- 	# At least one byte left to process.
- 
--	ldq	t0, 8(v0)	# e0	:
-+	ldq	zero, 8(v0)	# e0	: prefetch next quad
- 	subq	t4, 1, a2	# .. e1 :
- 	addq	v0, 8, v0	#-e0	:
- 
-@@ -138,19 +138,19 @@
- 
- 	# At least three quads remain to be accessed
- 
--	mov	t0, t3		# e0	: move prefetched value to correct reg
--
- 	.align	4
- $unrolled_loop:
--	ldq	t0, 8(v0)	#-e0	: prefetch t0
--	xor	a1, t3, t1	# .. e1 :
--	cmpbge	zero, t1, t1	# e0	:
--	bne	t1, $found_it	# .. e1 :
-+	ldq	t0, 0(v0)	# e0	: load quad
-+	xor	a1, t0, t1	# .. e1 :
-+	ldq	zero, 8(v0)	# e0	: prefetch next quad
-+	cmpbge	zero, t1, t1	# .. e1:
-+	bne	t1, $found_it	# e0    :
- 
--	addq	v0, 8, v0	#-e0	:
-+	addq	v0, 8, v0	#    e1	:
- $odd_quad_count:
-+	ldq	t0, 0(v0)	# e0	: load quad
- 	xor	a1, t0, t1	# .. e1 :
--	ldq	t3, 8(v0)	# e0	: prefetch t3
-+	ldq	zero, 8(v0)	# e0	: prefetch next quad
- 	cmpbge	zero, t1, t1	# .. e1 :
- 	addq	v0, 8, t5	#-e0	:
- 	bne	t1, $found_it	# .. e1	:
-@@ -159,8 +159,8 @@
- 	addq	v0, 8, v0	# .. e1 :
- 	bne	t5, $unrolled_loop #-e1 :
- 
--	mov	t3, t0		# e0	: move prefetched value into t0
--$final:	subq	t4, v0, a2	# .. e1	: a2 <- number of bytes left to do
-+$final:	ldq	t0, 0(v0)	# e0	: load last quad
-+	subq	t4, v0, a2	# .. e1	: a2 <- number of bytes left to do
- 	bne	a2, $last_quad	# e1	:
- 
- $not_found:

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-dl-procinfo.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-dl-procinfo.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-dl-procinfo.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,165 +0,0 @@
----
- ports/sysdeps/alpha/dl-machine.h  |   12 ++++++
- ports/sysdeps/alpha/dl-procinfo.c |   64 +++++++++++++++++++++++++++++++++++
- ports/sysdeps/alpha/dl-procinfo.h |   68 ++++++++++++++++++++++++++++++++++++++
- 3 files changed, 144 insertions(+)
-
---- /dev/null
-+++ b/ports/sysdeps/alpha/dl-procinfo.h
-@@ -0,0 +1,68 @@
-+/* Alpha version of processor capability information handling macros.
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Aurelien Jarno <aurelien@aurel32.net>, 2007.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _DL_PROCINFO_H
-+#define _DL_PROCINFO_H	1
-+
-+#include <ldsodefs.h>
-+
-+
-+/* Mask to filter out platforms.  */
-+#define _DL_HWCAP_PLATFORM    (-1ULL)
-+
-+#define _DL_PLATFORMS_COUNT   5
-+
-+static inline const char *
-+__attribute__ ((unused))
-+_dl_platform_string (int idx)
-+{
-+  return GLRO(dl_alpha_platforms)[idx];
-+};
-+
-+static inline int
-+__attribute__ ((unused, always_inline))
-+_dl_string_platform (const char *str)
-+{
-+  int i;
-+
-+  if (str != NULL)
-+    for (i = 0; i < _DL_PLATFORMS_COUNT; ++i)
-+      {
-+        if (strcmp (str, _dl_platform_string (i)) == 0)
-+          return i;
-+      }
-+  return -1;
-+};
-+
-+/* We cannot provide a general printing function.  */
-+#define _dl_procinfo(word) -1
-+
-+/* There are no hardware capabilities defined.  */
-+#define _dl_hwcap_string(idx) ""
-+
-+/* By default there is no important hardware capability.  */
-+#define HWCAP_IMPORTANT (0)
-+
-+/* We don't have any hardware capabilities.  */
-+#define _DL_HWCAP_COUNT	0
-+
-+#define _dl_string_hwcap(str) (-1)
-+
-+#endif /* dl-procinfo.h */
---- /dev/null
-+++ b/ports/sysdeps/alpha/dl-procinfo.c
-@@ -0,0 +1,64 @@
-+/* Data for Alpha version of processor capability information.
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Aurelien Jarno <aurelien@aurel32.net>, 2007.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* This information must be kept in sync with the _DL_PLATFORM_COUNT 
-+   definitions in procinfo.h.
-+
-+   If anything should be added here check whether the size of each string
-+   is still ok with the given array size.
-+
-+   All the #ifdefs in the definitions are quite irritating but
-+   necessary if we want to avoid duplicating the information.  There
-+   are three different modes:
-+
-+   - PROCINFO_DECL is defined.  This means we are only interested in
-+     declarations.
-+
-+   - PROCINFO_DECL is not defined:
-+
-+     + if SHARED is defined the file is included in an array
-+       initializer.  The .element = { ... } syntax is needed.
-+
-+     + if SHARED is not defined a normal array initialization is
-+       needed.
-+  */
-+
-+#ifndef PROCINFO_CLASS
-+#define PROCINFO_CLASS
-+#endif
-+
-+#if !defined PROCINFO_DECL && defined SHARED
-+  ._dl_alpha_platforms
-+#else
-+PROCINFO_CLASS const char _dl_alpha_platforms[5][5]
-+#endif
-+#ifndef PROCINFO_DECL
-+= {
-+    "ev4", "ev5", "ev56", "ev6", "ev67"
-+  }
-+#endif
-+#if !defined SHARED || defined PROCINFO_DECL
-+;
-+#else
-+,
-+#endif
-+
-+#undef PROCINFO_DECL
-+#undef PROCINFO_CLASS
---- a/ports/sysdeps/alpha/dl-machine.h
-+++ b/ports/sysdeps/alpha/dl-machine.h
-@@ -249,6 +249,18 @@
- /* The alpha never uses Elf64_Rel relocations.  */
- #define ELF_MACHINE_NO_REL 1
- 
-+/* We define an initialization functions.  This is called very early in
-+ *    _dl_sysdep_start.  */
-+#define DL_PLATFORM_INIT dl_platform_init ()
-+
-+static inline void __attribute__ ((unused))
-+dl_platform_init (void)
-+{
-+	if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0')
-+	/* Avoid an empty string which would disturb us.  */
-+		GLRO(dl_platform) = NULL;
-+}
-+	
- /* Fix up the instructions of a PLT entry to invoke the function
-    rather than the dynamic linker.  */
- static inline Elf64_Addr

Modified: glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-fdatasync.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-fdatasync.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-fdatasync.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -16,7 +16,7 @@
 
 --- a/sysdeps/unix/sysv/linux/kernel-features.h
 +++ b/sysdeps/unix/sysv/linux/kernel-features.h
-@@ -474,6 +474,12 @@
+@@ -454,6 +454,12 @@
  # define __ASSUME_FUTEX_LOCK_PI	1
  #endif
  
@@ -26,7 +26,7 @@
 +# define __ASSUME_FDATASYNC	1
 +#endif
 +
- /* Support for utimensat syscall was added in 2.6.22, on alpha and s390
+ /* Support for utimensat syscall was added in 2.6.22, on SH
     only after 2.6.22-rc1.  */
  #if __LINUX_KERNEL_VERSION >= 0x020616 \
 --- /dev/null
@@ -113,11 +113,10 @@
  get_kernel_syms	EXTRA	get_kernel_syms	i:p	get_kernel_syms
 --- a/sysdeps/unix/sysv/linux/Makefile
 +++ b/sysdeps/unix/sysv/linux/Makefile
-@@ -21,6 +21,7 @@
- 		   eventfd eventfd_read eventfd_write
+@@ -20,6 +20,7 @@
  
- 
 +CFLAGS-fdatasync.c = -fexceptions
  CFLAGS-gethostid.c = -fexceptions
  
  sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
+

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-fpu-round.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-fpu-round.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-fpu-round.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,274 +0,0 @@
-2007-11-16  Aurelien Jarno  <aurelien@aurel32.net>
-
-        * sysdeps/alpha/fpu/s_ceil.c: Restore old version.
-        * sysdeps/alpha/fpu/s_ceilf.c: Likewise.
-        * sysdeps/alpha/fpu/s_floor.c: Likewise.
-        * sysdeps/alpha/fpu/s_floorf.c: Likewise.
-        * sysdeps/alpha/fpu/s_rint.c: Likewise.
-        * sysdeps/alpha/fpu/s_rintf.c: Likewise.
-
-
----
- ports/sysdeps/alpha/fpu/s_ceil.c   |   25 +++++++++++++++----------
- ports/sysdeps/alpha/fpu/s_ceilf.c  |   30 ++++++++++++++++++++----------
- ports/sysdeps/alpha/fpu/s_floor.c  |   30 ++++++++++++++++++------------
- ports/sysdeps/alpha/fpu/s_floorf.c |   35 +++++++++++++++++++++++------------
- ports/sysdeps/alpha/fpu/s_rint.c   |   25 +++++++++++++++++--------
- ports/sysdeps/alpha/fpu/s_rintf.c  |   29 ++++++++++++++++++++++-------
- 6 files changed, 115 insertions(+), 59 deletions(-)
-
---- a/ports/sysdeps/alpha/fpu/s_ceil.c
-+++ b/ports/sysdeps/alpha/fpu/s_ceil.c
-@@ -27,20 +27,25 @@
- double
- __ceil (double x)
- {
--  double two52 = copysign (0x1.0p52, x);
--  double r, tmp;
--  
--  __asm (
-+  if (isless (fabs (x), 9007199254740992.0))	/* 1 << DBL_MANT_DIG */
-+    {
-+      double tmp1, new_x;
-+
-+      new_x = -x;
-+      __asm (
- #ifdef _IEEE_FP_INEXACT
--	 "addt/suim %2, %3, %1\n\tsubt/suim %1, %3, %0"
-+	     "cvttq/svim %2,%1\n\t"
- #else
--	 "addt/sum %2, %3, %1\n\tsubt/sum %1, %3, %0"
-+	     "cvttq/svm %2,%1\n\t"
- #endif
--	 : "=&f"(r), "=&f"(tmp)
--	 : "f"(-x), "f"(-two52));
-+	     "cvtqt/m %1,%0\n\t"
-+	     : "=f"(new_x), "=&f"(tmp1)
-+	     : "f"(new_x));
- 
--  /* Fix up the negation we did above, as well as handling -0 properly. */
--  return copysign (r, x);
-+      /* Fix up the negation we did above, as well as handling -0 properly. */
-+      x = copysign(new_x, x);
-+    }
-+  return x;
- }
- 
- weak_alias (__ceil, ceil)
---- a/ports/sysdeps/alpha/fpu/s_ceilf.c
-+++ b/ports/sysdeps/alpha/fpu/s_ceilf.c
-@@ -26,20 +26,30 @@
- float
- __ceilf (float x)
- {
--  float two23 = copysignf (0x1.0p23, x);
--  float r, tmp;
--  
--  __asm (
-+  if (isless (fabsf (x), 16777216.0f))	/* 1 << FLT_MANT_DIG */
-+    {
-+      /* Note that Alpha S_Floating is stored in registers in a
-+	 restricted T_Floating format, so we don't even need to
-+	 convert back to S_Floating in the end.  The initial
-+	 conversion to T_Floating is needed to handle denormals.  */
-+
-+      float tmp1, tmp2, new_x;
-+
-+      new_x = -x;
-+      __asm ("cvtst/s %3,%2\n\t"
- #ifdef _IEEE_FP_INEXACT
--	 "adds/suim %2, %3, %1\n\tsubs/suim %1, %3, %0"
-+	     "cvttq/svim %2,%1\n\t"
- #else
--	 "adds/sum %2, %3, %1\n\tsubs/sum %1, %3, %0"
-+	     "cvttq/svm %2,%1\n\t"
- #endif
--	 : "=&f"(r), "=&f"(tmp)
--	 : "f"(-x), "f"(-two23));
-+	     "cvtqt/m %1,%0\n\t"
-+	     : "=f"(new_x), "=&f"(tmp1), "=&f"(tmp2)
-+	     : "f"(new_x));
- 
--  /* Fix up the negation we did above, as well as handling -0 properly. */
--  return copysignf (r, x);
-+      /* Fix up the negation we did above, as well as handling -0 properly. */
-+      x = copysignf(new_x, x);
-+    }
-+  return x;
- }
- 
- weak_alias (__ceilf, ceilf)
---- a/ports/sysdeps/alpha/fpu/s_floor.c
-+++ b/ports/sysdeps/alpha/fpu/s_floor.c
-@@ -21,26 +21,32 @@
- #include <math_ldbl_opt.h>
- 
- 
--/* Use the -inf rounding mode conversion instructions to implement floor.  */
-+/* Use the -inf rounding mode conversion instructions to implement
-+   floor.  We note when the exponent is large enough that the value
-+   must be integral, as this avoids unpleasant integer overflows.  */
- 
- double
- __floor (double x)
- {
--  double two52 = copysign (0x1.0p52, x);
--  double r, tmp;
--  
--  __asm (
-+  if (isless (fabs (x), 9007199254740992.0))	/* 1 << DBL_MANT_DIG */
-+    {
-+      double tmp1, new_x;
-+
-+      __asm (
- #ifdef _IEEE_FP_INEXACT
--	 "addt/suim %2, %3, %1\n\tsubt/suim %1, %3, %0"
-+	     "cvttq/svim %2,%1\n\t"
- #else
--	 "addt/sum %2, %3, %1\n\tsubt/sum %1, %3, %0"
-+	     "cvttq/svm %2,%1\n\t"
- #endif
--	 : "=&f"(r), "=&f"(tmp)
--	 : "f"(x), "f"(two52));
-+	     "cvtqt/m %1,%0\n\t"
-+	     : "=f"(new_x), "=&f"(tmp1)
-+	     : "f"(x));
- 
--  /* floor(-0) == -0, and in general we'll always have the same
--     sign as our input.  */
--  return copysign (r, x);
-+      /* floor(-0) == -0, and in general we'll always have the same
-+	 sign as our input.  */
-+      x = copysign(new_x, x);
-+    }
-+  return x;
- }
- 
- weak_alias (__floor, floor)
---- a/ports/sysdeps/alpha/fpu/s_floorf.c
-+++ b/ports/sysdeps/alpha/fpu/s_floorf.c
-@@ -20,26 +20,37 @@
- #include <math.h>
- 
- 
--/* Use the -inf rounding mode conversion instructions to implement floor.  */
-+/* Use the -inf rounding mode conversion instructions to implement
-+   floor.  We note when the exponent is large enough that the value
-+   must be integral, as this avoids unpleasant integer overflows.  */
- 
- float
- __floorf (float x)
- {
--  float two23 = copysignf (0x1.0p23, x);
--  float r, tmp;
--  
--  __asm (
-+  if (isless (fabsf (x), 16777216.0f))	/* 1 << FLT_MANT_DIG */
-+    {
-+      /* Note that Alpha S_Floating is stored in registers in a
-+	 restricted T_Floating format, so we don't even need to
-+	 convert back to S_Floating in the end.  The initial
-+	 conversion to T_Floating is needed to handle denormals.  */
-+
-+      float tmp1, tmp2, new_x;
-+
-+      __asm ("cvtst/s %3,%2\n\t"
- #ifdef _IEEE_FP_INEXACT
--	 "adds/suim %2, %3, %1\n\tsubs/suim %1, %3, %0"
-+	     "cvttq/svim %2,%1\n\t"
- #else
--	 "adds/sum %2, %3, %1\n\tsubs/sum %1, %3, %0"
-+	     "cvttq/svm %2,%1\n\t"
- #endif
--	 : "=&f"(r), "=&f"(tmp)
--	 : "f"(x), "f"(two23));
-+	     "cvtqt/m %1,%0\n\t"
-+	     : "=f"(new_x), "=&f"(tmp1), "=&f"(tmp2)
-+	     : "f"(x));
- 
--  /* floor(-0) == -0, and in general we'll always have the same
--     sign as our input.  */
--  return copysignf (r, x);
-+      /* floor(-0) == -0, and in general we'll always have the same
-+	 sign as our input.  */
-+      x = copysignf(new_x, x);
-+    }
-+  return x;
- }
- 
- weak_alias (__floorf, floorf)
---- a/ports/sysdeps/alpha/fpu/s_rint.c
-+++ b/ports/sysdeps/alpha/fpu/s_rint.c
-@@ -24,15 +24,24 @@
- double
- __rint (double x)
- {
--  double two52 = copysign (0x1.0p52, x);
--  double r;
--  
--  r = x + two52;
--  r = r - two52;
-+  if (isless (fabs (x), 9007199254740992.0))	/* 1 << DBL_MANT_DIG */
-+    {
-+      double tmp1, new_x;
-+      __asm (
-+#ifdef _IEEE_FP_INEXACT
-+	     "cvttq/svid %2,%1\n\t"
-+#else
-+	     "cvttq/svd %2,%1\n\t"
-+#endif
-+	     "cvtqt/d %1,%0\n\t"
-+	     : "=f"(new_x), "=&f"(tmp1)
-+	     : "f"(x));
- 
--  /* rint(-0.1) == -0, and in general we'll always have the same sign
--     as our input.  */
--  return copysign (r, x);
-+      /* rint(-0.1) == -0, and in general we'll always have the same
-+	 sign as our input.  */
-+      x = copysign(new_x, x);
-+    }
-+  return x;
- }
- 
- weak_alias (__rint, rint)
---- a/ports/sysdeps/alpha/fpu/s_rintf.c
-+++ b/ports/sysdeps/alpha/fpu/s_rintf.c
-@@ -23,15 +23,30 @@
- float
- __rintf (float x)
- {
--  float two23 = copysignf (0x1.0p23, x);
--  float r;
-+  if (isless (fabsf (x), 16777216.0f))	/* 1 << FLT_MANT_DIG */
-+    {
-+      /* Note that Alpha S_Floating is stored in registers in a
-+	 restricted T_Floating format, so we don't even need to
-+	 convert back to S_Floating in the end.  The initial
-+	 conversion to T_Floating is needed to handle denormals.  */
- 
--  r = x + two23;
--  r = r - two23;
-+      float tmp1, tmp2, new_x;
- 
--  /* rint(-0.1) == -0, and in general we'll always have the same sign
--     as our input.  */
--  return copysign (r, x);
-+      __asm ("cvtst/s %3,%2\n\t"
-+#ifdef _IEEE_FP_INEXACT
-+	     "cvttq/svid %2,%1\n\t"
-+#else
-+	     "cvttq/svd %2,%1\n\t"
-+#endif
-+	     "cvtqt/d %1,%0\n\t"
-+	     : "=f"(new_x), "=&f"(tmp1), "=&f"(tmp2)
-+	     : "f"(x));
-+
-+      /* rint(-0.1) == -0, and in general we'll always have the same
-+	 sign as our input.  */
-+      x = copysignf(new_x, x);
-+    }
-+  return x;
- }
- 
- weak_alias (__rintf, rintf)

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-sock_nonblock.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-sock_nonblock.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-sock_nonblock.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,420 +0,0 @@
-2010-02-13  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/alpha/bits/socket.h: New file based on
-	the generic version, with SOCK_CLOEXEC and SOCK_NONBLOCK 
-	matching the kernel value.
-
----
- ports/sysdeps/unix/sysv/linux/alpha/bits/socket.h |  407 ++++++++++++++++++++++
- 1 file changed, 407 insertions(+)
-
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/socket.h
-@@ -0,0 +1,407 @@
-+/* System-specific socket constants and types.  Linux version.
-+   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009
-+   Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef __BITS_SOCKET_H
-+#define __BITS_SOCKET_H
-+
-+#ifndef _SYS_SOCKET_H
-+# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
-+#endif
-+
-+#define	__need_size_t
-+#include <stddef.h>
-+
-+#include <sys/types.h>
-+
-+/* Type for length arguments in socket calls.  */
-+#ifndef __socklen_t_defined
-+typedef __socklen_t socklen_t;
-+# define __socklen_t_defined
-+#endif
-+
-+/* Types of sockets.  */
-+enum __socket_type
-+{
-+  SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
-+				   byte streams.  */
-+#define SOCK_STREAM SOCK_STREAM
-+  SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
-+				   of fixed maximum length.  */
-+#define SOCK_DGRAM SOCK_DGRAM
-+  SOCK_RAW = 3,			/* Raw protocol interface.  */
-+#define SOCK_RAW SOCK_RAW
-+  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
-+#define SOCK_RDM SOCK_RDM
-+  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
-+				   datagrams of fixed maximum length.  */
-+#define SOCK_SEQPACKET SOCK_SEQPACKET
-+  SOCK_DCCP = 6,		/* Datagram Congestion Control Protocol.  */
-+#define SOCK_DCCP SOCK_DCCP
-+  SOCK_PACKET = 10,		/* Linux specific way of getting packets
-+				   at the dev level.  For writing rarp and
-+				   other similar things on the user level. */
-+#define SOCK_PACKET SOCK_PACKET
-+
-+  /* Flags to be ORed into the type parameter of socket and socketpair and
-+     used for the flags parameter of paccept.  */
-+
-+  SOCK_CLOEXEC = 010000000,	/* Atomically set close-on-exec flag for the
-+				   new descriptor(s).  */
-+#define SOCK_CLOEXEC SOCK_CLOEXEC
-+#undef SOCK_NONBLOCK
-+  SOCK_NONBLOCK = 0x40000000	/* Atomically mark descriptor(s) as
-+				   non-blocking.  */
-+#define SOCK_NONBLOCK SOCK_NONBLOCK
-+};
-+
-+/* Protocol families.  */
-+#define	PF_UNSPEC	0	/* Unspecified.  */
-+#define	PF_LOCAL	1	/* Local to host (pipes and file-domain).  */
-+#define	PF_UNIX		PF_LOCAL /* POSIX name for PF_LOCAL.  */
-+#define	PF_FILE		PF_LOCAL /* Another non-standard name for PF_LOCAL.  */
-+#define	PF_INET		2	/* IP protocol family.  */
-+#define	PF_AX25		3	/* Amateur Radio AX.25.  */
-+#define	PF_IPX		4	/* Novell Internet Protocol.  */
-+#define	PF_APPLETALK	5	/* Appletalk DDP.  */
-+#define	PF_NETROM	6	/* Amateur radio NetROM.  */
-+#define	PF_BRIDGE	7	/* Multiprotocol bridge.  */
-+#define	PF_ATMPVC	8	/* ATM PVCs.  */
-+#define	PF_X25		9	/* Reserved for X.25 project.  */
-+#define	PF_INET6	10	/* IP version 6.  */
-+#define	PF_ROSE		11	/* Amateur Radio X.25 PLP.  */
-+#define	PF_DECnet	12	/* Reserved for DECnet project.  */
-+#define	PF_NETBEUI	13	/* Reserved for 802.2LLC project.  */
-+#define	PF_SECURITY	14	/* Security callback pseudo AF.  */
-+#define	PF_KEY		15	/* PF_KEY key management API.  */
-+#define	PF_NETLINK	16
-+#define	PF_ROUTE	PF_NETLINK /* Alias to emulate 4.4BSD.  */
-+#define	PF_PACKET	17	/* Packet family.  */
-+#define	PF_ASH		18	/* Ash.  */
-+#define	PF_ECONET	19	/* Acorn Econet.  */
-+#define	PF_ATMSVC	20	/* ATM SVCs.  */
-+#define PF_RDS		21	/* RDS sockets.  */
-+#define	PF_SNA		22	/* Linux SNA Project */
-+#define	PF_IRDA		23	/* IRDA sockets.  */
-+#define	PF_PPPOX	24	/* PPPoX sockets.  */
-+#define	PF_WANPIPE	25	/* Wanpipe API sockets.  */
-+#define PF_LLC		26	/* Linux LLC.  */
-+#define PF_CAN		29	/* Controller Area Network.  */
-+#define PF_TIPC		30	/* TIPC sockets.  */
-+#define	PF_BLUETOOTH	31	/* Bluetooth sockets.  */
-+#define	PF_IUCV		32	/* IUCV sockets.  */
-+#define PF_RXRPC	33	/* RxRPC sockets.  */
-+#define PF_ISDN		34	/* mISDN sockets.  */
-+#define PF_PHONET	35	/* Phonet sockets.  */
-+#define PF_IEEE802154	36	/* IEEE 802.15.4 sockets.  */
-+#define	PF_MAX		37	/* For now..  */
-+
-+/* Address families.  */
-+#define	AF_UNSPEC	PF_UNSPEC
-+#define	AF_LOCAL	PF_LOCAL
-+#define	AF_UNIX		PF_UNIX
-+#define	AF_FILE		PF_FILE
-+#define	AF_INET		PF_INET
-+#define	AF_AX25		PF_AX25
-+#define	AF_IPX		PF_IPX
-+#define	AF_APPLETALK	PF_APPLETALK
-+#define	AF_NETROM	PF_NETROM
-+#define	AF_BRIDGE	PF_BRIDGE
-+#define	AF_ATMPVC	PF_ATMPVC
-+#define	AF_X25		PF_X25
-+#define	AF_INET6	PF_INET6
-+#define	AF_ROSE		PF_ROSE
-+#define	AF_DECnet	PF_DECnet
-+#define	AF_NETBEUI	PF_NETBEUI
-+#define	AF_SECURITY	PF_SECURITY
-+#define	AF_KEY		PF_KEY
-+#define	AF_NETLINK	PF_NETLINK
-+#define	AF_ROUTE	PF_ROUTE
-+#define	AF_PACKET	PF_PACKET
-+#define	AF_ASH		PF_ASH
-+#define	AF_ECONET	PF_ECONET
-+#define	AF_ATMSVC	PF_ATMSVC
-+#define AF_RDS		PF_RDS
-+#define	AF_SNA		PF_SNA
-+#define	AF_IRDA		PF_IRDA
-+#define	AF_PPPOX	PF_PPPOX
-+#define	AF_WANPIPE	PF_WANPIPE
-+#define AF_LLC		PF_LLC
-+#define AF_CAN		PF_CAN
-+#define AF_TIPC		PF_TIPC
-+#define	AF_BLUETOOTH	PF_BLUETOOTH
-+#define	AF_IUCV		PF_IUCV
-+#define AF_RXRPC	PF_RXRPC
-+#define AF_ISDN		PF_ISDN
-+#define AF_PHONET	PF_PHONET
-+#define AF_IEEE802154	PF_IEEE802154
-+#define	AF_MAX		PF_MAX
-+
-+/* Socket level values.  Others are defined in the appropriate headers.
-+
-+   XXX These definitions also should go into the appropriate headers as
-+   far as they are available.  */
-+#define SOL_RAW		255
-+#define SOL_DECNET      261
-+#define SOL_X25         262
-+#define SOL_PACKET	263
-+#define SOL_ATM		264	/* ATM layer (cell level).  */
-+#define SOL_AAL		265	/* ATM Adaption Layer (packet level).  */
-+#define SOL_IRDA	266
-+
-+/* Maximum queue length specifiable by listen.  */
-+#define SOMAXCONN	128
-+
-+/* Get the definition of the macro to define the common sockaddr members.  */
-+#include <bits/sockaddr.h>
-+
-+/* Structure describing a generic socket address.  */
-+struct sockaddr
-+  {
-+    __SOCKADDR_COMMON (sa_);	/* Common data: address family and length.  */
-+    char sa_data[14];		/* Address data.  */
-+  };
-+
-+
-+/* Structure large enough to hold any socket address (with the historical
-+   exception of AF_UNIX).  We reserve 128 bytes.  */
-+#define __ss_aligntype	unsigned long int
-+#define _SS_SIZE	128
-+#define _SS_PADSIZE	(_SS_SIZE - (2 * sizeof (__ss_aligntype)))
-+
-+struct sockaddr_storage
-+  {
-+    __SOCKADDR_COMMON (ss_);	/* Address family, etc.  */
-+    __ss_aligntype __ss_align;	/* Force desired alignment.  */
-+    char __ss_padding[_SS_PADSIZE];
-+  };
-+
-+
-+/* Bits in the FLAGS argument to `send', `recv', et al.  */
-+enum
-+  {
-+    MSG_OOB		= 0x01,	/* Process out-of-band data.  */
-+#define MSG_OOB		MSG_OOB
-+    MSG_PEEK		= 0x02,	/* Peek at incoming messages.  */
-+#define MSG_PEEK	MSG_PEEK
-+    MSG_DONTROUTE	= 0x04,	/* Don't use local routing.  */
-+#define MSG_DONTROUTE	MSG_DONTROUTE
-+#ifdef __USE_GNU
-+    /* DECnet uses a different name.  */
-+    MSG_TRYHARD		= MSG_DONTROUTE,
-+# define MSG_TRYHARD	MSG_DONTROUTE
-+#endif
-+    MSG_CTRUNC		= 0x08,	/* Control data lost before delivery.  */
-+#define MSG_CTRUNC	MSG_CTRUNC
-+    MSG_PROXY		= 0x10,	/* Supply or ask second address.  */
-+#define MSG_PROXY	MSG_PROXY
-+    MSG_TRUNC		= 0x20,
-+#define	MSG_TRUNC	MSG_TRUNC
-+    MSG_DONTWAIT	= 0x40, /* Nonblocking IO.  */
-+#define	MSG_DONTWAIT	MSG_DONTWAIT
-+    MSG_EOR		= 0x80, /* End of record.  */
-+#define	MSG_EOR		MSG_EOR
-+    MSG_WAITALL		= 0x100, /* Wait for a full request.  */
-+#define	MSG_WAITALL	MSG_WAITALL
-+    MSG_FIN		= 0x200,
-+#define	MSG_FIN		MSG_FIN
-+    MSG_SYN		= 0x400,
-+#define	MSG_SYN		MSG_SYN
-+    MSG_CONFIRM		= 0x800, /* Confirm path validity.  */
-+#define	MSG_CONFIRM	MSG_CONFIRM
-+    MSG_RST		= 0x1000,
-+#define	MSG_RST		MSG_RST
-+    MSG_ERRQUEUE	= 0x2000, /* Fetch message from error queue.  */
-+#define	MSG_ERRQUEUE	MSG_ERRQUEUE
-+    MSG_NOSIGNAL	= 0x4000, /* Do not generate SIGPIPE.  */
-+#define	MSG_NOSIGNAL	MSG_NOSIGNAL
-+    MSG_MORE		= 0x8000,  /* Sender will send more.  */
-+#define	MSG_MORE	MSG_MORE
-+
-+    MSG_CMSG_CLOEXEC	= 0x40000000	/* Set close_on_exit for file
-+                                           descriptor received through
-+                                           SCM_RIGHTS.  */
-+#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
-+  };
-+
-+
-+/* Structure describing messages sent by
-+   `sendmsg' and received by `recvmsg'.  */
-+struct msghdr
-+  {
-+    void *msg_name;		/* Address to send to/receive from.  */
-+    socklen_t msg_namelen;	/* Length of address data.  */
-+
-+    struct iovec *msg_iov;	/* Vector of data to send/receive into.  */
-+    size_t msg_iovlen;		/* Number of elements in the vector.  */
-+
-+    void *msg_control;		/* Ancillary data (eg BSD filedesc passing). */
-+    size_t msg_controllen;	/* Ancillary data buffer length.
-+				   !! The type should be socklen_t but the
-+				   definition of the kernel is incompatible
-+				   with this.  */
-+
-+    int msg_flags;		/* Flags on received message.  */
-+  };
-+
-+/* Structure used for storage of ancillary data object information.  */
-+struct cmsghdr
-+  {
-+    size_t cmsg_len;		/* Length of data in cmsg_data plus length
-+				   of cmsghdr structure.
-+				   !! The type should be socklen_t but the
-+				   definition of the kernel is incompatible
-+				   with this.  */
-+    int cmsg_level;		/* Originating protocol.  */
-+    int cmsg_type;		/* Protocol specific type.  */
-+#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
-+    __extension__ unsigned char __cmsg_data __flexarr; /* Ancillary data.  */
-+#endif
-+  };
-+
-+/* Ancillary data object manipulation macros.  */
-+#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
-+# define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
-+#else
-+# define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1))
-+#endif
-+#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
-+#define CMSG_FIRSTHDR(mhdr) \
-+  ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr)		      \
-+   ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0)
-+#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
-+			 & (size_t) ~(sizeof (size_t) - 1))
-+#define CMSG_SPACE(len) (CMSG_ALIGN (len) \
-+			 + CMSG_ALIGN (sizeof (struct cmsghdr)))
-+#define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
-+
-+extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
-+				      struct cmsghdr *__cmsg) __THROW;
-+#ifdef __USE_EXTERN_INLINES
-+# ifndef _EXTERN_INLINE
-+#  define _EXTERN_INLINE __extern_inline
-+# endif
-+_EXTERN_INLINE struct cmsghdr *
-+__NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
-+{
-+  if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
-+    /* The kernel header does this so there may be a reason.  */
-+    return 0;
-+
-+  __cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
-+			       + CMSG_ALIGN (__cmsg->cmsg_len));
-+  if ((unsigned char *) (__cmsg + 1) > ((unsigned char *) __mhdr->msg_control
-+					+ __mhdr->msg_controllen)
-+      || ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
-+	  > ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
-+    /* No more entries.  */
-+    return 0;
-+  return __cmsg;
-+}
-+#endif	/* Use `extern inline'.  */
-+
-+/* Socket level message types.  This must match the definitions in
-+   <linux/socket.h>.  */
-+enum
-+  {
-+    SCM_RIGHTS = 0x01		/* Transfer file descriptors.  */
-+#define SCM_RIGHTS SCM_RIGHTS
-+#ifdef __USE_GNU
-+    , SCM_CREDENTIALS = 0x02	/* Credentials passing.  */
-+# define SCM_CREDENTIALS SCM_CREDENTIALS
-+#endif
-+  };
-+
-+#ifdef __USE_GNU
-+/* User visible structure for SCM_CREDENTIALS message */
-+struct ucred
-+{
-+  pid_t pid;			/* PID of sending process.  */
-+  uid_t uid;			/* UID of sending process.  */
-+  gid_t gid;			/* GID of sending process.  */
-+};
-+#endif
-+
-+/* Ugly workaround for unclean kernel headers.  */
-+#if !defined __USE_MISC && !defined __USE_GNU
-+# ifndef FIOGETOWN
-+#  define __SYS_SOCKET_H_undef_FIOGETOWN
-+# endif
-+# ifndef FIOSETOWN
-+#  define __SYS_SOCKET_H_undef_FIOSETOWN
-+# endif
-+# ifndef SIOCATMARK
-+#  define __SYS_SOCKET_H_undef_SIOCATMARK
-+# endif
-+# ifndef SIOCGPGRP
-+#  define __SYS_SOCKET_H_undef_SIOCGPGRP
-+# endif
-+# ifndef SIOCGSTAMP
-+#  define __SYS_SOCKET_H_undef_SIOCGSTAMP
-+# endif
-+# ifndef SIOCGSTAMPNS
-+#  define __SYS_SOCKET_H_undef_SIOCGSTAMPNS
-+# endif
-+# ifndef SIOCSPGRP
-+#  define __SYS_SOCKET_H_undef_SIOCSPGRP
-+# endif
-+#endif
-+
-+/* Get socket manipulation related informations from kernel headers.  */
-+#include <asm/socket.h>
-+
-+#if !defined __USE_MISC && !defined __USE_GNU
-+# ifdef __SYS_SOCKET_H_undef_FIOGETOWN
-+#  undef __SYS_SOCKET_H_undef_FIOGETOWN
-+#  undef FIOGETOWN
-+# endif
-+# ifdef __SYS_SOCKET_H_undef_FIOSETOWN
-+#  undef __SYS_SOCKET_H_undef_FIOSETOWN
-+#  undef FIOSETOWN
-+# endif
-+# ifdef __SYS_SOCKET_H_undef_SIOCATMARK
-+#  undef __SYS_SOCKET_H_undef_SIOCATMARK
-+#  undef SIOCATMARK
-+# endif
-+# ifdef __SYS_SOCKET_H_undef_SIOCGPGRP
-+#  undef __SYS_SOCKET_H_undef_SIOCGPGRP
-+#  undef SIOCGPGRP
-+# endif
-+# ifdef __SYS_SOCKET_H_undef_SIOCGSTAMP
-+#  undef __SYS_SOCKET_H_undef_SIOCGSTAMP
-+#  undef SIOCGSTAMP
-+# endif
-+# ifdef __SYS_SOCKET_H_undef_SIOCGSTAMPNS
-+#  undef __SYS_SOCKET_H_undef_SIOCGSTAMPNS
-+#  undef SIOCGSTAMPNS
-+# endif
-+# ifdef __SYS_SOCKET_H_undef_SIOCSPGRP
-+#  undef __SYS_SOCKET_H_undef_SIOCSPGRP
-+#  undef SIOCSPGRP
-+# endif
-+#endif
-+
-+/* Structure used to manipulate the SO_LINGER option.  */
-+struct linger
-+  {
-+    int l_onoff;		/* Nonzero to linger on close.  */
-+    int l_linger;		/* Time to linger.  */
-+  };
-+
-+#endif	/* bits/socket.h */

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/amd64/cvs-avx-tcb-alignment.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/amd64/cvs-avx-tcb-alignment.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/amd64/cvs-avx-tcb-alignment.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,41 +0,0 @@
-2010-10-13  H.J. Lu  <hongjiu.lu@intel.com>
-
-	[BZ #12113]
-	* sysdeps/x86_64/pthreaddef.h (TCB_ALIGNMENT): Changed to 32.
-	* sysdeps/x86_64/tls.h (TLS_TCB_ALIGN): Defined with alignment
-	of "struct pthread".
-
-diff --git a/nptl/sysdeps/x86_64/pthreaddef.h b/nptl/sysdeps/x86_64/pthreaddef.h
-index be63a8c..8ec135c 100644
---- a/nptl/sysdeps/x86_64/pthreaddef.h
-+++ b/nptl/sysdeps/x86_64/pthreaddef.h
-@@ -27,8 +27,9 @@
- /* Minimal stack size after allocating thread descriptor and guard size.  */
- #define MINIMAL_REST_STACK	2048
- 
--/* Alignment requirement for TCB.  */
--#define TCB_ALIGNMENT		16
-+/* Alignment requirement for TCB.  Need to store post-AVX vector registers
-+   in the TCB and we want the storage to be aligned at 32-byte.  */
-+#define TCB_ALIGNMENT		32
- 
- 
- /* Location of current stack frame.  The frame pointer is not usable.  */
-diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h
-index e39eb5f..41b5e6d 100644
---- a/nptl/sysdeps/x86_64/tls.h
-+++ b/nptl/sysdeps/x86_64/tls.h
-@@ -117,12 +117,7 @@ typedef struct
- # define TLS_TCB_SIZE sizeof (struct pthread)
- 
- /* Alignment requirements for the TCB.  */
--//# define TLS_TCB_ALIGN __alignof__ (struct pthread)
--// Normally the above would be correct  But we have to store post-AVX
--// vector registers in the TCB and we want the storage to be aligned.
--// unfortunately there isn't yet a type for these values and hence no
--// 32-byte alignment requirement.  Make this explicit, for now.
--# define TLS_TCB_ALIGN 32
-+# define TLS_TCB_ALIGN __alignof__ (struct pthread)
- 
- /* The TCB can have any size and the memory following the address the
-    thread pointer points to is unspecified.  Allocate the TCB there.  */

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-__block.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-__block.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-__block.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,36 +0,0 @@
-2010-06-24  Mark Heily  <mark@heily.com>
-
-	* crypt/crypt.h, posix/unistd.h: Use __libc_block instead of
-	__block.
-
---- a/crypt/crypt.h
-+++ b/crypt/crypt.h
-@@ -38,7 +38,7 @@
- 
- /* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt
-    block in place.  */
--extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1));
-+extern void encrypt (char *__libc_block, int __edflag) __THROW __nonnull ((1));
- 
- #ifdef __USE_GNU
- /* Reentrant versions of the functions above.  The additional argument
-@@ -65,7 +65,7 @@
- 		      struct crypt_data * __restrict __data)
-      __THROW __nonnull ((1, 2));
- 
--extern void encrypt_r (char *__block, int __edflag,
-+extern void encrypt_r (char *__libc_block, int __edflag,
- 		       struct crypt_data * __restrict __data)
-      __THROW __nonnull ((1, 3));
- #endif
---- a/posix/unistd.h
-+++ b/posix/unistd.h
-@@ -1132,7 +1132,7 @@
- 
- /* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt
-    block in place.  */
--extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1));
-+extern void encrypt (char *__libc_block, int __edflag) __THROW __nonnull ((1));
- 
- 
- /* Swab pairs bytes in the first N bytes of the area pointed to by

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-audit-suid.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-audit-suid.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-audit-suid.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,215 +0,0 @@
-2010-10-22  Andreas Schwab  <schwab@redhat.com>
-
-	* include/dlfcn.h (__RTLD_SECURE): Define.
-	* elf/dl-load.c (_dl_map_object): Remove preloaded parameter.  Use
-	mode & __RTLD_SECURE instead.
-	(open_path): Rename preloaded parameter to secure.
-	* sysdeps/generic/ldsodefs.h (_dl_map_object): Adjust declaration.
-	* elf/dl-open.c (dl_open_worker): Adjust call to _dl_map_object.
-	* elf/dl-deps.c (openaux): Likewise.
-	* elf/rtld.c (struct map_args): Remove is_preloaded.
-	(map_doit): Don't use it.
-	(dl_main): Likewise.
-	(do_preload): Use __RTLD_SECURE instead of is_preloaded.
-	(dlmopen_doit): Add __RTLD_SECURE to mode bits.
-
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index a58de5c..a51fb6e 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -62,7 +62,7 @@ openaux (void *a)
- {
-   struct openaux_args *args = (struct openaux_args *) a;
- 
--  args->aux = _dl_map_object (args->map, args->name, 0,
-+  args->aux = _dl_map_object (args->map, args->name,
- 			      (args->map->l_type == lt_executable
- 			       ? lt_library : args->map->l_type),
- 			      args->trace_mode, args->open_mode,
-diff --git a/elf/dl-load.c b/elf/dl-load.c
-index a7162eb..aa8738f 100644
---- a/elf/dl-load.c
-+++ b/elf/dl-load.c
-@@ -1812,7 +1812,7 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader,
-    if MAY_FREE_DIRS is true.  */
- 
- static int
--open_path (const char *name, size_t namelen, int preloaded,
-+open_path (const char *name, size_t namelen, int secure,
- 	   struct r_search_path_struct *sps, char **realname,
- 	   struct filebuf *fbp, struct link_map *loader, int whatcode,
- 	   bool *found_other_class)
-@@ -1894,7 +1894,7 @@ open_path (const char *name, size_t namelen, int preloaded,
- 	  /* Remember whether we found any existing directory.  */
- 	  here_any |= this_dir->status[cnt] != nonexisting;
- 
--	  if (fd != -1 && __builtin_expect (preloaded, 0)
-+	  if (fd != -1 && __builtin_expect (secure, 0)
- 	      && INTUSE(__libc_enable_secure))
- 	    {
- 	      /* This is an extra security effort to make sure nobody can
-@@ -1963,7 +1963,7 @@ open_path (const char *name, size_t namelen, int preloaded,
- 
- struct link_map *
- internal_function
--_dl_map_object (struct link_map *loader, const char *name, int preloaded,
-+_dl_map_object (struct link_map *loader, const char *name,
- 		int type, int trace_mode, int mode, Lmid_t nsid)
- {
-   int fd;
-@@ -2067,7 +2067,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	  for (l = loader; l; l = l->l_loader)
- 	    if (cache_rpath (l, &l->l_rpath_dirs, DT_RPATH, "RPATH"))
- 	      {
--		fd = open_path (name, namelen, preloaded, &l->l_rpath_dirs,
-+		fd = open_path (name, namelen, mode & __RTLD_SECURE,
-+				&l->l_rpath_dirs,
- 				&realname, &fb, loader, LA_SER_RUNPATH,
- 				&found_other_class);
- 		if (fd != -1)
-@@ -2082,14 +2083,15 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	      && main_map != NULL && main_map->l_type != lt_loaded
- 	      && cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH,
- 			      "RPATH"))
--	    fd = open_path (name, namelen, preloaded, &main_map->l_rpath_dirs,
-+	    fd = open_path (name, namelen, mode & __RTLD_SECURE,
-+			    &main_map->l_rpath_dirs,
- 			    &realname, &fb, loader ?: main_map, LA_SER_RUNPATH,
- 			    &found_other_class);
- 	}
- 
-       /* Try the LD_LIBRARY_PATH environment variable.  */
-       if (fd == -1 && env_path_list.dirs != (void *) -1)
--	fd = open_path (name, namelen, preloaded, &env_path_list,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE, &env_path_list,
- 			&realname, &fb,
- 			loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded,
- 			LA_SER_LIBPATH, &found_other_class);
-@@ -2098,12 +2100,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
-       if (fd == -1 && loader != NULL
- 	  && cache_rpath (loader, &loader->l_runpath_dirs,
- 			  DT_RUNPATH, "RUNPATH"))
--	fd = open_path (name, namelen, preloaded,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE,
- 			&loader->l_runpath_dirs, &realname, &fb, loader,
- 			LA_SER_RUNPATH, &found_other_class);
- 
-       if (fd == -1
--	  && (__builtin_expect (! preloaded, 1)
-+	  && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
- 	      || ! INTUSE(__libc_enable_secure)))
- 	{
- 	  /* Check the list of libraries in the file /etc/ld.so.cache,
-@@ -2169,7 +2171,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	  && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
- 	      || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
- 	  && rtld_search_dirs.dirs != (void *) -1)
--	fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
- 			&realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
- 
-       /* Add another newline when we are tracing the library loading.  */
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index c394b3f..cf8e8cc 100644
---- a/elf/dl-open.c
-+++ b/elf/dl-open.c
-@@ -223,7 +223,7 @@ dl_open_worker (void *a)
- 
-   /* Load the named object.  */
-   struct link_map *new;
--  args->map = new = _dl_map_object (call_map, file, 0, lt_loaded, 0,
-+  args->map = new = _dl_map_object (call_map, file, lt_loaded, 0,
- 				    mode | __RTLD_CALLMAP, args->nsid);
- 
-   /* If the pointer returned is NULL this means the RTLD_NOLOAD flag is
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 5ecc4fe..06b534a 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -589,7 +589,6 @@ struct map_args
-   /* Argument to map_doit.  */
-   char *str;
-   struct link_map *loader;
--  int is_preloaded;
-   int mode;
-   /* Return value of map_doit.  */
-   struct link_map *map;
-@@ -627,16 +626,17 @@ static void
- map_doit (void *a)
- {
-   struct map_args *args = (struct map_args *) a;
--  args->map = _dl_map_object (args->loader, args->str,
--			      args->is_preloaded, lt_library, 0, args->mode,
--			      LM_ID_BASE);
-+  args->map = _dl_map_object (args->loader, args->str, lt_library, 0,
-+			      args->mode, LM_ID_BASE);
- }
- 
- static void
- dlmopen_doit (void *a)
- {
-   struct dlmopen_args *args = (struct dlmopen_args *) a;
--  args->map = _dl_open (args->fname, RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT,
-+  args->map = _dl_open (args->fname,
-+			(RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT
-+			 | __RTLD_SECURE),
- 			dl_main, LM_ID_NEWLM, _dl_argc, INTUSE(_dl_argv),
- 			__environ);
- }
-@@ -806,8 +806,7 @@ do_preload (char *fname, struct link_map *main_map, const char *where)
- 
-   args.str = fname;
-   args.loader = main_map;
--  args.is_preloaded = 1;
--  args.mode = 0;
-+  args.mode = __RTLD_SECURE;
- 
-   unsigned int old_nloaded = GL(dl_ns)[LM_ID_BASE]._ns_nloaded;
- 
-@@ -1054,7 +1053,6 @@ of this helper program; chances are you did not intend to run this program.\n\
- 
- 	  args.str = rtld_progname;
- 	  args.loader = NULL;
--	  args.is_preloaded = 0;
- 	  args.mode = __RTLD_OPENEXEC;
- 	  (void) _dl_catch_error (&objname, &err_str, &malloced, map_doit,
- 				  &args);
-@@ -1066,7 +1064,7 @@ of this helper program; chances are you did not intend to run this program.\n\
-       else
- 	{
- 	  HP_TIMING_NOW (start);
--	  _dl_map_object (NULL, rtld_progname, 0, lt_library, 0,
-+	  _dl_map_object (NULL, rtld_progname, lt_library, 0,
- 			  __RTLD_OPENEXEC, LM_ID_BASE);
- 	  HP_TIMING_NOW (stop);
- 
-diff --git a/include/dlfcn.h b/include/dlfcn.h
-index a67426d..af92483 100644
---- a/include/dlfcn.h
-+++ b/include/dlfcn.h
-@@ -9,6 +9,7 @@
- #define __RTLD_OPENEXEC	0x20000000
- #define __RTLD_CALLMAP	0x10000000
- #define __RTLD_AUDIT	0x08000000
-+#define __RTLD_SECURE	0x04000000 /* Apply additional security checks.  */
- 
- #define __LM_ID_CALLER	-2
- 
-diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
-index fcc943b..fa4b6b2 100644
---- a/sysdeps/generic/ldsodefs.h
-+++ b/sysdeps/generic/ldsodefs.h
-@@ -824,11 +824,9 @@ extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *),
- 
- /* Open the shared object NAME and map in its segments.
-    LOADER's DT_RPATH is used in searching for NAME.
--   If the object is already opened, returns its existing map.
--   For preloaded shared objects PRELOADED is set to a non-zero
--   value to allow additional security checks.  */
-+   If the object is already opened, returns its existing map.  */
- extern struct link_map *_dl_map_object (struct link_map *loader,
--					const char *name, int preloaded,
-+					const char *name,
- 					int type, int trace_mode, int mode,
- 					Lmid_t nsid)
-      internal_function attribute_hidden;

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dont-expand-dst-twice.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dont-expand-dst-twice.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dont-expand-dst-twice.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,45 +0,0 @@
-2010-10-18  Andreas Schwab  <schwab@redhat.com>
-
-	* elf/dl-open.c (dl_open_worker): Don't expand DST here, let
-	_dl_map_object do it.
-
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 754a263..c394b3f 100644
---- a/elf/dl-open.c
-+++ b/elf/dl-open.c
-@@ -221,35 +221,6 @@ dl_open_worker (void *a)
- 
-   assert (_dl_debug_initialize (0, args->nsid)->r_state == RT_CONSISTENT);
- 
--  /* Maybe we have to expand a DST.  */
--  if (__builtin_expect (dst != NULL, 0))
--    {
--      size_t len = strlen (file);
--
--      /* Determine how much space we need.  We have to allocate the
--	 memory locally.  */
--      size_t required = DL_DST_REQUIRED (call_map, file, len,
--					 _dl_dst_count (dst, 0));
--
--      /* Get space for the new file name.  */
--      char *new_file = (char *) alloca (required + 1);
--
--      /* Generate the new file name.  */
--      _dl_dst_substitute (call_map, file, new_file, 0);
--
--      /* If the substitution failed don't try to load.  */
--      if (*new_file == '\0')
--	_dl_signal_error (0, "dlopen", NULL,
--			  N_("empty dynamic string token substitution"));
--
--      /* Now we have a new file name.  */
--      file = new_file;
--
--      /* It does not matter whether call_map is set even if we
--	 computed it only because of the DST.  Since the path contains
--	 a slash the value is not used.  See dl-load.c.  */
--    }
--
-   /* Load the named object.  */
-   struct link_map *new;
-   args->map = new = _dl_map_object (call_map, file, 0, lt_loaded, 0,

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-flush-cache-textrels.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-flush-cache-textrels.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-flush-cache-textrels.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,27 +0,0 @@
-2010-06-02  Kirill A. Shutemov  <kirill@shutemov.name>
-
-	* elf/dl-reloc.c: Flush cache after solving TEXTRELs if arch
-	requires it.
-
-diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
-index 6c00691..23cb59c 100644
---- a/elf/dl-reloc.c
-+++ b/elf/dl-reloc.c
-@@ -1,5 +1,5 @@
- /* Relocate a shared object and resolve its references to other loaded objects.
--   Copyright (C) 1995-2006, 2008, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2006, 2008, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -307,6 +307,10 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
- 	  goto call_error;
- 	}
- 
-+#ifdef CLEAR_CACHE
-+      CLEAR_CACHE (textrels->start, textrels->start + textrels->len);
-+#endif
-+
-       textrels = textrels->next;
-     }
- 

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-futimens.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-futimens.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-futimens.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,18 +0,0 @@
-2009-12-21  Ulrich Drepper  <drepper@redhat.com>
-
-	* sysdeps/unix/sysv/linux/futimens.c: Handle AT_FDCWD.
-
---- a/sysdeps/unix/sysv/linux/futimens.c
-+++ b/sysdeps/unix/sysv/linux/futimens.c
-@@ -33,6 +33,11 @@ int
- futimens (int fd, const struct timespec tsp[2])
- {
- #ifdef __NR_utimensat
-+  if (fd < 0)
-+    {
-+      __set_errno (EBADF);
-+      return -1;
-+    }
-   return INLINE_SYSCALL (utimensat, 4, fd, NULL, tsp, 0);
- #else
-   __set_errno (ENOSYS);

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-getaddrinfo.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-getaddrinfo.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-getaddrinfo.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,40 +0,0 @@
-2010-03-26  Ulrich Drepper  <drepper@redhat.com>
-
-	* sysdeps/posix/getaddrinfo.c (gaih_inet): Don't assume success always
-	means aborting the loop over the NSS methods.
- 
----
- sysdeps/posix/getaddrinfo.c |   21 +++++++++++----------
- 1 file changed, 11 insertions(+), 10 deletions(-)
-
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -817,17 +817,18 @@
- 				    canon = name;
- 				}
- 			    }
--
--			  break;
-+			  status = NSS_STATUS_SUCCESS;
-+			}
-+		      else
-+			{
-+			  /* We can have different states for AF_INET and
-+			     AF_INET6.  Try to find a useful one for both.  */
-+			  if (inet6_status == NSS_STATUS_TRYAGAIN)
-+			    status = NSS_STATUS_TRYAGAIN;
-+			  else if (status == NSS_STATUS_UNAVAIL
-+				   && inet6_status != NSS_STATUS_UNAVAIL)
-+			    status = inet6_status;
- 			}
--
--		      /* We can have different states for AF_INET and
--			 AF_INET6.  Try to find a useful one for both.  */
--		      if (inet6_status == NSS_STATUS_TRYAGAIN)
--			status = NSS_STATUS_TRYAGAIN;
--		      else if (status == NSS_STATUS_UNAVAIL
--			       && inet6_status != NSS_STATUS_UNAVAIL)
--			status = inet6_status;
- 		    }
- 		  else
- 		    status = NSS_STATUS_UNAVAIL;

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glob.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glob.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glob.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,272 +0,0 @@
-2010-03-27  Ulrich Drepper  <drepper@redhat.com>
-
-	* posix/glob.c (glob): Initialize oldcount early, too.
-
-2010-03-24  Ulrich Drepper  <drepper@redhat.com>
-	    Andreas Schwab  <andreas@redhat.com>
-
-	* posix/glob.c (glob): Clean up gl_pathc and gl_pathv earlier.
-	If pattern is "" bail out early
-
----
- posix/glob.c        |   52 ++++++++++++++++++++----------------
- posix/tst-gnuglob.c |   75 +++++++++++++++++++++++++++++++++++++---------------
- 2 files changed, 83 insertions(+), 44 deletions(-)
-
---- a/posix/glob.c
-+++ b/posix/glob.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007, 2008
-+/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -421,6 +421,26 @@
- 	}
-     }
- 
-+  if (!(flags & GLOB_APPEND))
-+    {
-+      pglob->gl_pathc = 0;
-+      if (!(flags & GLOB_DOOFFS))
-+	pglob->gl_pathv = NULL;
-+      else
-+	{
-+	  size_t i;
-+	  pglob->gl_pathv = (char **) malloc ((pglob->gl_offs + 1)
-+					      * sizeof (char *));
-+	  if (pglob->gl_pathv == NULL)
-+	    return GLOB_NOSPACE;
-+
-+	  for (i = 0; i <= pglob->gl_offs; ++i)
-+	    pglob->gl_pathv[i] = NULL;
-+	}
-+    }
-+
-+  oldcount = pglob->gl_pathc + pglob->gl_offs;
-+
-   /* Find the filename.  */
-   filename = strrchr (pattern, '/');
- #if defined __MSDOS__ || defined WINDOWS32
-@@ -448,6 +468,12 @@
- 	}
-       else
- 	{
-+	  if (__builtin_expect (pattern[0] == '\0', 0))
-+	    {
-+	      dirs.gl_pathv = NULL;
-+	      goto no_matches;
-+	    }
-+
- 	  filename = pattern;
- #ifdef _AMIGA
- 	  dirname = "";
-@@ -495,7 +521,7 @@
- 
-       if (filename[0] == '\0'
- #if defined __MSDOS__ || defined WINDOWS32
--          && dirname[dirlen - 1] != ':'
-+	  && dirname[dirlen - 1] != ':'
- 	  && (dirlen < 3 || dirname[dirlen - 2] != ':'
- 	      || dirname[dirlen - 1] != '/')
- #endif
-@@ -532,26 +558,6 @@
- 	}
-     }
- 
--  if (!(flags & GLOB_APPEND))
--    {
--      pglob->gl_pathc = 0;
--      if (!(flags & GLOB_DOOFFS))
--        pglob->gl_pathv = NULL;
--      else
--	{
--	  size_t i;
--	  pglob->gl_pathv = (char **) malloc ((pglob->gl_offs + 1)
--					      * sizeof (char *));
--	  if (pglob->gl_pathv == NULL)
--	    return GLOB_NOSPACE;
--
--	  for (i = 0; i <= pglob->gl_offs; ++i)
--	    pglob->gl_pathv[i] = NULL;
--	}
--    }
--
--  oldcount = pglob->gl_pathc + pglob->gl_offs;
--
- #ifndef VMS
-   if ((flags & (GLOB_TILDE|GLOB_TILDE_CHECK)) && dirname[0] == '~')
-     {
-@@ -567,7 +573,7 @@
- # else
- #  ifdef WINDOWS32
- 	  if (home_dir == NULL || home_dir[0] == '\0')
--            home_dir = "c:/users/default"; /* poor default */
-+	    home_dir = "c:/users/default"; /* poor default */
- #  else
- #   if ! _LIBC || __OPTION_EGLIBC_GETLOGIN
- 	  if (home_dir == NULL || home_dir[0] == '\0')
---- a/posix/tst-gnuglob.c
-+++ b/posix/tst-gnuglob.c
-@@ -1,6 +1,6 @@
- /* Test the GNU extensions in glob which allow the user to provide callbacks
-    for the filesystem access functions.
--   Copyright (C) 2001-2002, 2007 Free Software Foundation, Inc.
-+   Copyright (C) 2001-2002, 2007, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
- 
-@@ -61,9 +61,9 @@
-       { "..", 3, DT_DIR },
-       { ".foo", 3, DT_REG },
-       { "dir1lev3", 3, DT_DIR },
--        { ".", 4, DT_DIR },
--        { "..", 4, DT_DIR },
--        { "file1lev4", 4, DT_REG },
-+	{ ".", 4, DT_DIR },
-+	{ "..", 4, DT_DIR },
-+	{ "file1lev4", 4, DT_REG },
-       { "file1lev3", 3, DT_REG },
-       { "file2lev3", 3, DT_REG },
-     { "file2lev2", 2, DT_REG },
-@@ -81,9 +81,9 @@
-       { "..", 3, DT_DIR },
-       { ".foo", 3, DT_REG },
-       { ".dir", 3, DT_DIR },
--        { ".", 4, DT_DIR },
--        { "..", 4, DT_DIR },
--        { "hidden", 4, DT_REG }
-+	{ ".", 4, DT_DIR },
-+	{ "..", 4, DT_DIR },
-+	{ "hidden", 4, DT_REG }
- };
- #define nfiles (sizeof (filesystem) / sizeof (filesystem[0]))
- 
-@@ -283,7 +283,7 @@
- static const char *
- flagstr (int flags)
- {
--  const char *strs[] =
-+  static const char *const strs[] =
-   {
-     "GLOB_ERR", "GLOB_MARK", "GLOB_NOSORT", "GLOB_DOOFSS", "GLOB_NOCHECK",
-     "GLOB_APPEND", "GLOB_NOESCAPE", "GLOB_PERIOD", "GLOB_MAGCHAR",
-@@ -312,6 +312,29 @@
-     }
- 
-   return buf;
-+#undef nstrs
-+}
-+
-+
-+static const char *
-+errstr (int val)
-+{
-+  static const char *const strs[] =
-+    {
-+      [GLOB_NOSPACE] = "GLOB_NOSPACE",
-+      [GLOB_ABORTED] = "GLOB_ABORTED",
-+      [GLOB_NOMATCH] = "GLOB_NOMATCH",
-+      [GLOB_NOSYS] = "GLOB_NOSYS"
-+    };
-+#define nstrs (sizeof (strs) / sizeof (strs[0]))
-+  static char buf[100];
-+  if (val < 0 || val >= nstrs || strs[val] == NULL)
-+    {
-+      snprintf (buf, sizeof (buf), "GLOB_??? (%d)", val);
-+      return buf;
-+    }
-+  return strs[val];
-+#undef nstrs
- }
- 
- 
-@@ -376,28 +399,34 @@
-   gl.gl_lstat = my_stat;
-   gl.gl_stat = my_stat;
- 
--#define test(a, b, c...) \
-+#define test(a, b, r, c...) \
-   fmt = a;								      \
--  flags = b;								      \
-+  flags = GLOB_ALTDIRFUNC | b;						      \
-   errval = glob (fmt, flags, NULL, &gl);				      \
--  if (errval != 0)							      \
-+  if (errval != r)							      \
-     {									      \
--      printf ("glob (\"%s\", %s) failed: %s\n", fmt, flagstr (flags),	      \
--	      errval >= 0 && errval < nglob_errstring			      \
--	      ? glob_errstring[errval] : "???");			      \
-+      if (r == 0)							      \
-+	printf ("glob (\"%s\", %s) failed: %s\n", fmt, flagstr (flags),	      \
-+		errval >= 0 && errval < nglob_errstring			      \
-+		? glob_errstring[errval] : "???");			      \
-+      else								      \
-+	printf ("glob (\"%s\", %s) did not fail\n", fmt, flagstr (flags));    \
-       result = 1;							      \
-     }									      \
-+  else if (r == 0)							      \
-+    result |= test_result (fmt, flags, &gl, (const char *[]) { c, NULL });    \
-   else									      \
--    result |= test_result (fmt, flags, &gl, (const char *[]) { c, NULL })
-+    printf ("result for glob (\"%s\", %s) = %s\n\n", fmt, flagstr (flags),    \
-+	    errstr (errval))
- 
--  test ("*/*/*", GLOB_ALTDIRFUNC,
-+  test ("*/*/*", 0, 0,
- 	"dir1lev1/dir2lev2/dir1lev3",
- 	"dir1lev1/dir2lev2/file1lev3",
- 	"dir1lev1/dir2lev2/file2lev3",
- 	"dir1lev1/dir3lev2/file3lev3",
- 	"dir1lev1/dir3lev2/file4lev3");
- 
--  test ("*/*/*", GLOB_ALTDIRFUNC | GLOB_PERIOD,
-+  test ("*/*/*", GLOB_PERIOD, 0,
- 	"dir1lev1/dir1lev2/.",
- 	"dir1lev1/dir1lev2/..",
- 	"dir1lev1/dir2lev2/.",
-@@ -415,7 +444,7 @@
- 	"dir2lev1/dir1lev2/.dir",
- 	"dir2lev1/dir1lev2/.foo");
- 
--  test ("*/*/.*", GLOB_ALTDIRFUNC,
-+  test ("*/*/.*", 0, 0,
- 	"dir1lev1/dir1lev2/.",
- 	"dir1lev1/dir1lev2/..",
- 	"dir1lev1/dir2lev2/.",
-@@ -428,7 +457,7 @@
- 	"dir2lev1/dir1lev2/.dir",
- 	"dir2lev1/dir1lev2/.foo");
- 
--  test ("*1*/*2*/.*", GLOB_ALTDIRFUNC,
-+  test ("*1*/*2*/.*", 0, 0,
- 	"dir1lev1/dir1lev2/.",
- 	"dir1lev1/dir1lev2/..",
- 	"dir1lev1/dir2lev2/.",
-@@ -441,7 +470,7 @@
- 	"dir2lev1/dir1lev2/.dir",
- 	"dir2lev1/dir1lev2/.foo");
- 
--  test ("*1*/*1*/.*", GLOB_ALTDIRFUNC,
-+  test ("*1*/*1*/.*", 0, 0,
- 	"dir1lev1/dir1lev2/.",
- 	"dir1lev1/dir1lev2/..",
- 	"dir2lev1/dir1lev2/.",
-@@ -449,12 +478,16 @@
- 	"dir2lev1/dir1lev2/.dir",
- 	"dir2lev1/dir1lev2/.foo");
- 
--  test ("\\/*", GLOB_ALTDIRFUNC,
-+  test ("\\/*", 0, 0,
- 	"/dir1lev1",
- 	"/dir2lev1",
- 	"/file1lev1",
- 	"/file2lev1");
- 
-+  test ("", 0, GLOB_NOMATCH, NULL);
-+
-+  test ("", GLOB_NOCHECK, 0, "");
-+
-   globfree (&gl);
- 
-   return result;

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-ignore-origin-privileged.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-ignore-origin-privileged.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-ignore-origin-privileged.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,20 +0,0 @@
-2010-12-13  Andreas Schwab  <schwab@redhat.com>
-
-	* elf/dl-object.c (_dl_new_object): Ignore origin of privileged
-	program.
-
- 	* posix/fnmatch_loop.c (NEW_PATTERN): Fix use of alloca.
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 5d15ce1..a34e902 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -220,6 +220,9 @@ _dl_new_object (char *realname, const char *libname, int type,
-     out:
-       new->l_origin = origin;
-     }
-+  else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+    /* The origin of a privileged program cannot be trusted.  */
-+    new->l_origin = (char *) -1;
- 
-   return new;
- }

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-malloc_info-init.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-malloc_info-init.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-malloc_info-init.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,78 +0,0 @@
-2010-01-14  Ulrich Drepper  <drepper@redhat.com>
- 
-	[BZ #11126]
-	* malloc/malloc.c (malloc_info): Initialize malloc if not already
-	done.  Handle empty bin lists.
- 
----
- malloc/malloc.c |   41 ++++++++++++++++++++++++-----------------
- 1 file changed, 24 insertions(+), 17 deletions(-)
-
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -6372,16 +6372,19 @@
- 
-     mbinptr bin = bin_at (ar_ptr, 1);
-     struct malloc_chunk *r = bin->fd;
--    while (r != bin)
-+    if (r != NULL)
-       {
--	++sizes[NFASTBINS].count;
--	sizes[NFASTBINS].total += r->size;
--	sizes[NFASTBINS].from = MIN (sizes[NFASTBINS].from, r->size);
--	sizes[NFASTBINS].to = MAX (sizes[NFASTBINS].to, r->size);
--	r = r->fd;
-+	while (r != bin)
-+	  {
-+	    ++sizes[NFASTBINS].count;
-+	    sizes[NFASTBINS].total += r->size;
-+	    sizes[NFASTBINS].from = MIN (sizes[NFASTBINS].from, r->size);
-+	    sizes[NFASTBINS].to = MAX (sizes[NFASTBINS].to, r->size);
-+	    r = r->fd;
-+	  }
-+	nblocks += sizes[NFASTBINS].count;
-+	avail += sizes[NFASTBINS].total;
-       }
--    nblocks += sizes[NFASTBINS].count;
--    avail += sizes[NFASTBINS].total;
- 
-     for (size_t i = 2; i < NBINS; ++i)
-       {
-@@ -6391,17 +6394,18 @@
- 	sizes[NFASTBINS - 1 + i].to = sizes[NFASTBINS - 1 + i].total
- 	  = sizes[NFASTBINS - 1 + i].count = 0;
- 
--	while (r != bin)
--	  {
--	    ++sizes[NFASTBINS - 1 + i].count;
--	    sizes[NFASTBINS - 1 + i].total += r->size;
--	    sizes[NFASTBINS - 1 + i].from = MIN (sizes[NFASTBINS - 1 + i].from,
-+	if (r != NULL)
-+	  while (r != bin)
-+	    {
-+	      ++sizes[NFASTBINS - 1 + i].count;
-+	      sizes[NFASTBINS - 1 + i].total += r->size;
-+	      sizes[NFASTBINS - 1 + i].from
-+		= MIN (sizes[NFASTBINS - 1 + i].from, r->size);
-+	      sizes[NFASTBINS - 1 + i].to = MAX (sizes[NFASTBINS - 1 + i].to,
- 						 r->size);
--	    sizes[NFASTBINS - 1 + i].to = MAX (sizes[NFASTBINS - 1 + i].to,
--					       r->size);
- 
--	    r = r->fd;
--	  }
-+	      r = r->fd;
-+	    }
- 
- 	if (sizes[NFASTBINS - 1 + i].count == 0)
- 	  sizes[NFASTBINS - 1 + i].from = 0;
-@@ -6463,6 +6467,9 @@
-     fputs ("</heap>\n", fp);
-   }
- 
-+  if(__malloc_initialized < 0)
-+    ptmalloc_init ();
-+
-   fputs ("<malloc version=\"1\">\n", fp);
- 
-   /* Iterate over all arenas currently in use.  */

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-redirect-throw.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-redirect-throw.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-redirect-throw.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,99 +0,0 @@
-2010-06-07  Jakub Jelinek  <jakub@redhat.com>
-
-	* libio/stdio.h (sscanf, vsscanf): Use __REDIRECT_NTH instead of
-	__REDIRECT followed by __THROW.
-	* wcsmbs/wchar.h (swscanf, vswscanf): Likewise.
-	* posix/getopt.h (getopt): Likewise.
-
-diff --git a/libio/stdio.h b/libio/stdio.h
-index 85542b1..bf16b3f 100644
---- a/libio/stdio.h
-+++ b/libio/stdio.h
-@@ -447,9 +447,9 @@ extern int __REDIRECT (fscanf, (FILE *__restrict __stream,
- 		       __isoc99_fscanf) __wur;
- extern int __REDIRECT (scanf, (__const char *__restrict __format, ...),
- 		       __isoc99_scanf) __wur;
--extern int __REDIRECT (sscanf, (__const char *__restrict __s,
--				__const char *__restrict __format, ...),
--		       __isoc99_sscanf) __THROW;
-+extern int __REDIRECT_NTH (sscanf, (__const char *__restrict __s,
-+				    __const char *__restrict __format, ...),
-+			   __isoc99_sscanf);
- # else
- extern int __isoc99_fscanf (FILE *__restrict __stream,
- 			    __const char *__restrict __format, ...) __wur;
-@@ -501,11 +501,11 @@ extern int __REDIRECT (vfscanf,
- extern int __REDIRECT (vscanf, (__const char *__restrict __format,
- 				_G_va_list __arg), __isoc99_vscanf)
-      __attribute__ ((__format__ (__scanf__, 1, 0))) __wur;
--extern int __REDIRECT (vsscanf,
--		       (__const char *__restrict __s,
--			__const char *__restrict __format, _G_va_list __arg),
--		       __isoc99_vsscanf)
--     __THROW __attribute__ ((__format__ (__scanf__, 2, 0)));
-+extern int __REDIRECT_NTH (vsscanf,
-+			   (__const char *__restrict __s,
-+			    __const char *__restrict __format,
-+			    _G_va_list __arg), __isoc99_vsscanf)
-+     __attribute__ ((__format__ (__scanf__, 2, 0)));
- #  else
- extern int __isoc99_vfscanf (FILE *__restrict __s,
- 			     __const char *__restrict __format,
-diff --git a/posix/getopt.h b/posix/getopt.h
-index ff0251d..6e2fa27 100644
---- a/posix/getopt.h
-+++ b/posix/getopt.h
-@@ -1,5 +1,5 @@
- /* Declarations for getopt.
--   Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009
-+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009,2010
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -158,9 +158,9 @@ extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
-    additional functionality can be disable at runtime.  This redirection
-    helps to also do this at runtime.  */
- #  ifdef __REDIRECT
--  extern int __REDIRECT (getopt, (int ___argc, char *const *___argv,
--				  const char *__shortopts),
--			 __posix_getopt) __THROW;
-+  extern int __REDIRECT_NTH (getopt, (int ___argc, char *const *___argv,
-+				      const char *__shortopts),
-+			     __posix_getopt);
- #  else
- extern int __posix_getopt (int ___argc, char *const *___argv,
- 			   const char *__shortopts) __THROW;
-diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
-index 5a4e10e..061b105 100644
---- a/wcsmbs/wchar.h
-+++ b/wcsmbs/wchar.h
-@@ -658,10 +658,10 @@ extern int __REDIRECT (fwscanf, (__FILE *__restrict __stream,
- extern int __REDIRECT (wscanf, (__const wchar_t *__restrict __format, ...),
- 		       __isoc99_wscanf)
-      /* __attribute__ ((__format__ (__wscanf__, 1, 2))) */;
--extern int __REDIRECT (swscanf, (__const wchar_t *__restrict __s,
--				 __const wchar_t *__restrict __format, ...),
--		       __isoc99_swscanf)
--     __THROW /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
-+extern int __REDIRECT_NTH (swscanf, (__const wchar_t *__restrict __s,
-+				     __const wchar_t *__restrict __format,
-+				     ...), __isoc99_swscanf)
-+     /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
- #  else
- extern int __isoc99_fwscanf (__FILE *__restrict __stream,
- 			     __const wchar_t *__restrict __format, ...);
-@@ -712,10 +712,10 @@ extern int __REDIRECT (vfwscanf, (__FILE *__restrict __s,
- extern int __REDIRECT (vwscanf, (__const wchar_t *__restrict __format,
- 				 __gnuc_va_list __arg), __isoc99_vwscanf)
-      /* __attribute__ ((__format__ (__wscanf__, 1, 0))) */;
--extern int __REDIRECT (vswscanf, (__const wchar_t *__restrict __s,
--				  __const wchar_t *__restrict __format,
--				  __gnuc_va_list __arg), __isoc99_vswscanf)
--     __THROW /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
-+extern int __REDIRECT_NTH (vswscanf, (__const wchar_t *__restrict __s,
-+				      __const wchar_t *__restrict __format,
-+				      __gnuc_va_list __arg), __isoc99_vswscanf)
-+     /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
- #  else
- extern int __isoc99_vfwscanf (__FILE *__restrict __s,
- 			      __const wchar_t *__restrict __format,

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-remove.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-remove.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-remove.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,47 +0,0 @@
-commit cb652f30b0aa17e65803962305e052e509a5316d
-Author: Ulrich Drepper <drepper@redhat.com>
-Date:   Sun Apr 4 02:08:37 2010 -0700
-
-    Handle POSIX-compliant errno value of unlink in remove.
-
----
- sysdeps/posix/remove.c           |   10 ++++++++--
- sysdeps/unix/sysv/linux/remove.c |    2 ++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
---- a/sysdeps/posix/remove.c
-+++ b/sysdeps/posix/remove.c
-@@ -1,5 +1,5 @@
- /* ANSI C `remove' function to delete a file or directory.  POSIX.1 version.
--   Copyright (C) 1995,96,97,2002,2003 Free Software Foundation, Inc.
-+   Copyright (C) 1995,96,97,2002,2003,2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -21,6 +21,12 @@
- #include <stdio.h>
- #include <unistd.h>
- 
-+
-+#ifndef IS_NO_DIRECTORY_ERROR
-+# define IS_NO_DIRECTORY_ERROR errno != EPERM
-+#endif
-+
-+
- int
- remove (file)
-      const char *file;
-@@ -28,7 +34,7 @@
-   /* First try to unlink since this is more frequently the necessary action. */
-   if (__unlink (file) != 0
-       /* If it is indeed a directory...  */
--      && (errno != EISDIR
-+      && (IS_NO_DIRECTORY_ERROR
- 	  /* ...try to remove it.  */
- 	  || __rmdir (file) != 0))
-     /* Cannot remove the object for whatever reason.  */
---- /dev/null
-+++ b/sysdeps/unix/sysv/linux/remove.c
-@@ -0,0 +1,2 @@
-+#define IS_NO_DIRECTORY_ERROR errno != EISDIR
-+#include <sysdeps/posix/remove.c>

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-resolv-bindv6only.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-resolv-bindv6only.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-resolv-bindv6only.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,97 +0,0 @@
-2010-01-14  Ulrich Drepper  <drepper@redhat.com>
- 
-	[BZ #11141]
-	* resolv/res_send.c (reopen): Don't use IPv6 sockets for IPv4
-	addresses.
-
----
- resolv/res_send.c |   44 +++++++++-----------------------------------
- 1 file changed, 9 insertions(+), 35 deletions(-)
-
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -199,10 +199,6 @@
- #endif
- static int		sock_eq(struct sockaddr_in6 *, struct sockaddr_in6 *);
- 
--/* Reachover. */
--
--static void convaddr4to6(struct sockaddr_in6 *sa);
--
- /* Public. */
- 
- /* int
-@@ -911,10 +907,12 @@
- reopen (res_state statp, int *terrno, int ns)
- {
- 	if (EXT(statp).nssocks[ns] == -1) {
--		struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns];
-+		struct sockaddr *nsap
-+		  = (struct sockaddr *) EXT(statp).nsaddrs[ns];
-+		socklen_t slen;
- 
- 		/* only try IPv6 if IPv6 NS and if not failed before */
--		if ((EXT(statp).nscount6 > 0) && !statp->ipv6_unavail) {
-+		if (nsap->sa_family == AF_INET6 && !statp->ipv6_unavail) {
- 			if (__builtin_expect (__have_o_nonblock >= 0, 1)) {
- 				EXT(statp).nssocks[ns] =
- 				  socket(PF_INET6, SOCK_DGRAM|SOCK_NONBLOCK,
-@@ -931,12 +929,8 @@
- 				  socket(PF_INET6, SOCK_DGRAM, 0);
- 			if (EXT(statp).nssocks[ns] < 0)
- 			    statp->ipv6_unavail = errno == EAFNOSUPPORT;
--			/* If IPv6 socket and nsap is IPv4, make it
--			   IPv4-mapped */
--			else if (nsap->sin6_family == AF_INET)
--			    convaddr4to6(nsap);
--		}
--		if (EXT(statp).nssocks[ns] < 0) {
-+			slen = sizeof (struct sockaddr_in6);
-+		} else if (nsap->sa_family == AF_INET) {
- 			if (__builtin_expect (__have_o_nonblock >= 0, 1)) {
- 				EXT(statp).nssocks[ns]
- 				  = socket(PF_INET, SOCK_DGRAM|SOCK_NONBLOCK,
-@@ -951,6 +945,7 @@
- 			if (__builtin_expect (__have_o_nonblock < 0, 0))
- 				EXT(statp).nssocks[ns]
- 				  = socket(PF_INET, SOCK_DGRAM, 0);
-+			slen = sizeof (struct sockaddr_in);
- 		}
- 		if (EXT(statp).nssocks[ns] < 0) {
- 			*terrno = errno;
-@@ -969,10 +964,8 @@
- 		 * error message is received.  We can thus detect
- 		 * the absence of a nameserver without timing out.
- 		 */
--		if (connect(EXT(statp).nssocks[ns], (struct sockaddr *)nsap,
--			    sizeof *nsap) < 0) {
--			Aerror(statp, stderr, "connect(dg)", errno,
--			       (struct sockaddr *) nsap);
-+		if (connect(EXT(statp).nssocks[ns], nsap, slen) < 0) {
-+			Aerror(statp, stderr, "connect(dg)", errno, nsap);
- 			__res_iclose(statp, false);
- 			return (0);
- 		}
-@@ -1415,22 +1408,3 @@
- 		(a1->sin6_addr.s6_addr32[3] ==
- 		 ((struct sockaddr_in *)a2)->sin_addr.s_addr));
- }
--
--/*
-- * Converts IPv4 family, address and port to
-- * IPv6 family, IPv4-mapped IPv6 address and port.
-- */
--static void
--convaddr4to6(struct sockaddr_in6 *sa)
--{
--    struct sockaddr_in *sa4p = (struct sockaddr_in *) sa;
--    in_port_t port = sa4p->sin_port;
--    in_addr_t addr = sa4p->sin_addr.s_addr;
--
--    sa->sin6_family = AF_INET6;
--    sa->sin6_port = port;
--    sa->sin6_addr.s6_addr32[0] = 0;
--    sa->sin6_addr.s6_addr32[1] = 0;
--    sa->sin6_addr.s6_addr32[2] = htonl(0xFFFF);
--    sa->sin6_addr.s6_addr32[3] = addr;
--}

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-stat-issock.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-stat-issock.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-stat-issock.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,30 +0,0 @@
-2010-04-04  Ulrich Drepper  <drepper@redhat.com>
- 
-	[BZ #11279]
-	* io/sys/stat.h: Always define S_ISSOCK for XPG6 and up.
-
----
- io/sys/stat.h |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/io/sys/stat.h
-+++ b/io/sys/stat.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007, 2009
-+/* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007, 2009, 2010
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -143,9 +143,11 @@
- # define S_ISLNK(mode)  0
- #endif
- 
--#if (defined __USE_BSD || defined __USE_UNIX98) \
-+#if (defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K) \
-     && defined __S_IFSOCK
- # define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK)
-+#elif defined __USE_XOPEN2K
-+# define S_ISSOCK(mode) 0
- #endif
- 
- /* These are from POSIX.1b.  If the objects are not implemented using separate

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-sunrpc-license.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-sunrpc-license.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-sunrpc-license.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,2852 +0,0 @@
-2010-09-01  Ulrich Drepper  <drepper@redhat.com>
- 
-	* nis/rpcsvc/nis.h: Update copyright notice.
-	* nis/rpcsvc/nis.x: Likewise.
-	* nis/rpcsvc/nis_callback.h: Likewise.
-	* nis/rpcsvc/nis_callback.x: Likewise.
-	* nis/rpcsvc/nis_object.x: Likewise.
-	* nis/rpcsvc/nis_tags.h: Likewise.
-	* nis/rpcsvc/yp.h: Likewise.
-	* nis/rpcsvc/yp.x: Likewise.
-	* nis/rpcsvc/ypupd.h: Likewise.
-	* nis/yp_xdr.c: Likewise.
-	* nis/ypupdate_xdr.c: Likewise.
-
-2010-08-20  Petr Baudis  <pasky@suse.cz>
-
-	* LICENSES: Sync the sunrpc license.
-
-2010-08-19  Ulrich Drepper  <drepper@redhat.com>
- 
-	* sunrpc/auth_des.c: Update copyright notice once again.
-	* sunrpc/auth_none.c: Likewise.
-	* sunrpc/auth_unix.c: Likewise.
-	* sunrpc/authdes_prot.c: Likewise.
-	* sunrpc/authuxprot.c: Likewise.
-	* sunrpc/bindrsvprt.c: Likewise.
-	* sunrpc/clnt_gen.c: Likewise.
-	* sunrpc/clnt_perr.c: Likewise.
-	* sunrpc/clnt_raw.c: Likewise.
-	* sunrpc/clnt_simp.c: Likewise.
-	* sunrpc/clnt_tcp.c: Likewise.
-	* sunrpc/clnt_udp.c: Likewise.
-	* sunrpc/clnt_unix.c: Likewise.
-	* sunrpc/des_crypt.c: Likewise.
-	* sunrpc/des_soft.c: Likewise.
-	* sunrpc/get_myaddr.c: Likewise.
-	* sunrpc/getrpcport.c: Likewise.
-	* sunrpc/key_call.c: Likewise.
-	* sunrpc/key_prot.c: Likewise.
-	* sunrpc/openchild.c: Likewise.
-	* sunrpc/pm_getmaps.c: Likewise.
-	* sunrpc/pm_getport.c: Likewise.
-	* sunrpc/pmap_clnt.c: Likewise.
-	* sunrpc/pmap_prot.c: Likewise.
-	* sunrpc/pmap_prot2.c: Likewise.
-	* sunrpc/pmap_rmt.c: Likewise.
-	* sunrpc/rpc/auth.h: Likewise.
-	* sunrpc/rpc/auth_unix.h: Likewise.
-	* sunrpc/rpc/clnt.h: Likewise.
-	* sunrpc/rpc/des_crypt.h: Likewise.
-	* sunrpc/rpc/key_prot.h: Likewise.
-	* sunrpc/rpc/netdb.h: Likewise.
-	* sunrpc/rpc/pmap_clnt.h: Likewise.
-	* sunrpc/rpc/pmap_prot.h: Likewise.
-	* sunrpc/rpc/pmap_rmt.h: Likewise.
-	* sunrpc/rpc/rpc.h: Likewise.
-	* sunrpc/rpc/rpc_des.h: Likewise.
-	* sunrpc/rpc/rpc_msg.h: Likewise.
-	* sunrpc/rpc/svc.h: Likewise.
-	* sunrpc/rpc/svc_auth.h: Likewise.
-	* sunrpc/rpc/types.h: Likewise.
-	* sunrpc/rpc/xdr.h: Likewise.
-	* sunrpc/rpc_clntout.c: Likewise.
-	* sunrpc/rpc_cmsg.c: Likewise.
-	* sunrpc/rpc_common.c: Likewise.
-	* sunrpc/rpc_cout.c: Likewise.
-	* sunrpc/rpc_dtable.c: Likewise.
-	* sunrpc/rpc_hout.c: Likewise.
-	* sunrpc/rpc_main.c: Likewise.
-	* sunrpc/rpc_parse.c: Likewise.
-	* sunrpc/rpc_parse.h: Likewise.
-	* sunrpc/rpc_prot.c: Likewise.
-	* sunrpc/rpc_sample.c: Likewise.
-	* sunrpc/rpc_scan.c: Likewise.
-	* sunrpc/rpc_scan.h: Likewise.
-	* sunrpc/rpc_svcout.c: Likewise.
-	* sunrpc/rpc_tblout.c: Likewise.
-	* sunrpc/rpc_util.c: Likewise.
-	* sunrpc/rpc_util.h: Likewise.
-	* sunrpc/rpcinfo.c: Likewise.
-	* sunrpc/rpcsvc/bootparam_prot.x: Likewise.
-	* sunrpc/rpcsvc/key_prot.x: Likewise.
-	* sunrpc/rpcsvc/klm_prot.x: Likewise.
-	* sunrpc/rpcsvc/mount.x: Likewise.
-	* sunrpc/rpcsvc/nfs_prot.x: Likewise.
-	* sunrpc/rpcsvc/nlm_prot.x: Likewise.
-	* sunrpc/rpcsvc/rex.x: Likewise.
-	* sunrpc/rpcsvc/rstat.x: Likewise.
-	* sunrpc/rpcsvc/rusers.x: Likewise.
-	* sunrpc/rpcsvc/sm_inter.x: Likewise.
-	* sunrpc/rpcsvc/spray.x: Likewise.
-	* sunrpc/rpcsvc/yppasswd.x: Likewise.
-	* sunrpc/rtime.c: Likewise.
-	* sunrpc/svc.c: Likewise.
-	* sunrpc/svc_auth.c: Likewise.
-	* sunrpc/svc_authux.c: Likewise.
-	* sunrpc/svc_raw.c: Likewise.
-	* sunrpc/svc_run.c: Likewise.
-	* sunrpc/svc_simple.c: Likewise.
-	* sunrpc/svc_tcp.c: Likewise.
-	* sunrpc/svc_udp.c: Likewise.
-	* sunrpc/svc_unix.c: Likewise.
-	* sunrpc/svcauth_des.c: Likewise.
-	* sunrpc/xcrypt.c: Likewise.
-	* sunrpc/xdr.c: Likewise.
-	* sunrpc/xdr_array.c: Likewise.
-	* sunrpc/xdr_float.c: Likewise.
-	* sunrpc/xdr_mem.c: Likewise.
-	* sunrpc/xdr_rec.c: Likewise.
-	* sunrpc/xdr_ref.c: Likewise.
-	* sunrpc/xdr_sizeof.c: Likewise.
-	* sunrpc/xdr_stdio.c: Likewise.
-
-diff --git a/LICENSES b/LICENSES
-index b3b8899..1c99d2c 100644
---- a/LICENSES
-+++ b/LICENSES
-@@ -63,30 +63,34 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- The Sun RPC support (from rpcsrc-4.0) is covered by the following
- license:
- 
--Copyright (C) 1984, Sun Microsystems, Inc.
--
--Sun RPC is a product of Sun Microsystems, Inc. and is provided for
--unrestricted use provided that this legend is included on all tape media
--and as a part of the software program in whole or part.  Users may copy
--or modify Sun RPC without charge, but are not authorized to license or
--distribute it to anyone else except as part of a product or program
--developed by the user.
--
--SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
--WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
--PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
--
--Sun RPC is provided with no support and without any obligation on the
--part of Sun Microsystems, Inc. to assist in its use, correction,
--modification or enhancement.
--
--SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
--INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
--OR ANY PART THEREOF.
--
--In no event will Sun Microsystems, Inc. be liable for any lost revenue
--or profits or other special, indirect and consequential damages, even if
--Sun has been advised of the possibility of such damages.
-+Copyright (c) 2010, Oracle America, Inc.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are
-+met:
-+
-+    * Redistributions of source code must retain the above copyright
-+      notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above
-+      copyright notice, this list of conditions and the following
-+      disclaimer in the documentation and/or other materials
-+      provided with the distribution.
-+    * Neither the name of the "Oracle America, Inc." nor the names of its
-+      contributors may be used to endorse or promote products derived
-+      from this software without specific prior written permission.
-+
-+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- 
- The following CMU license covers some of the support code for Mach,
-
-diff --git a/sunrpc/auth_des.c b/sunrpc/auth_des.c
-index acd8eb4..0228562 100644
---- a/sunrpc/auth_des.c
-+++ b/sunrpc/auth_des.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1988 by Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/auth_none.c b/sunrpc/auth_none.c
-index b78f1e1..57b3418 100644
---- a/sunrpc/auth_none.c
-+++ b/sunrpc/auth_none.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
-index 3a371c7..301055b 100644
---- a/sunrpc/auth_unix.c
-+++ b/sunrpc/auth_unix.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/authdes_prot.c b/sunrpc/authdes_prot.c
-index 392e0ff..0d1b535 100644
---- a/sunrpc/authdes_prot.c
-+++ b/sunrpc/authdes_prot.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1988 by Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/authuxprot.c b/sunrpc/authuxprot.c
-index 979cd68..74db8a2 100644
---- a/sunrpc/authuxprot.c
-+++ b/sunrpc/authuxprot.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/bindrsvprt.c b/sunrpc/bindrsvprt.c
-index 22aaecd..d493c9f 100644
---- a/sunrpc/bindrsvprt.c
-+++ b/sunrpc/bindrsvprt.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1987 by Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c
-index cbb4dd7..a562f41 100644
---- a/sunrpc/clnt_gen.c
-+++ b/sunrpc/clnt_gen.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 1987, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c
-index 7c860a3..f48c53a 100644
---- a/sunrpc/clnt_perr.c
-+++ b/sunrpc/clnt_perr.c
-@@ -1,7 +1,7 @@
- /*
-  * clnt_perror.c
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c
-index d94032d..7a8030e 100644
---- a/sunrpc/clnt_raw.c
-+++ b/sunrpc/clnt_raw.c
-@@ -1,7 +1,7 @@
- /*
-  * clnt_raw.c
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/clnt_simp.c b/sunrpc/clnt_simp.c
-index 11cdf8d..b7a64e6 100644
---- a/sunrpc/clnt_simp.c
-+++ b/sunrpc/clnt_simp.c
-@@ -2,7 +2,7 @@
-  * clnt_simple.c
-  * Simplified front end to rpc.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c
-index d26a126..8527868 100644
---- a/sunrpc/clnt_tcp.c
-+++ b/sunrpc/clnt_tcp.c
-@@ -1,7 +1,7 @@
- /*
-  * clnt_tcp.c, Implements a TCP/IP based, client side RPC.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
-index 360e26a..6bb1ca3 100644
---- a/sunrpc/clnt_udp.c
-+++ b/sunrpc/clnt_udp.c
-@@ -1,7 +1,7 @@
- /*
-  * clnt_udp.c, Implements a UDP/IP based, client side RPC.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c
-index bca1273..02b1489 100644
---- a/sunrpc/clnt_unix.c
-+++ b/sunrpc/clnt_unix.c
-@@ -1,7 +1,7 @@
- /*
-  * clnt_unix.c, Implements a TCP/IP based, client side RPC.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/des_crypt.c b/sunrpc/des_crypt.c
-index b66589b..57dce6a 100644
---- a/sunrpc/des_crypt.c
-+++ b/sunrpc/des_crypt.c
-@@ -1,6 +1,6 @@
- /*
-  * des_crypt.c, DES encryption library routines
-- * Copyright (C) 1986, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -12,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/des_soft.c b/sunrpc/des_soft.c
-index 4573d9d..20a3214 100644
---- a/sunrpc/des_soft.c
-+++ b/sunrpc/des_soft.c
-@@ -2,6 +2,7 @@
- static char sccsid[] = "@(#)des_soft.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
- #endif
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -12,7 +13,7 @@ static char sccsid[] = "@(#)des_soft.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/get_myaddr.c b/sunrpc/get_myaddr.c
-index 7f20005..1906cfa 100644
---- a/sunrpc/get_myaddr.c
-+++ b/sunrpc/get_myaddr.c
-@@ -2,7 +2,7 @@
-  * get_myaddress.c
-  *
-  * Get client's IP address via ioctl.  This avoids using the yellowpages.
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/getrpcport.c b/sunrpc/getrpcport.c
-index 7786701..07ee8c0 100644
---- a/sunrpc/getrpcport.c
-+++ b/sunrpc/getrpcport.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1985 by Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
-index 3ad066a..4ab6b97 100644
---- a/sunrpc/key_call.c
-+++ b/sunrpc/key_call.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1988 by Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/key_prot.c b/sunrpc/key_prot.c
-index b2eb233..8592bee 100644
---- a/sunrpc/key_prot.c
-+++ b/sunrpc/key_prot.c
-@@ -1,4 +1,4 @@
--/* Copyright (c)  1990, 1991 Sun Microsystems, Inc.
-+/* Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -10,7 +10,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/openchild.c b/sunrpc/openchild.c
-index defd93a..18c7d10 100644
---- a/sunrpc/openchild.c
-+++ b/sunrpc/openchild.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1988 by Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/pm_getmaps.c b/sunrpc/pm_getmaps.c
-index 983b2ba..a62b3c7 100644
---- a/sunrpc/pm_getmaps.c
-+++ b/sunrpc/pm_getmaps.c
-@@ -3,7 +3,7 @@
-  * Client interface to pmap rpc service.
-  * contains pmap_getmaps, which is only tcp service involved
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -15,7 +15,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
-index e37f6e7..66340c0 100644
---- a/sunrpc/pm_getport.c
-+++ b/sunrpc/pm_getport.c
-@@ -2,7 +2,7 @@
-  * pmap_getport.c
-  * Client interface to pmap rpc service.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/pmap_clnt.c b/sunrpc/pmap_clnt.c
-index 64a53b6..965469f 100644
---- a/sunrpc/pmap_clnt.c
-+++ b/sunrpc/pmap_clnt.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/pmap_prot.c b/sunrpc/pmap_prot.c
-index cc57456..8362e12 100644
---- a/sunrpc/pmap_prot.c
-+++ b/sunrpc/pmap_prot.c
-@@ -2,7 +2,7 @@
-  * pmap_prot.c
-  * Protocol for the local binder service, or pmap.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/pmap_prot2.c b/sunrpc/pmap_prot2.c
-index 43e62e3..bd180bc 100644
---- a/sunrpc/pmap_prot2.c
-+++ b/sunrpc/pmap_prot2.c
-@@ -2,7 +2,7 @@
-  * pmap_prot2.c
-  * Protocol for the local binder service, or pmap.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c
-index 15a9591..c07b4b1 100644
---- a/sunrpc/pmap_rmt.c
-+++ b/sunrpc/pmap_rmt.c
-@@ -3,7 +3,7 @@
-  * Client interface to pmap rpc service.
-  * remote call and broadcast service
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -15,7 +15,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/auth.h b/sunrpc/rpc/auth.h
-index 0c26639..d0bee51 100644
---- a/sunrpc/rpc/auth.h
-+++ b/sunrpc/rpc/auth.h
-@@ -1,7 +1,7 @@
- /*
-  * auth.h, Authentication interface.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/auth_unix.h b/sunrpc/rpc/auth_unix.h
-index 268c2b5..2f4ee1d 100644
---- a/sunrpc/rpc/auth_unix.h
-+++ b/sunrpc/rpc/auth_unix.h
-@@ -1,7 +1,7 @@
- /*
-  * auth_unix.h, Protocol for UNIX style authentication parameters for RPC
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/clnt.h b/sunrpc/rpc/clnt.h
-index 5b03b86..7e4228c 100644
---- a/sunrpc/rpc/clnt.h
-+++ b/sunrpc/rpc/clnt.h
-@@ -1,7 +1,7 @@
- /*
-  * clnt.h - Client side remote procedure call interface.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/des_crypt.h b/sunrpc/rpc/des_crypt.h
-index 6e84398..77cca3c 100644
---- a/sunrpc/rpc/des_crypt.h
-+++ b/sunrpc/rpc/des_crypt.h
-@@ -1,8 +1,8 @@
- /*
-- * @(#)des_crypt.h	2.1 88/08/11 4.0 RPCSRC;	from 1.4 88/02/08 (C) 1986 SMI
-+ * @(#)des_crypt.h	2.1 88/08/11 4.0 RPCSRC
-  *
-  * des_crypt.h, des library routine interface
-- * Copyright (C) 1986, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/key_prot.h b/sunrpc/rpc/key_prot.h
-index 16f03ff..74627e6 100644
---- a/sunrpc/rpc/key_prot.h
-+++ b/sunrpc/rpc/key_prot.h
-@@ -8,7 +8,7 @@
- 
- #include <rpc/rpc.h>
- 
--/* Copyright (c)  1990, 1991 Sun Microsystems, Inc.
-+/* Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -20,7 +20,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/netdb.h b/sunrpc/rpc/netdb.h
-index bcb0de2..0c03496 100644
---- a/sunrpc/rpc/netdb.h
-+++ b/sunrpc/rpc/netdb.h
-@@ -1,5 +1,6 @@
- /* @(#)netdb.h	2.1 88/07/29 3.9 RPCSRC */
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -10,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-@@ -27,7 +28,6 @@
-  *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
--/*	@(#)rpc.h 1.8 87/07/24 SMI	*/
- 
- /* Cleaned up for GNU C library roland@gnu.ai.mit.edu:
-    added multiple inclusion protection and use of <sys/cdefs.h>.
-diff --git a/sunrpc/rpc/pmap_clnt.h b/sunrpc/rpc/pmap_clnt.h
-index 7564f99..f8587c6 100644
---- a/sunrpc/rpc/pmap_clnt.h
-+++ b/sunrpc/rpc/pmap_clnt.h
-@@ -2,7 +2,7 @@
-  * pmap_clnt.h
-  * Supplies C routines to get to portmap services.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/pmap_prot.h b/sunrpc/rpc/pmap_prot.h
-index 39d6176..e5fd7cb 100644
---- a/sunrpc/rpc/pmap_prot.h
-+++ b/sunrpc/rpc/pmap_prot.h
-@@ -2,7 +2,7 @@
-  * pmap_prot.h
-  * Protocol for the local binder service, or pmap.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/pmap_rmt.h b/sunrpc/rpc/pmap_rmt.h
-index 4ecb206..f868014 100644
---- a/sunrpc/rpc/pmap_rmt.h
-+++ b/sunrpc/rpc/pmap_rmt.h
-@@ -2,7 +2,7 @@
-  * Structures and XDR routines for parameters to and replies from
-  * the portmapper remote-call-service.
-  *
-- * Copyright (C) 1986, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/rpc.h b/sunrpc/rpc/rpc.h
-index 4c16c39..173a4e3 100644
---- a/sunrpc/rpc/rpc.h
-+++ b/sunrpc/rpc/rpc.h
-@@ -2,7 +2,7 @@
-  * rpc.h, Just includes the billions of rpc header files necessary to
-  * do remote procedure calling.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/rpc_des.h b/sunrpc/rpc/rpc_des.h
-index f70db03..4b3c426 100644
---- a/sunrpc/rpc/rpc_des.h
-+++ b/sunrpc/rpc/rpc_des.h
-@@ -1,7 +1,7 @@
- /*
-  * Generic DES driver interface
-  * Keep this file hardware independent!
-- * Copyright (c) 1986 by Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/rpc_msg.h b/sunrpc/rpc/rpc_msg.h
-index 292cf90..273b187 100644
---- a/sunrpc/rpc/rpc_msg.h
-+++ b/sunrpc/rpc/rpc_msg.h
-@@ -2,7 +2,7 @@
-  * rpc_msg.h
-  * rpc message definition
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/svc.h b/sunrpc/rpc/svc.h
-index e7b126c..54d1ac1 100644
---- a/sunrpc/rpc/svc.h
-+++ b/sunrpc/rpc/svc.h
-@@ -1,7 +1,7 @@
- /*
-  * svc.h, Server-side remote procedure call interface.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/svc_auth.h b/sunrpc/rpc/svc_auth.h
-index f72f4f1..4ba2741 100644
---- a/sunrpc/rpc/svc_auth.h
-+++ b/sunrpc/rpc/svc_auth.h
-@@ -1,7 +1,7 @@
- /*
-  * svc_auth.h, Service side of rpc authentication.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
-index 5744e5a..3dca5c4 100644
---- a/sunrpc/rpc/types.h
-+++ b/sunrpc/rpc/types.h
-@@ -1,4 +1,5 @@
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -9,7 +10,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc/xdr.h b/sunrpc/rpc/xdr.h
-index f5ba7b3..70f033a 100644
---- a/sunrpc/rpc/xdr.h
-+++ b/sunrpc/rpc/xdr.h
-@@ -1,7 +1,7 @@
- /*
-  * xdr.h, External Data Representation Serialization Routines.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_clntout.c b/sunrpc/rpc_clntout.c
-index 8c0f9cc..ec040c7 100644
---- a/sunrpc/rpc_clntout.c
-+++ b/sunrpc/rpc_clntout.c
-@@ -1,6 +1,6 @@
- /*
-  * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
-- * Copyright (C) 1987, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -12,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_cmsg.c b/sunrpc/rpc_cmsg.c
-index 0974903..2fe401c 100644
---- a/sunrpc/rpc_cmsg.c
-+++ b/sunrpc/rpc_cmsg.c
-@@ -1,7 +1,7 @@
- /*
-  * rpc_callmsg.c
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c
-index ba89953..9090402 100644
---- a/sunrpc/rpc_common.c
-+++ b/sunrpc/rpc_common.c
-@@ -1,4 +1,5 @@
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -9,7 +10,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_cout.c b/sunrpc/rpc_cout.c
-index e0e6535..d003ad7 100644
---- a/sunrpc/rpc_cout.c
-+++ b/sunrpc/rpc_cout.c
-@@ -1,6 +1,7 @@
- /*
-- * From: @(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI
-+ * From: @(#)rpc_cout.c 1.13 89/02/22
-  *
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_dtable.c b/sunrpc/rpc_dtable.c
-index 9aff675..44faa9f 100644
---- a/sunrpc/rpc_dtable.c
-+++ b/sunrpc/rpc_dtable.c
-@@ -1,5 +1,6 @@
- /* @(#)rpc_dtablesize.c	2.1 88/07/29 4.0 RPCSRC */
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -10,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_hout.c b/sunrpc/rpc_hout.c
-index 346e154..31b6d3a 100644
---- a/sunrpc/rpc_hout.c
-+++ b/sunrpc/rpc_hout.c
-@@ -1,6 +1,7 @@
- /*
-- * From: @(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI
-+ * From: @(#)rpc_hout.c 1.12 89/02/22
-  *
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
-index fcb094d..ad1b400 100644
---- a/sunrpc/rpc_main.c
-+++ b/sunrpc/rpc_main.c
-@@ -1,6 +1,7 @@
- /*
-- * From @(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI;
-+ * From @(#)rpc_main.c 1.30 89/03/30
-  *
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 56ec1a4..1a1df6d 100644
---- a/sunrpc/rpc_parse.c
-+++ b/sunrpc/rpc_parse.c
-@@ -1,6 +1,7 @@
- /*
-- * From: @(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI
-+ * From: @(#)rpc_parse.c 1.8 89/02/22
-  *
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_parse.h b/sunrpc/rpc_parse.h
-index 815c780..55a999d 100644
---- a/sunrpc/rpc_parse.h
-+++ b/sunrpc/rpc_parse.h
-@@ -1,6 +1,7 @@
--/*      @(#)rpc_parse.h  1.3  90/08/29  (C) 1987 SMI   */
-+/*      @(#)rpc_parse.h  1.3  90/08/29
- 
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c
-index d926083..efbb353 100644
---- a/sunrpc/rpc_prot.c
-+++ b/sunrpc/rpc_prot.c
-@@ -1,7 +1,7 @@
- /*
-  * rpc_prot.c
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_sample.c b/sunrpc/rpc_sample.c
-index 1f3bfd0..e90b58c 100644
---- a/sunrpc/rpc_sample.c
-+++ b/sunrpc/rpc_sample.c
-@@ -1,6 +1,7 @@
- /*
-- * From: @(#)rpc_sample.c  1.1  90/08/30  (C) 1987 SMI
-+ * From: @(#)rpc_sample.c  1.1  90/08/30
-  *
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_scan.c b/sunrpc/rpc_scan.c
-index d4f518f..0a88baf 100644
---- a/sunrpc/rpc_scan.c
-+++ b/sunrpc/rpc_scan.c
-@@ -1,6 +1,7 @@
- /*
-- * From: @(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI
-+ * From: @(#)rpc_scan.c 1.11 89/02/22
-  *
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_scan.h b/sunrpc/rpc_scan.h
-index 384f807..9786a51 100644
---- a/sunrpc/rpc_scan.h
-+++ b/sunrpc/rpc_scan.h
-@@ -1,6 +1,7 @@
--/*      @(#)rpc_scan.h  1.3  90/08/29  (C) 1987 SMI   */
-+/*      @(#)rpc_scan.h  1.3  90/08/29  */
- 
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_svcout.c b/sunrpc/rpc_svcout.c
-index 1887b75..71d9abd 100644
---- a/sunrpc/rpc_svcout.c
-+++ b/sunrpc/rpc_svcout.c
-@@ -1,6 +1,7 @@
- /*
-- * From: @(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI
-+ * From: @(#)rpc_svcout.c 1.29 89/03/30
-  *
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_tblout.c b/sunrpc/rpc_tblout.c
-index 2d77c60..a7d2f43 100644
---- a/sunrpc/rpc_tblout.c
-+++ b/sunrpc/rpc_tblout.c
-@@ -1,6 +1,7 @@
- /*
-- * From: @(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI
-+ * From: @(#)rpc_tblout.c 1.4 89/02/22
-  *
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_util.c b/sunrpc/rpc_util.c
-index 6a6c0e4..52aa697 100644
---- a/sunrpc/rpc_util.c
-+++ b/sunrpc/rpc_util.c
-@@ -1,6 +1,7 @@
- /*
-- * From: @(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI
-+ * From: @(#)rpc_util.c 1.11 89/02/22
-  *
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpc_util.h b/sunrpc/rpc_util.h
-index 72f08eb..53316d9 100644
---- a/sunrpc/rpc_util.h
-+++ b/sunrpc/rpc_util.h
-@@ -1,6 +1,7 @@
--/*      @(#)rpc_util.h  1.5  90/08/29  (C) 1987 SMI   */
-+/*      @(#)rpc_util.h  1.5  90/08/29  */
- 
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -11,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcinfo.c b/sunrpc/rpcinfo.c
-index 6020cd5..16c0354 100644
---- a/sunrpc/rpcinfo.c
-+++ b/sunrpc/rpcinfo.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 1986, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcsvc/bootparam_prot.x b/sunrpc/rpcsvc/bootparam_prot.x
-index f272d52..117e428 100644
---- a/sunrpc/rpcsvc/bootparam_prot.x
-+++ b/sunrpc/rpcsvc/bootparam_prot.x
-@@ -1,7 +1,7 @@
- /* @(#)bootparam_prot.x	2.1 88/08/01 4.0 RPCSRC */
--/* @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro */
- 
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -12,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcsvc/key_prot.x b/sunrpc/rpcsvc/key_prot.x
-index 0350250..9baf943 100644
---- a/sunrpc/rpcsvc/key_prot.x
-+++ b/sunrpc/rpcsvc/key_prot.x
-@@ -1,6 +1,6 @@
- /*
-  * Key server protocol definition
-- * Copyright (C) 1990, 1991 Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -12,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcsvc/klm_prot.x b/sunrpc/rpcsvc/klm_prot.x
-index 7b4c152..aee5b1a 100644
---- a/sunrpc/rpcsvc/klm_prot.x
-+++ b/sunrpc/rpcsvc/klm_prot.x
-@@ -1,9 +1,8 @@
- /* @(#)klm_prot.x	2.1 88/08/01 4.0 RPCSRC */
--/* @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro */
- 
- /*
-  * Kernel/lock manager protocol definition
-- * Copyright (C) 1986 Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -15,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcsvc/mount.x b/sunrpc/rpcsvc/mount.x
-index da61c4e..ed3b339 100644
---- a/sunrpc/rpcsvc/mount.x
-+++ b/sunrpc/rpcsvc/mount.x
-@@ -1,7 +1,7 @@
- /* @(#)mount.x	2.1 88/08/01 4.0 RPCSRC */
--/* @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro */
- 
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -12,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-@@ -114,7 +114,7 @@ program MOUNTPROG {
- 
- 		/*
- 		 * If fhs_status is 0, then fhs_fhandle contains the
--	 	 * file handle for the directory. This file handle may
-+		 * file handle for the directory. This file handle may
- 		 * be used in the NFS protocol. This procedure also adds
- 		 * a new entry to the mount list for this client mounting
- 		 * the directory.
-diff --git a/sunrpc/rpcsvc/nfs_prot.x b/sunrpc/rpcsvc/nfs_prot.x
-index 2a68540..ad992e2 100644
---- a/sunrpc/rpcsvc/nfs_prot.x
-+++ b/sunrpc/rpcsvc/nfs_prot.x
-@@ -2,7 +2,7 @@
- 
- /*
-  * nfs_prot.x 1.2 87/10/12
-- * Copyright 1987 Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcsvc/nlm_prot.x b/sunrpc/rpcsvc/nlm_prot.x
-index e60c931..81ff137 100644
---- a/sunrpc/rpcsvc/nlm_prot.x
-+++ b/sunrpc/rpcsvc/nlm_prot.x
-@@ -1,9 +1,34 @@
- /* @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC */
--/* @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro */
- 
- /*
-  * Network lock manager protocol definition
-- * Copyright (C) 1986 Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-+ *
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  *
-  * protocol used between local lock manager and remote lock manager
-  */
-diff --git a/sunrpc/rpcsvc/rex.x b/sunrpc/rpcsvc/rex.x
-index 253b8a7..b5baf15 100644
---- a/sunrpc/rpcsvc/rex.x
-+++ b/sunrpc/rpcsvc/rex.x
-@@ -1,7 +1,7 @@
- /* @(#)rex.x	2.1 88/08/01 4.0 RPCSRC */
--/* @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro */
- 
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -12,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcsvc/rstat.x b/sunrpc/rpcsvc/rstat.x
-index b2c6b6e..9b7b102 100644
---- a/sunrpc/rpcsvc/rstat.x
-+++ b/sunrpc/rpcsvc/rstat.x
-@@ -1,7 +1,7 @@
- /* @(#)rstat.x	2.2 88/08/01 4.0 RPCSRC */
--/* @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro */
- 
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -12,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcsvc/rusers.x b/sunrpc/rpcsvc/rusers.x
-index bcf5fd2..476ed74 100644
---- a/sunrpc/rpcsvc/rusers.x
-+++ b/sunrpc/rpcsvc/rusers.x
-@@ -1,4 +1,5 @@
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -9,7 +10,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcsvc/sm_inter.x b/sunrpc/rpcsvc/sm_inter.x
-index 9c20383..767f0e0 100644
---- a/sunrpc/rpcsvc/sm_inter.x
-+++ b/sunrpc/rpcsvc/sm_inter.x
-@@ -1,6 +1,6 @@
- /*
-  * Status monitor protocol specification
-- * Copyright (C) 1986 Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -12,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcsvc/spray.x b/sunrpc/rpcsvc/spray.x
-index 2830722..68b7c48 100644
---- a/sunrpc/rpcsvc/spray.x
-+++ b/sunrpc/rpcsvc/spray.x
-@@ -1,7 +1,7 @@
- /* @(#)spray.x	2.1 88/08/01 4.0 RPCSRC */
--/* @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro */
- 
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -12,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rpcsvc/yppasswd.x b/sunrpc/rpcsvc/yppasswd.x
-index b8ff7c2..34e3efe 100644
---- a/sunrpc/rpcsvc/yppasswd.x
-+++ b/sunrpc/rpcsvc/yppasswd.x
-@@ -1,7 +1,7 @@
- /* @(#)yppasswd.x	2.1 88/08/01 4.0 RPCSRC */
--/* @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro */
- 
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -12,7 +12,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/rtime.c b/sunrpc/rtime.c
-index 790bf4b..768c621 100644
---- a/sunrpc/rtime.c
-+++ b/sunrpc/rtime.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1988 by Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/svc.c b/sunrpc/svc.c
-index d389a52..f745417 100644
---- a/sunrpc/svc.c
-+++ b/sunrpc/svc.c
-@@ -5,7 +5,7 @@
-  * for handling transport handles.  The svc routines handle the
-  * list of service routines.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -17,7 +17,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/svc_auth.c b/sunrpc/svc_auth.c
-index 11555c5..2ccfdaa 100644
---- a/sunrpc/svc_auth.c
-+++ b/sunrpc/svc_auth.c
-@@ -1,7 +1,7 @@
- /*
-  * svc_auth.c, Server-side rpc authenticator interface.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/svc_authux.c b/sunrpc/svc_authux.c
-index 477ff25..1de08bc 100644
---- a/sunrpc/svc_authux.c
-+++ b/sunrpc/svc_authux.c
-@@ -6,7 +6,7 @@
-  * _svcauth_short uses a shorthand auth to index into a cache of longhand auths.
-  * Note: the shorthand has been gutted for efficiency.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -18,7 +18,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/svc_raw.c b/sunrpc/svc_raw.c
-index 924135b..3dd4827 100644
---- a/sunrpc/svc_raw.c
-+++ b/sunrpc/svc_raw.c
-@@ -4,7 +4,7 @@
-  * This lets us simulate rpc and get rpc (round trip) overhead, without
-  * any interference from the kernel.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -16,7 +16,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/svc_run.c b/sunrpc/svc_run.c
-index 1bb8c87..de6c3c7 100644
---- a/sunrpc/svc_run.c
-+++ b/sunrpc/svc_run.c
-@@ -1,4 +1,5 @@
- /*
-+ * Copyright (c) 2010, Oracle America, Inc.
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-  * met:
-@@ -9,7 +10,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/svc_simple.c b/sunrpc/svc_simple.c
-index 1d6f515..4b178bf 100644
---- a/sunrpc/svc_simple.c
-+++ b/sunrpc/svc_simple.c
-@@ -2,7 +2,7 @@
-  * svc_simple.c
-  * Simplified front end to rpc.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c
-index 2048fdf..dd66485 100644
---- a/sunrpc/svc_tcp.c
-+++ b/sunrpc/svc_tcp.c
-@@ -1,7 +1,7 @@
- /*
-  * svc_tcp.c, Server side for TCP/IP based RPC.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
-index b9fccab..f989484 100644
---- a/sunrpc/svc_udp.c
-+++ b/sunrpc/svc_udp.c
-@@ -3,7 +3,7 @@
-  * Server side for UDP/IP based RPC.  (Does some caching in the hopes of
-  * achieving execute-at-most-once semantics.)
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -15,7 +15,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
-index f22a23a..29b71b2 100644
---- a/sunrpc/svc_unix.c
-+++ b/sunrpc/svc_unix.c
-@@ -1,7 +1,7 @@
- /*
-  * svc_unix.c, Server side for TCP/IP based RPC.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/svcauth_des.c b/sunrpc/svcauth_des.c
-index 573891e..19d0f54 100644
---- a/sunrpc/svcauth_des.c
-+++ b/sunrpc/svcauth_des.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1988 by Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/xcrypt.c b/sunrpc/xcrypt.c
-index f430a1d..337fd2c 100644
---- a/sunrpc/xcrypt.c
-+++ b/sunrpc/xcrypt.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -11,7 +11,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
-index c5e961f..d8e782e 100644
---- a/sunrpc/xdr.c
-+++ b/sunrpc/xdr.c
-@@ -1,7 +1,7 @@
- /*
-  * xdr.c, Generic XDR routines implementation.
-  *
-- * Copyright (C) 1986, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
-index 02728b0..03df57b 100644
---- a/sunrpc/xdr_array.c
-+++ b/sunrpc/xdr_array.c
-@@ -1,7 +1,7 @@
- /*
-  * xdr_array.c, Generic XDR routines implementation.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/xdr_float.c b/sunrpc/xdr_float.c
-index 75dc70c..3925f5b 100644
---- a/sunrpc/xdr_float.c
-+++ b/sunrpc/xdr_float.c
-@@ -1,7 +1,7 @@
- /*
-  * xdr_float.c, Generic XDR routines implementation.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c
-index f9a0b14..c4f4715 100644
---- a/sunrpc/xdr_mem.c
-+++ b/sunrpc/xdr_mem.c
-@@ -1,7 +1,7 @@
- /*
-- * xdr_mem.h, XDR implementation using memory buffers.
-+ * xdr_mem.c, XDR implementation using memory buffers.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c
-index a66462c..977b0bb 100644
---- a/sunrpc/xdr_rec.c
-+++ b/sunrpc/xdr_rec.c
-@@ -2,7 +2,7 @@
-  * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
-  * layer above tcp (for rpc's use).
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -14,7 +14,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/xdr_ref.c b/sunrpc/xdr_ref.c
-index e2acb84..dda40ab 100644
---- a/sunrpc/xdr_ref.c
-+++ b/sunrpc/xdr_ref.c
-@@ -1,7 +1,7 @@
- /*
-  * xdr_reference.c, Generic XDR routines implementation.
-  *
-- * Copyright (C) 1987, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/xdr_sizeof.c b/sunrpc/xdr_sizeof.c
-index d4bada3..270121b 100644
---- a/sunrpc/xdr_sizeof.c
-+++ b/sunrpc/xdr_sizeof.c
-@@ -1,7 +1,7 @@
- /*
-  * xdr_sizeof.c
-  *
-- * Copyright 1990 Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
-index f58465a..9488601 100644
---- a/sunrpc/xdr_stdio.c
-+++ b/sunrpc/xdr_stdio.c
-@@ -1,7 +1,7 @@
- /*
-  * xdr_stdio.c, XDR implementation on standard i/o file.
-  *
-- * Copyright (C) 1984, Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions are
-@@ -13,7 +13,7 @@
-  *       copyright notice, this list of conditions and the following
-  *       disclaimer in the documentation and/or other materials
-  *       provided with the distribution.
-- *     * Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-  *       contributors may be used to endorse or promote products derived
-  *       from this software without specific prior written permission.
-  *
-diff --git a/nis/rpcsvc/nis.h b/nis/rpcsvc/nis.h
-index 0495457..5c5c7bb 100644
---- a/nis/rpcsvc/nis.h
-+++ b/nis/rpcsvc/nis.h
-@@ -1,31 +1,32 @@
- /*
-- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-- * unrestricted use provided that this legend is included on all tape
-- * media and as a part of the software program in whole or part.  Users
-- * may copy or modify Sun RPC without charge, but are not authorized
-- * to license or distribute it to anyone else except as part of a product or
-- * program developed by the user or with the express written consent of
-- * Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-  *
-- * Sun RPC is provided with no support and without any obligation on the
-- * part of Sun Microsystems, Inc. to assist in its use, correction,
-- * modification or enhancement.
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-  *
-- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-- * OR ANY PART THEREOF.
-- *
-- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-- * or profits or other special, indirect and consequential damages, even if
-- * Sun has been advised of the possibility of such damages.
-- *
-- * Sun Microsystems, Inc.
-- * 2550 Garcia Avenue
-- * Mountain View, California  94043
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
- #ifndef _RPCSVC_NIS_H
-diff --git a/nis/rpcsvc/nis.x b/nis/rpcsvc/nis.x
-index 54ddb05..e318af2 100644
---- a/nis/rpcsvc/nis.x
-+++ b/nis/rpcsvc/nis.x
-@@ -1,31 +1,32 @@
- %/*
--% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
--% * unrestricted use provided that this legend is included on all tape
--% * media and as a part of the software program in whole or part.  Users
--% * may copy or modify Sun RPC without charge, but are not authorized
--% * to license or distribute it to anyone else except as part of a product or
--% * program developed by the user or with the express written consent of
--% * Sun Microsystems, Inc.
-+% * Copyright (c) 2010, Oracle America, Inc.
- % *
--% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
--% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
--% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+% * Redistribution and use in source and binary forms, with or without
-+% * modification, are permitted provided that the following conditions are
-+% * met:
- % *
--% * Sun RPC is provided with no support and without any obligation on the
--% * part of Sun Microsystems, Inc. to assist in its use, correction,
--% * modification or enhancement.
-+% *     * Redistributions of source code must retain the above copyright
-+% *       notice, this list of conditions and the following disclaimer.
-+% *     * Redistributions in binary form must reproduce the above
-+% *       copyright notice, this list of conditions and the following
-+% *       disclaimer in the documentation and/or other materials
-+% *       provided with the distribution.
-+% *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+% *       contributors may be used to endorse or promote products derived
-+% *       from this software without specific prior written permission.
- % *
--% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
--% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
--% * OR ANY PART THEREOF.
--% *
--% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
--% * or profits or other special, indirect and consequential damages, even if
--% * Sun has been advised of the possibility of such damages.
--% *
--% * Sun Microsystems, Inc.
--% * 2550 Garcia Avenue
--% * Mountain View, California  94043
-+% *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+% *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+% *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+% *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+% *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+% *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+% *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+% *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+% *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+% *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+% *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+% *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- % */
- 
- #ifdef RPC_HDR
-diff --git a/nis/rpcsvc/nis_callback.h b/nis/rpcsvc/nis_callback.h
-index eca4ed9..6f05728 100644
---- a/nis/rpcsvc/nis_callback.h
-+++ b/nis/rpcsvc/nis_callback.h
-@@ -1,31 +1,32 @@
- /*
-- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-- * unrestricted use provided that this legend is included on all tape
-- * media and as a part of the software program in whole or part.  Users
-- * may copy or modify Sun RPC without charge, but are not authorized
-- * to license or distribute it to anyone else except as part of a product or
-- * program developed by the user or with the express written consent of
-- * Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-  *
-- * Sun RPC is provided with no support and without any obligation on the
-- * part of Sun Microsystems, Inc. to assist in its use, correction,
-- * modification or enhancement.
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-  *
-- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-- * OR ANY PART THEREOF.
-- *
-- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-- * or profits or other special, indirect and consequential damages, even if
-- * Sun has been advised of the possibility of such damages.
-- *
-- * Sun Microsystems, Inc.
-- * 2550 Garcia Avenue
-- * Mountain View, California  94043
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- #ifndef _RPCSVC_NIS_CALLBACK_H
- #define _RPCSVC_NIS_CALLBACK_H 1
-diff --git a/nis/rpcsvc/nis_callback.x b/nis/rpcsvc/nis_callback.x
-index 4817865..0fdca9e 100644
---- a/nis/rpcsvc/nis_callback.x
-+++ b/nis/rpcsvc/nis_callback.x
-@@ -1,44 +1,42 @@
- %/*
--% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
--% * unrestricted use provided that this legend is included on all tape
--% * media and as a part of the software program in whole or part.  Users
--% * may copy or modify Sun RPC without charge, but are not authorized
--% * to license or distribute it to anyone else except as part of a product or
--% * program developed by the user or with the express written consent of
--% * Sun Microsystems, Inc.
-+% * Copyright (c) 2010, Oracle America, Inc.
- % *
--% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
--% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
--% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+% * Redistribution and use in source and binary forms, with or without
-+% * modification, are permitted provided that the following conditions are
-+% * met:
- % *
--% * Sun RPC is provided with no support and without any obligation on the
--% * part of Sun Microsystems, Inc. to assist in its use, correction,
--% * modification or enhancement.
-+% *     * Redistributions of source code must retain the above copyright
-+% *       notice, this list of conditions and the following disclaimer.
-+% *     * Redistributions in binary form must reproduce the above
-+% *       copyright notice, this list of conditions and the following
-+% *       disclaimer in the documentation and/or other materials
-+% *       provided with the distribution.
-+% *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+% *       contributors may be used to endorse or promote products derived
-+% *       from this software without specific prior written permission.
- % *
--% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
--% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
--% * OR ANY PART THEREOF.
--% *
--% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
--% * or profits or other special, indirect and consequential damages, even if
--% * Sun has been advised of the possibility of such damages.
--% *
--% * Sun Microsystems, Inc.
--% * 2550 Garcia Avenue
--% * Mountain View, California  94043
-+% *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+% *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+% *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+% *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+% *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+% *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+% *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+% *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+% *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+% *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+% *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+% *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- % */
- 
- /*
-  *	nis_callback.x
-- *
-- *	Copyright (c) 1988-1992 Sun Microsystems Inc
-- *	All Rights Reserved.
-  */
- 
--%#pragma ident	"@(#)nis_callback.x	1.7	94/05/03 SMI"
-+%#pragma ident	"@(#)nis_callback.x	1.7	94/05/03"
- 
- /*
-- * "@(#)zns_cback.x 1.2 90/09/10 Copyr 1990 Sun Micro" 
-+ * "@(#)zns_cback.x 1.2 90/09/10"
-  *
-  * RPCL description of the Callback Service.
-  */
-diff --git a/nis/rpcsvc/nis_object.x b/nis/rpcsvc/nis_object.x
-index 43e7688..774b38f 100644
---- a/nis/rpcsvc/nis_object.x
-+++ b/nis/rpcsvc/nis_object.x
-@@ -1,11 +1,37 @@
- /*
-  *	nis_object.x
-  *
-- *	Copyright (c) 1988-1992 Sun Microsystems Inc
-- *	All Rights Reserved.
-+ * Copyright (c) 2010, Oracle America, Inc.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-+ *
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--%#pragma ident	"@(#)nis_object.x	1.12	97/11/19 SMI"
-+%#pragma ident	"@(#)nis_object.x	1.12	97/11/19"
- 
- #if RPC_HDR
- %
-diff --git a/nis/rpcsvc/nis_tags.h b/nis/rpcsvc/nis_tags.h
-index 9a24188..c2dc7fd 100644
---- a/nis/rpcsvc/nis_tags.h
-+++ b/nis/rpcsvc/nis_tags.h
-@@ -1,5 +1,32 @@
- /*
-- * Copyright (c) 1991, Sun Microsystems Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-+ *
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
- /*
-@@ -13,9 +40,9 @@
- #define	_RPCSVC_NIS_TAGS_H
- 
- #if 0
--#pragma ident	"@(#)nis_tags.h	1.16	96/10/25 SMI"
-+#pragma ident	"@(#)nis_tags.h	1.16	96/10/25"
- #endif
--/* from file: zns_tags.h	1.7 Copyright (c) 1990 Sun Microsystems */
-+/* from file: zns_tags.h	1.7 */
- 
- #ifdef	__cplusplus
- extern "C" {
-diff --git a/nis/rpcsvc/yp.h b/nis/rpcsvc/yp.h
-index ffc13b8..968b74c 100644
---- a/nis/rpcsvc/yp.h
-+++ b/nis/rpcsvc/yp.h
-@@ -1,30 +1,32 @@
- /*
-- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-- * unrestricted use provided that this legend is included on all tape
-- * media and as a part of the software program in whole or part.  Users
-- * may copy or modify Sun RPC without charge, but are not authorized
-- * to license or distribute it to anyone else except as part of a product or
-- * program developed by the user.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-  *
-- * Sun RPC is provided with no support and without any obligation on the
-- * part of Sun Microsystems, Inc. to assist in its use, correction,
-- * modification or enhancement.
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-  *
-- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-- * OR ANY PART THEREOF.
-- *
-- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-- * or profits or other special, indirect and consequential damages, even if
-- * Sun has been advised of the possibility of such damages.
-- *
-- * Sun Microsystems, Inc.
-- * 2550 Garcia Avenue
-- * Mountain View, California  94043
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
- #ifndef __RPCSVC_YP_H__
-diff --git a/nis/rpcsvc/yp.x b/nis/rpcsvc/yp.x
-index b1b2565..269ae6f 100644
---- a/nis/rpcsvc/yp.x
-+++ b/nis/rpcsvc/yp.x
-@@ -1,32 +1,34 @@
- /* @(#)yp.x	2.1 88/08/01 4.0 RPCSRC */
- 
- /*
-- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-- * unrestricted use provided that this legend is included on all tape
-- * media and as a part of the software program in whole or part.  Users
-- * may copy or modify Sun RPC without charge, but are not authorized
-- * to license or distribute it to anyone else except as part of a product or
-- * program developed by the user.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-  *
-- * Sun RPC is provided with no support and without any obligation on the
-- * part of Sun Microsystems, Inc. to assist in its use, correction,
-- * modification or enhancement.
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-  *
-- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-- * OR ANY PART THEREOF.
-- *
-- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-- * or profits or other special, indirect and consequential damages, even if
-- * Sun has been advised of the possibility of such damages.
-- *
-- * Sun Microsystems, Inc.
-- * 2550 Garcia Avenue
-- * Mountain View, California  94043
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
- /*
-diff --git a/nis/rpcsvc/ypupd.h b/nis/rpcsvc/ypupd.h
-index c53e69d..d07fd4d 100644
---- a/nis/rpcsvc/ypupd.h
-+++ b/nis/rpcsvc/ypupd.h
-@@ -1,34 +1,32 @@
- /*
-- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-- * unrestricted use provided that this legend is included on all tape
-- * media and as a part of the software program in whole or part.  Users
-- * may copy or modify Sun RPC without charge, but are not authorized
-- * to license or distribute it to anyone else except as part of a product or
-- * program developed by the user or with the express written consent of
-- * Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-  *
-- * Sun RPC is provided with no support and without any obligation on the
-- * part of Sun Microsystems, Inc. to assist in its use, correction,
-- * modification or enhancement.
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-  *
-- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-- * OR ANY PART THEREOF.
-- *
-- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-- * or profits or other special, indirect and consequential damages, even if
-- * Sun has been advised of the possibility of such damages.
-- *
-- * Sun Microsystems, Inc.
-- * 2550 Garcia Avenue
-- * Mountain View, California  94043
-- */
--/*
-- * Copyright (c) 1986, 1990 by Sun Microsystems, Inc.
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- /* from @(#)ypupdate_prot.x	1.3 91/03/11 TIRPC 1.0 */
- 
-diff --git a/nis/yp_xdr.c b/nis/yp_xdr.c
-index bdd5d87..76e0f2f 100644
---- a/nis/yp_xdr.c
-+++ b/nis/yp_xdr.c
-@@ -1,30 +1,32 @@
- /*
-- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-- * unrestricted use provided that this legend is included on all tape
-- * media and as a part of the software program in whole or part.  Users
-- * may copy or modify Sun RPC without charge, but are not authorized
-- * to license or distribute it to anyone else except as part of a product or
-- * program developed by the user.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-  *
-- * Sun RPC is provided with no support and without any obligation on the
-- * part of Sun Microsystems, Inc. to assist in its use, correction,
-- * modification or enhancement.
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-  *
-- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-- * OR ANY PART THEREOF.
-- *
-- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-- * or profits or other special, indirect and consequential damages, even if
-- * Sun has been advised of the possibility of such damages.
-- *
-- * Sun Microsystems, Inc.
-- * 2550 Garcia Avenue
-- * Mountain View, California  94043
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
- #include <rpcsvc/yp.h>
-diff --git a/nis/ypupdate_xdr.c b/nis/ypupdate_xdr.c
-index 0f5469f..9f6d69f 100644
---- a/nis/ypupdate_xdr.c
-+++ b/nis/ypupdate_xdr.c
-@@ -1,34 +1,32 @@
- /*
-- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-- * unrestricted use provided that this legend is included on all tape
-- * media and as a part of the software program in whole or part.  Users
-- * may copy or modify Sun RPC without charge, but are not authorized
-- * to license or distribute it to anyone else except as part of a product or
-- * program developed by the user or with the express written consent of
-- * Sun Microsystems, Inc.
-+ * Copyright (c) 2010, Oracle America, Inc.
-  *
-- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-  *
-- * Sun RPC is provided with no support and without any obligation on the
-- * part of Sun Microsystems, Inc. to assist in its use, correction,
-- * modification or enhancement.
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials
-+ *       provided with the distribution.
-+ *     * Neither the name of the "Oracle America, Inc." nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-  *
-- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-- * OR ANY PART THEREOF.
-- *
-- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-- * or profits or other special, indirect and consequential damages, even if
-- * Sun has been advised of the possibility of such damages.
-- *
-- * Sun Microsystems, Inc.
-- * 2550 Garcia Avenue
-- * Mountain View, California  94043
-- */
--/*
-- * Copyright (c) 1986, 1990 by Sun Microsystems, Inc.
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-+ *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
- #include <rpcsvc/ypupd.h>

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-umount-nofollow.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-umount-nofollow.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-umount-nofollow.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,22 +0,0 @@
-2010-03-12  Ulrich Drepper  <drepper@redhat.com>
-
-	* sysdeps/unix/sysv/linux/sys/mount.h (UMOUNT_NOFOLLOW): Define.
-
----
- sysdeps/unix/sysv/linux/sys/mount.h |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/sysdeps/unix/sysv/linux/sys/mount.h
-+++ b/sysdeps/unix/sysv/linux/sys/mount.h
-@@ -100,8 +100,10 @@
- #define MNT_FORCE MNT_FORCE
-   MNT_DETACH = 2,		/* Just detach from the tree.  */
- #define MNT_DETACH MNT_DETACH
--  MNT_EXPIRE = 4		/* Mark for expiry.  */
-+  MNT_EXPIRE = 4,		/* Mark for expiry.  */
- #define MNT_EXPIRE MNT_EXPIRE
-+  UMOUNT_NOFOLLOW = 8		/* Don't follow symlink on umount.  */
-+#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
- };
- 
- 

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-disable-test-tgmath2.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-disable-test-tgmath2.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-disable-test-tgmath2.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -6,10 +6,10 @@
 +++ b/math/Makefile
 @@ -92,7 +92,7 @@
  # Rules for the test suite.
- tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
+ tests = test-matherr test-fenv basic-test \
  	test-misc test-fpucw tst-definitions test-tgmath test-tgmath-ret \
--	bug-nextafter bug-nexttoward bug-tgmath1 test-tgmath-int test-tgmath2
-+	bug-nextafter bug-nexttoward bug-tgmath1 test-tgmath-int
+-	bug-nextafter bug-nexttoward bug-tgmath1 test-tgmath-int test-tgmath2 \
++	bug-nextafter bug-nexttoward bug-tgmath1 test-tgmath-int \
+ 	test-dbl-wrap
+ tests-$(OPTION_EGLIBC_LIBM_BIG) += atest-exp atest-sincos atest-exp2
  # We do the `long double' tests only if this data type is available and
- # distinct from `double'.
- test-longdouble-yes = test-ldouble test-ildoubl

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-ldso-disable-hwcap.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-ldso-disable-hwcap.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-ldso-disable-hwcap.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -51,7 +51,7 @@
      {
 --- a/elf/dl-cache.c
 +++ b/elf/dl-cache.c
-@@ -244,6 +244,7 @@
+@@ -245,6 +245,7 @@ _dl_load_cache_lookup (const char *name)
    if (cache_new != (void *) -1)
      {
        uint64_t platform;
@@ -59,16 +59,18 @@
  
        /* This is where the strings start.  */
        cache_data = (const char *) cache_new;
-@@ -255,11 +256,16 @@
+@@ -256,6 +257,9 @@ _dl_load_cache_lookup (const char *name)
        if (platform != (uint64_t) -1)
  	platform = 1ULL << platform;
  
 +      if (__access ("/etc/ld.so.nohwcap", F_OK) == 0)
 +	disable_hwcap = 1;
 +
-       /* Only accept hwcap if it's for the right platform.  */
  #define _DL_HWCAP_TLS_MASK (1LL << 63)
- #define HWCAP_CHECK \
+       uint64_t hwcap_exclude = ~((GLRO(dl_hwcap) & GLRO(dl_hwcap_mask))
+ 				 | _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK);
+@@ -266,6 +270,8 @@ _dl_load_cache_lookup (const char *name)
+ 	continue;							      \
        if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion))	      \
  	continue;							      \
 +      if (disable_hwcap && lib->hwcap != 0)				      \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-pagesize.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-pagesize.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-pagesize.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,30 +1,9 @@
 ---
- ports/sysdeps/unix/sysv/linux/alpha/sys/user.h |    4 ++--
  ports/sysdeps/unix/sysv/linux/mips/sys/user.h  |    4 ++--
  sysdeps/unix/sysv/linux/ia64/sys/user.h        |    3 ++-
  sysdeps/unix/sysv/linux/x86_64/sys/user.h      |    4 ++--
  4 files changed, 8 insertions(+), 7 deletions(-)
 
---- a/ports/sysdeps/unix/sysv/linux/alpha/sys/user.h
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/sys/user.h
-@@ -23,7 +23,7 @@
-    only. Don't read too much into it. Don't use it for anything other
-    than gdb/strace unless you know what you are doing. */
- 
--#include <asm/page.h>
-+#include <unistd.h>
- #include <asm/reg.h>
- 
- struct user
-@@ -41,7 +41,7 @@
-   char u_comm[32];				/* user command name */
- };
- 
--#define NBPG			PAGE_SIZE
-+#define NBPG			(sysconf(_SC_PAGESIZE))
- #define UPAGES			1
- #define HOST_TEXT_START_ADDR	(u.start_code)
- #define HOST_DATA_START_ADDR	(u.start_data)
 --- a/sysdeps/unix/sysv/linux/ia64/sys/user.h
 +++ b/sysdeps/unix/sysv/linux/ia64/sys/user.h
 @@ -21,6 +21,7 @@

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/local-ntp-update.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-ntp-update.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-ntp-update.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,17 +0,0 @@
-Partial update of the NTP API, backported from commit eb4157390cac6212921ef198353635e138dc0a00
-
----
- sysdeps/unix/sysv/linux/sys/timex.h |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/sysdeps/unix/sysv/linux/sys/timex.h
-+++ b/sysdeps/unix/sysv/linux/sys/timex.h
-@@ -85,6 +85,8 @@
- #define MOD_TIMECONST	ADJ_TIMECONST
- #define MOD_CLKB	ADJ_TICK
- #define MOD_CLKA	ADJ_OFFSET_SINGLESHOT /* 0x8000 in original */
-+#define MOD_MICRO	ADJ_MICRO
-+#define MOD_NANO	ADJ_NANO
- 
- 
- /* Status codes (timex.status) */

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-bits-fcntl_h-at.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-bits-fcntl_h-at.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-bits-fcntl_h-at.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -28,27 +28,27 @@
 	constants.
 
 ---
- io/fcntl.h                                       |   12 ------------
- ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h |   13 +++++++++++++
- ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h  |   15 +++++++++++++++
- ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h   |   13 +++++++++++++
- ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h  |   13 +++++++++++++
- ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h  |   13 +++++++++++++
- ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h  |   13 +++++++++++++
- ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h  |   13 +++++++++++++
- sysdeps/mach/hurd/bits/fcntl.h                   |   13 +++++++++++++
- sysdeps/unix/sysv/linux/i386/bits/fcntl.h        |   13 +++++++++++++
- sysdeps/unix/sysv/linux/ia64/bits/fcntl.h        |   13 +++++++++++++
- sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h     |   13 +++++++++++++
- sysdeps/unix/sysv/linux/s390/bits/fcntl.h        |   13 +++++++++++++
- sysdeps/unix/sysv/linux/sh/bits/fcntl.h          |   13 +++++++++++++
- sysdeps/unix/sysv/linux/sparc/bits/fcntl.h       |   13 +++++++++++++
- sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h      |   13 +++++++++++++
+ io/fcntl.h                                       |   14 ------------
+ ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h |   15 +++++++++++++
+ ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h  |   17 +++++++++++++++
+ ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h   |   15 +++++++++++++
+ ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h  |   15 +++++++++++++
+ ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h  |   15 +++++++++++++
+ ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h  |   15 +++++++++++++
+ ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h  |   15 +++++++++++++
+ sysdeps/mach/hurd/bits/fcntl.h                   |   15 +++++++++++++
+ sysdeps/unix/sysv/linux/i386/bits/fcntl.h        |   15 +++++++++++++
+ sysdeps/unix/sysv/linux/ia64/bits/fcntl.h        |   15 +++++++++++++
+ sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h     |   15 +++++++++++++
+ sysdeps/unix/sysv/linux/s390/bits/fcntl.h        |   15 +++++++++++++
+ sysdeps/unix/sysv/linux/sh/bits/fcntl.h          |   15 +++++++++++++
+ sysdeps/unix/sysv/linux/sparc/bits/fcntl.h       |   15 +++++++++++++
+ sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h      |   15 +++++++++++++
  16 files changed, 197 insertions(+), 12 deletions(-)
 
 --- a/io/fcntl.h
 +++ b/io/fcntl.h
-@@ -56,18 +56,6 @@
+@@ -56,20 +56,6 @@
  # define SEEK_END	2	/* Seek from end of file.  */
  #endif	/* XPG */
  
@@ -60,6 +60,8 @@
 -# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 -					   unlinking file.  */
 -# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
+-# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
+-					   traversal.  */
 -# define AT_EACCESS		0x200	/* Test access permitted for
 -					   effective IDs, not real IDs.  */
 -#endif
@@ -69,7 +71,7 @@
  
 --- a/sysdeps/mach/hurd/bits/fcntl.h
 +++ b/sysdeps/mach/hurd/bits/fcntl.h
-@@ -219,3 +219,16 @@
+@@ -219,3 +219,18 @@
  # define POSIX_FADV_DONTNEED	4 /* Don't need these pages.  */
  # define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
  #endif
@@ -83,12 +85,14 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
 --- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
-@@ -227,6 +227,19 @@
+@@ -227,6 +227,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -101,6 +105,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -110,7 +116,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
-@@ -221,6 +221,19 @@
+@@ -221,6 +221,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -123,6 +129,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -132,7 +140,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
-@@ -227,6 +227,19 @@
+@@ -227,6 +227,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -145,6 +153,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -154,7 +164,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
-@@ -247,6 +247,19 @@
+@@ -247,6 +247,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -167,6 +177,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -176,7 +188,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
-@@ -227,6 +227,19 @@
+@@ -227,6 +227,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -189,6 +201,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -198,7 +212,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
-@@ -246,6 +246,19 @@
+@@ -246,6 +246,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -211,6 +225,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -220,7 +236,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
-@@ -241,6 +241,19 @@
+@@ -241,6 +241,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -233,6 +249,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -242,7 +260,7 @@
  #ifdef __USE_GNU
 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-@@ -215,6 +215,19 @@
+@@ -215,6 +215,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -255,6 +273,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -264,7 +284,7 @@
  #ifdef __USE_GNU
 --- a/ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h
-@@ -179,3 +179,18 @@
+@@ -179,3 +179,20 @@
  # define POSIX_FADV_DONTNEED	4 /* Don't need these pages.  */
  # define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
  #endif
@@ -278,6 +298,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -285,7 +307,7 @@
 +
 --- a/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
-@@ -227,6 +227,19 @@
+@@ -227,6 +227,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -298,6 +320,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -307,7 +331,7 @@
  #ifdef __USE_GNU
 --- a/ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h
-@@ -182,6 +182,19 @@
+@@ -182,6 +182,21 @@
  # define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
  #endif
  
@@ -320,6 +344,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -329,7 +355,7 @@
  /* Provide kernel hint to read ahead.  */
 --- a/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
-@@ -198,6 +198,19 @@
+@@ -198,6 +198,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -342,6 +368,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -351,7 +379,7 @@
  #ifdef __USE_GNU
 --- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-@@ -226,6 +226,19 @@
+@@ -226,6 +226,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -364,6 +392,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif
@@ -373,7 +403,7 @@
  #ifdef __USE_GNU
 --- a/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
-@@ -240,6 +240,19 @@
+@@ -240,6 +240,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -386,6 +416,8 @@
 +# define AT_REMOVEDIR		0x200	/* Remove directory instead of
 +					   unlinking file.  */
 +# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
++# define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
++					   traversal.  */
 +# define AT_EACCESS		0x200	/* Test access permitted for
 +					   effective IDs, not real IDs.  */
 +#endif

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-etc-resolv.conf.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-etc-resolv.conf.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-etc-resolv.conf.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,42 +0,0 @@
-2009-11-08  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* resolv/res_init.c (__res_vinit): Initialize nameserver to the
-	loopback address if none specified.
-
----
- resolv/res_init.c |   17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
---- a/resolv/res_init.c
-+++ b/resolv/res_init.c
-@@ -176,13 +176,6 @@
- 		statp->id = res_randomid();
- 	}
- 
--#ifdef USELOOPBACK
--	statp->nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
--#else
--	statp->nsaddr.sin_addr.s_addr = INADDR_ANY;
--#endif
--	statp->nsaddr.sin_family = AF_INET;
--	statp->nsaddr.sin_port = htons(NAMESERVER_PORT);
- 	statp->nscount = 0;
- 	statp->ndots = 1;
- 	statp->pfcode = 0;
-@@ -433,6 +426,16 @@
- #endif
- 	    (void) fclose(fp);
- 	}
-+	if (statp->nscount == 0) {
-+	    statp->nscount = 1;
-+#ifdef USELOOPBACK
-+	    statp->nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
-+#else
-+	    statp->nsaddr.sin_addr.s_addr = INADDR_ANY;
-+#endif
-+	    statp->nsaddr.sin_family = AF_INET;
-+	    statp->nsaddr.sin_port = htons(NAMESERVER_PORT);
-+	}
- 	if (statp->defdname[0] == 0 &&
- 	    __gethostname(buf, sizeof(statp->defdname) - 1) == 0 &&
- 	    (cp = strchr(buf, '.')) != NULL)

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-futex_robust_pi.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-futex_robust_pi.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-futex_robust_pi.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -13,15 +13,13 @@
 
 --- a/sysdeps/unix/sysv/linux/kernel-features.h
 +++ b/sysdeps/unix/sysv/linux/kernel-features.h
-@@ -454,11 +454,16 @@
+@@ -454,9 +454,17 @@
  # define __ASSUME_ATFCTS	1
  #endif
  
 -/* Support for inter-process robust mutexes was added in 2.6.17.  */
 -#if __LINUX_KERNEL_VERSION >= 0x020611 \
--    && ((!defined __sh__ && !defined __alpha__) \
--	|| (__LINUX_KERNEL_VERSION >= 0x020613 && defined __sh__) \
--	|| (__LINUX_KERNEL_VERSION >= 0x020617 && defined __alpha__))
+-    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613)
 +/* Support for inter-process robust mutexes was added in 2.6.17 on i386,
 +   powerpc and s390. It was added in 2.6.18 on s390 and sparc64, 2.6.19 on
 +   ia64 and 2.6.23 on sh. */
@@ -31,7 +29,8 @@
 +     || (__LINUX_KERNEL_VERSION >= 0x020612 && defined __sparc__ && __arch64__) \
 +     || (__LINUX_KERNEL_VERSION >= 0x020611 && defined __x86_64__) \
 +     || (__LINUX_KERNEL_VERSION >= 0x020613 && defined __ia64__) \
-+     || (__LINUX_KERNEL_VERSION >= 0x020617 && defined __sh__)
++     || (__LINUX_KERNEL_VERSION >= 0x020617 && defined __sh__) \
++     || (__LINUX_KERNEL_VERSION >= 0x020617 && defined __alpha__)
  # define __ASSUME_SET_ROBUST_LIST	1
  #endif
  

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-group_member.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-group_member.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-group_member.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,20 +0,0 @@
-2010-06-13  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* posix/group_member.c(__group_member): Correct off-by-one
-	error.
-
-diff --git a/posix/group_member.c b/posix/group_member.c
-index 7bd9c46..104a055 100644
---- a/posix/group_member.c
-+++ b/posix/group_member.c
-@@ -41,8 +41,8 @@ __group_member (gid)
-       size *= 2;
-     } while (n == size / 2);
- 
--  while (n >= 0)
--    if (groups[n--] == gid)
-+  while (n > 0)
-+    if (groups[--n] == gid)
-       return 1;
- 
-   return 0;

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-longdouble.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-longdouble.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-longdouble.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -4,10 +4,10 @@
 
 --- a/math/Makefile
 +++ b/math/Makefile
-@@ -93,13 +93,17 @@
- tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
- 	test-misc test-fpucw tst-definitions test-tgmath test-tgmath-ret \
- 	bug-nextafter bug-nexttoward bug-tgmath1 test-tgmath-int
+@@ -95,13 +95,17 @@
+ 	bug-nextafter bug-nexttoward bug-tgmath1 test-tgmath-int \
+ 	test-dbl-wrap
+ tests-$(OPTION_EGLIBC_LIBM_BIG) += atest-exp atest-sincos atest-exp2
 -# We do the `long double' tests only if this data type is available and
 -# distinct from `double'.
 +# We do the `long double' tests only if this data type is available.

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-nis-shadow.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-nis-shadow.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-nis-shadow.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,302 +0,0 @@
-2010-01-06  Christoph Pleger <Christoph.Pleger@cs.tu-dortmund.de>
-	    Aurelien Jarno  <aurelien@aurel32.net>
-
-	* nis/nss_nis/nis-pwd.c (internal_nis_getpwent_r): When adjunct
-	style secret password is returned, mangle 'x' instead of the
-	encrypted password.
-	(_nss_nis_getpwnam_r): Likewise.
-	(_nss_nis_getpwuid_r): Likewise.
-	* nis/nss_nis/nis-spwd.c (internal_nis_getspent_r): When shadow.byname
-	does not exist, look in passwd.adjunct.byname and adapt the result.
-	(_nss_nis_getspnam_r): Likewise.
-
----
- nis/nss_nis/nis-pwd.c  |   99 ++++++++++++-------------------------------------
- nis/nss_nis/nis-spwd.c |   55 ++++++++++++++++++++++++---
- 2 files changed, 74 insertions(+), 80 deletions(-)
-
---- a/nis/nss_nis/nis-pwd.c
-+++ b/nis/nss_nis/nis-pwd.c
-@@ -266,49 +266,32 @@
-       /* Check for adjunct style secret passwords.  They can be
- 	 recognized by a password starting with "##".  */
-       char *p = strchr (result, ':');
--      size_t namelen;
--      char *result2;
--      int len2;
-       if (p != NULL	/* This better should be true in all cases.  */
--	  && p[1] == '#' && p[2] == '#'
--	  && (namelen = p - result,
--	      yp_match (domain, "passwd.adjunct.byname", result, namelen,
--			&result2, &len2)) == YPERR_SUCCESS)
-+	  && p[1] == '#' && p[2] == '#')
- 	{
--	  /* We found a passwd.adjunct entry.  Merge encrypted
--	     password therein into original result.  */
--	  char *encrypted = strchr (result2, ':');
--	  char *endp;
--	  size_t restlen;
--
--	  if (encrypted == NULL
--	      || (endp = strchr (++encrypted, ':')) == NULL
--	      || (p = strchr (p + 1, ':')) == NULL)
-+	  size_t namelen = p - result;
-+	  if ((p = strchr (p + 1, ':')) == NULL)
- 	    {
- 	      /* Invalid format of the entry.  This never should happen
- 		 unless the data from which the NIS table is generated is
- 		 wrong.  We simply ignore it.  */
--	      free (result2);
- 	      goto non_adjunct;
- 	    }
- 
--	  restlen = len - (p - result);
--	  if (__builtin_expect ((size_t) (namelen + (endp - encrypted)
--					  + restlen + 2) > buflen, 0))
-+	  /* We found an adjunct style secret password.  Replace
-+	     it by 'x' into the result.  */
-+	  size_t restlen = len - (p - result);
-+	  if (__builtin_expect ((size_t) (namelen + restlen + 3) > buflen, 0))
- 	    {
--	      free (result2);
- 	      free (result);
- 	      *errnop = ERANGE;
- 	      return NSS_STATUS_TRYAGAIN;
- 	    }
- 
--	  mempcpy (mempcpy (mempcpy (mempcpy (buffer, result, namelen),
--				     ":", 1),
--			    encrypted, endp - encrypted),
-+	  mempcpy (mempcpy (mempcpy (buffer, result, namelen),
-+			    ":x", 2),
- 		   p, restlen + 1);
- 	  p = buffer;
--
--	  free (result2);
- 	}
-       else
- 	{
-@@ -400,47 +383,32 @@
- 
-   /* Check for adjunct style secret passwords.  They can be recognized
-      by a password starting with "##".  */
--  char *result2;
--  int len2;
-   char *p = strchr (result, ':');
-   if (p != NULL	/* This better should be true in all cases.  */
--      && p[1] == '#' && p[2] == '#'
--      && yp_match (domain, "passwd.adjunct.byname", name, namelen,
--		   &result2, &len2) == YPERR_SUCCESS)
-+      && p[1] == '#' && p[2] == '#')
-     {
--      /* We found a passwd.adjunct entry.  Merge encrypted password
--	 therein into original result.  */
--      char *encrypted = strchr (result2, ':');
--      char *endp;
--
--      if (encrypted == NULL
--	  || (endp = strchr (++encrypted, ':')) == NULL
--	  || (p = strchr (p + 1, ':')) == NULL)
-+      if ((p = strchr (p + 1, ':')) == NULL)
- 	{
- 	  /* Invalid format of the entry.  This never should happen
- 	     unless the data from which the NIS table is generated is
- 	     wrong.  We simply ignore it.  */
--	  free (result2);
- 	  goto non_adjunct;
- 	}
- 
-+      /* We found an adjunct style secret password.  Replace
-+	 it by 'x' into the result.  */
-       size_t restlen = len - (p - result);
--      if (__builtin_expect ((size_t) (namelen + (endp - encrypted)
--				      + restlen + 2) > buflen, 0))
-+      if (__builtin_expect ((size_t) (namelen + restlen + 3) > buflen, 0))
- 	{
--	  free (result2);
- 	  free (result);
- 	  *errnop = ERANGE;
- 	  return NSS_STATUS_TRYAGAIN;
- 	}
- 
--      __mempcpy (__mempcpy (__mempcpy (__mempcpy (buffer, name, namelen),
--				       ":", 1),
--			    encrypted, endp - encrypted),
-+      __mempcpy (__mempcpy (__mempcpy (buffer, result, namelen),
-+			     ":x", 2),
- 		 p, restlen + 1);
-       p = buffer;
--
--      free (result2);
-     }
-   else
-     {
-@@ -499,50 +467,33 @@
- 
-   /* Check for adjunct style secret passwords.  They can be recognized
-      by a password starting with "##".  */
--  char *result2;
--  int len2;
--  size_t namelen;
-   char *p = strchr (result, ':');
-   if (p != NULL	/* This better should be true in all cases.  */
--      && p[1] == '#' && p[2] == '#'
--      && (namelen = p - result,
--	  yp_match (domain, "passwd.adjunct.byname", result, namelen,
--		    &result2, &len2)) == YPERR_SUCCESS)
-+      && p[1] == '#' && p[2] == '#')
-     {
--      /* We found a passwd.adjunct entry.  Merge encrypted password
--	 therein into original result.  */
--      char *encrypted = strchr (result2, ':');
--      char *endp;
--      size_t restlen;
--
--      if (encrypted == NULL
--	  || (endp = strchr (++encrypted, ':')) == NULL
--	  || (p = strchr (p + 1, ':')) == NULL)
-+      size_t namelen = p - result;
-+      if ((p = strchr (p + 1, ':')) == NULL)
- 	{
- 	  /* Invalid format of the entry.  This never should happen
- 	     unless the data from which the NIS table is generated is
- 	     wrong.  We simply ignore it.  */
--	  free (result2);
- 	  goto non_adjunct;
- 	}
- 
--      restlen = len - (p - result);
--      if (__builtin_expect ((size_t) (namelen + (endp - encrypted)
--				      + restlen + 2) > buflen, 0))
-+      /* We found an adjunct style secret password.  Replace
-+	 it by 'x' into the result.  */
-+      size_t restlen = len - (p - result);
-+      if (__builtin_expect ((size_t) (namelen + restlen + 3) > buflen, 0))
- 	{
--	  free (result2);
- 	  free (result);
- 	  *errnop = ERANGE;
- 	  return NSS_STATUS_TRYAGAIN;
- 	}
- 
--      __mempcpy (__mempcpy (__mempcpy (__mempcpy (buffer, result, namelen),
--				       ":", 1),
--			    encrypted, endp - encrypted),
-+      __mempcpy (__mempcpy (__mempcpy (buffer, result, namelen),
-+			   ":x", 2),
- 		 p, restlen + 1);
-       p = buffer;
--
--      free (result2);
-     }
-   else
-     {
---- a/nis/nss_nis/nis-spwd.c
-+++ b/nis/nss_nis/nis-spwd.c
-@@ -81,13 +81,38 @@
-       int len;
-       int keylen;
-       int yperr;
-+      int adjunct_used = 0;
- 
-       if (new_start)
--        yperr = yp_first (domain, "shadow.byname", &outkey, &keylen, &result,
--			  &len);
-+	{
-+	  yperr = yp_first (domain, "shadow.byname", &outkey, &keylen, &result,
-+			    &len);
-+
-+	  if (yperr == YPERR_MAP)
-+	    {
-+	      if (result != NULL)
-+		free(result);
-+
-+	      yperr = yp_first (domain, "passwd.adjunct.byname", &outkey, &keylen,
-+				&result, &len);
-+	      adjunct_used = 1;
-+	    }
-+	}
-       else
--        yperr = yp_next (domain, "shadow.byname", oldkey, oldkeylen, &outkey,
--			 &keylen, &result, &len);
-+	{
-+	  yperr = yp_next (domain, "shadow.byname", oldkey, oldkeylen, &outkey,
-+			   &keylen, &result, &len);
-+
-+	  if (yperr == YPERR_MAP)
-+	    {
-+	      if (result != NULL)
-+		free(result);
-+
-+	      yperr = yp_next (domain, "passwd.adjunct.byname", oldkey, oldkeylen,
-+			       &outkey, &keylen, &result, &len);
-+	      adjunct_used = 1;
-+	    }
-+	}
- 
-       if (__builtin_expect (yperr != YPERR_SUCCESS, 0))
-         {
-@@ -98,7 +123,7 @@
-           return retval;
-         }
- 
--      if (__builtin_expect ((size_t) (len + 1) > buflen, 0))
-+      if (__builtin_expect ((size_t) (len + (adjunct_used ? 3 : 1)) > buflen, 0))
-         {
-           free (result);
- 	  *errnop = ERANGE;
-@@ -107,6 +132,9 @@
- 
-       char *p = strncpy (buffer, result, len);
-       buffer[len] = '\0';
-+      if (adjunct_used)
-+        p = strcat (buffer, "::");
-+
-       while (isspace (*p))
-         ++p;
-       free (result);
-@@ -149,6 +177,8 @@
- _nss_nis_getspnam_r (const char *name, struct spwd *sp,
- 		     char *buffer, size_t buflen, int *errnop)
- {
-+  int adjunct_used = 0;
-+
-   if (name == NULL)
-     {
-       *errnop = EINVAL;
-@@ -164,6 +194,16 @@
-   int yperr = yp_match (domain, "shadow.byname", name, strlen (name), &result,
- 			&len);
- 
-+  if (yperr == YPERR_MAP)
-+    {
-+      if (result != NULL)
-+	free(result);
-+
-+      yperr = yp_match (domain, "passwd.adjunct.byname", name, strlen (name), &result,
-+			&len);
-+      adjunct_used = 1;
-+  }
-+
-   if (__builtin_expect (yperr != YPERR_SUCCESS, 0))
-     {
-       enum nss_status retval = yperr2nss (yperr);
-@@ -173,7 +213,7 @@
-       return retval;
-     }
- 
--  if (__builtin_expect ((size_t) (len + 1) > buflen, 0))
-+  if (__builtin_expect ((size_t) (len + (adjunct_used ? 3 : 1)) > buflen, 0))
-     {
-       free (result);
-       *errnop = ERANGE;
-@@ -182,6 +222,9 @@
- 
-   char *p = strncpy (buffer, result, len);
-   buffer[len] = '\0';
-+  if (adjunct_used)
-+    p = strcat (buffer, "::");
-+
-   while (isspace (*p))
-     ++p;
-   free (result);

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-resolv.conf-thread.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-resolv.conf-thread.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-resolv.conf-thread.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,26 +0,0 @@
-2010-09-15  Aurelien Jarno  <aurelien@aurel32.net>
- 
-	* resolv/res_libc (__res_maybe_init): Ask other threads to
-	to re-initialize their resolver states when _PATH_RESCONF
-	changes.
-
---- a/resolv/res_libc.c
-+++ b/resolv/res_libc.c
-@@ -100,10 +100,13 @@
- 
- 	if (resp->options & RES_INIT) {
- 		ret = stat (_PATH_RESCONF, &statbuf);
--		if ((__res_initstamp != resp->_u._ext.initstamp)
--		    || ((ret == 0) && (last_mtime != statbuf.st_mtime))) {
--			if (ret == 0)
--				last_mtime = statbuf.st_mtime;
-+		if ((ret == 0) && (last_mtime != statbuf.st_mtime)) {
-+			last_mtime = statbuf.st_mtime;
-+			atomicinclock (lock);
-+			atomicinc (__res_initstamp);
-+			atomicincunlock (lock);
-+		}
-+		if (__res_initstamp != resp->_u._ext.initstamp) {
- 			if (resp->nscount > 0)
- 				__res_iclose (resp, true);
- 			return __res_vinit (resp, 1);

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/arm/local-no-hwcap.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/arm/local-no-hwcap.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/arm/local-no-hwcap.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,17 +0,0 @@
-# DP: Restricted hardware caps for ARM
-
----
- ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
-+++ b/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
-@@ -54,7 +54,7 @@
-   return GLRO(dl_arm_cap_flags)[idx];
- };
- 
--#define HWCAP_IMPORTANT		(HWCAP_ARM_HALF | HWCAP_ARM_FAST_MULT)
-+#define HWCAP_IMPORTANT		(HWCAP_ARM_VFP | HWCAP_ARM_NEON)
- 
- static inline int
- __attribute__ ((unused))

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hppa/cvs-nptl-compat.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hppa/cvs-nptl-compat.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hppa/cvs-nptl-compat.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,36 +0,0 @@
----
- ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h
-@@ -64,7 +64,10 @@
- {
-   struct __pthread_mutex_s
-   {
--    int __lock;
-+    /* Ensure that the entire structure when embedded in another
-+       structure retains the same alignment requirements as it
-+       did in LinuxThreads, thus add aligned 16 here.  */
-+    int __lock __attribute__ ((aligned(16)));
-     unsigned int __count;
-     int __owner;
-     /* KIND must stay at this position in the structure to maintain
-@@ -113,7 +116,7 @@
-        start of the 4-word lock structure, the next four words
-        are set all to 1 by the Linuxthreads 
-        PTHREAD_COND_INITIALIZER.  */
--    int __lock;
-+    int __lock __attribute__ ((aligned(16)));
-     /* Tracks the initialization of this structure:
-        0  initialized with NPTL PTHREAD_COND_INITIALIZER.
-        1  initialized with Linuxthreads PTHREAD_COND_INITIALIZER.
-@@ -161,7 +164,7 @@
-        start of the 4-word 16-byte aligned lock structure. The
-        next four words are all set to 1 by the Linuxthreads
-        PTHREAD_RWLOCK_INITIALIZER. We ignore them in NPTL.  */
--    int __compat_padding[4];
-+    int __compat_padding[4] __attribute__ ((aligned(16)));
-     int __lock;
-     unsigned int __nr_readers;
-     unsigned int __readers_wakeup;

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hppa/cvs-vfork.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hppa/cvs-vfork.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hppa/cvs-vfork.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,55 +0,0 @@
-2010-06-24  Carlos O'Donell  <carlos@codesourcery.com>
-
-	* sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S: Only create stack 
-	frame around call to SYSCALL_ERROR_HANDLER. Do not restore %rp 
-	from the stack frame on successfull return.
-
-diff --git a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S
-index 83a70b7..15efa98 100644
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -50,10 +50,9 @@
- 
- 	/* r26, r25, r24, r23 are free since vfork has no arguments */
- ENTRY(__vfork)
--	/* Prologue */
--	stwm	%r3, 64(%sp)
--	stw	%sp, -4(%sp)
--	stw	%r19, -32(%sp)
-+	/* We must not create a frame. When the child unwinds to call 
-+	   exec it will clobber the same frame that the parent
-+	   needs to unwind.  */
- 
- 	/* Save the PIC register. */
- #ifdef PIC
-@@ -75,12 +74,20 @@ ENTRY(__vfork)
- 	comclr,>>= %r1,%ret0,%r0        /* Note: unsigned compare. */
- 	b,n	.Lerror
- 
--	/* Return, no need to restore the PIC register. */
--	ldw	-84(%sp), %rp
--	bv	%r0(%rp)
--	ldwm	-64(%sp), %r3
-+	/* Return, and DO NOT restore rp. The child may have called
-+	   functions that updated the frame's rp. This works because
-+	   the kernel ensures rp is preserved across the vfork 
-+	   syscall.  */
-+	bv,n	%r0(%rp)
- 
- .Lerror:
-+	/* Now we need a stack to call a function. We are assured
-+	   that there is no child now, so it's safe to create
-+	   a frame.  */
-+	stw	%rp, -20(%sp)
-+	stwm	%r3, 64(%sp)
-+	stw	%sp, -4(%sp)
-+
- 	sub	%r0,%ret0,%r3
- 	SYSCALL_ERROR_HANDLER
- 	/* Restore the PIC register (in delay slot) on error */

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-stack-grows-up.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-stack-grows-up.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-stack-grows-up.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -8,12 +8,6 @@
 
 --- a/nptl/allocatestack.c
 +++ b/nptl/allocatestack.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002-2007, 2009 Free Software Foundation, Inc.
-+/* Copyright (C) 2002-2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
- 
 @@ -353,6 +353,15 @@
    if (__builtin_expect (attr->flags & ATTR_FLAG_STACKADDR, 0))
      {
@@ -54,7 +48,7 @@
  #elif TLS_DTV_AT_TP
 -      pd = (struct pthread *) (((uintptr_t) attr->stackaddr
 +      pd = (struct pthread *) (((uintptr_t) stackaddr
- 			        - __static_tls_size - adj)
+				- __static_tls_size - adj)
  			       - TLS_PRE_TCB_SIZE);
  #endif
 @@ -391,7 +400,7 @@
@@ -137,12 +131,6 @@
    return 0;
 --- a/nptl/pthread_create.c
 +++ b/nptl/pthread_create.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002-2007,2008,2009 Free Software Foundation, Inc.
-+/* Copyright (C) 2002-2007,2008,2009,2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
- 
 @@ -388,12 +388,18 @@
  #ifdef _STACK_GROWS_DOWN
    char *sp = CURRENT_STACK_FRAME;

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-getcwd.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-getcwd.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-getcwd.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,17 +0,0 @@
-The patch below fixes a spurious call to mach_port_deallocate: rootdevid
-is already deallocated as soon as it is fetched through __io_identity.
-
----
- sysdeps/mach/hurd/getcwd.c |    1 -
- 1 file changed, 1 deletion(-)
-
---- a/sysdeps/mach/hurd/getcwd.c
-+++ b/sysdeps/mach/hurd/getcwd.c
-@@ -60,7 +60,6 @@
-       __mach_port_deallocate (__mach_task_self (), thisid);
-       __mach_port_deallocate (__mach_task_self (), thisdevid);
-       __mach_port_deallocate (__mach_task_self (), rootid);
--      __mach_port_deallocate (__mach_task_self (), rootdevid);
- 
-       if (dirbuf != NULL)
- 	__vm_deallocate (__mach_task_self (),

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-getnprocs.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-getnprocs.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-getnprocs.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,44 +0,0 @@
-http://sources.redhat.com/ml/libc-alpha/2010-01/msg00046.html
-
-2010-01-26  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-	* sysdeps/mach/getsysstats.c (get_nprocs_conf, get_nprocs,
-	get_phys_pages, get_avphys_pages): Add weak aliases.
-
----
- getsysstats.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c
-index d2bebb6..a7e0804 100644
---- a/sysdeps/mach/getsysstats.c
-+++ b/sysdeps/mach/getsysstats.c
-@@ -40,6 +40,7 @@ __get_nprocs_conf ()
- 
-   return hbi.max_cpus;
- }
-+weak_alias (__get_nprocs_conf, get_nprocs_conf)
- 
- /* Return the number of processors currently available on the system. */
- int
-@@ -58,6 +59,7 @@ __get_nprocs ()
- 
-   return hbi.avail_cpus;
- }
-+weak_alias (__get_nprocs, get_nprocs)
- 
- /* Return the number of physical pages on the system. */
- long int
-@@ -76,6 +78,7 @@ __get_phys_pages ()
- 
-   return hbi.memory_size / __vm_page_size;
- }
-+weak_alias (__get_phys_pages, get_phys_pages)
- 
- /* Return the number of available physical pages */
- long int
-@@ -100,3 +103,4 @@ __get_avphys_pages ()
- 
-   return vs.free_count;
- }
-+weak_alias (__get_avphys_pages, get_avphys_pages)

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-linkat.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-linkat.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-linkat.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,68 +0,0 @@
-This fixes linkat() with AT_SYMLINK_FOLLOW in flags, which is currently
-returning EINVAL.
-
-2010-06-02  Emilio Pozuelo Monfort  <pochu27@gmail.com>
-
-	* hurd/lookup-at.c (__file_name_lookup_at): Accept
-	AT_SYMLINK_FOLLOW in at_flags.  Fail with EINVAL if both
-	AT_SYMLINK_FOLLOW and AT_SYMLINK_NOFOLLOW are present
-	in at_flags.
-	* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
-	* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in flags.
-
----
- hurd/hurd/fd.h             |    5 +++--
- hurd/lookup-at.c           |    6 ++++++
- sysdeps/mach/hurd/linkat.c |    4 +++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h
-index d1aa867..2473476 100644
---- a/hurd/hurd/fd.h
-+++ b/hurd/hurd/fd.h
-@@ -254,8 +254,9 @@ extern int _hurd_select (int nfds, struct pollfd *pollfds,
- 			 const sigset_t *sigmask);
-
- /* Variant of file_name_lookup used in *at function implementations.
--   AT_FLAGS should contain only AT_SYMLINK_NOFOLLOW; other bits
--   cause EINVAL.  */
-+   AT_FLAGS may only contain AT_SYMLINK_FOLLOW or AT_SYMLINK_NOFOLLOW,
-+   which will remove and add O_NOLINK from FLAGS respectively.
-+   Other bits cause EINVAL.  */
- extern file_t __file_name_lookup_at (int fd, int at_flags,
- 				     const char *file_name,
- 				     int flags, mode_t mode);
-diff --git a/hurd/lookup-at.c b/hurd/lookup-at.c
-index 7f55527..728a970 100644
---- a/hurd/lookup-at.c
-+++ b/hurd/lookup-at.c
-@@ -30,8 +30,14 @@ __file_name_lookup_at (int fd, int at_flags,
-   error_t err;
-   file_t result;
-
-+  if ((at_flags & AT_SYMLINK_FOLLOW) && (at_flags & AT_SYMLINK_NOFOLLOW))
-+    return (__hurd_fail (EINVAL), MACH_PORT_NULL);
-+
-   flags |= (at_flags & AT_SYMLINK_NOFOLLOW) ? O_NOLINK : 0;
-   at_flags &= ~AT_SYMLINK_NOFOLLOW;
-+  if (at_flags & AT_SYMLINK_FOLLOW)
-+    flags &= ~O_NOLINK;
-+  at_flags &= ~AT_SYMLINK_FOLLOW;
-   if (at_flags != 0)
-     return (__hurd_fail (EINVAL), MACH_PORT_NULL);
-
-diff --git a/sysdeps/mach/hurd/linkat.c b/sysdeps/mach/hurd/linkat.c
-index 1942144..f8406a5 100644
---- a/sysdeps/mach/hurd/linkat.c
-+++ b/sysdeps/mach/hurd/linkat.c
-@@ -38,7 +38,9 @@ linkat (fromfd, from, tofd, to, flags)
-   file_t oldfile, linknode, todir;
-   char *toname;
-
--  oldfile = __file_name_lookup_at (fromfd, flags, from, 0, 0);
-+  /* POSIX says linkat() doesn't follow symlinks by default, so pass
-+     O_NOLINK.  That can be overriden by AT_SYMLINK_FOLLOW in FLAGS.  */
-+  oldfile = __file_name_lookup_at (fromfd, flags, from, O_NOLINK, 0);
-   if (oldfile == MACH_PORT_NULL)
-     return -1;
-

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-sched_param.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-sched_param.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-sched_param.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,51 +0,0 @@
-2010-09-01  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-        This aligns bits/sched.h onto sysdeps/unix/sysv/linux/bits/sched.h:
-        define __sched_param instead of SCHED_* and sched_param when
-	<bits/sched.h> is included with __need_schedparam defined.
-
-        * bits/sched.h [__need_schedparam] (SCHED_OTHER, SCHED_FIFO, SCHED_RR,
-        sched_param): do not define.
-
-        [!__defined_schedparam && (__need_schedparam || _SCHED_H)]
-        (__defined_schedparam): Define to 1.
-	(__sched_param): New structure, identical to sched_param.
-	(__need_schedparam): Undefine.
-
----
- sched.h |   15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/bits/sched.h b/bits/sched.h
-index af92dbc..a068e50 100644
---- a/bits/sched.h
-+++ b/bits/sched.h
-@@ -18,6 +18,8 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifndef __need_schedparam
-+
- #ifndef _SCHED_H
- # error "Never include <bits/sched.h> directly; use <sched.h> instead."
- #endif
-@@ -34,6 +36,19 @@ struct sched_param
-   int __sched_priority;
- };
- 
-+#endif	/* need schedparam */
-+
-+#if !defined __defined_schedparam \
-+    && (defined __need_schedparam || defined _SCHED_H)
-+# define __defined_schedparam	1
-+/* Data structure to describe a process' schedulability.  */
-+struct __sched_param
-+  {
-+    int __sched_priority;
-+  };
-+# undef __need_schedparam
-+#endif
-+
- 
- #if defined _SCHED_H && !defined __cpu_set_t_defined
- # define __cpu_set_t_defined

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-select.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-select.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-select.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,20 +0,0 @@
-http://sourceware.org/ml/libc-alpha/2010-08/msg00002.html
-
-2010-07-31  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-        * hurd/hurdselect.c (_hurd_select): Round timeout up instead of down
-        when converting to ms.
-
-diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c
-index 544eee9..a7228f0 100644
---- a/hurd/hurdselect.c
-+++ b/hurd/hurdselect.c
-@@ -52,7 +52,7 @@ _hurd_select (int nfds,
-   int firstfd, lastfd;
-   mach_msg_timeout_t to = (timeout != NULL ?
- 			   (timeout->tv_sec * 1000 +
--			    timeout->tv_nsec / 1000000) :
-+			    (timeout->tv_nsec + 999999) / 1000000) :
- 			   0);
-   struct
-     {

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-sendmsg-leak.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-sendmsg-leak.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-sendmsg-leak.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,35 +0,0 @@
-commit 23d101d8eea76469b41c12b10a8e8ed13cf66bc6
-Author: Emilio Pozuelo Monfort <pochu27@gmail.com>
-Date:   Tue Jul 20 19:19:34 2010 -0700
-
-    Hurd: fix sendmsg memory leak in error paths
-
-diff --git a/sysdeps/mach/hurd/sendmsg.c b/sysdeps/mach/hurd/sendmsg.c
-index a9d1c8c..118fd59 100644
---- a/sysdeps/mach/hurd/sendmsg.c
-+++ b/sysdeps/mach/hurd/sendmsg.c
-@@ -109,14 +109,22 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
- 	     and talk to it with the ifsock protocol.  */
- 	  file_t file = __file_name_lookup (addr->sun_path, 0, 0);
- 	  if (file == MACH_PORT_NULL)
--	    return -1;
-+	    {
-+	      if (dealloc)
-+		__vm_deallocate (__mach_task_self (), data.addr, len);
-+	      return -1;
-+	    }
- 	  err = __ifsock_getsockaddr (file, &aport);
- 	  __mach_port_deallocate (__mach_task_self (), file);
- 	  if (err == MIG_BAD_ID || err == EOPNOTSUPP)
- 	    /* The file did not grok the ifsock protocol.  */
- 	    err = ENOTSOCK;
- 	  if (err)
--	    return __hurd_fail (err);
-+	    {
-+	      if (dealloc)
-+		__vm_deallocate (__mach_task_self (), data.addr, len);
-+	      return __hurd_fail (err);
-+	    }
- 	}
-       else
- 	err = EIEIO;

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-setsid.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-setsid.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-setsid.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,77 +0,0 @@
-commit e87e2f48effefe5e70a9a21bc13d7187608d0365
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date:   Tue Dec 22 11:51:44 2009 -0800
-
-    Hurd: Fix possibly uninitialized variable in _hurd_locked_install_cttyid.
-
----
- ChangeLog        |    5 +++++
- hurd/hurdioctl.c |   24 ++++++++++--------------
- 2 files changed, 15 insertions(+), 14 deletions(-)
-
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -283,6 +283,11 @@
- 
- 	* dirent/dirent.h: Fix typo in feature selection macro use.
- 
-+2009-12-22  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-+
-+	* hurd/hurdioctl.c (_hurd_locked_install_cttyid): Set newctty to
-+	MACH_PORT_NULL when id != cttyid.
-+
- 2009-12-15  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* include/link.h (struct link_map): Move l_used into its own word.
---- a/hurd/hurdioctl.c
-+++ b/hurd/hurdioctl.c
-@@ -1,5 +1,6 @@
- /* ioctl commands which must be done in the C library.
--   Copyright (C) 1994,95,96,97,99,2001,02 Free Software Foundation, Inc.
-+   Copyright (C) 1994,95,96,97,99,2001,2002,2009
-+	Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -169,33 +170,28 @@
-   for (i = 0; i < _hurd_dtablesize; ++i)
-     {
-       struct hurd_fd *const d = _hurd_dtable[i];
--      mach_port_t newctty;
-+      mach_port_t newctty = MACH_PORT_NULL;
- 
-       if (d == NULL)
- 	/* Nothing to do for an unused descriptor cell.  */
- 	continue;
- 
--      if (cttyid == MACH_PORT_NULL)
--	/* We now have no controlling tty at all.  */
--	newctty = MACH_PORT_NULL;
--      else
-+      if (cttyid != MACH_PORT_NULL)
-+	/* We do have some controlling tty.  */
- 	HURD_PORT_USE (&d->port,
- 		       ({ mach_port_t id;
- 			  /* Get the io object's cttyid port.  */
- 			  if (! __term_getctty (port, &id))
- 			    {
--			      if (id == cttyid && /* Is it ours?  */
-+			      if (id == cttyid /* Is it ours?  */
- 				  /* Get the ctty io port.  */
--				  __term_open_ctty (port,
--						    _hurd_pid, _hurd_pgrp,
--						    &newctty))
-+				  && __term_open_ctty (port,
-+						       _hurd_pid, _hurd_pgrp,
-+						       &newctty))
- 				/* XXX it is our ctty but the call failed? */
- 				newctty = MACH_PORT_NULL;
--			      __mach_port_deallocate
--				(__mach_task_self (), (mach_port_t) id);
-+			      __mach_port_deallocate (__mach_task_self (), id);
- 			    }
--			  else
--			    newctty = MACH_PORT_NULL;
- 			  0;
- 			}));
- 

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-ttyname.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-ttyname.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-ttyname.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,54 +0,0 @@
-http://www.cygwin.com/ml/libc-alpha/2010-06/msg00005.html
-
-2010-06-06  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-        * sysdeps/mach/hurd/ttyname.c (ttyname): Replace MIG_BAD_ID and
-        EOPNOTSUPP errors with ENOTTY.
-        * sysdeps/mach/hurd/ttyname_r.c (__ttyname_r): Replace MIG_BAD_ID and
-        EOPNOTSUPP errors with ENOTTY.
-
----
- ttyname.c   |    8 ++++++--
- ttyname_r.c |    8 ++++++--
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/sysdeps/mach/hurd/ttyname.c b/sysdeps/mach/hurd/ttyname.c
-index 927851e..6e2e5bf 100644
---- a/sysdeps/mach/hurd/ttyname.c
-+++ b/sysdeps/mach/hurd/ttyname.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1994, 1997 Free Software Foundation, Inc.
-+/* Copyright (C) 1994, 1997, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -32,7 +32,11 @@ ttyname (int fd)
- 
-   nodename[0] = '\0';
-   if (err = HURD_DPORT_USE (fd, __term_get_nodename (port, nodename)))
--    return __hurd_dfail (fd, err), NULL;
-+    {
-+      if (err == MIG_BAD_ID || err == EOPNOTSUPP)
-+	err = ENOTTY;
-+      return __hurd_dfail (fd, err), NULL;
-+    }
- 
-   return nodename;
- }
-diff --git a/sysdeps/mach/hurd/ttyname_r.c b/sysdeps/mach/hurd/ttyname_r.c
-index 8896252..5f6c9c3 100644
---- a/sysdeps/mach/hurd/ttyname_r.c
-+++ b/sysdeps/mach/hurd/ttyname_r.c
-@@ -34,7 +34,11 @@ __ttyname_r (int fd, char *buf, size_t buflen)
- 
-   nodename[0] = '\0';
-   if (err = HURD_DPORT_USE (fd, __term_get_nodename (port, nodename)))
--    return __hurd_dfail (fd, err), errno;
-+    {
-+      if (err == MIG_BAD_ID || err == EOPNOTSUPP)
-+	err = ENOTTY;
-+      return __hurd_dfail (fd, err), errno;
-+    }
- 
-   len = strlen (nodename) + 1;
-   if (len > buflen)

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,31 +0,0 @@
-http://sources.redhat.com/ml/libc-alpha/2010-01/msg00038.html
-
-2010-01-17  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-	* sysdeps/mach/hurd/bits/libc-lock.h (__rtld_lock_recursive_t): New
-	type.
-	(__rtld_lock_initialize): New macro.
-
----
- sysdeps/mach/hurd/bits/libc-lock.h |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/sysdeps/mach/hurd/bits/libc-lock.h
-+++ b/sysdeps/mach/hurd/bits/libc-lock.h
-@@ -34,6 +34,7 @@
-   void *owner;
-   int count;
- } __libc_lock_recursive_t;
-+typedef __libc_lock_recursive_t __rtld_lock_recursive_t;
- 
- #define __libc_lock_owner_self() ((void *) __hurd_threadvar_location (0))
- 
-@@ -124,6 +125,8 @@
- 
- #define __rtld_lock_init_recursive(NAME) \
-   __libc_lock_init_recursive (NAME)
-+#define __rtld_lock_initialize(NAME) \
-+  (void) ((NAME) = (__rtld_lock_recursive_t) _RTLD_LOCK_RECURSIVE_INITIALIZER)
- #define __rtld_lock_trylock_recursive(NAME) \
-   __libc_lock_trylock_recursive (NAME)
- #define __rtld_lock_lock_recursive(NAME) \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/i386/local-pthread_cond_wait.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/i386/local-pthread_cond_wait.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/i386/local-pthread_cond_wait.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,7 +1,7 @@
 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
 +++ /dev/null
-@@ -1,644 +0,0 @@
--/* Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+@@ -1,592 +0,0 @@
+-/* Copyright (C) 2002-2004,2006-2007,2009,2010 Free Software Foundation, Inc.
 -   This file is part of the GNU C Library.
 -   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 -
@@ -25,6 +25,8 @@
 -#include <lowlevellock.h>
 -#include <lowlevelcond.h>
 -#include <tcb-offsets.h>
+-#include <pthread-errnos.h>
+-#include <pthread-pi-defines.h>
 -#include <kernel-features.h>
 -
 -
@@ -36,16 +38,31 @@
 -	.align	16
 -__pthread_cond_wait:
 -.LSTARTCODE:
+-	cfi_startproc
+-#ifdef SHARED
+-	cfi_personality(DW_EH_PE_pcrel | DW_EH_PE_sdata4 | DW_EH_PE_indirect,
+-			DW.ref.__gcc_personality_v0)
+-	cfi_lsda(DW_EH_PE_pcrel | DW_EH_PE_sdata4, .LexceptSTART)
+-#else
+-	cfi_personality(DW_EH_PE_udata4, __gcc_personality_v0)
+-	cfi_lsda(DW_EH_PE_udata4, .LexceptSTART)
+-#endif
 -
+-	pushl	%ebp
+-	cfi_adjust_cfa_offset(4)
+-	cfi_rel_offset(%ebp, 0)
 -	pushl	%edi
--.Lpush_edi:
+-	cfi_adjust_cfa_offset(4)
+-	cfi_rel_offset(%edi, 0)
 -	pushl	%esi
--.Lpush_esi:
+-	cfi_adjust_cfa_offset(4)
+-	cfi_rel_offset(%esi, 0)
 -	pushl	%ebx
--.Lpush_ebx:
+-	cfi_adjust_cfa_offset(4)
+-	cfi_rel_offset(%ebx, 0)
 -
 -	xorl	%esi, %esi
--	movl	16(%esp), %ebx
+-	movl	20(%esp), %ebx
 -
 -	/* Get internal lock.  */
 -	movl	$1, %edx
@@ -61,7 +78,7 @@
 -	/* Store the reference to the mutex.  If there is already a
 -	   different value in there this is a bad user bug.  */
 -2:	cmpl	$-1, dep_mutex(%ebx)
--	movl	20(%esp), %eax
+-	movl	24(%esp), %eax
 -	je	15f
 -	movl	%eax, dep_mutex(%ebx)
 -
@@ -77,9 +94,10 @@
 -	addl	$1, cond_futex(%ebx)
 -	addl	$(1 << nwaiters_shift), cond_nwaiters(%ebx)
 -
--#define FRAME_SIZE 16
+-#define FRAME_SIZE 20
 -	subl	$FRAME_SIZE, %esp
--.Lsubl:
+-	cfi_adjust_cfa_offset(FRAME_SIZE)
+-	cfi_remember_state
 -
 -	/* Get and store current wakeup_seq value.  */
 -	movl	wakeup_seq(%ebx), %edi
@@ -89,7 +107,9 @@
 -	movl	%edx, 8(%esp)
 -	movl	%eax, 12(%esp)
 -
--8:	movl	cond_futex(%ebx), %edi
+-	/* Reset the pi-requeued flag.  */
+-8:	movl	$0, 16(%esp)
+-	movl	cond_futex(%ebx), %ebp
 -
 -	/* Unlock.  */
 -	LOCK
@@ -104,12 +124,39 @@
 -4:	call	__pthread_enable_asynccancel
 -	movl	%eax, (%esp)
 -
--#if FUTEX_PRIVATE_FLAG > 255
 -	xorl	%ecx, %ecx
--#endif
 -	cmpl	$-1, dep_mutex(%ebx)
 -	sete	%cl
--	subl	$1, %ecx
+-	je	18f
+-
+-	movl	dep_mutex(%ebx), %edi
+-	/* Requeue to a non-robust PI mutex if the PI bit is set and
+-	   the robust bit is not set.  */
+-	movl	MUTEX_KIND(%edi), %eax
+-	andl	$(ROBUST_BIT|PI_BIT), %eax
+-	cmpl	$PI_BIT, %eax
+-	jne	18f
+-
+-	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
+-	movl	%ebp, %edx
+-	xorl	%esi, %esi
+-	addl	$cond_futex, %ebx
+-	movl	$SYS_futex, %eax
+-	ENTER_KERNEL
+-	subl	$cond_futex, %ebx
+-	/* Set the pi-requeued flag only if the kernel has returned 0. The
+-	   kernel does not hold the mutex on error.  */
+-	cmpl	$0, %eax
+-	sete	16(%esp)
+-	je	19f
+-
+-	/* Normal and PI futexes dont mix. Use normal futex functions only
+-	   if the kernel does not support the PI futex functions.  */
+-	cmpl	$-ENOSYS, %eax
+-	jne	19f
+-	xorl	%ecx, %ecx
+-
+-18:	subl	$1, %ecx
 -#ifdef __ASSUME_PRIVATE_FUTEX
 -	andl	$FUTEX_PRIVATE_FLAG, %ecx
 -#else
@@ -118,7 +165,7 @@
 -#if FUTEX_WAIT != 0
 -	addl	$FUTEX_WAIT, %ecx
 -#endif
--	movl	%edi, %edx
+-	movl	%ebp, %edx
 -	addl	$cond_futex, %ebx
 -.Ladd_cond_futex:
 -	movl	$SYS_futex, %eax
@@ -126,7 +173,7 @@
 -	subl	$cond_futex, %ebx
 -.Lsub_cond_futex:
 -
--	movl	(%esp), %eax
+-19:	movl	(%esp), %eax
 -	call	__pthread_disable_asynccancel
 -.LcleanupEND:
 -
@@ -202,24 +249,41 @@
 -#endif
 -	jne	10f
 -
--11:	movl	20+FRAME_SIZE(%esp), %eax
+-	/* With requeue_pi, the mutex lock is held in the kernel.  */
+-11:	movl	24+FRAME_SIZE(%esp), %eax
+-	movl	16(%esp), %ecx
+-	testl	%ecx, %ecx
+-	jnz	21f
+-
 -	call	__pthread_mutex_cond_lock
--	addl	$FRAME_SIZE, %esp
--.Laddl:
+-20:	addl	$FRAME_SIZE, %esp
+-	cfi_adjust_cfa_offset(-FRAME_SIZE);
 -
 -14:	popl	%ebx
--.Lpop_ebx:
+-	cfi_adjust_cfa_offset(-4)
+-	cfi_restore(%ebx)
 -	popl	%esi
--.Lpop_esi:
+-	cfi_adjust_cfa_offset(-4)
+-	cfi_restore(%esi)
 -	popl	%edi
--.Lpop_edi:
+-	cfi_adjust_cfa_offset(-4)
+-	cfi_restore(%edi)
+-	popl	%ebp
+-	cfi_adjust_cfa_offset(-4)
+-	cfi_restore(%ebp)
 -
 -	/* We return the result of the mutex_lock operation.  */
 -	ret
 -
+-	cfi_restore_state
+-
+-21:	call	__pthread_mutex_cond_lock_adjust
+-	xorl	%eax, %eax
+-	jmp	20b
+-
+-	cfi_adjust_cfa_offset(-FRAME_SIZE);
 -	/* Initial locking failed.  */
 -1:
--.LSbl1:
 -#if cond_lock == 0
 -	movl	%ebx, %edx
 -#else
@@ -238,10 +302,18 @@
 -	call	__lll_lock_wait
 -	jmp	2b
 -
--	/* Unlock in loop requires waekup.  */
--3:
--.LSbl2:
+-	/* The initial unlocking of the mutex failed.  */
+-12:
+-	LOCK
 -#if cond_lock == 0
+-	subl	$1, (%ebx)
+-#else
+-	subl	$1, cond_lock(%ebx)
+-#endif
+-	jne	14b
+-
+-	movl	%eax, %esi
+-#if cond_lock == 0
 -	movl	%ebx, %eax
 -#else
 -	leal	cond_lock(%ebx), %eax
@@ -257,14 +329,18 @@
 -	addl	$LLL_PRIVATE, %ecx
 -#endif
 -	call	__lll_unlock_wake
--	jmp	4b
 -
--	/* Locking in loop failed.  */
--5:
+-	movl	%esi, %eax
+-	jmp	14b
+-
+-	cfi_adjust_cfa_offset(FRAME_SIZE)
+-
+-	/* Unlock in loop requires wakeup.  */
+-3:
 -#if cond_lock == 0
--	movl	%ebx, %edx
+-	movl	%ebx, %eax
 -#else
--	leal	cond_lock(%ebx), %edx
+-	leal	cond_lock(%ebx), %eax
 -#endif
 -#if (LLL_SHARED-LLL_PRIVATE) > 255
 -	xorl	%ecx, %ecx
@@ -276,15 +352,15 @@
 -#if LLL_PRIVATE != 0
 -	addl	$LLL_PRIVATE, %ecx
 -#endif
--	call	__lll_lock_wait
--	jmp	6b
+-	call	__lll_unlock_wake
+-	jmp	4b
 -
--	/* Unlock after loop requires wakeup.  */
--10:
+-	/* Locking in loop failed.  */
+-5:
 -#if cond_lock == 0
--	movl	%ebx, %eax
+-	movl	%ebx, %edx
 -#else
--	leal	cond_lock(%ebx), %eax
+-	leal	cond_lock(%ebx), %edx
 -#endif
 -#if (LLL_SHARED-LLL_PRIVATE) > 255
 -	xorl	%ecx, %ecx
@@ -296,22 +372,12 @@
 -#if LLL_PRIVATE != 0
 -	addl	$LLL_PRIVATE, %ecx
 -#endif
--	call	__lll_unlock_wake
--	jmp	11b
+-	call	__lll_lock_wait
+-	jmp	6b
 -
--	/* The initial unlocking of the mutex failed.  */
--12:
--.LSbl3:
--	LOCK
+-	/* Unlock after loop requires wakeup.  */
+-10:
 -#if cond_lock == 0
--	subl	$1, (%ebx)
--#else
--	subl	$1, cond_lock(%ebx)
--#endif
--	jne	14b
--
--	movl	%eax, %esi
--#if cond_lock == 0
 -	movl	%ebx, %eax
 -#else
 -	leal	cond_lock(%ebx), %eax
@@ -327,9 +393,7 @@
 -	addl	$LLL_PRIVATE, %ecx
 -#endif
 -	call	__lll_unlock_wake
--
--	movl	%esi, %eax
--	jmp	14b
+-	jmp	11b
 -	.size	__pthread_cond_wait, .-__pthread_cond_wait
 -versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
 -		  GLIBC_2_3_2)
@@ -470,7 +534,7 @@
 -	movl	$0x7fffffff, %edx
 -	ENTER_KERNEL
 -
--5:	movl	20+FRAME_SIZE(%esp), %eax
+-5:	movl	24+FRAME_SIZE(%esp), %eax
 -	call	__pthread_mutex_cond_lock
 -
 -	movl	%esi, (%esp)
@@ -478,14 +542,15 @@
 -	call	_Unwind_Resume
 -	hlt
 -.LENDCODE:
+-	cfi_endproc
 -	.size	__condvar_w_cleanup, .-__condvar_w_cleanup
 -
 -
 -	.section .gcc_except_table,"a",@progbits
 -.LexceptSTART:
--	.byte	0xff				# @LPStart format (omit)
--	.byte	0xff				# @TType format (omit)
--	.byte	0x0b				# call-site format
+-	.byte	DW_EH_PE_omit			# @LPStart format (omit)
+-	.byte	DW_EH_PE_omit			# @TType format (omit)
+-	.byte	DW_EH_PE_sdata4			# call-site format
 -						# DW_EH_PE_sdata4
 -	.uleb128 .Lcstend-.Lcstbegin
 -.Lcstbegin:
@@ -507,123 +572,6 @@
 -	.uleb128  0
 -.Lcstend:
 -
--	.section .eh_frame,"a",@progbits
--.LSTARTFRAME:
--	.long	L(ENDCIE)-L(STARTCIE)		# Length of the CIE.
--.LSTARTCIE:
--	.long	0				# CIE ID.
--	.byte	1				# Version number.
--#ifdef SHARED
--	.string	"zPLR"				# NUL-terminated augmentation
--						# string.
--#else
--	.string	"zPL"				# NUL-terminated augmentation
--						# string.
--#endif
--	.uleb128 1				# Code alignment factor.
--	.sleb128 -4				# Data alignment factor.
--	.byte	8				# Return address register
--						# column.
--#ifdef SHARED
--	.uleb128 7				# Augmentation value length.
--	.byte	0x9b				# Personality: DW_EH_PE_pcrel
--						# + DW_EH_PE_sdata4
--						# + DW_EH_PE_indirect
--	.long	DW.ref.__gcc_personality_v0-.
--	.byte	0x1b				# LSDA Encoding: DW_EH_PE_pcrel
--						# + DW_EH_PE_sdata4.
--	.byte	0x1b				# FDE Encoding: DW_EH_PE_pcrel
--						# + DW_EH_PE_sdata4.
--#else
--	.uleb128 6				# Augmentation value length.
--	.byte	0x0				# Personality: absolute
--	.long	__gcc_personality_v0
--	.byte	0x0				# LSDA Encoding: absolute
--#endif
--	.byte 0x0c				# DW_CFA_def_cfa
--	.uleb128 4
--	.uleb128 4
--	.byte	0x88				# DW_CFA_offset, column 0x8
--	.uleb128 1
--	.align 4
--.LENDCIE:
--
--	.long	.LENDFDE-.LSTARTFDE		# Length of the FDE.
--.LSTARTFDE:
--	.long	.LSTARTFDE-.LSTARTFRAME		# CIE pointer.
--#ifdef SHARED
--	.long	.LSTARTCODE-.			# PC-relative start address
--						# of the code.
--#else
--	.long	.LSTARTCODE			# Start address of the code.
--#endif
--	.long	.LENDCODE-.LSTARTCODE		# Length of the code.
--	.uleb128 4				# Augmentation size
--#ifdef SHARED
--	.long	.LexceptSTART-.
--#else
--	.long	.LexceptSTART
--#endif
--	.byte	0x40+.Lpush_edi-.LSTARTCODE	# DW_CFA_advance_loc+N
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 8
--	.byte	0x87				# DW_CFA_offset %edi
--	.uleb128 2
--	.byte	0x40+.Lpush_esi-.Lpush_edi	# DW_CFA_advance_loc+N
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 12
--	.byte	0x86				# DW_CFA_offset %esi
--	.uleb128 3
--	.byte	0x40+.Lpush_ebx-.Lpush_esi	# DW_CFA_advance_loc+N
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 16
--	.byte	0x83				# DW_CFA_offset %ebx
--	.uleb128 4
--	.byte	4				# DW_CFA_advance_loc4
--	.4byte	.Lsubl-.Lpush_ebx
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 16+FRAME_SIZE
--	.byte	4				# DW_CFA_advance_loc4
--	.4byte	.Laddl-.Lsubl
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 16
--	.byte	0x40+ .Lpop_ebx-.Laddl		# DW_CFA_advance_loc+N
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 12
--	.byte	0xc3				# DW_CFA_restore %ebx
--	.byte	0x40+.Lpop_esi-.Lpop_ebx	# DW_CFA_advance_loc+N
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 8
--	.byte	0xc6				# DW_CFA_restore %esi
--	.byte	0x40+.Lpop_edi-.Lpop_esi	# DW_CFA_advance_loc+N
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 4
--	.byte	0xc7				# DW_CFA_restore %edi
--	.byte	0x40+.LSbl1-.Lpop_edi		# DW_CFA_advance_loc+N
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 16
--	.byte	0x87				# DW_CFA_offset %edi
--	.uleb128 2
--	.byte	0x86				# DW_CFA_offset %esi
--	.uleb128 3
--	.byte	0x83				# DW_CFA_offset %ebx
--	.uleb128 4
--	.byte	4				# DW_CFA_advance_loc4
--	.4byte	.LSbl2-.LSbl1
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 16+FRAME_SIZE
--	.byte	4				# DW_CFA_advance_loc4
--	.4byte	.LSbl3-.LSbl2
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 16
--	.byte	4				# DW_CFA_advance_loc4
--	.4byte	.LSbl4-.LSbl3
--	.byte	14				# DW_CFA_def_cfa_offset
--	.uleb128 16+FRAME_SIZE
--	.align	4
--.LENDFDE:
--
--
 -#ifdef PIC
 -	.section .gnu.linkonce.t.__i686.get_pc_thunk.cx,"ax",@progbits
 -	.globl	__i686.get_pc_thunk.cx

Modified: glibc-package/branches/eglibc-2.13/debian/patches/locale/locale-print-LANGUAGE.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/locale/locale-print-LANGUAGE.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/locale/locale-print-LANGUAGE.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -12,19 +12,19 @@
 
 --- a/locale/programs/locale.c
 +++ b/locale/programs/locale.c
-@@ -773,6 +773,7 @@
+@@ -793,6 +793,7 @@ show_locale_vars (void)
  {
    size_t cat_no;
-   const char *lcall = getenv ("LC_ALL");
-+  const char *language = getenv ("LANGUAGE");
+   const char *lcall = getenv ("LC_ALL") ? : "";
++  const char *language = getenv ("LANGUAGE") ? : "";
    const char *lang = getenv ("LANG") ? : "";
  
    auto void get_source (const char *name);
-@@ -791,6 +792,9 @@
+@@ -811,6 +812,9 @@ show_locale_vars (void)
    /* LANG has to be the first value.  */
-   printf ("LANG=%s\n", lang);
+   print_assignment ("LANG", lang, false);
  
-+  if (language != NULL && getenv ("POSIXLY_CORRECT") == NULL)
++  if (getenv ("POSIXLY_CORRECT") == NULL)
 +    printf ("LANGUAGE=%s\n", language);
 +
    /* Now all categories in an unspecified order.  */

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/first_weekday.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/first_weekday.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/first_weekday.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -45,7 +45,6 @@
  localedata/locales/byn_ER         |    2 ++
  localedata/locales/ca_ES          |    2 ++
  localedata/locales/de_BE          |    2 ++
- localedata/locales/de_CH          |    2 ++
  localedata/locales/de_LU          |    2 ++
  localedata/locales/dz_BT          |    3 ++-
  localedata/locales/el_GR          |    2 ++
@@ -511,17 +510,6 @@
  END LC_TIME
  
  LC_PAPER
---- a/localedata/locales/de_CH
-+++ b/localedata/locales/de_CH
-@@ -120,6 +120,8 @@
- date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
-+%  FIXME: found in CLDR
-+first_weekday 2
- END LC_TIME
- 
- LC_PAPER
 --- a/localedata/locales/de_LU
 +++ b/localedata/locales/de_LU
 @@ -119,6 +119,8 @@

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/localedata/fr_BE-first_weekday.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/fr_BE-first_weekday.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/fr_BE-first_weekday.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,15 +0,0 @@
----
- localedata/locales/fr_BE |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/localedata/locales/fr_BE
-+++ b/localedata/locales/fr_BE
-@@ -122,6 +122,8 @@
- <U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
- <U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
-+week    7;19971130;4
-+first_weekday 2
- END LC_TIME
- 
- LC_PAPER

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-es_CR.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-es_CR.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-es_CR.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,117 +0,0 @@
-2010-01-28  Marcelo E. Magallon  <marcelo.magallon@gmail.com>
-
-	* locales/es_CR: Update for LC_MONETARY, LC_NUMERIC, LC_PAPER, 
-	LC_TELEPHONE and LC_NAME and LC_ADDRESS.
-
----
- localedata/locales/es_CR |   48 +++++++++++++++++++++++++++++------------------
- 1 file changed, 30 insertions(+), 18 deletions(-)
-
---- a/localedata/locales/es_CR
-+++ b/localedata/locales/es_CR
-@@ -21,8 +21,8 @@
- fax        ""
- language   "Spanish"
- territory  "Costa Rica"
--revision   "1.0"
--date       "2000-08-21"
-+revision   "1.1"
-+date       "2009-12-23"
- %
- category  "es_CR:2000";LC_IDENTIFICATION
- category  "es_CR:2000";LC_CTYPE
-@@ -53,9 +53,10 @@
- 
- LC_MONETARY
- int_curr_symbol      "<U0043><U0052><U0043><U0020>"
--currency_symbol      "<U0043>"
--mon_decimal_point    "<U002E>"
--mon_thousands_sep    "<U002C>"
-+currency_symbol      "<U20A1>"
-+% Decreto Ejecutivo 29660
-+mon_decimal_point    "<U002C>"
-+mon_thousands_sep    "<U0020>"
- mon_grouping         3;3
- positive_sign        ""
- negative_sign        "<U002D>"
-@@ -70,9 +71,10 @@
- END LC_MONETARY
- 
- LC_NUMERIC
--decimal_point        "<U002E>"
--thousands_sep        ""
--grouping             0;0
-+% Decreto Ejecutivo 29660
-+decimal_point        "<U002C>"
-+thousands_sep        "<U0020>"
-+grouping             3;3
- END LC_NUMERIC
- 
- LC_TIME
-@@ -106,39 +108,42 @@
-         "<U006E><U006F><U0076><U0069><U0065><U006D><U0062><U0072><U0065>";/
-         "<U0064><U0069><U0063><U0069><U0065><U006D><U0062><U0072><U0065>"
- d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
--d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
-+d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
- t_fmt   "<U0025><U0054>"
- am_pm   "<U0061><U002E><U006D><U002E>";"<U0070><U002E><U006D><U002E>"
- t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>"
--date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-+date_fmt	"<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
--first_weekday 1
-+first_weekday 2
- first_workday 2
- END LC_TIME
- 
- LC_PAPER
--% FIXME
--height   297
--% FIXME
--width    210
-+height   279
-+width    216
- END LC_PAPER
- 
- LC_TELEPHONE
--tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
--<U006C>"
-+tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020>/
-+<U0025><U006C>"
-+tel_dom_fmt "<U0025><U006C>"
- int_prefix     "<U0035><U0030><U0036>"
- int_select     "<U0030><U0030>"
- END LC_TELEPHONE
- 
- LC_MEASUREMENT
--% FIXME
- measurement    1
- END LC_MEASUREMENT
- 
- LC_NAME
- name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
- <U0025><U006D><U0025><U0074><U0025><U0066>"
-+name_gen    "<U0053><U0072><U002E><U002F><U0053><U0072><U0061><U002E>"
-+name_miss   "<U0053><U0072><U0074><U0061><U002E>"
-+name_mr     "<U0053><U0072><U002E>"
-+name_mrs    "<U0053><U0072><U0061><U002E>"
-+name_ms     "<U0053><U0072><U0061><U002E>"
- END LC_NAME
- 
- LC_ADDRESS
-@@ -147,6 +152,13 @@
- <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
- <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
- <U004E><U0025><U0063><U0025><U004E>"
-+country_name  "<U0043><U006F><U0073><U0074><U0061><U0020><U0052><U0069><U0063><U0061>"
-+country_post  "<U0043><U0052>"
-+country_car   "<U0043><U0052>"
-+country_isbn  "9930,9977,9968"
-+lang_name     "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
-+lang_ab       "<U0065><U0073>"
-+lang_term     "<U0073><U0070><U0061>"
- country_ab2   "<U0043><U0052>"
- country_ab3   "<U0043><U0052><U0049>"
- country_num   188

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-et_EE.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-et_EE.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-et_EE.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -2,10 +2,6 @@
 
 	* locales/et_EE: Change currency to euro.
 
-2010-01-05  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* locales/et_EE: Change first_weekday and first_workday to 2.
-
 ---
  localedata/locales/et_EE |    8 ++--
  1 file changed, 4 insertions(+), 4 deletions(-)
@@ -23,14 +19,3 @@
  mon_decimal_point   "<U002C>"
  mon_thousands_sep   "<U00A0>"
  mon_grouping        3;3
-@@ -178,8 +178,8 @@
- <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
- <U0025><U005A><U0020><U0025><U0059>"
- week    7;19971130;4
--first_weekday 1
--first_workday 1
-+first_weekday 2
-+first_workday 2
- END LC_TIME
- 
- LC_MESSAGES

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locales-fr.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locales-fr.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locales-fr.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -35,9 +35,9 @@
 +<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
 +<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 +<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
- END LC_TIME
- 
- LC_PAPER
+
+ week    7;19971130;4
+ first_weekday 2
 @@ -142,8 +144,7 @@
  END LC_MEASUREMENT
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/sort-UTF8-first.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/sort-UTF8-first.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/sort-UTF8-first.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -4,7 +4,7 @@
 
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -226,8 +226,8 @@
+@@ -227,8 +227,8 @@ hi_IN/UTF-8 \
  hne_IN/UTF-8 \
  hr_HR.UTF-8/UTF-8 \
  hr_HR/ISO-8859-2 \
@@ -14,7 +14,7 @@
  ht_HT/UTF-8 \
  hu_HU.UTF-8/UTF-8 \
  hu_HU/ISO-8859-2 \
-@@ -247,8 +247,8 @@
+@@ -248,8 +248,8 @@ it_IT@euro/ISO-8859-15 \
  iu_CA/UTF-8 \
  iw_IL.UTF-8/UTF-8 \
  iw_IL/ISO-8859-8 \
@@ -24,17 +24,17 @@
  ka_GE.UTF-8/UTF-8 \
  ka_GE/GEORGIAN-PS \
  kk_KZ.UTF-8/UTF-8 \
-@@ -257,8 +257,8 @@
+@@ -258,8 +258,8 @@ kl_GL.UTF-8/UTF-8 \
  kl_GL/ISO-8859-1 \
  km_KH/UTF-8 \
  kn_IN/UTF-8 \
 -ko_KR.EUC-KR/EUC-KR \
  ko_KR.UTF-8/UTF-8 \
 +ko_KR.EUC-KR/EUC-KR \
+ kok_IN/UTF-8 \
  ks_IN/UTF-8 \
  ks_IN@devanagari/UTF-8 \
- ku_TR.UTF-8/UTF-8 \
-@@ -326,8 +326,8 @@
+@@ -328,8 +328,8 @@ pt_PT/ISO-8859-1 \
  pt_PT@euro/ISO-8859-15 \
  ro_RO.UTF-8/UTF-8 \
  ro_RO/ISO-8859-2 \
@@ -44,7 +44,7 @@
  ru_RU/ISO-8859-5 \
  ru_UA.UTF-8/UTF-8 \
  ru_UA/KOI8-U \
-@@ -391,28 +391,28 @@
+@@ -394,28 +394,28 @@ ur_PK/UTF-8 \
  uz_UZ/ISO-8859-1 \
  uz_UZ@cyrillic/UTF-8 \
  ve_ZA/UTF-8 \

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/localedata/submitted-pt_BR.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/submitted-pt_BR.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/submitted-pt_BR.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,19 +0,0 @@
-2009-11-23  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* locales/pt_BR: Change thousand separator to dot.
-
----
- localedata/locales/pt_BR |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/localedata/locales/pt_BR
-+++ b/localedata/locales/pt_BR
-@@ -79,7 +79,7 @@
- 
- LC_NUMERIC
- decimal_point             "<U002C>"
--thousands_sep             ""
-+thousands_sep             "<U002E>"
- grouping                  0;0
- END LC_NUMERIC
- 

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/tailor-iso14651_t1.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/tailor-iso14651_t1.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/tailor-iso14651_t1.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -647,7 +647,7 @@
 -% letter;accent;case;specials
 -
 -order_start forward;backward/
--            ;forward;position
+-	    ;forward;position
 -
 -% <CAPITAL> or <SMALL> letters first:
 -

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-define-m68k-tls-relocations.patch
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-define-m68k-tls-relocations.patch	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-define-m68k-tls-relocations.patch	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,56 +0,0 @@
-From: Maxim Kuvyrkov <maxim@codesourcery.com>
-Date: Wed, 10 Feb 2010 15:24:21 +0000 (-0800)
-Subject: Add m68k TLS relocations
-X-Git-Tag: glibc-2.12~194
-X-Git-Url: http://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=bbabf1f73f611b9101b42c3390a9ddd53e6dd7d4
-
-Add m68k TLS relocations
----
-
-#diff --git a/ChangeLog b/ChangeLog
-#index 5ab2cbc..cea1089 100644
-#--- a/ChangeLog
-#+++ b/ChangeLog
-#@@ -1,3 +1,7 @@
-#+2010-02-09  Maxim Kuvyrkov  <maxim@codesourcery.com>
-#+
-#+	* elf/elf.h: Define m68k TLS relocations.
-#+
-# 2010-02-10  Luis Machado  <luisgpm@br.ibm.com>
-# 
-#	 * sysdeps/powerpc/powerpc64/power7/Implies: Removed.
-diff --git a/elf/elf.h b/elf/elf.h
-index 8af7c17..8b1ee47 100644
---- a/elf/elf.h
-+++ b/elf/elf.h
-@@ -1123,8 +1123,29 @@ typedef struct
- #define R_68K_GLOB_DAT	20		/* Create GOT entry */
- #define R_68K_JMP_SLOT	21		/* Create PLT entry */
- #define R_68K_RELATIVE	22		/* Adjust by program base */
-+#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
-+#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
-+#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
-+#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
-+#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
-+#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
-+#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
-+#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
-+#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
-+#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
-+#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
-+#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
-+#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
-+					   static TLS block */
-+#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
-+					   static TLS block */
-+#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
-+					   static TLS block */
-+#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
-+#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
-+#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
- /* Keep this the last entry.  */
--#define R_68K_NUM	23
-+#define R_68K_NUM	43
- 
- /* Intel 80386 specific definitions.  */
- 

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-tls-support.patch
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-tls-support.patch	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-tls-support.patch	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,4015 +0,0 @@
-This series of m68k related commits brings eglibc-2.11.2 up to date with the glibc-ports git
-as of 2010-06-30, including NPTL support.
-
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Wed, 18 Nov 2009 17:30:48 +0000 (+0000)
-Subject: Change misleading names of parameters of sync_file_range for M68K.
-X-Git-Tag: glibc-2.12~86
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=6add932d9099ac27762c45e344416c1ee11f6d78
-
-Change misleading names of parameters of sync_file_range for M68K.
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 7a3e8b7..87117d3 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2009-11-18  Joseph Myers  <joseph@codesourcery.com>
-+
-+	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Change misleading
-+	names of parameters of sync_file_range.
-+
- 2009-11-17  Joseph Myers  <joseph@codesourcery.com>
- 
- 	[BZ #10972]
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-index 6fc7a0a..c6dd1a8 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-@@ -236,7 +236,7 @@ extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
- 
- 
- /* Selective file content synch'ing.  */
--extern int sync_file_range (int __fd, __off64_t __from, __off64_t __to,
-+extern int sync_file_range (int __fd, __off64_t __offset, __off64_t __count,
- 			    unsigned int __flags);
- 
- 
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Thu, 19 Nov 2009 22:34:08 +0000 (+0000)
-Subject: Define F_OWNER_PGRP for M68K.
-X-Git-Tag: glibc-2.12~82
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=76d306ec9888f824496ea7783266ea91e6825374
-
-Define F_OWNER_PGRP for M68K.
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 87117d3..74407c4 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2009-11-19  Joseph Myers  <joseph@codesourcery.com>
-+
-+	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Introduce new symbol
-+	F_OWNER_PGRP and mark F_OWNER_GID obsolete.
-+
- 2009-11-18  Joseph Myers  <joseph@codesourcery.com>
- 
- 	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Change misleading
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-index c6dd1a8..8ed8eb6 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-@@ -171,9 +171,10 @@ struct flock64
- /* Owner types.  */
- enum __pid_type
-   {
--    F_OWNER_TID = 0,	/* Kernel thread.  */
--    F_OWNER_PID,	/* Process.  */
--    F_OWNER_GID		/* Process group.  */
-+    F_OWNER_TID = 0,		/* Kernel thread.  */
-+    F_OWNER_PID,		/* Process.  */
-+    F_OWNER_PGRP,		/* Process group.  */
-+    F_OWNER_GID = F_OWNER_PGRP	/* Alternative, obsolete name.  */
-   };
- 
- /* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
-From: Andreas Schwab <schwab@redhat.com>
-Date: Mon, 23 Nov 2009 15:34:39 +0000 (+0100)
-Subject: Use struct timespec for timestamps in struct stat also if __USE_XOPEN2K8
-X-Git-Tag: glibc-2.12~81
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=127f9dc1f0b7c21112007f476d710ea6b70d13c0
-
-Use struct timespec for timestamps in struct stat also if __USE_XOPEN2K8
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 74407c4..42d6a91 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2009-11-23  Andreas Schwab  <schwab@linux-m68k.org>
-+
-+	* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Use struct timespec
-+	for timestamps also if __USE_XOPEN2K8.
-+
- 2009-11-19  Joseph Myers  <joseph@codesourcery.com>
- 
- 	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Introduce new symbol
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-index 8d18d6d..7801043 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-@@ -61,7 +61,7 @@ struct stat
- #else
-     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
- #endif
--#ifdef __USE_MISC
-+#if defined __USE_MISC || defined __USE_XOPEN2K8
-     /* Nanosecond resolution timestamps are stored in a format
-        equivalent to 'struct timespec'.  This is the type used
-        whenever possible but the Unix namespace rules do not allow the
-@@ -107,7 +107,7 @@ struct stat64
-     __blksize_t st_blksize;		/* Optimal block size for I/O.  */
- 
-     __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
--#ifdef __USE_MISC
-+# if defined __USE_MISC || defined __USE_XOPEN2K8
-     /* Nanosecond resolution timestamps are stored in a format
-        equivalent to 'struct timespec'.  This is the type used
-        whenever possible but the Unix namespace rules do not allow the
-@@ -117,14 +117,14 @@ struct stat64
-     struct timespec st_atim;		/* Time of last access.  */
-     struct timespec st_mtim;		/* Time of last modification.  */
-     struct timespec st_ctim;		/* Time of last status change.  */
--#else
-+# else
-     __time_t st_atime;			/* Time of last access.  */
-     unsigned long int st_atimensec;	/* Nscecs of last access.  */
-     __time_t st_mtime;			/* Time of last modification.  */
-     unsigned long int st_mtimensec;	/* Nsecs of last modification.  */
-     __time_t st_ctime;			/* Time of last status change.  */
-     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
--#endif
-+# endif
-     __ino64_t st_ino;			/* File serial number.		*/
-   };
- #endif
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Wed, 16 Dec 2009 12:37:07 +0000 (+0000)
-Subject: Update M68K O_SYNC.
-X-Git-Tag: glibc-2.12~69
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=4b8a7d2c3f00ac9a4e31e3c8c132b4b9aefbc5fe
-
-Update M68K O_SYNC.
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 42d6a91..8411570 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2009-12-16  Joseph Myers  <joseph@codesourcery.com>
-+
-+	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Redefine O_SYNC and
-+	O_DSYNC to match 2.6.33+ kernels.
-+
- 2009-11-23  Andreas Schwab  <schwab@linux-m68k.org>
- 
- 	* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Use struct timespec
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-index 8ed8eb6..1f98cf5 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-@@ -40,7 +40,7 @@
- #define O_APPEND	  02000
- #define O_NONBLOCK	  04000
- #define O_NDELAY	O_NONBLOCK
--#define O_SYNC		 010000
-+#define O_SYNC	       04010000
- #define O_FSYNC		 O_SYNC
- #define O_ASYNC		 020000
- 
-@@ -56,7 +56,7 @@
-    We define the symbols here but let them do the same as O_SYNC since
-    this is a superset.	*/
- #if defined __USE_POSIX199309 || defined __USE_UNIX98
--# define O_DSYNC	O_SYNC	/* Synchronize data.  */
-+# define O_DSYNC	010000	/* Synchronize data.  */
- # define O_RSYNC	O_SYNC	/* Synchronize read operations.	 */
- #endif
- 
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Wed, 16 Dec 2009 19:35:09 +0000 (+0000)
-Subject: Update M68K bits/poll.h for POSIX 2008.
-X-Git-Tag: glibc-2.12~65
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=5d79f83e907d938087a5a93c514e48a4ce438c9d
-
-Update M68K bits/poll.h for POSIX 2008.
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 8411570..978cd1a 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,5 +1,11 @@
- 2009-12-16  Joseph Myers  <joseph@codesourcery.com>
- 
-+	[BZ #11093]
-+	* sysdeps/unix/sysv/linux/m68k/bits/poll.h: Define POLLRDNORM,
-+	POLLRDBAND, POLLWRNORM, and POLLWRBAND also for POSIX 2008.
-+
-+2009-12-16  Joseph Myers  <joseph@codesourcery.com>
-+
- 	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Redefine O_SYNC and
- 	O_DSYNC to match 2.6.33+ kernels.
- 
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/poll.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/poll.h
-index bc28579..84219ba 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/poll.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/poll.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1997, 2001, 2008 Free Software Foundation, Inc.
-+/* Copyright (C) 1997, 2001, 2008, 2009 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -27,7 +27,7 @@
- #define POLLPRI		0x002		/* There is urgent data to read.  */
- #define POLLOUT		0x004		/* Writing now will not block.  */
- 
--#ifdef __USE_XOPEN
-+#if defined __USE_XOPEN || defined __USE_XOPEN2K8
- /* These values are defined in XPG4.2.  */
- # define POLLRDNORM	0x040		/* Normal data may be read.  */
- # define POLLRDBAND	0x080		/* Priority data may be read.  */
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Sun, 10 Jan 2010 19:02:51 +0000 (+0000)
-Subject: Update M68K bits/fcntl.h for XPG7 and allow bits/stat.h inclusion from fcntl.h.
-X-Git-Tag: glibc-2.12~62
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=2f12146a331fa728950cbe55da1efb406c26e5cb
-
-Update M68K bits/fcntl.h for XPG7 and allow bits/stat.h inclusion from fcntl.h.
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 978cd1a..094e7a8 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,11 @@
-+2010-01-10  Joseph Myers  <joseph@codesourcery.com>
-+
-+	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Define O_DIRECTORY,
-+	O_NOFOLLOW, O_CLOEXEC, F_DUPFD_CLOEXEC, F_SETOWN, and F_GETOWN for
-+	XPG7.
-+	* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Enable using from
-+	fcntl.h.
-+
- 2009-12-16  Joseph Myers  <joseph@codesourcery.com>
- 
- 	[BZ #11093]
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-index 1f98cf5..d1eb706 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-@@ -1,5 +1,5 @@
- /* O_*, F_*, FD_* bit values for Linux.
--   Copyright (C) 2000, 2004, 2008, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 2000, 2004, 2008, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -44,12 +44,14 @@
- #define O_FSYNC		 O_SYNC
- #define O_ASYNC		 020000
- 
--#ifdef __USE_GNU
-+#ifdef __USE_XOPEN2K8
- # define O_DIRECTORY	 040000	/* Must be a directory.	 */
- # define O_NOFOLLOW	0100000	/* Do not follow links.	 */
-+# define O_CLOEXEC     02000000 /* Set close_on_exec.  */
-+#endif
-+#ifdef __USE_GNU
- # define O_DIRECT	0200000	/* Direct disk access.	*/
- # define O_NOATIME	01000000 /* Do not set atime.  */
--# define O_CLOEXEC     02000000 /* Set close_on_exec.  */
- #endif
- 
- /* For now Linux has synchronisity options for data and read operations.
-@@ -83,7 +85,7 @@
- #define F_SETLK64	13	/* Set record locking info (non-blocking).  */
- #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
- 
--#if defined __USE_BSD || defined __USE_UNIX98
-+#if defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K8
- # define F_SETOWN	8	/* Get owner of socket (receiver of SIGIO).  */
- # define F_GETOWN	9	/* Set owner of socket (receiver of SIGIO).  */
- #endif
-@@ -99,6 +101,8 @@
- # define F_SETLEASE	1024	/* Set a lease.	 */
- # define F_GETLEASE	1025	/* Enquire what lease is active.  */
- # define F_NOTIFY	1026	/* Request notfications on a directory.	 */
-+#endif
-+#ifdef __USE_XOPEN2K8
- # define F_DUPFD_CLOEXEC 1030	/* Duplicate file descriptor with
- 				   close-on-exit set.  */
- #endif
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-index 7801043..771a53a 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1992,95,96,97,98,99,2000,2001,2002,2008,2009
-+/* Copyright (C) 1992,95,96,97,98,99,2000,2001,2002,2008,2009,2010
-      Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -17,7 +17,7 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
--#ifndef _SYS_STAT_H
-+#if !defined _SYS_STAT_H && !defined _FCNTL_H
- # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
- #endif
- 
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Mon, 11 Jan 2010 21:51:34 +0000 (+0000)
-Subject: Fix M68K bits/stat.h double inclusion problem.
-X-Git-Tag: glibc-2.12~59
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=fdefc0e1f176327cabedf4011673b3272321093e
-
-Fix M68K bits/stat.h double inclusion problem.
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 094e7a8..cdc9242 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2010-01-11  Joseph Myers  <joseph@codesourcery.com>
-+
-+	* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Fix double-inclusion
-+	problem.
-+
- 2010-01-10  Joseph Myers  <joseph@codesourcery.com>
- 
- 	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Define O_DIRECTORY,
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-index 771a53a..0c1d149 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
-@@ -21,6 +21,9 @@
- # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
- #endif
- 
-+#ifndef _BITS_STAT_H
-+#define _BITS_STAT_H	1
-+
- /* Versions of the `struct stat' data structure.  */
- #define _STAT_VER_LINUX_OLD	1
- #define _STAT_VER_KERNEL	1
-@@ -167,3 +170,5 @@ struct stat64
- # define UTIME_NOW	((1l << 30) - 1l)
- # define UTIME_OMIT	((1l << 30) - 2l)
- #endif
-+
-+#endif	/* bits/stat.h */
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Wed, 10 Feb 2010 15:32:33 +0000 (+0000)
-Subject: Add hidden alias for M68K fegetenv.
-X-Git-Tag: glibc-2.12~46
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=ee0c4dd1ccc424d57d97dc078a4aba0c70eeb8a4
-
-Add hidden alias for M68K fegetenv.
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index cdc9242..8487ba3 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,7 @@
-+2010-02-10  Joseph Myers  <joseph@codesourcery.com>
-+
-+	* sysdeps/m68k/fpu/fegetenv.c: Add hidden alias.
-+
- 2010-01-11  Joseph Myers  <joseph@codesourcery.com>
- 
- 	* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Fix double-inclusion
-diff --git a/ports/sysdeps/m68k/fpu/fegetenv.c b/ports/sysdeps/m68k/fpu/fegetenv.c
-index 6f23e8b..30f3fa5 100644
---- a/ports/sysdeps/m68k/fpu/fegetenv.c
-+++ b/ports/sysdeps/m68k/fpu/fegetenv.c
-@@ -1,5 +1,5 @@
- /* Store current floating-point environment.
--   Copyright (C) 1997,99,2000,01 Free Software Foundation, Inc.
-+   Copyright (C) 1997,99,2000,01,10 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
- 
-@@ -41,4 +41,5 @@ strong_alias (__fegetenv, __old_fegetenv)
- compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1);
- #endif
- 
-+libm_hidden_ver (__fegetenv, fegetenv)
- versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2);
-From: Maxim Kuvyrkov <maxim@codesourcery.com>
-Date: Tue, 9 Mar 2010 10:20:36 +0000 (-0800)
-Subject: m68k: update jmpbuf-unwind.h
-X-Git-Tag: glibc-2.12~41
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=42ae1878f326c413dd026373ebdb6bf6cd20e75d
-
-m68k: update jmpbuf-unwind.h
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 8487ba3..d14368e 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2010-03-09  Maxim Kuvyrkov  <maxim@codesourcery.com>
-+
-+	* sysdeps/m68k/jmpbuf-unwind.h (_JMPBUF_CFA_UNWINDS_ADJ)
-+	(_jmpbuf_sp, _JMPBUF_UNWINDS_ADJ, __libc_unwind_longjmp): Define.
-+
- 2010-02-10  Joseph Myers  <joseph@codesourcery.com>
- 
- 	* sysdeps/m68k/fpu/fegetenv.c: Add hidden alias.
-diff --git a/ports/sysdeps/m68k/jmpbuf-unwind.h b/ports/sysdeps/m68k/jmpbuf-unwind.h
-index 3490c79..28b9537 100644
---- a/ports/sysdeps/m68k/jmpbuf-unwind.h
-+++ b/ports/sysdeps/m68k/jmpbuf-unwind.h
-@@ -1,5 +1,5 @@
- /* Examine __jmp_buf for unwinding frames.  m68k version.
--   Copyright (C) 2006 Free Software Foundation, Inc.
-+   Copyright (C) 2006, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -18,8 +18,29 @@
-    02111-1307 USA.  */
- 
- #include <setjmp.h>
-+#include <stdint.h>
-+#include <unwind.h>
- 
- /* Test if longjmp to JMPBUF would unwind the frame
-    containing a local variable at ADDRESS.  */
- #define _JMPBUF_UNWINDS(jmpbuf, address, demangle)		\
-   ((void *) (address) < (void *) demangle ((jmpbuf)->__sp))
-+
-+#define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
-+  _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
-+
-+static inline uintptr_t __attribute__ ((unused))
-+_jmpbuf_sp (__jmp_buf regs)
-+{
-+  uintptr_t sp = regs[0].__sp;
-+#ifdef PTR_DEMANGLE
-+  PTR_DEMANGLE (sp);
-+#endif
-+  return sp;
-+}
-+
-+#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \
-+  ((uintptr_t) (_address) - (_adj) < _jmpbuf_sp (_jmpbuf) - (_adj))
-+
-+/* We use the normal longjmp for unwinding.  */
-+#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val)
-From: Maxim Kuvyrkov <maxim@codesourcery.com>
-Date: Tue, 9 Mar 2010 10:32:38 +0000 (-0800)
-Subject: m68k: remove bits/siginfo.h in favor of generic one
-X-Git-Tag: glibc-2.12~40
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=d8e90a15fedd2660d02f5d8e4e7da17e01916d30
-
-m68k: remove bits/siginfo.h in favor of generic one
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index d14368e..e2b54e5 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,5 +1,7 @@
- 2010-03-09  Maxim Kuvyrkov  <maxim@codesourcery.com>
- 
-+	* sysdeps/unix/sysv/linux/m68k/bits/siginfo.h: Remove.
-+
- 	* sysdeps/m68k/jmpbuf-unwind.h (_JMPBUF_CFA_UNWINDS_ADJ)
- 	(_jmpbuf_sp, _JMPBUF_UNWINDS_ADJ, __libc_unwind_longjmp): Define.
- 
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/siginfo.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/siginfo.h
-deleted file mode 100644
-index 1ded1c2..0000000
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/siginfo.h
-+++ /dev/null
-@@ -1,316 +0,0 @@
--/* siginfo_t, sigevent and constants.  m68k linux version.
--   Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#if !defined _SIGNAL_H && !defined __need_siginfo_t \
--    && !defined __need_sigevent_t
--# error "Never include this file directly.  Use <signal.h> instead"
--#endif
--
--#include <bits/wordsize.h>
--
--#if (!defined __have_sigval_t \
--     && (defined _SIGNAL_H || defined __need_siginfo_t \
--	 || defined __need_sigevent_t))
--# define __have_sigval_t	1
--
--/* Type for data associated with a signal.  */
--typedef union sigval
--  {
--    int sival_int;
--    void *sival_ptr;
--  } sigval_t;
--#endif
--
--#if (!defined __have_siginfo_t \
--     && (defined _SIGNAL_H || defined __need_siginfo_t))
--# define __have_siginfo_t	1
--
--# define __SI_MAX_SIZE     128
--# if __WORDSIZE == 64
--#  define __SI_PAD_SIZE     ((__SI_MAX_SIZE / sizeof (int)) - 4)
--# else
--#  define __SI_PAD_SIZE     ((__SI_MAX_SIZE / sizeof (int)) - 3)
--# endif
--
--typedef struct siginfo
--  {
--    int si_signo;		/* Signal number.  */
--    int si_errno;		/* If non-zero, an errno value associated with
--				   this signal, as defined in <errno.h>.  */
--    int si_code;		/* Signal code.  */
--
--    union
--      {
--	int _pad[__SI_PAD_SIZE];
--
--	 /* kill().  */
--	struct
--	  {
--	    __pid_t si_pid;	/* Sending process ID.  */
--	    unsigned short __pad; /* 16-bit version of si_uid.  */
--	    __uid_t si_uid;	/* Real user ID of sending process.  */
--	  } _kill;
--
--	/* POSIX.1b timers.  */
--	struct
--	  {
--	    int si_tid;		/* Timer ID.  */
--	    int si_overrun;	/* Overrun count.  */
--	    sigval_t si_sigval;	/* Signal value.  */
--	  } _timer;
--
--	/* POSIX.1b signals.  */
--	struct
--	  {
--	    __pid_t si_pid;	/* Sending process ID.  */
--	    unsigned short __pad; /* 16-bit version of si_uid.  */
--	    sigval_t si_sigval;	/* Signal value.  */
--	    __uid_t si_uid;	/* Real user ID of sending process.  */
--	  } _rt;
--
--	/* SIGCHLD.  */
--	struct
--	  {
--	    __pid_t si_pid;	/* Which child.  */
--	    unsigned short __pad; /* 16-bit version of si_uid.  */
--	    int si_status;	/* Exit value or signal.  */
--	    __clock_t si_utime;
--	    __clock_t si_stime;
--	    __uid_t si_uid;	/* Real user ID of sending process.  */
--	  } _sigchld;
--
--	/* SIGILL, SIGFPE, SIGSEGV, SIGBUS.  */
--	struct
--	  {
--	    void *si_addr;	/* Faulting insn/memory ref.  */
--	  } _sigfault;
--
--	/* SIGPOLL.  */
--	struct
--	  {
--	    long int si_band;	/* Band event for SIGPOLL.  */
--	    int si_fd;
--	  } _sigpoll;
--      } _sifields;
--  } siginfo_t;
--
--
--/* X/Open requires some more fields with fixed names.  */
--# define si_pid		_sifields._kill.si_pid
--# define si_uid		_sifields._kill.si_uid
--# define si_timerid	_sifields._timer.si_tid
--# define si_overrun	_sifields._timer.si_overrun
--# define si_status	_sifields._sigchld.si_status
--# define si_utime	_sifields._sigchld.si_utime
--# define si_stime	_sifields._sigchld.si_stime
--# define si_value	_sifields._rt.si_sigval
--# define si_int		_sifields._rt.si_sigval.sival_int
--# define si_ptr		_sifields._rt.si_sigval.sival_ptr
--# define si_addr	_sifields._sigfault.si_addr
--# define si_band	_sifields._sigpoll.si_band
--# define si_fd		_sifields._sigpoll.si_fd
--
--
--/* Values for `si_code'.  Positive values are reserved for kernel-generated
--   signals.  */
--enum
--{
--  SI_ASYNCNL = -60,		/* Sent by asynch name lookup completion.  */
--# define SI_ASYNCNL	SI_ASYNCNL
--  SI_TKILL = -6,		/* Sent by tkill.  */
--# define SI_TKILL	SI_TKILL
--  SI_SIGIO,			/* Sent by queued SIGIO. */
--# define SI_SIGIO	SI_SIGIO
--  SI_ASYNCIO,			/* Sent by AIO completion.  */
--# define SI_ASYNCIO	SI_ASYNCIO
--  SI_MESGQ,			/* Sent by real time mesq state change.  */
--# define SI_MESGQ	SI_MESGQ
--  SI_TIMER,			/* Sent by timer expiration.  */
--# define SI_TIMER	SI_TIMER
--  SI_QUEUE,			/* Sent by sigqueue.  */
--# define SI_QUEUE	SI_QUEUE
--  SI_USER,			/* Sent by kill, sigsend, raise.  */
--# define SI_USER	SI_USER
--  SI_KERNEL = 0x80		/* Send by kernel.  */
--#define SI_KERNEL	SI_KERNEL
--};
--
--
--/* `si_code' values for SIGILL signal.  */
--enum
--{
--  ILL_ILLOPC = 1,		/* Illegal opcode.  */
--# define ILL_ILLOPC	ILL_ILLOPC
--  ILL_ILLOPN,			/* Illegal operand.  */
--# define ILL_ILLOPN	ILL_ILLOPN
--  ILL_ILLADR,			/* Illegal addressing mode.  */
--# define ILL_ILLADR	ILL_ILLADR
--  ILL_ILLTRP,			/* Illegal trap. */
--# define ILL_ILLTRP	ILL_ILLTRP
--  ILL_PRVOPC,			/* Privileged opcode.  */
--# define ILL_PRVOPC	ILL_PRVOPC
--  ILL_PRVREG,			/* Privileged register.  */
--# define ILL_PRVREG	ILL_PRVREG
--  ILL_COPROC,			/* Coprocessor error.  */
--# define ILL_COPROC	ILL_COPROC
--  ILL_BADSTK			/* Internal stack error.  */
--# define ILL_BADSTK	ILL_BADSTK
--};
--
--/* `si_code' values for SIGFPE signal.  */
--enum
--{
--  FPE_INTDIV = 1,		/* Integer divide by zero.  */
--# define FPE_INTDIV	FPE_INTDIV
--  FPE_INTOVF,			/* Integer overflow.  */
--# define FPE_INTOVF	FPE_INTOVF
--  FPE_FLTDIV,			/* Floating point divide by zero.  */
--# define FPE_FLTDIV	FPE_FLTDIV
--  FPE_FLTOVF,			/* Floating point overflow.  */
--# define FPE_FLTOVF	FPE_FLTOVF
--  FPE_FLTUND,			/* Floating point underflow.  */
--# define FPE_FLTUND	FPE_FLTUND
--  FPE_FLTRES,			/* Floating point inexact result.  */
--# define FPE_FLTRES	FPE_FLTRES
--  FPE_FLTINV,			/* Floating point invalid operation.  */
--# define FPE_FLTINV	FPE_FLTINV
--  FPE_FLTSUB			/* Subscript out of range.  */
--# define FPE_FLTSUB	FPE_FLTSUB
--};
--
--/* `si_code' values for SIGSEGV signal.  */
--enum
--{
--  SEGV_MAPERR = 1,		/* Address not mapped to object.  */
--# define SEGV_MAPERR	SEGV_MAPERR
--  SEGV_ACCERR			/* Invalid permissions for mapped object.  */
--# define SEGV_ACCERR	SEGV_ACCERR
--};
--
--/* `si_code' values for SIGBUS signal.  */
--enum
--{
--  BUS_ADRALN = 1,		/* Invalid address alignment.  */
--# define BUS_ADRALN	BUS_ADRALN
--  BUS_ADRERR,			/* Non-existant physical address.  */
--# define BUS_ADRERR	BUS_ADRERR
--  BUS_OBJERR			/* Object specific hardware error.  */
--# define BUS_OBJERR	BUS_OBJERR
--};
--
--/* `si_code' values for SIGTRAP signal.  */
--enum
--{
--  TRAP_BRKPT = 1,		/* Process breakpoint.  */
--# define TRAP_BRKPT	TRAP_BRKPT
--  TRAP_TRACE			/* Process trace trap.  */
--# define TRAP_TRACE	TRAP_TRACE
--};
--
--/* `si_code' values for SIGCHLD signal.  */
--enum
--{
--  CLD_EXITED = 1,		/* Child has exited.  */
--# define CLD_EXITED	CLD_EXITED
--  CLD_KILLED,			/* Child was killed.  */
--# define CLD_KILLED	CLD_KILLED
--  CLD_DUMPED,			/* Child terminated abnormally.  */
--# define CLD_DUMPED	CLD_DUMPED
--  CLD_TRAPPED,			/* Traced child has trapped.  */
--# define CLD_TRAPPED	CLD_TRAPPED
--  CLD_STOPPED,			/* Child has stopped.  */
--# define CLD_STOPPED	CLD_STOPPED
--  CLD_CONTINUED			/* Stopped child has continued.  */
--# define CLD_CONTINUED	CLD_CONTINUED
--};
--
--/* `si_code' values for SIGPOLL signal.  */
--enum
--{
--  POLL_IN = 1,			/* Data input available.  */
--# define POLL_IN	POLL_IN
--  POLL_OUT,			/* Output buffers available.  */
--# define POLL_OUT	POLL_OUT
--  POLL_MSG,			/* Input message available.   */
--# define POLL_MSG	POLL_MSG
--  POLL_ERR,			/* I/O error.  */
--# define POLL_ERR	POLL_ERR
--  POLL_PRI,			/* High priority input available.  */
--# define POLL_PRI	POLL_PRI
--  POLL_HUP			/* Device disconnected.  */
--# define POLL_HUP	POLL_HUP
--};
--
--# undef __need_siginfo_t
--#endif	/* !have siginfo_t && (have _SIGNAL_H || need siginfo_t).  */
--
--
--#if (defined _SIGNAL_H || defined __need_sigevent_t) \
--    && !defined __have_sigevent_t
--# define __have_sigevent_t	1
--
--/* Structure to transport application-defined values with signals.  */
--# define __SIGEV_MAX_SIZE	64
--# if __WORDSIZE == 64
--#  define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 4)
--# else
--#  define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 3)
--# endif
--
--typedef struct sigevent
--  {
--    sigval_t sigev_value;
--    int sigev_signo;
--    int sigev_notify;
--
--    union
--      {
--	int _pad[__SIGEV_PAD_SIZE];
--
--	/* When SIGEV_SIGNAL and SIGEV_THREAD_ID set, LWP ID of the
--	   thread to receive the signal.  */
--	__pid_t _tid;
--
--	struct
--	  {
--	    void (*_function) (sigval_t);	/* Function to start.  */
--	    void *_attribute;			/* Really pthread_attr_t.  */
--	  } _sigev_thread;
--      } _sigev_un;
--  } sigevent_t;
--
--/* POSIX names to access some of the members.  */
--# define sigev_notify_function   _sigev_un._sigev_thread._function
--# define sigev_notify_attributes _sigev_un._sigev_thread._attribute
--
--/* `sigev_notify' values.  */
--enum
--{
--  SIGEV_SIGNAL = 0,		/* Notify via signal.  */
--# define SIGEV_SIGNAL	SIGEV_SIGNAL
--  SIGEV_NONE,			/* Other notification: meaningless.  */
--# define SIGEV_NONE	SIGEV_NONE
--  SIGEV_THREAD,			/* Deliver via thread creation.  */
--# define SIGEV_THREAD	SIGEV_THREAD
--
--  SIGEV_THREAD_ID = 4		/* Send signal to specific thread.  */
--#define SIGEV_THREAD_ID	SIGEV_THREAD_ID
--};
--
--#endif	/* have _SIGNAL_H.  */
-From: Maxim Kuvyrkov <maxim@codesourcery.com>
-Date: Tue, 9 Mar 2010 10:34:24 +0000 (-0800)
-Subject: m68k: update ColdFire sigcontext ABI
-X-Git-Tag: glibc-2.12~39
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=75e73e66e49104a7aff24aa50043ae7ab02e38f3
-
-m68k: update ColdFire sigcontext ABI
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index e2b54e5..d63b88e 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,5 +1,8 @@
- 2010-03-09  Maxim Kuvyrkov  <maxim@codesourcery.com>
- 
-+	* sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h: Remove.
-+	* sysdeps/unix/sysv/linux/m68k/register-dump.h: Update.
-+
- 	* sysdeps/unix/sysv/linux/m68k/bits/siginfo.h: Remove.
- 
- 	* sysdeps/m68k/jmpbuf-unwind.h (_JMPBUF_CFA_UNWINDS_ADJ)
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h
-deleted file mode 100644
-index 8ad0c96..0000000
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h
-+++ /dev/null
-@@ -1,62 +0,0 @@
--/* Copyright (C) 2006 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#if !defined _SIGNAL_H && !defined _SYS_UCONTEXT_H
--# error "Never use <bits/sigcontext.h> directly; include <signal.h> instead."
--#endif
--
--#ifndef _BITS_SIGCONTEXT_H
--#define _BITS_SIGCONTEXT_H 1
--
--struct sigcontext {
--  unsigned long sc_mask;
--  unsigned long sc_usp;
--  unsigned long sc_d0;
--  unsigned long sc_d1;
--#ifdef __mcoldfire__
--  unsigned long sc_d2;
--  unsigned long sc_d3;
--  unsigned long sc_d4;
--  unsigned long sc_d5;
--  unsigned long sc_d6;
--  unsigned long sc_d7;
--#endif
--  unsigned long sc_a0;
--  unsigned long sc_a1;
--#ifdef __mcoldfire__
--  unsigned long sc_a2;
--  unsigned long sc_a3;
--  unsigned long sc_a4;
--  unsigned long sc_a5;
--  unsigned long sc_a6;
--#endif
--  unsigned short sc_sr;
--  unsigned long sc_pc;
--  unsigned short sc_formatvec;
--#ifdef __mcoldfire__
--  unsigned long sc_fpregs[8][2];
--  unsigned long sc_fpcntl[3];
--  unsigned char sc_fpstate[16];
--#else
--  unsigned long sc_fpregs[2*3];
--  unsigned long sc_fpcntl[3];
--  unsigned char sc_fpstate[216];
--#endif
--};
--
--#endif
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/register-dump.h b/ports/sysdeps/unix/sysv/linux/m68k/register-dump.h
-index 391902f..78709d9 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/register-dump.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/register-dump.h
-@@ -40,7 +40,6 @@
- 
- */
- 
--#ifndef __mcoldfire__
- /* Linux saves only the call-clobbered registers in the sigcontext.  We
-    need to use a trampoline that saves the rest so that the C code can
-    access them.  We use the sc_fpstate field, since the handler is not
-@@ -59,14 +58,17 @@ catch_segfault:\n\
- 	/* Clear the first 4 bytes to make it a null fp state, just\n\
- 	   in case the handler does return.  */\n\
- 	clr.l (%%a0)+\n\
--	movem.l %%d2-%%d7/%%a2-%%a6,(%%a0)\n\
--	fmovem.x %%fp2-%%fp7,11*4(%%a0)\n\
--	jra real_catch_segfault"
-+	movem.l %%d2-%%d7/%%a2-%%a6,(%%a0)\n"
-+#ifndef __mcoldfire__
-+       "fmovem.x %%fp2-%%fp7,11*4(%%a0)\n"
-+#elif defined __mcffpu__
-+       "fmovem.d %%fp2-%%fp7,11*4(%%a0)\n"
-+#endif
-+       "jra real_catch_segfault"
-        : : "n" (offsetof (struct sigcontext, sc_fpstate)));
- }
- #define catch_segfault(a,b) \
-   __attribute_used__ real_catch_segfault(a,b)
--#endif
- 
- static void
- hexvalue (unsigned long int value, char *buf, size_t len)
-@@ -104,36 +106,19 @@ register_dump (int fd, struct sigcontext *ctx)
-   /* Generate strings of register contents.  */
-   hexvalue (ctx->sc_d0, regs[0], 8);
-   hexvalue (ctx->sc_d1, regs[1], 8);
--#ifdef __mcoldfire__
--  hexvalue (ctx->sc_d2, regs[2], 8);
--  hexvalue (ctx->sc_d3, regs[3], 8);
--  hexvalue (ctx->sc_d4, regs[4], 8);
--  hexvalue (ctx->sc_d5, regs[5], 8);
--  hexvalue (ctx->sc_d6, regs[6], 8);
--  hexvalue (ctx->sc_d7, regs[7], 8);
--#else
-   hexvalue (*p++, regs[2], 8);
-   hexvalue (*p++, regs[3], 8);
-   hexvalue (*p++, regs[4], 8);
-   hexvalue (*p++, regs[5], 8);
-   hexvalue (*p++, regs[6], 8);
-   hexvalue (*p++, regs[7], 8);
--#endif
-   hexvalue (ctx->sc_a0, regs[8], 8);
-   hexvalue (ctx->sc_a1, regs[9], 8);
--#ifdef __mcoldfire__
--  hexvalue (ctx->sc_a2, regs[10], 8);
--  hexvalue (ctx->sc_a3, regs[11], 8);
--  hexvalue (ctx->sc_a4, regs[12], 8);
--  hexvalue (ctx->sc_a5, regs[13], 8);
--  hexvalue (ctx->sc_a6, regs[14], 8);
--#else
-   hexvalue (*p++, regs[10], 8);
-   hexvalue (*p++, regs[11], 8);
-   hexvalue (*p++, regs[12], 8);
-   hexvalue (*p++, regs[13], 8);
-   hexvalue (*p++, regs[14], 8);
--#endif
-   hexvalue (ctx->sc_usp, regs[15], 8);
-   hexvalue (ctx->sc_pc, regs[16], 8);
-   hexvalue (ctx->sc_sr, regs[17], 4);
-@@ -142,9 +127,6 @@ register_dump (int fd, struct sigcontext *ctx)
-   for (i = 0; i < 2; i++)
-     for (j = 0; j < fpreg_size; j += 8)
-       hexvalue (*pfp++, fpregs[i] + j, 8);
--#ifdef __mcoldfire__
--  p = pfp;
--#endif
-   for (i = 2; i < 8; i++)
-     for (j = 0; j < fpreg_size; j += 8)
-       hexvalue (*p++, fpregs[i] + j, 8);
-From: Maxim Kuvyrkov <maxim@codesourcery.com>
-Date: Fri, 12 Mar 2010 18:50:55 +0000 (+0100)
-Subject: NPTL support for m68k/ColdFire
-X-Git-Tag: glibc-2.12~38
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=40111cb9e17a911c8913f00d9b913a71ceb6e609
-
-NPTL support for m68k/ColdFire
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index d63b88e..32681ff 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,5 +1,45 @@
- 2010-03-09  Maxim Kuvyrkov  <maxim@codesourcery.com>
- 
-+	NPTL support for m68k/ColdFire
-+	* sysdeps/unix/sysv/linux/m68k/sysdep.h (tls.h): Include.
-+	(INTERNAL_SYSCALL): Convert to INTERNAL_SYSCALL_NCS.
-+	(PTR_MANGLE, PTR_DEMANGLE): Define.
-+	(NEED_STATIC_SYSINFO_DSO): Define.
-+	* sysdeps/unix/sysv/linux/m68k/clone.S: Support RESET_PID.
-+	* sysdeps/unix/sysv/linux/m68k/m68k-helpers.S: New.
-+	* sysdeps/unix/sysv/linux/m68k/Makefile: Add new files to lists.
-+	* sysdeps/unix/sysv/linux/m68k/vfork.S: Add SAVE_PID/RESTORE_PID.
-+	* sysdeps/unix/sysv/linux/m68k/m68k-vdso.c: New.
-+	* sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c: New.
-+	* sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: New.
-+	* sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h: New.
-+	* sysdeps/unix/sysv/linux/m68k/Versions: Add symbols for NPTL support.
-+	* sysdeps/unix/sysv/linux/m68k/init-first.c: New.
-+	* sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h: New.
-+	* sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h: New.
-+	* sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h: New.
-+	* sysdeps/unix/sysv/linux/m68k/nptl/clone.S: New.
-+	* sysdeps/unix/sysv/linux/m68k/nptl/fork.c: New.
-+	* sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h: New.
-+	* sysdeps/unix/sysv/linux/m68k/nptl/vfork.S: New.
-+	* sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S: New.
-+	* sysdeps/unix/sysv/linux/m68k/nptl/createthread.c: New.
-+	* sysdeps/unix/sysv/linux/m68k/nptl/pthread_once.c: New.
-+	* sysdeps/unix/sysv/linux/m68k/socket.S: Update cancelation code.
-+	* sysdeps/m68k/dl-tls.h: New.
-+	* sysdeps/m68k/libc-tls.c: New.
-+	* sysdeps/m68k/tls-macros.h: New.
-+	* sysdeps/m68k/dl-machine.h (RTLD_START): Terminate stack frame to
-+	generate better backtraces.
-+	(elf_machine_type_class, elf_machine_rela): Handle TLS relocations.
-+	* sysdeps/m68k/dl-machine.h: Handle TLS relocations.
-+	* sysdeps/m68k/nptl/tcb-offsets.sym: New.
-+	* sysdeps/m68k/nptl/pthread_spin_trylock.c: New.
-+	* sysdeps/m68k/nptl/tls.h: New.
-+	* sysdeps/m68k/nptl/pthread_spin_lock.c: New.
-+	* sysdeps/m68k/nptl/pthreaddef.h: New.
-+	* sysdeps/m68k/nptl/Makefile: New.
-+
- 	* sysdeps/unix/sysv/linux/m68k/bits/sigcontext.h: Remove.
- 	* sysdeps/unix/sysv/linux/m68k/register-dump.h: Update.
- 
-diff --git a/ports/sysdeps/m68k/dl-machine.h b/ports/sysdeps/m68k/dl-machine.h
-index 08a4396..9bc35e7 100644
---- a/ports/sysdeps/m68k/dl-machine.h
-+++ b/ports/sysdeps/m68k/dl-machine.h
-@@ -1,5 +1,6 @@
- /* Machine-dependent ELF dynamic relocation inline functions.  m68k version.
--   Copyright (C) 1996-2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2001, 2002, 2003, 2004, 2005, 2010
-+   Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -24,6 +25,7 @@
- 
- #include <sys/param.h>
- #include <sysdep.h>
-+#include <dl-tls.h>
- 
- /* Return nonzero iff ELF header is compatible with the running host.  */
- static inline int
-@@ -121,6 +123,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
- 	.globl _start\n\
- 	.type _start,@function\n\
- _start:\n\
-+	sub.l %fp, %fp\n\
- 	move.l %sp, -(%sp)\n\
- 	jbsr _dl_start\n\
- 	addq.l #4, %sp\n\
-@@ -159,12 +162,16 @@ _dl_start_user:\n\
- 	.size _dl_start_user, . - _dl_start_user\n\
- 	.previous");
- 
--/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
--   PLT entries should not be allowed to define the value.
-+/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or
-+   TLS variable, so undefined references should not be allowed to
-+   define the value.
-    ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one
-    of the main executable's symbols, as for a COPY reloc.  */
- #define elf_machine_type_class(type) \
--  ((((type) == R_68K_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)	\
-+  ((((type) == R_68K_JMP_SLOT	     \
-+     || (type) == R_68K_TLS_DTPMOD32 \
-+     || (type) == R_68K_TLS_DTPREL32 \
-+     || (type) == R_68K_TLS_TPREL32) * ELF_RTYPE_CLASS_PLT)	\
-    | (((type) == R_68K_COPY) * ELF_RTYPE_CLASS_COPY))
- 
- /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries.  */
-@@ -262,6 +269,25 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
- 	case R_68K_PC32:
- 	  *reloc_addr = value + reloc->r_addend - (Elf32_Addr) reloc_addr;
- 	  break;
-+#if defined USE_TLS && !defined RTLD_BOOTSTRAP
-+	case R_68K_TLS_DTPMOD32:
-+	  /* Get the information from the link map returned by the
-+	     resolv function.  */
-+	  if (sym_map != NULL)
-+	    *reloc_addr = sym_map->l_tls_modid;
-+	  break;
-+	case R_68K_TLS_DTPREL32:
-+	  if (sym != NULL)
-+	    *reloc_addr = TLS_DTPREL_VALUE (sym, reloc);
-+	  break;
-+	case R_68K_TLS_TPREL32:
-+	  if (sym != NULL)
-+	    {
-+	      CHECK_STATIC_TLS (map, sym_map);
-+	      *reloc_addr = TLS_TPREL_VALUE (sym_map, sym, reloc);
-+	    }
-+	  break;
-+#endif /* defined USE_TLS && !defined RTLD_BOOTSTRAP */
- 	case R_68K_NONE:		/* Alright, Wilbur.  */
- 	  break;
- 	default:
-diff --git a/ports/sysdeps/m68k/dl-tls.h b/ports/sysdeps/m68k/dl-tls.h
-new file mode 100644
-index 0000000..f2ce998
---- /dev/null
-+++ b/ports/sysdeps/m68k/dl-tls.h
-@@ -0,0 +1,48 @@
-+/* Thread-local storage handling in the ELF dynamic linker.  M68K version.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+
-+/* Type used for the representation of TLS information in the GOT.  */
-+typedef struct
-+{
-+  unsigned long int ti_module;
-+  unsigned long int ti_offset;
-+} tls_index;
-+
-+/* The thread pointer points 0x7000 past the first static TLS block.  */
-+#define TLS_TP_OFFSET		0x7000
-+
-+/* Dynamic thread vector pointers point 0x8000 past the start of each
-+   TLS block.  */
-+#define TLS_DTV_OFFSET		0x8000
-+
-+/* Compute the value for a TPREL reloc.  */
-+#define TLS_TPREL_VALUE(sym_map, sym, reloc)				\
-+  ((sym_map)->l_tls_offset + (sym)->st_value + (reloc)->r_addend	\
-+   - TLS_TP_OFFSET)
-+
-+/* Compute the value for a DTPREL reloc.  */
-+#define TLS_DTPREL_VALUE(sym, reloc)				\
-+  ((sym)->st_value + (reloc)->r_addend - TLS_DTV_OFFSET)
-+
-+extern void *__tls_get_addr (tls_index *ti);
-+
-+#define GET_ADDR_OFFSET	        (ti->ti_offset + TLS_DTV_OFFSET)
-+#define __TLS_GET_ADDR(__ti)	(__tls_get_addr (__ti) - TLS_DTV_OFFSET)
-diff --git a/ports/sysdeps/m68k/libc-tls.c b/ports/sysdeps/m68k/libc-tls.c
-new file mode 100644
-index 0000000..e865fac
---- /dev/null
-+++ b/ports/sysdeps/m68k/libc-tls.c
-@@ -0,0 +1,38 @@
-+/* Thread-local storage handling in the ELF dynamic linker.  m68k version.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <csu/libc-tls.c>
-+#include <dl-tls.h>
-+
-+#if USE_TLS
-+
-+/* On M68K, linker optimizations are not required, so __tls_get_addr
-+   can be called even in statically linked binaries.  In this case module
-+   must be always 1 and PT_TLS segment exist in the binary, otherwise it
-+   would not link.  */
-+
-+void *
-+__tls_get_addr (tls_index *ti)
-+{
-+  dtv_t *dtv = THREAD_DTV ();
-+  return (char *) dtv[1].pointer.val + GET_ADDR_OFFSET;
-+}
-+
-+#endif
-diff --git a/ports/sysdeps/m68k/nptl/Makefile b/ports/sysdeps/m68k/nptl/Makefile
-new file mode 100644
-index 0000000..f36fc8f
---- /dev/null
-+++ b/ports/sysdeps/m68k/nptl/Makefile
-@@ -0,0 +1,22 @@
-+# Copyright (C) 2010 Free Software Foundation, Inc.
-+# This file is part of the GNU C Library.
-+# Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+#
-+# The GNU C Library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 2.1 of the License, or (at your option) any later version.
-+#
-+# The GNU C Library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with the GNU C Library; if not, write to the Free
-+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+# 02111-1307 USA.
-+
-+ifeq ($(subdir),csu)
-+gen-as-const-headers += tcb-offsets.sym
-+endif
-diff --git a/ports/sysdeps/m68k/nptl/pthread_spin_lock.c b/ports/sysdeps/m68k/nptl/pthread_spin_lock.c
-new file mode 100644
-index 0000000..1cc16c8
---- /dev/null
-+++ b/ports/sysdeps/m68k/nptl/pthread_spin_lock.c
-@@ -0,0 +1,31 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <atomic.h>
-+#include "pthreadP.h"
-+
-+int
-+pthread_spin_lock (pthread_spinlock_t *lock)
-+{
-+  while (atomic_compare_and_exchange_val_acq(lock, 1, 0) != 0)
-+   while (*lock != 0)
-+    ;
-+
-+  return 0;
-+}
-diff --git a/ports/sysdeps/m68k/nptl/pthread_spin_trylock.c b/ports/sysdeps/m68k/nptl/pthread_spin_trylock.c
-new file mode 100644
-index 0000000..831bffb
---- /dev/null
-+++ b/ports/sysdeps/m68k/nptl/pthread_spin_trylock.c
-@@ -0,0 +1,28 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <errno.h>
-+#include <atomic.h>
-+#include "pthreadP.h"
-+
-+int
-+pthread_spin_trylock (pthread_spinlock_t *lock)
-+{
-+  return atomic_compare_and_exchange_val_acq(lock, 1, 0) ? EBUSY : 0;
-+}
-diff --git a/ports/sysdeps/m68k/nptl/pthreaddef.h b/ports/sysdeps/m68k/nptl/pthreaddef.h
-new file mode 100644
-index 0000000..0a54907
---- /dev/null
-+++ b/ports/sysdeps/m68k/nptl/pthreaddef.h
-@@ -0,0 +1,39 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* Default stack size.  */
-+#define ARCH_STACK_DEFAULT_SIZE	(2 * 1024 * 1024)
-+
-+/* Required stack pointer alignment at beginning.  */
-+#define STACK_ALIGN		16
-+
-+/* Minimal stack size after allocating thread descriptor and guard size.  */
-+#define MINIMAL_REST_STACK	2048
-+
-+/* Alignment requirement for TCB.  */
-+#define TCB_ALIGNMENT		16
-+
-+
-+/* Location of current stack frame.  */
-+#define CURRENT_STACK_FRAME	__builtin_frame_address (0)
-+
-+
-+/* XXX Until we have a better place keep the definitions here.  */
-+#define __exit_thread_inline(val) \
-+  INLINE_SYSCALL (exit, 1, (val))
-diff --git a/ports/sysdeps/m68k/nptl/tcb-offsets.sym b/ports/sysdeps/m68k/nptl/tcb-offsets.sym
-new file mode 100644
-index 0000000..b1bba65
---- /dev/null
-+++ b/ports/sysdeps/m68k/nptl/tcb-offsets.sym
-@@ -0,0 +1,11 @@
-+#include <sysdep.h>
-+#include <tls.h>
-+
-+--
-+
-+-- Derive offsets relative to the thread register.
-+#define thread_offsetof(mem)	(long)(offsetof(struct pthread, mem) - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE)
-+
-+MULTIPLE_THREADS_OFFSET		thread_offsetof (header.multiple_threads)
-+PID_OFFSET			thread_offsetof (pid)
-+TID_OFFSET			thread_offsetof (tid)
-diff --git a/ports/sysdeps/m68k/nptl/tls.h b/ports/sysdeps/m68k/nptl/tls.h
-new file mode 100644
-index 0000000..c29824c
---- /dev/null
-+++ b/ports/sysdeps/m68k/nptl/tls.h
-@@ -0,0 +1,171 @@
-+/* Definition for thread-local data handling.  NPTL/m68k version.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _TLS_H
-+#define _TLS_H	1
-+
-+#include <dl-sysdep.h>
-+
-+#ifndef __ASSEMBLER__
-+# include <stdbool.h>
-+# include <stddef.h>
-+# include <stdint.h>
-+
-+/* Type for the dtv.  */
-+typedef union dtv
-+{
-+  size_t counter;
-+  struct
-+  {
-+    void *val;
-+    bool is_static;
-+  } pointer;
-+} dtv_t;
-+
-+#else /* __ASSEMBLER__ */
-+# include <tcb-offsets.h>
-+#endif /* __ASSEMBLER__ */
-+
-+/* Signal that TLS support is available.  */
-+#define USE_TLS	1
-+
-+#ifndef __ASSEMBLER__
-+
-+/* Get system call information.  */
-+# include <sysdep.h>
-+
-+/* The TP points to the start of the thread blocks.  */
-+# define TLS_DTV_AT_TP	1
-+
-+/* Get the thread descriptor definition.  */
-+# include <nptl/descr.h>
-+
-+typedef struct
-+{
-+  dtv_t *dtv;
-+  void *private;
-+} tcbhead_t;
-+
-+/* This is the size of the initial TCB.  Because our TCB is before the thread
-+   pointer, we don't need this.  */
-+# define TLS_INIT_TCB_SIZE	0
-+
-+/* Alignment requirements for the initial TCB.  */
-+# define TLS_INIT_TCB_ALIGN	__alignof__ (struct pthread)
-+
-+/* This is the size of the TCB.  Because our TCB is before the thread
-+   pointer, we don't need this.  */
-+# define TLS_TCB_SIZE		0
-+
-+/* Alignment requirements for the TCB.  */
-+# define TLS_TCB_ALIGN		__alignof__ (struct pthread)
-+
-+/* This is the size we need before TCB - actually, it includes the TCB.  */
-+# define TLS_PRE_TCB_SIZE						\
-+  (sizeof (struct pthread)						\
-+   + ((sizeof (tcbhead_t) + TLS_TCB_ALIGN - 1) & ~(TLS_TCB_ALIGN - 1)))
-+
-+/* The thread pointer (TP) points to the end of the
-+   TCB + 0x7000, as for PowerPC and MIPS.  This implies that TCB address is
-+   TP - 0x7000.  As we define TLS_DTV_AT_TP we can
-+   assume that the pthread struct is allocated immediately ahead of the
-+   TCB.  This implies that the pthread_descr address is
-+   TP - (TLS_PRE_TCB_SIZE + 0x7000).  */
-+# define TLS_TCB_OFFSET	0x7000
-+
-+/* Install the dtv pointer.  The pointer passed is to the element with
-+   index -1 which contain the length.  */
-+# define INSTALL_DTV(tcbp, dtvp) \
-+  ((tcbhead_t *) (tcbp))[-1].dtv = dtvp + 1
-+
-+/* Install new dtv for current thread.  */
-+# define INSTALL_NEW_DTV(dtv) \
-+  (THREAD_DTV () = (dtv))
-+
-+/* Return dtv of given thread descriptor.  */
-+# define GET_DTV(tcbp) \
-+  (((tcbhead_t *) (tcbp))[-1].dtv)
-+
-+/* Code to initially initialize the thread pointer.  This might need
-+   special attention since 'errno' is not yet available and if the
-+   operation can cause a failure 'errno' must not be touched.  */
-+# define TLS_INIT_TP(tcbp, secondcall)					\
-+  ({									\
-+    INTERNAL_SYSCALL_DECL (err);					\
-+    int _sys_result;							\
-+									\
-+    _sys_result = INTERNAL_SYSCALL (set_thread_area, err, 1,		\
-+				    ((void *) (tcbp)) + TLS_TCB_OFFSET); \
-+    INTERNAL_SYSCALL_ERROR_P (_sys_result, err) ? "unknown error" : NULL; })
-+
-+extern void * __m68k_read_tp (void);
-+
-+/* Return the address of the dtv for the current thread.  */
-+# define THREAD_DTV() \
-+  (((tcbhead_t *) (__m68k_read_tp () - TLS_TCB_OFFSET))[-1].dtv)
-+
-+/* Return the thread descriptor for the current thread.  */
-+# define THREAD_SELF \
-+  ((struct pthread *) (__m68k_read_tp () - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE))
-+
-+/* Magic for libthread_db to know how to do THREAD_SELF.  */
-+# define DB_THREAD_SELF \
-+  CONST_THREAD_AREA (32, TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE)
-+
-+/* Access to data in the thread descriptor is easy.  */
-+# define THREAD_GETMEM(descr, member) \
-+  descr->member
-+# define THREAD_GETMEM_NC(descr, member, idx) \
-+  descr->member[idx]
-+# define THREAD_SETMEM(descr, member, value) \
-+  descr->member = (value)
-+# define THREAD_SETMEM_NC(descr, member, idx, value) \
-+  descr->member[idx] = (value)
-+
-+/* l_tls_offset == 0 is perfectly valid on M68K, so we have to use some
-+   different value to mean unset l_tls_offset.  */
-+# define NO_TLS_OFFSET		-1
-+
-+/* Get and set the global scope generation counter in struct pthread.  */
-+#define THREAD_GSCOPE_FLAG_UNUSED 0
-+#define THREAD_GSCOPE_FLAG_USED   1
-+#define THREAD_GSCOPE_FLAG_WAIT   2
-+#define THREAD_GSCOPE_RESET_FLAG()					\
-+  do									\
-+    { int __res								\
-+	= atomic_exchange_rel (&THREAD_SELF->header.gscope_flag,	\
-+			       THREAD_GSCOPE_FLAG_UNUSED);		\
-+      if (__res == THREAD_GSCOPE_FLAG_WAIT)				\
-+	lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
-+    }									\
-+  while (0)
-+#define THREAD_GSCOPE_SET_FLAG()					\
-+  do									\
-+    {									\
-+      THREAD_SELF->header.gscope_flag = THREAD_GSCOPE_FLAG_USED;	\
-+      atomic_write_barrier ();						\
-+    }									\
-+  while (0)
-+#define THREAD_GSCOPE_WAIT() \
-+  GL(dl_wait_lookup_done) ()
-+
-+#endif /* __ASSEMBLER__ */
-+
-+#endif	/* tls.h */
-diff --git a/ports/sysdeps/m68k/tls-macros.h b/ports/sysdeps/m68k/tls-macros.h
-new file mode 100644
-index 0000000..d03d7b9
---- /dev/null
-+++ b/ports/sysdeps/m68k/tls-macros.h
-@@ -0,0 +1,70 @@
-+/* Macros for accessing thread-local storage.  m68k version.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#define TLS_GD(x)							\
-+  ({									\
-+    void *__result;							\
-+    extern void *__tls_get_addr (void *);				\
-+									\
-+    asm ("movel #_GLOBAL_OFFSET_TABLE_@GOTPC, %0\n\t"			\
-+	 "lea (-6, %%pc, %0), %0\n\t"					\
-+	 "lea " #x "@TLSGD(%0), %0"					\
-+	 : "=&a" (__result));						\
-+    (int *) __tls_get_addr (__result); })
-+
-+#define TLS_LD(x)							\
-+  ({									\
-+    char *__tp;								\
-+    int __offset;							\
-+    extern void *__tls_get_addr (void *);				\
-+									\
-+    asm ("movel #_GLOBAL_OFFSET_TABLE_@GOTPC, %0\n\t"			\
-+	 "lea (-6, %%pc, %0), %0\n\t"					\
-+	 "lea " #x "@TLSLDM(%0), %0"					\
-+	 : "=&a" (__tp));						\
-+    __tp = (char *) __tls_get_addr (__tp);				\
-+    asm ("movel #" #x "@TLSLDO, %0"					\
-+	 : "=a" (__offset));						\
-+    (int *) (__tp + __offset); })
-+
-+#define TLS_IE(x)							\
-+  ({									\
-+    char *__tp;								\
-+    int __offset;							\
-+    extern void * __m68k_read_tp (void);				\
-+									\
-+    __tp = (char *) __m68k_read_tp ();					\
-+    asm ("movel #_GLOBAL_OFFSET_TABLE_@GOTPC, %0\n\t"			\
-+	 "lea (-6, %%pc, %0), %0\n\t"					\
-+	 "movel " #x "@TLSIE(%0), %0"					\
-+	 : "=&a" (__offset));						\
-+    (int *) (__tp + __offset); })
-+
-+#define TLS_LE(x)							\
-+  ({									\
-+    char *__tp;								\
-+    int __offset;							\
-+    extern void * __m68k_read_tp (void);				\
-+									\
-+    __tp = (char *) __m68k_read_tp ();					\
-+    asm ("movel #" #x "@TLSLE, %0"					\
-+	 : "=a" (__offset));						\
-+    (int *) (__tp + __offset); })
-+
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/Makefile b/ports/sysdeps/unix/sysv/linux/m68k/Makefile
-index 6bb4f6b..97d9584 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/Makefile
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/Makefile
-@@ -2,12 +2,18 @@
- 
- m68k-syntax-flag = -DMOTOROLA_SYNTAX
- 
-+ifeq ($(subdir),csu)
-+sysdep_routines += m68k-helpers
-+endif
-+
- ifeq ($(subdir),misc)
- sysdep_routines += mremap
- sysdep_headers += sys/reg.h
- endif
- 
- ifeq ($(subdir),elf)
-+sysdep_routines += dl-vdso libc-m68k-vdso
-+sysdep-rtld-routines += m68k-vdso
- sysdep-others += lddlibc4
- install-bin += lddlibc4
- endif
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/Versions b/ports/sysdeps/unix/sysv/linux/m68k/Versions
-index 5650f7f..8a941f8 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/Versions
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/Versions
-@@ -32,4 +32,18 @@ libc {
-   GLIBC_2.11 {
-     fallocate64;
-   }
-+  GLIBC_2.12 {
-+    __m68k_read_tp;
-+  }
-+  GLIBC_PRIVATE {
-+    __vdso_atomic_cmpxchg_32; __vdso_atomic_barrier;
-+  }
-+}
-+
-+ld {
-+  GLIBC_PRIVATE {
-+    __rtld___vdso_read_tp;
-+    __rtld___vdso_atomic_cmpxchg_32;
-+    __rtld___vdso_atomic_barrier;
-+  }
- }
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
-new file mode 100644
-index 0000000..c361060
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
-@@ -0,0 +1,61 @@
-+/* Resolve function pointers to VDSO functions.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+
-+#ifndef _M68K_VDSO_H
-+#define _M68K_VDSO_H
-+
-+#ifdef SHARED
-+
-+# ifdef IS_IN_rtld
-+# define M68K_VDSO_SYMBOL(name) __rtld_##name
-+# define STR_M68K_VDSO_SYMBOL(name) "__rtld_" #name
-+# else
-+# define M68K_VDSO_SYMBOL(name) name
-+# define STR_M68K_VDSO_SYMBOL(name) #name
-+# endif
-+
-+# ifndef __ASSEMBLER__
-+
-+/* We define __rtld_* copies for rtld.
-+   We need them visible in libc to initialize.  */
-+#  if defined IS_IN_rtld || !defined NOT_IN_libc
-+extern void *__rtld___vdso_read_tp;
-+extern void *__rtld___vdso_atomic_cmpxchg_32;
-+extern void *__rtld___vdso_atomic_barrier;
-+
-+/* These stubs are meant to be invoked only from the assembly.  */
-+extern void __vdso_read_tp_stub (void);
-+extern void __vdso_atomic_cmpxchg_32_stub (void);
-+extern void __vdso_atomic_barrier_stub (void);
-+#  endif /* IS_IN_rtld || !NOT_IN_libc */
-+
-+/* RTLD should only use its own copies.  */
-+#  ifndef IS_IN_rtld
-+extern void *__vdso_read_tp;
-+extern void *__vdso_atomic_cmpxchg_32;
-+extern void *__vdso_atomic_barrier;
-+#  endif /* !IS_IN_rtld */
-+
-+# endif /* !__ASSEMBLER__ */
-+
-+#endif /* SHARED */
-+
-+#endif /* _M68K_VDSO_H */
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/clone.S b/ports/sysdeps/unix/sysv/linux/m68k/clone.S
-index a179f8e..401e2ef 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/clone.S
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/clone.S
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1996,97,98,2002 Free Software Foundation, Inc.
-+/* Copyright (C) 1996,97,98,2002,2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Andreas Schwab (schwab@issan.informatik.uni-dortmund.de)
- 
-@@ -17,14 +17,21 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
--/* clone is even more special than fork as it mucks with stacks
-+/* clone() is even more special than fork() as it mucks with stacks
-    and invokes a function in the right context after its all over.  */
- 
- #include <sysdep.h>
- #define _ERRNO_H	1
- #include <bits/errno.h>
-+#ifdef RESET_PID
-+#include <tls.h>
-+#endif
-+
-+#define CLONE_VM      0x00000100
-+#define CLONE_THREAD  0x00010000
- 
--/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
-+/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg,
-+	     void *parent_tidptr, void *tls, void *child_tidptr) */
- 
-         .text
- ENTRY (__clone)
-@@ -42,7 +49,17 @@ ENTRY (__clone)
- 	movel	16(%sp), -(%a1)
- 
- 	/* Do the system call */
--	movel	12(%sp), %d1		/* get flags */
-+	movel	12+0(%sp), %d1		/* get flags */
-+	movel	%d3, -(%a1)             /* save %d3 and get parent_tidptr */
-+	movel	%d3, -(%sp)
-+	movel	20+4(%sp), %d3
-+	movel	%d4, -(%a1)		/* save %d4 and get child_tidptr */
-+	movel	%d4, -(%sp)
-+	movel	28+8(%sp), %d4
-+	movel	%d5, -(%a1)             /* save %d5 and get tls */
-+	movel	%d5, -(%sp)
-+	movel	24+12(%sp), %d5
-+	/* save %d2 and get stack pointer */
- #ifdef __mcoldfire__
- 	movel	%d2, -(%a1)
- 	movel	%d2, -(%sp)
-@@ -57,6 +74,9 @@ ENTRY (__clone)
- #else
- 	exg	%d2, %a1		/* restore %d2 */
- #endif
-+	movel	(%sp)+, %d5             /* restore %d5, %d4 and %d3 */
-+	movel	(%sp)+, %d4
-+	movel	(%sp)+, %d3
- 
- 	tstl	%d0
- 	jmi	SYSCALL_ERROR_LABEL
-@@ -65,11 +85,35 @@ ENTRY (__clone)
- 	rts
- 
- thread_start:
-+	cfi_startproc
-+	cfi_undefined (pc)	/* Mark end of stack */
- 	subl	%fp, %fp	/* terminate the stack frame */
-+#ifdef RESET_PID
-+	/* Check and see if we need to reset the PID.  */
-+	movel	%d1, %a1
-+	andl	#CLONE_THREAD, %d1
-+	jne	donepid
-+	movel	%a1, %d1
-+	movel	#-1, %d0
-+	andl	#CLONE_VM, %d1
-+	jne	gotpid
-+	movel	#SYS_ify (getpid), %d0
-+	trap	#0
-+gotpid:
-+	movel	%a0, -(%sp)
-+	movel	%d0, -(%sp)
-+	bsrl	__m68k_read_tp@PLTPC
-+	movel	(%sp)+, %d0
-+	movel	%d0, PID_OFFSET(%a0)
-+	movel	%d0, TID_OFFSET(%a0)
-+	movel	(%sp)+, %a0
-+donepid:
-+#endif
- 	jsr	(%a0)
- 	movel	%d0, %d1
- 	movel	#SYS_ify (exit), %d0
- 	trap	#0
-+	cfi_endproc
- 
- PSEUDO_END (__clone)
- 
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h b/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h
-new file mode 100644
-index 0000000..1198bb9
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h
-@@ -0,0 +1,105 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _BITS_ATOMIC_H
-+#define _BITS_ATOMIC_H	1
-+
-+#include <stdint.h>
-+#include <sysdep.h>
-+#include <bits/m68k-vdso.h>
-+
-+/* Coldfire has no atomic compare-and-exchange operation, but the
-+   kernel provides userspace atomicity operations.  Use them.  */
-+
-+typedef int32_t atomic32_t;
-+typedef uint32_t uatomic32_t;
-+typedef int_fast32_t atomic_fast32_t;
-+typedef uint_fast32_t uatomic_fast32_t;
-+
-+typedef intptr_t atomicptr_t;
-+typedef uintptr_t uatomicptr_t;
-+typedef intmax_t atomic_max_t;
-+typedef uintmax_t uatomic_max_t;
-+
-+/* The only basic operation needed is compare and exchange.  */
-+/* For ColdFire we'll have to trap into the kernel mode anyway,
-+   so trap from the library rather then from the kernel wrapper.  */
-+#ifdef SHARED
-+# define atomic_compare_and_exchange_val_acq(mem, newval, oldval)	\
-+  ({									\
-+    /* Use temporary variables to workaround call-clobberness of */	\
-+    /* the registers.  */						\
-+    __typeof (mem) _mem = mem;						\
-+    __typeof (oldval) _oldval = oldval;					\
-+    __typeof (newval) _newval = newval;					\
-+    register __typeof (mem) _a0 asm ("a0") = _mem;			\
-+    register __typeof (oldval) _d0 asm ("d0") = _oldval;		\
-+    register __typeof (newval) _d1 asm ("d1") = _newval;		\
-+    void *tmp;								\
-+									\
-+    asm ("movel #_GLOBAL_OFFSET_TABLE_@GOTPC, %2\n\t"			\
-+	 "lea (-6, %%pc, %2), %2\n\t"					\
-+	 "movel " STR_M68K_VDSO_SYMBOL (__vdso_atomic_cmpxchg_32)	\
-+	 "@GOT(%2), %2\n\t"						\
-+	 "movel (%2), %2\n\t"						\
-+	 "jsr (%2)\n\t"							\
-+	 : "+d" (_d0), "+m" (*_a0), "=&a" (tmp)				\
-+	 : "a" (_a0), "d" (_d1));					\
-+    _d0;								\
-+  })
-+#else
-+# define atomic_compare_and_exchange_val_acq(mem, newval, oldval)	\
-+  ({									\
-+    /* Use temporary variables to workaround call-clobberness of */	\
-+    /* the registers.  */						\
-+    __typeof (mem) _mem = mem;						\
-+    __typeof (oldval) _oldval = oldval;					\
-+    __typeof (newval) _newval = newval;					\
-+    register __typeof (oldval) _d0 asm ("d0")				\
-+      = SYS_ify (atomic_cmpxchg_32);					\
-+    register __typeof (mem) _a0 asm ("a0") = _mem;			\
-+    register __typeof (oldval) _d2 asm ("d2") = _oldval;		\
-+    register __typeof (newval) _d1 asm ("d1") = _newval;		\
-+									\
-+    asm ("trap #0"							\
-+	 : "+d" (_d0), "+m" (*_a0)					\
-+	 : "a" (_a0), "d" (_d2), "d" (_d1));				\
-+    _d0;								\
-+  })
-+#endif
-+
-+#ifdef SHARED
-+# define atomic_full_barrier()					 \
-+  ({								 \
-+    void *tmp;							 \
-+								 \
-+    asm ("movel #_GLOBAL_OFFSET_TABLE_@GOTPC, %0\n\t"		 \
-+	 "lea (-6, %pc, %0), %0\n\t"				 \
-+	 "movel " STR_M68K_VDSO_SYMBOL (__vdso_atomic_barrier)	 \
-+	 "@GOT(%0), %0\n\t"					 \
-+	 "movel (%0), %0\n\t"					 \
-+	 "jsr (%0)\n\t"						 \
-+	 : "=&a" (tmp));					 \
-+  })
-+#else
-+# define atomic_full_barrier()				\
-+  (INTERNAL_SYSCALL (atomic_barrier, , 0), (void) 0)
-+#endif
-+
-+#endif
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/init-first.c b/ports/sysdeps/unix/sysv/linux/m68k/init-first.c
-new file mode 100644
-index 0000000..f8168d1
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/init-first.c
-@@ -0,0 +1,74 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* Note: linking in vDSO to a static binary requires changes to
-+   the main GLIBC proper.  Not yet implemented.  */
-+#ifdef SHARED
-+
-+#include <dl-vdso.h>
-+#include <bits/m68k-vdso.h>
-+
-+static inline void
-+_libc_vdso_platform_setup (void)
-+{
-+  void *p;
-+
-+  PREPARE_VERSION (linux26, "LINUX_2.6", 61765110);
-+
-+  /* It may happen that rtld didn't initialize the vDSO, so fallback
-+     to the syscall implementations if _dl_vdso_vsym returns NULL.
-+     This may happen when a static executable dlopen's a dynamic library.
-+     This really is nothing more than a workaround for rtld/csu
-+     deficiency.  Ideally, init code would setup the vDSO for static
-+     binaries too.  */
-+
-+  p = _dl_vdso_vsym ("__kernel_read_tp", &linux26);
-+  if (p != NULL)
-+    {
-+      __vdso_read_tp = p;
-+      __rtld___vdso_read_tp = p;
-+    }
-+  else
-+    assert (__vdso_read_tp == (void *) __vdso_read_tp_stub);
-+
-+  p = _dl_vdso_vsym ("__kernel_atomic_cmpxchg_32", &linux26);
-+  if (p != NULL)
-+    {
-+      __vdso_atomic_cmpxchg_32 = p;
-+      __rtld___vdso_atomic_cmpxchg_32 = p;
-+    }
-+  else
-+    assert (__vdso_atomic_cmpxchg_32
-+	    == (void *) __vdso_atomic_cmpxchg_32_stub);
-+
-+  p = _dl_vdso_vsym ("__kernel_atomic_barrier", &linux26);
-+  if (p != NULL)
-+    {
-+      __vdso_atomic_barrier = p;
-+      __rtld___vdso_atomic_barrier = p;
-+    }
-+  else
-+    assert (__vdso_atomic_barrier == (void *) __vdso_atomic_barrier_stub);
-+}
-+
-+#define VDSO_SETUP _libc_vdso_platform_setup
-+
-+#endif /* SHARED */
-+
-+#include <sysdeps/unix/sysv/linux/init-first.c>
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c b/ports/sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c
-new file mode 100644
-index 0000000..45982e9
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/libc-m68k-vdso.c
-@@ -0,0 +1 @@
-+#include "m68k-vdso.c"
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
-new file mode 100644
-index 0000000..00db4bb
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
-@@ -0,0 +1,105 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   In addition to the permissions in the GNU Lesser General Public
-+   License, the Free Software Foundation gives you unlimited
-+   permission to link the compiled version of this file with other
-+   programs, and to distribute those programs without any restriction
-+   coming from the use of this file. (The GNU Lesser General Public
-+   License restrictions do apply in other respects; for example, they
-+   cover modification of the file, and distribution when not linked
-+   into another program.)
-+
-+   Note that people who make modified versions of this file are not
-+   obligated to grant this special exception for their modified
-+   versions; it is their choice whether to do so. The GNU Lesser
-+   General Public License gives permission to release a modified
-+   version without this exception; this exception also makes it
-+   possible to release a modified version which carries forward this
-+   exception.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <sysdep.h>
-+#include <bits/m68k-vdso.h>
-+
-+	.text
-+
-+	.hidden __vdso_read_tp_stub
-+ENTRY (__vdso_read_tp_stub)
-+	cfi_startproc
-+	move.l	#__NR_get_thread_area, %d0
-+	trap	#0
-+	move.l	%d0, %a0
-+	rts
-+	cfi_endproc
-+END (__vdso_read_tp_stub)
-+
-+# ifdef SHARED
-+/* GCC will emit calls to this routine.  Linux has an
-+   equivalent helper function (which clobbers fewer registers than
-+   a normal function call) in a vdso; tail call to the
-+   helper.  */
-+# ifdef IS_IN_rtld
-+/* rtld gets a hidden copy of __m68k_read_tp.  */
-+	.hidden __m68k_read_tp
-+# endif
-+ENTRY (__m68k_read_tp)
-+	cfi_startproc
-+	move.l	#_GLOBAL_OFFSET_TABLE_@GOTPC, %a0
-+	lea	(-6, %pc, %a0), %a0
-+	move.l	M68K_VDSO_SYMBOL (__vdso_read_tp)@GOT(%a0), %a0
-+	move.l	(%a0), %a0
-+	jmp	(%a0)
-+	cfi_endproc
-+END (__m68k_read_tp)
-+
-+/* The following two stubs are for macros in atomic.h, they can't
-+   clobber anything.  */
-+
-+	.hidden __vdso_atomic_cmpxchg_32_stub
-+ENTRY (__vdso_atomic_cmpxchg_32_stub)
-+	cfi_startproc
-+	move.l	%d2, -(%sp)
-+	cfi_adjust_cfa_offset (4)
-+	cfi_rel_offset (%d2, 0)
-+	move.l	%d0, %d2
-+	move.l	#SYS_ify (atomic_cmpxchg_32), %d0
-+	trap	#0
-+	move.l	(%sp)+, %d2
-+	cfi_adjust_cfa_offset (-4)
-+	cfi_restore (%d2)
-+	rts
-+	cfi_endproc
-+END (__vdso_atomic_cmpxchg_32_stub)
-+	
-+	.hidden __vdso_atomic_barrier_stub
-+ENTRY (__vdso_atomic_barrier_stub)
-+	cfi_startproc
-+	move.l	%d0, -(%sp)
-+	cfi_adjust_cfa_offset (4)
-+	move.l	#SYS_ify (atomic_barrier), %d0
-+	trap	#0
-+	move.l	(%sp)+, %d0
-+	cfi_adjust_cfa_offset (-4)
-+	rts
-+	cfi_endproc
-+END (__vdso_atomic_barrier_stub)
-+# else /* !SHARED */
-+/* If the vDSO is not available, use a syscall to get TP.  */
-+	strong_alias (__vdso_read_tp_stub, __m68k_read_tp)
-+# endif /* SHARED */
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c b/ports/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c
-new file mode 100644
-index 0000000..73b2570
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/m68k-vdso.c
-@@ -0,0 +1,35 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifdef SHARED
-+
-+#include <bits/m68k-vdso.h>
-+
-+/* Because these pointers are used from other libraries than libc,
-+   they are exported at GLIBC_PRIVATE version.
-+   We initialize them to syscall implementation so that they will be ready
-+   to use from the very beginning.  */
-+void * M68K_VDSO_SYMBOL (__vdso_read_tp)
-+= (void *) __vdso_read_tp_stub;
-+void * M68K_VDSO_SYMBOL (__vdso_atomic_cmpxchg_32)
-+= (void *) __vdso_atomic_cmpxchg_32_stub;
-+void * M68K_VDSO_SYMBOL (__vdso_atomic_barrier)
-+= (void *) __vdso_atomic_barrier_stub;
-+
-+#endif /* SHARED */
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
-new file mode 100644
-index 0000000..0140810
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
-@@ -0,0 +1,172 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _BITS_PTHREADTYPES_H
-+#define _BITS_PTHREADTYPES_H	1
-+
-+#include <endian.h>
-+
-+#define __SIZEOF_PTHREAD_ATTR_T 36
-+#define __SIZEOF_PTHREAD_MUTEX_T 24
-+#define __SIZEOF_PTHREAD_MUTEXATTR_T 4
-+#define __SIZEOF_PTHREAD_COND_T 48
-+#define __SIZEOF_PTHREAD_CONDATTR_T 4
-+#define __SIZEOF_PTHREAD_RWLOCK_T 32
-+#define __SIZEOF_PTHREAD_RWLOCKATTR_T 8
-+#define __SIZEOF_PTHREAD_BARRIER_T 20
-+#define __SIZEOF_PTHREAD_BARRIERATTR_T 4
-+
-+
-+/* Thread identifiers.  The structure of the attribute type is
-+   deliberately not exposed.  */
-+typedef unsigned long int pthread_t;
-+
-+
-+typedef union
-+{
-+  char __size[__SIZEOF_PTHREAD_ATTR_T];
-+  long int __align;
-+} pthread_attr_t;
-+
-+
-+typedef struct __pthread_internal_slist
-+{
-+  struct __pthread_internal_slist *__next;
-+} __pthread_slist_t;
-+
-+
-+/* Data structures for mutex handling.  The structure of the attribute
-+   type is deliberately not exposed.  */
-+typedef union
-+{
-+  struct __pthread_mutex_s
-+  {
-+    int __lock;
-+    unsigned int __count;
-+    int __owner;
-+    /* KIND must stay at this position in the structure to maintain
-+       binary compatibility.  */
-+    int __kind;
-+    unsigned int __nusers;
-+    __extension__ union
-+    {
-+      int __spins;
-+      __pthread_slist_t __list;
-+    };
-+  } __data;
-+  char __size[__SIZEOF_PTHREAD_MUTEX_T];
-+  long int __align;
-+} pthread_mutex_t;
-+
-+typedef union
-+{
-+  char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
-+  int __align;
-+} pthread_mutexattr_t;
-+
-+
-+/* Data structure for conditional variable handling.  The structure of
-+   the attribute type is deliberately not exposed.  */
-+typedef union
-+{
-+  struct
-+  {
-+    int __lock;
-+    unsigned int __futex;
-+    __extension__ unsigned long long int __total_seq;
-+    __extension__ unsigned long long int __wakeup_seq;
-+    __extension__ unsigned long long int __woken_seq;
-+    void *__mutex;
-+    unsigned int __nwaiters;
-+    unsigned int __broadcast_seq;
-+  } __data;
-+  char __size[__SIZEOF_PTHREAD_COND_T];
-+  __extension__ long long int __align;
-+} pthread_cond_t;
-+
-+typedef union
-+{
-+  char __size[__SIZEOF_PTHREAD_CONDATTR_T];
-+  int __align;
-+} pthread_condattr_t;
-+
-+
-+/* Keys for thread-specific data */
-+typedef unsigned int pthread_key_t;
-+
-+
-+/* Once-only execution */
-+typedef int pthread_once_t;
-+
-+
-+#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-+/* Data structure for read-write lock variable handling.  The
-+   structure of the attribute type is deliberately not exposed.  */
-+typedef union
-+{
-+  struct
-+  {
-+    int __lock;
-+    unsigned int __nr_readers;
-+    unsigned int __readers_wakeup;
-+    unsigned int __writer_wakeup;
-+    unsigned int __nr_readers_queued;
-+    unsigned int __nr_writers_queued;
-+    unsigned char __pad1;
-+    unsigned char __pad2;
-+    unsigned char __shared;
-+    /* FLAGS must stay at this position in the structure to maintain
-+       binary compatibility.  */
-+    unsigned char __flags;
-+    int __writer;
-+  } __data;
-+  char __size[__SIZEOF_PTHREAD_RWLOCK_T];
-+  long int __align;
-+} pthread_rwlock_t;
-+
-+typedef union
-+{
-+  char __size[__SIZEOF_PTHREAD_RWLOCKATTR_T];
-+  long int __align;
-+} pthread_rwlockattr_t;
-+#endif
-+
-+
-+#ifdef __USE_XOPEN2K
-+/* POSIX spinlock data type.  */
-+typedef volatile int pthread_spinlock_t;
-+
-+
-+/* POSIX barriers data type.  The structure of the type is
-+   deliberately not exposed.  */
-+typedef union
-+{
-+  char __size[__SIZEOF_PTHREAD_BARRIER_T];
-+  long int __align;
-+} pthread_barrier_t;
-+
-+typedef union
-+{
-+  char __size[__SIZEOF_PTHREAD_BARRIERATTR_T];
-+  int __align;
-+} pthread_barrierattr_t;
-+#endif
-+
-+
-+#endif	/* bits/pthreadtypes.h */
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
-new file mode 100644
-index 0000000..2950cc9
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
-@@ -0,0 +1,36 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _SEMAPHORE_H
-+# error "Never use <bits/semaphore.h> directly; include <semaphore.h> instead."
-+#endif
-+
-+
-+#define __SIZEOF_SEM_T	16
-+
-+
-+/* Value returned if `sem_open' failed.  */
-+#define SEM_FAILED      ((sem_t *) 0)
-+
-+
-+typedef union
-+{
-+  char __size[__SIZEOF_SEM_T];
-+  long int __align;
-+} sem_t;
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/clone.S b/ports/sysdeps/unix/sysv/linux/m68k/nptl/clone.S
-new file mode 100644
-index 0000000..e7388fe
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/clone.S
-@@ -0,0 +1,2 @@
-+#define RESET_PID
-+#include "../clone.S"
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c b/ports/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c
-new file mode 100644
-index 0000000..be11444
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/createthread.c
-@@ -0,0 +1,25 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* Value passed to 'clone' for initialization of the thread register.  */
-+#define TLS_VALUE ((void *) (pd) \
-+		   + TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE)
-+
-+/* Get the real implementation.	 */
-+#include <nptl/sysdeps/pthread/createthread.c>
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/fork.c b/ports/sysdeps/unix/sysv/linux/m68k/nptl/fork.c
-new file mode 100644
-index 0000000..dc1584e
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/fork.c
-@@ -0,0 +1,30 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <sched.h>
-+#include <signal.h>
-+#include <sysdep.h>
-+#include <tls.h>
-+
-+#define ARCH_FORK() \
-+  INLINE_SYSCALL (clone, 5,						      \
-+		  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0,     \
-+		  NULL, &THREAD_SELF->tid, NULL)
-+
-+#include <sysdeps/unix/sysv/linux/fork.c>
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
-new file mode 100644
-index 0000000..926077d
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
-@@ -0,0 +1,281 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* Borrowed from ARM's version.  */
-+
-+#ifndef _LOWLEVELLOCK_H
-+#define _LOWLEVELLOCK_H	1
-+
-+#include <time.h>
-+#include <sys/param.h>
-+#include <bits/pthreadtypes.h>
-+#include <atomic.h>
-+#include <sysdep.h>
-+#include <kernel-features.h>
-+
-+#define FUTEX_WAIT		0
-+#define FUTEX_WAKE		1
-+#define FUTEX_REQUEUE		3
-+#define FUTEX_CMP_REQUEUE	4
-+#define FUTEX_WAKE_OP		5
-+#define FUTEX_OP_CLEAR_WAKE_IF_GT_ONE	((4 << 24) | 1)
-+#define FUTEX_LOCK_PI		6
-+#define FUTEX_UNLOCK_PI		7
-+#define FUTEX_TRYLOCK_PI	8
-+#define FUTEX_WAIT_BITSET	9
-+#define FUTEX_WAKE_BITSET	10
-+#define FUTEX_PRIVATE_FLAG	128
-+#define FUTEX_CLOCK_REALTIME	256
-+
-+#define FUTEX_BITSET_MATCH_ANY	0xffffffff
-+
-+/* Values for 'private' parameter of locking macros.  Yes, the
-+   definition seems to be backwards.  But it is not.  The bit will be
-+   reversed before passing to the system call.  */
-+#define LLL_PRIVATE	0
-+#define LLL_SHARED	FUTEX_PRIVATE_FLAG
-+
-+
-+#if !defined NOT_IN_libc || defined IS_IN_rtld
-+/* In libc.so or ld.so all futexes are private.  */
-+# ifdef __ASSUME_PRIVATE_FUTEX
-+#  define __lll_private_flag(fl, private) \
-+  ((fl) | FUTEX_PRIVATE_FLAG)
-+# else
-+#  define __lll_private_flag(fl, private) \
-+  ((fl) | THREAD_GETMEM (THREAD_SELF, header.private_futex))
-+# endif
-+#else
-+# ifdef __ASSUME_PRIVATE_FUTEX
-+#  define __lll_private_flag(fl, private) \
-+  (((fl) | FUTEX_PRIVATE_FLAG) ^ (private))
-+# else
-+#  define __lll_private_flag(fl, private) \
-+  (__builtin_constant_p (private)					      \
-+   ? ((private) == 0							      \
-+      ? ((fl) | THREAD_GETMEM (THREAD_SELF, header.private_futex))	      \
-+      : (fl))								      \
-+   : ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG)				      \
-+	      & THREAD_GETMEM (THREAD_SELF, header.private_futex))))
-+# endif	      
-+#endif
-+
-+
-+#define lll_futex_wait(futexp, val, private) \
-+  lll_futex_timed_wait(futexp, val, NULL, private)
-+
-+#define lll_futex_timed_wait(futexp, val, timespec, private) \
-+  ({									      \
-+    INTERNAL_SYSCALL_DECL (__err);					      \
-+    long int __ret;							      \
-+    __ret = INTERNAL_SYSCALL (futex, __err, 4, (futexp),		      \
-+			      __lll_private_flag (FUTEX_WAIT, private),	      \
-+			      (val), (timespec));			      \
-+    __ret;								      \
-+  })
-+
-+#define lll_futex_wake(futexp, nr, private) \
-+  ({									      \
-+    INTERNAL_SYSCALL_DECL (__err);					      \
-+    long int __ret;							      \
-+    __ret = INTERNAL_SYSCALL (futex, __err, 4, (futexp),		      \
-+			      __lll_private_flag (FUTEX_WAKE, private),	      \
-+			      (nr), 0);					      \
-+    __ret;								      \
-+  })
-+
-+#define lll_robust_dead(futexv, private) \
-+  do									      \
-+    {									      \
-+      int *__futexp = &(futexv);					      \
-+      atomic_or (__futexp, FUTEX_OWNER_DIED);				      \
-+      lll_futex_wake (__futexp, 1, private);				      \
-+    }									      \
-+  while (0)
-+
-+/* Returns non-zero if error happened, zero if success.  */
-+#define lll_futex_requeue(futexp, nr_wake, nr_move, mutex, val, private) \
-+  ({									      \
-+    INTERNAL_SYSCALL_DECL (__err);					      \
-+    long int __ret;							      \
-+    __ret = INTERNAL_SYSCALL (futex, __err, 6, (futexp),		      \
-+			      __lll_private_flag (FUTEX_CMP_REQUEUE, private),\
-+			      (nr_wake), (nr_move), (mutex), (val));	      \
-+    INTERNAL_SYSCALL_ERROR_P (__ret, __err);				      \
-+  })
-+
-+/* Returns non-zero if error happened, zero if success.  */
-+#define lll_futex_wake_unlock(futexp, nr_wake, nr_wake2, futexp2, private) \
-+  ({									      \
-+    INTERNAL_SYSCALL_DECL (__err);					      \
-+    long int __ret;							      \
-+    __ret = INTERNAL_SYSCALL (futex, __err, 6, (futexp),		      \
-+			      __lll_private_flag (FUTEX_WAKE_OP, private),    \
-+			      (nr_wake), (nr_wake2), (futexp2),		      \
-+			      FUTEX_OP_CLEAR_WAKE_IF_GT_ONE);		      \
-+    INTERNAL_SYSCALL_ERROR_P (__ret, __err);				      \
-+  })
-+
-+#define lll_trylock(lock)				\
-+  atomic_compare_and_exchange_val_acq (&(lock), 1, 0)
-+
-+#define lll_cond_trylock(lock)				\
-+  atomic_compare_and_exchange_val_acq (&(lock), 2, 0)
-+
-+#define lll_robust_trylock(lock, id)			\
-+  atomic_compare_and_exchange_val_acq (&(lock), id, 0)
-+
-+extern void __lll_lock_wait_private (int *futex) attribute_hidden;
-+extern void __lll_lock_wait (int *futex, int private) attribute_hidden;
-+extern int __lll_robust_lock_wait (int *futex, int private) attribute_hidden;
-+
-+#define __lll_lock(futex, private)					      \
-+  ((void) ({								      \
-+    int *__futex = (futex);						      \
-+    if (__builtin_expect (atomic_compare_and_exchange_val_acq (__futex,       \
-+								1, 0), 0))    \
-+      {									      \
-+	if (__builtin_constant_p (private) && (private) == LLL_PRIVATE)	      \
-+	  __lll_lock_wait_private (__futex);				      \
-+	else								      \
-+	  __lll_lock_wait (__futex, private);				      \
-+      }									      \
-+  }))
-+#define lll_lock(futex, private) __lll_lock (&(futex), private)
-+
-+
-+#define __lll_robust_lock(futex, id, private)				      \
-+  ({									      \
-+    int *__futex = (futex);						      \
-+    int __val = 0;							      \
-+									      \
-+    if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, id,  \
-+								0), 0))	      \
-+      __val = __lll_robust_lock_wait (__futex, private);		      \
-+    __val;								      \
-+  })
-+#define lll_robust_lock(futex, id, private) \
-+  __lll_robust_lock (&(futex), id, private)
-+
-+
-+#define __lll_cond_lock(futex, private)					      \
-+  ((void) ({								      \
-+    int *__futex = (futex);						      \
-+    if (__builtin_expect (atomic_exchange_acq (__futex, 2), 0))		      \
-+      __lll_lock_wait (__futex, private);				      \
-+  }))
-+#define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private)
-+
-+
-+#define lll_robust_cond_lock(futex, id, private) \
-+  __lll_robust_lock (&(futex), (id) | FUTEX_WAITERS, private)
-+
-+
-+extern int __lll_timedlock_wait (int *futex, const struct timespec *,
-+				 int private) attribute_hidden;
-+extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *,
-+					int private) attribute_hidden;
-+
-+#define __lll_timedlock(futex, abstime, private)			      \
-+  ({									      \
-+     int *__futex = (futex);						      \
-+     int __val = 0;							      \
-+									      \
-+     if (__builtin_expect (atomic_exchange_acq (__futex, 1), 0))	      \
-+       __val = __lll_timedlock_wait (__futex, abstime, private);	      \
-+     __val;								      \
-+  })
-+#define lll_timedlock(futex, abstime, private) \
-+  __lll_timedlock (&(futex), abstime, private)
-+
-+
-+#define __lll_robust_timedlock(futex, abstime, id, private)		      \
-+  ({									      \
-+    int *__futex = (futex);						      \
-+    int __val = 0;							      \
-+									      \
-+    if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, id,  \
-+								0), 0))	      \
-+      __val = __lll_robust_timedlock_wait (__futex, abstime, private);	      \
-+    __val;								      \
-+  })
-+#define lll_robust_timedlock(futex, abstime, id, private) \
-+  __lll_robust_timedlock (&(futex), abstime, id, private)
-+
-+
-+#define __lll_unlock(futex, private) \
-+  (void)							\
-+    ({ int *__futex = (futex);					\
-+       int __oldval = atomic_exchange_rel (__futex, 0);		\
-+       if (__builtin_expect (__oldval > 1, 0))			\
-+	 lll_futex_wake (__futex, 1, private);			\
-+    })
-+#define lll_unlock(futex, private) __lll_unlock(&(futex), private)
-+
-+
-+#define __lll_robust_unlock(futex, private) \
-+  (void)							\
-+    ({ int *__futex = (futex);					\
-+       int __oldval = atomic_exchange_rel (__futex, 0);		\
-+       if (__builtin_expect (__oldval & FUTEX_WAITERS, 0))	\
-+	 lll_futex_wake (__futex, 1, private);			\
-+    })
-+#define lll_robust_unlock(futex, private) \
-+  __lll_robust_unlock(&(futex), private)
-+
-+
-+#define lll_islocked(futex) \
-+  (futex != 0)
-+
-+
-+/* Our internal lock implementation is identical to the binary-compatible
-+   mutex implementation. */
-+
-+/* Initializers for lock.  */
-+#define LLL_LOCK_INITIALIZER		(0)
-+#define LLL_LOCK_INITIALIZER_LOCKED	(1)
-+
-+/* The states of a lock are:
-+    0  -  untaken
-+    1  -  taken by one user
-+   >1  -  taken by more users */
-+
-+/* The kernel notifies a process which uses CLONE_CLEARTID via futex
-+   wakeup when the clone terminates.  The memory location contains the
-+   thread ID while the clone is running and is reset to zero
-+   afterwards.	*/
-+#define lll_wait_tid(tid) \
-+  do {							\
-+    __typeof (tid) __tid;				\
-+    while ((__tid = (tid)) != 0)			\
-+      lll_futex_wait (&(tid), __tid, LLL_SHARED);	\
-+  } while (0)
-+
-+extern int __lll_timedwait_tid (int *, const struct timespec *)
-+     attribute_hidden;
-+
-+#define lll_timedwait_tid(tid, abstime) \
-+  ({							\
-+    int __res = 0;					\
-+    if ((tid) != 0)					\
-+      __res = __lll_timedwait_tid (&(tid), (abstime));	\
-+    __res;						\
-+  })
-+
-+#endif	/* lowlevellock.h */
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
-new file mode 100644
-index 0000000..36c9270
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
-@@ -0,0 +1,36 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <tcb-offsets.h>
-+
-+#define SAVE_PID \
-+	bsrl	__m68k_read_tp@PLTPC	; /* Get the thread pointer.  */ \
-+	movel	%a0, %a1		; /* Save TP for RESTORE_PID.  */ \
-+	movel	PID_OFFSET(%a1), %d0	; /* Get the PID.  */ \
-+	movel	%d0, %d1		; /* Save PID for RESTORE_PID.  */ \
-+	negl	%d0			; /* Negate the PID.  */ \
-+	movel	%d0, PID_OFFSET(%a1)	; /* Store the temporary PID.  */
-+
-+#define RESTORE_PID \
-+	tstl	%d0			; \
-+	beq	1f			; /* If we are the parent... */ \
-+	movel	%d1, PID_OFFSET(%a1)	; /* Restore the PID.  */ \
-+1:	
-+
-+#include <sysdeps/unix/sysv/linux/m68k/vfork.S>
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/pthread_once.c b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pthread_once.c
-new file mode 100644
-index 0000000..415045f
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pthread_once.c
-@@ -0,0 +1,91 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include "pthreadP.h"
-+#include <lowlevellock.h>
-+
-+unsigned long int __fork_generation attribute_hidden;
-+
-+static void
-+clear_once_control (void *arg)
-+{
-+  pthread_once_t *once_control = (pthread_once_t *) arg;
-+
-+  *once_control = 0;
-+  lll_futex_wake (once_control, INT_MAX, LLL_PRIVATE);
-+}
-+
-+int
-+__pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
-+{
-+  for (;;)
-+    {
-+      int oldval;
-+      int newval;
-+
-+      /* Pseudo code:
-+	 newval = __fork_generation | 1;
-+	 oldval = *once_control;
-+	 if ((oldval & 2) == 0)
-+	   *once_control = newval;
-+	 Do this atomically.
-+      */
-+      do
-+	{
-+	  newval = __fork_generation | 1;
-+	  oldval = *once_control;
-+	  if (oldval & 2)
-+	    break;
-+	} while (atomic_compare_and_exchange_val_acq (once_control, newval, oldval) != oldval);
-+
-+      /* Check if the initializer has already been done.  */
-+      if ((oldval & 2) != 0)
-+	return 0;
-+
-+      /* Check if another thread already runs the initializer.	*/
-+      if ((oldval & 1) == 0)
-+	break;
-+
-+      /* Check whether the initializer execution was interrupted by a fork.  */
-+      if (oldval != newval)
-+	break;
-+
-+      /* Same generation, some other thread was faster. Wait.  */
-+      lll_futex_wait (once_control, oldval, LLL_PRIVATE);
-+    }
-+
-+  /* This thread is the first here.  Do the initialization.
-+     Register a cleanup handler so that in case the thread gets
-+     interrupted the initialization can be restarted.  */
-+  pthread_cleanup_push (clear_once_control, once_control);
-+
-+  init_routine ();
-+
-+  pthread_cleanup_pop (0);
-+
-+  /* Say that the initialisation is done.  */
-+  *once_control = __fork_generation | 2;
-+
-+  /* Wake up all other threads.  */
-+  lll_futex_wake (once_control, INT_MAX, LLL_PRIVATE);
-+
-+  return 0;
-+}
-+weak_alias (__pthread_once, pthread_once)
-+strong_alias (__pthread_once, __pthread_once_internal)
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h
-new file mode 100644
-index 0000000..87e2d55
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h
-@@ -0,0 +1,141 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <sysdep.h>
-+#include <tls.h>
-+#ifndef __ASSEMBLER__
-+# include <nptl/pthreadP.h>
-+#endif
-+
-+#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
-+
-+# undef PSEUDO
-+# define PSEUDO(name, syscall_name, args)				      \
-+  .text;								      \
-+  ENTRY (name)								      \
-+    SINGLE_THREAD_P;							      \
-+    jne .Lpseudo_cancel;						      \
-+  .type __##syscall_name##_nocancel,@function;			              \
-+  .globl __##syscall_name##_nocancel;				 	      \
-+  __##syscall_name##_nocancel:					              \
-+    DO_CALL (syscall_name, args);					      \
-+    cmp.l &-4095, %d0;							      \
-+    jcc SYSCALL_ERROR_LABEL;						      \
-+    rts;								      \
-+  .size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel;	      \
-+  .Lpseudo_cancel:							      \
-+    cfi_startproc;							      \
-+    CENABLE;								      \
-+    DOCARGS_##args							      \
-+    move.l %d0, -(%sp); /* Save result of CENABLE.  */  		      \
-+    cfi_adjust_cfa_offset (4); \
-+    move.l &SYS_ify (syscall_name), %d0;				      \
-+    trap &0;								      \
-+    move.l %d0, %d2;							      \
-+    CDISABLE;								      \
-+    addq.l &4, %sp; /* Remove result of CENABLE from the stack.  */           \
-+    cfi_adjust_cfa_offset (-4); \
-+    move.l %d2, %d0;							      \
-+    UNDOCARGS_##args							      \
-+    cmp.l &-4095, %d0;							      \
-+    jcc SYSCALL_ERROR_LABEL;		                                      \
-+    cfi_endproc
-+
-+/* Note: we use D2 to save syscall's return value as D0 will be clobbered in
-+   CDISABLE.  */
-+# define DOCARGS_0	move.l %d2, -(%sp);		\
-+  cfi_adjust_cfa_offset (4); cfi_rel_offset (%d2, 0);
-+# define UNDOCARGS_0	move.l (%sp)+, %d2;	\
-+  cfi_adjust_cfa_offset (-4); cfi_restore (%d2);
-+
-+# define DOCARGS_1	_DOCARGS_1 (4); DOCARGS_0
-+# define _DOCARGS_1(n)	move.l n(%sp), %d1;
-+# define UNDOCARGS_1	UNDOCARGS_0
-+
-+# define DOCARGS_2	_DOCARGS_2 (8)
-+# define _DOCARGS_2(n)	DOCARGS_0 move.l n+4(%sp), %d2; _DOCARGS_1 (n)
-+# define UNDOCARGS_2	UNDOCARGS_0
-+
-+/* TODO: We can optimize DOCARGS_{3, 4} by saving registers to a0 and a1
-+   instead of pushing them on stack.  */
-+# define DOCARGS_3	_DOCARGS_3 (12)
-+# define _DOCARGS_3(n)	move.l %d3, -(%sp);				\
-+  cfi_adjust_cfa_offset (4); cfi_rel_offset (%d3, 0);			\
-+  move.l n+4(%sp), %d3; _DOCARGS_2 (n)
-+# define UNDOCARGS_3	UNDOCARGS_2 move.l (%sp)+, %d3;		\
-+  cfi_adjust_cfa_offset (-4); cfi_restore (%d3);
-+
-+# define DOCARGS_4	_DOCARGS_4 (16)
-+# define _DOCARGS_4(n)	move.l %d4, -(%sp);			\
-+  cfi_adjust_cfa_offset (4); cfi_rel_offset (%d4, 0);		\
-+  move.l n+4(%sp), %d4; _DOCARGS_3 (n)
-+# define UNDOCARGS_4	UNDOCARGS_3 move.l (%sp)+, %d4;	\
-+  cfi_adjust_cfa_offset (-4); cfi_restore (%d4);
-+
-+# define DOCARGS_5	_DOCARGS_5 (20)
-+# define _DOCARGS_5(n)	move.l %d5, %a1; cfi_register (%d5, a1); \
-+  move.l n(%sp), %d5; _DOCARGS_4 (n-4)
-+# define UNDOCARGS_5	UNDOCARGS_4 move.l %a1, %d5; cfi_restore (%d5);
-+
-+# define DOCARGS_6	_DOCARGS_6 (24)
-+# define _DOCARGS_6(n)	move.l n(%sp), %a0; _DOCARGS_5 (n-4)
-+# define UNDOCARGS_6	UNDOCARGS_5
-+
-+# ifdef PIC
-+#  define PSEUDO_JMP(sym) jbsr sym ## @PLTPC
-+# else
-+#  define PSEUDO_JMP(sym) jbsr sym
-+# endif
-+
-+# ifdef IS_IN_libpthread
-+#  define CENABLE	PSEUDO_JMP (__pthread_enable_asynccancel)
-+#  define CDISABLE	PSEUDO_JMP (__pthread_disable_asynccancel)
-+# elif !defined NOT_IN_libc
-+#  define CENABLE	PSEUDO_JMP (__libc_enable_asynccancel)
-+#  define CDISABLE	PSEUDO_JMP (__libc_disable_asynccancel)
-+# elif defined IS_IN_librt
-+#  define CENABLE	PSEUDO_JMP (__librt_enable_asynccancel)
-+#  define CDISABLE	PSEUDO_JMP (__librt_disable_asynccancel)
-+# else
-+#  error Unsupported library
-+# endif
-+
-+# ifndef __ASSEMBLER__
-+#  define SINGLE_THREAD_P						\
-+  __builtin_expect (THREAD_GETMEM (THREAD_SELF,				\
-+				   header.multiple_threads) == 0, 1)
-+# else
-+#  define SINGLE_THREAD_P			\
-+  PSEUDO_JMP (__m68k_read_tp);		        \
-+  tst.l MULTIPLE_THREADS_OFFSET(%a0)
-+# endif
-+
-+#elif !defined __ASSEMBLER__
-+
-+# define SINGLE_THREAD_P (1)
-+# define NO_CANCELLATION (1)
-+
-+#endif
-+
-+#ifndef __ASSEMBLER__
-+# define RTLD_SINGLE_THREAD_P					  \
-+  __builtin_expect (THREAD_GETMEM (THREAD_SELF,			  \
-+				   header.multiple_threads) == 0, \
-+		    1)
-+#endif
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
-new file mode 100644
-index 0000000..8599c3d
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
-@@ -0,0 +1,38 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <tcb-offsets.h>
-+
-+#define SAVE_PID \
-+	bsrl	__m68k_read_tp@PLTPC	; /* Get the thread pointer.  */ \
-+	movel	%a0, %a1		; /* Save TP for RESTORE_PID.  */ \
-+	movel	PID_OFFSET(%a1), %d0	; /* Get the PID.  */ \
-+	movel	%d0, %d1		; /* Save PID for RESTORE_PID.  */ \
-+	negl	%d0			; /* Negate the PID.  */ \
-+	bne	1f			; /* If it was zero... */ \
-+	movel	#0x80000000, %d0	; /* use 0x80000000 instead.  */ \
-+1:	movel	%d0, PID_OFFSET(%a1)	; /* Store the temporary PID.  */
-+
-+#define RESTORE_PID \
-+	tstl	%d0			; \
-+	beq	1f			; /* If we are the parent... */ \
-+	movel	%d1, PID_OFFSET(%a1)	; /* Restore the PID.  */ \
-+1:	
-+
-+#include <sysdeps/unix/sysv/linux/m68k/vfork.S>
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/socket.S b/ports/sysdeps/unix/sysv/linux/m68k/socket.S
-index 2690f18..147a3b2 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/socket.S
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/socket.S
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
-+/* Copyright (C) 1996, 1997, 1998, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -41,8 +41,11 @@
- 
- .globl __socket
- ENTRY (__socket)
--#if defined NEED_CANCELLATION && defined CENABLE
--	SINGLE_THREAD_P (%a0)
-+#ifdef NEED_CANCELLATION
-+# if !defined CENABLE || !defined CDISABLE
-+#  error CENABLE and/or CDISABLE is not defined
-+# endif
-+	SINGLE_THREAD_P
- 	jne 1f
- #endif
- 
-@@ -69,21 +72,26 @@ ENTRY (__socket)
- 	/* Successful; return the syscall's value.  */
- 	rts
- 
--#if defined NEED_CANCELLATION && defined CENABLE
--1:	/* Enable asynchronous cancellation.  */
-+#ifdef NEED_CANCELLATION
-+1:	cfi_startproc
-+	/* Enable asynchronous cancellation.  */
- 	CENABLE
- 
--	/* Save registers.  */
-+	/* Save D2.  */
- 	move.l %d2, -(%sp)
--	move.l %d0, -(%sp)
-+	cfi_adjust_cfa_offset (4)
-+	cfi_rel_offset (%d2, 0)
- 
--	move.l #SYS_ify (socketcall), %d0 /* System call number in %d0.  */
-+	/* Save the result of CENABLE.  */
-+	move.l %d0, -(%sp)
-+	cfi_adjust_cfa_offset (4)
- 
- 	/* Use ## so `socket' is a separate token that might be #define'd.  */
- 	move.l #P (SOCKOP_,socket), %d1	/* Subcode is first arg to syscall.  */
- 	lea 4+8(%sp), %a1		/* Address of args is 2nd arg.  */
- 	move.l %a1, %d2
- 
-+	move.l #SYS_ify (socketcall), %d0 /* System call number in %d0.  */
- 	/* Do the system call trap.  */
- 	trap #0
- 
-@@ -91,14 +99,18 @@ ENTRY (__socket)
- 	move.l %d0, %d2
- 	CDISABLE
- 	addq.l #4, %sp
-+	cfi_adjust_cfa_offset (-4)
- 	move.l %d2, %d0
- 
- 	/* Restore registers.  */
- 	move.l (%sp)+, %d2
-+	cfi_adjust_cfa_offset (-4)
-+	cfi_restore (%d2)
- 
- 	/* %d0 is < 0 if there was an error.  */
- 	tst.l %d0
- 	jmi SYSCALL_ERROR_LABEL
-+	cfi_endproc
- 
- 	/* Successful; return the syscall's value.  */
- 	rts
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h b/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
-index 12687d8..e3aed15 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
-@@ -1,4 +1,5 @@
--/* Copyright (C) 1996, 1997, 1998, 2000, 2003, 2004, 2006 Free Software Foundation, Inc.
-+/* Copyright (C) 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2010
-+   Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Written by Andreas Schwab, <schwab@issan.informatik.uni-dortmund.de>,
-    December 1995.
-@@ -23,6 +24,7 @@
- 
- #include <sysdeps/unix/sysdep.h>
- #include <sysdeps/m68k/sysdep.h>
-+#include <tls.h>
- 
- /* Defines RTLD_PRIVATE_ERRNO.  */
- #include <dl-sysdep.h>
-@@ -148,9 +150,11 @@ SYSCALL_ERROR_LABEL:							      \
- 	arg 3		%d3	     call-saved
- 	arg 4		%d4	     call-saved
- 	arg 5		%d5	     call-saved
-+	arg 6		%a0	     call-clobbered
- 
-    The stack layout upon entering the function is:
- 
-+	24(%sp)		Arg# 6
- 	20(%sp)		Arg# 5
- 	16(%sp)		Arg# 4
- 	12(%sp)		Arg# 3
-@@ -229,7 +233,7 @@ SYSCALL_ERROR_LABEL:							      \
-    normally.  It will never touch errno.  This returns just what the kernel
-    gave back.  */
- #undef INTERNAL_SYSCALL
--#define INTERNAL_SYSCALL(name, err, nr, args...)	\
-+#define INTERNAL_SYSCALL_NCS(name, err, nr, args...)	\
-   ({ unsigned int _sys_result;				\
-      {							\
-        /* Load argument values in temporary variables
-@@ -237,7 +241,7 @@ SYSCALL_ERROR_LABEL:							      \
- 	  before the call used registers are set.  */	\
-        LOAD_ARGS_##nr (args)				\
-        LOAD_REGS_##nr					\
--       register int _d0 asm ("%d0") = __NR_##name;	\
-+       register int _d0 asm ("%d0") = name;		\
-        asm volatile ("trap #0"				\
- 		     : "=d" (_d0)			\
- 		     : "0" (_d0) ASM_ARGS_##nr		\
-@@ -245,6 +249,8 @@ SYSCALL_ERROR_LABEL:							      \
-        _sys_result = _d0;				\
-      }							\
-      (int) _sys_result; })
-+#define INTERNAL_SYSCALL(name, err, nr, args...)	\
-+  INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, ##args)
- 
- #undef INTERNAL_SYSCALL_ERROR_P
- #define INTERNAL_SYSCALL_ERROR_P(val, err)		\
-@@ -300,4 +306,15 @@ SYSCALL_ERROR_LABEL:							      \
- #define ASM_ARGS_6	ASM_ARGS_5, "a" (_a0)
- 
- #endif /* not __ASSEMBLER__ */
-+
-+/* Pointer mangling is not yet supported for M68K.  */
-+#define PTR_MANGLE(var) (void) (var)
-+#define PTR_DEMANGLE(var) (void) (var)
-+
-+#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
-+/* M68K needs system-supplied DSO to access TLS helpers
-+   even when statically linked.  */
-+# define NEED_STATIC_SYSINFO_DSO 1
-+#endif
-+
- #endif
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
-index 8027b2f..61bbf2f 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
-+/* Copyright (C) 1999, 2002, 2003, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Andreas Schwab <schwab@gnu.org>.
- 
-@@ -22,6 +22,14 @@
- #include <bits/errno.h>
- #include <kernel-features.h>
- 
-+#ifndef SAVE_PID
-+#define SAVE_PID
-+#endif
-+
-+#ifndef RESTORE_PID
-+#define RESTORE_PID
-+#endif
-+
- /* Clone the calling process, but without copying the whole address space.
-    The calling process is suspended until the new process exits or is
-    replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
-@@ -31,12 +39,20 @@ ENTRY (__vfork)
- 
- #ifdef __NR_vfork
- 
-+	/* SAVE_PID clobbers call-clobbered registers and
-+	   saves data in D1 and A1.  */
-+
-+	SAVE_PID
-+	
- 	/* Pop the return PC value into A0.  */
- 	movel	%sp@+, %a0
- 
- 	/* Stuff the syscall number in D0 and trap into the kernel.  */
- 	movel	#SYS_ify (vfork), %d0
- 	trap	#0
-+
-+	RESTORE_PID
-+
- 	tstl	%d0
- 	jmi	.Lerror		/* Branch forward if it failed.  */
- 
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Fri, 12 Mar 2010 18:55:40 +0000 (+0100)
-Subject: Whitespace cleanup
-X-Git-Tag: glibc-2.12~37
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=2b3dafb0874b7843355e7e02b0009be6df52271d
-
-Whitespace cleanup
----
-
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
-index 00db4bb..242d23d 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
-@@ -86,7 +86,7 @@ ENTRY (__vdso_atomic_cmpxchg_32_stub)
- 	rts
- 	cfi_endproc
- END (__vdso_atomic_cmpxchg_32_stub)
--	
-+
- 	.hidden __vdso_atomic_barrier_stub
- ENTRY (__vdso_atomic_barrier_stub)
- 	cfi_startproc
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
-index 926077d..bc2970e 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
-@@ -73,7 +73,7 @@
-       : (fl))								      \
-    : ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG)				      \
- 	      & THREAD_GETMEM (THREAD_SELF, header.private_futex))))
--# endif	      
-+# endif
- #endif
- 
- 
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
-index 36c9270..639d5ed 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S
-@@ -31,6 +31,6 @@
- 	tstl	%d0			; \
- 	beq	1f			; /* If we are the parent... */ \
- 	movel	%d1, PID_OFFSET(%a1)	; /* Restore the PID.  */ \
--1:	
-+1:
- 
- #include <sysdeps/unix/sysv/linux/m68k/vfork.S>
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
-index 8599c3d..95e3764 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/vfork.S
-@@ -33,6 +33,6 @@
- 	tstl	%d0			; \
- 	beq	1f			; /* If we are the parent... */ \
- 	movel	%d1, PID_OFFSET(%a1)	; /* Restore the PID.  */ \
--1:	
-+1:
- 
- #include <sysdeps/unix/sysv/linux/m68k/vfork.S>
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/vfork.S b/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
-index 61bbf2f..4def7e3 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
-@@ -43,7 +43,7 @@ ENTRY (__vfork)
- 	   saves data in D1 and A1.  */
- 
- 	SAVE_PID
--	
-+
- 	/* Pop the return PC value into A0.  */
- 	movel	%sp@+, %a0
- 
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Fri, 12 Mar 2010 20:37:02 +0000 (+0100)
-Subject: Add m68k-helpers optimized for m680x0
-X-Git-Tag: glibc-2.12~36
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=7e261ba3d85d10eefbb55f2e9d67c55910dfae2f
-
-Add m68k-helpers optimized for m680x0
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 32681ff..446a307 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,10 @@
-+2010-03-12  Andreas Schwab  <schwab@linux-m68k.org>
-+
-+	* sysdeps/unix/sysv/linux/m68k/m68k-helpers.S: Renamed ...
-+	* sysdeps/unix/sysv/linux/m68k/coldfire/m68k-helpers.S: ... to
-+	this.
-+	* sysdeps/unix/sysv/linux/m68k/m680x0/m68k-helpers.S: New file.
-+
- 2010-03-09  Maxim Kuvyrkov  <maxim@codesourcery.com>
- 
- 	NPTL support for m68k/ColdFire
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/ports/sysdeps/unix/sysv/linux/m68k/coldfire/m68k-helpers.S
-similarity index 100%
-copy from sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
-copy to sysdeps/unix/sysv/linux/m68k/coldfire/m68k-helpers.S
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/ports/sysdeps/unix/sysv/linux/m68k/m680x0/m68k-helpers.S
-similarity index 97%
-rename from sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
-rename to sysdeps/unix/sysv/linux/m68k/m680x0/m68k-helpers.S
-index 242d23d..83ce564 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/m680x0/m68k-helpers.S
-@@ -60,11 +60,9 @@ END (__vdso_read_tp_stub)
- # endif
- ENTRY (__m68k_read_tp)
- 	cfi_startproc
--	move.l	#_GLOBAL_OFFSET_TABLE_@GOTPC, %a0
--	lea	(-6, %pc, %a0), %a0
-+	lea	_GLOBAL_OFFSET_TABLE_@GOTPC(%pc), %a0
- 	move.l	M68K_VDSO_SYMBOL (__vdso_read_tp)@GOT(%a0), %a0
--	move.l	(%a0), %a0
--	jmp	(%a0)
-+	jmp	([%a0])
- 	cfi_endproc
- END (__m68k_read_tp)
- 
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Fri, 12 Mar 2010 21:15:23 +0000 (+0100)
-Subject: m68k: don't include <sysdep.h> in lowlevellock.h
-X-Git-Tag: glibc-2.12~35
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=7d6cb729ed0451f51b63cb563271f1ce889d5a78
-
-m68k: don't include <sysdep.h> in lowlevellock.h
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 446a307..712651d 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,5 +1,8 @@
- 2010-03-12  Andreas Schwab  <schwab@linux-m68k.org>
- 
-+	* sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h: Don't include
-+	<sysdep.h>.
-+
- 	* sysdeps/unix/sysv/linux/m68k/m68k-helpers.S: Renamed ...
- 	* sysdeps/unix/sysv/linux/m68k/coldfire/m68k-helpers.S: ... to
- 	this.
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
-index bc2970e..5ca78ec 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
-@@ -26,7 +26,6 @@
- #include <sys/param.h>
- #include <bits/pthreadtypes.h>
- #include <atomic.h>
--#include <sysdep.h>
- #include <kernel-features.h>
- 
- #define FUTEX_WAIT		0
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Sat, 13 Mar 2010 00:00:03 +0000 (+0100)
-Subject: m68k: TLS reference to errno in syscall stubs
-X-Git-Tag: glibc-2.12~34
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=dbd0094b3f71213bc178cd1946496defbedb1d62
-
-m68k: TLS reference to errno in syscall stubs
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 712651d..b16fde2 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2010-03-13  Andreas Schwab  <schwab@linux-m68k.org>
-+
-+	* sysdeps/unix/sysv/linux/m68k/sysdep.h (SYSCALL_ERROR_HANDLER):
-+	Add variant for USE__THREAD.
-+
- 2010-03-12  Andreas Schwab  <schwab@linux-m68k.org>
- 
- 	* sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h: Don't include
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h b/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
-index e3aed15..8bd188b 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/sysdep.h
-@@ -111,10 +111,27 @@ SYSCALL_ERROR_LABEL:							      \
-        a pointer (e.g., mmap).  */					      \
-     move.l %d0, %a0;							      \
-     rts;
--# else /* !RTLD_PRIVATE_ERRNO */
--/* Store (- %d0) into errno through the GOT.  */
--#  if defined _LIBC_REENTRANT
--#   define SYSCALL_ERROR_HANDLER					      \
-+# elif USE___THREAD
-+#  ifndef NOT_IN_libc
-+#   define SYSCALL_ERROR_ERRNO __libc_errno
-+#  else
-+#   define SYSCALL_ERROR_ERRNO errno
-+#  endif
-+#  define SYSCALL_ERROR_HANDLER						      \
-+SYSCALL_ERROR_LABEL:							      \
-+    neg.l %d0;								      \
-+    move.l %d0, -(%sp);							      \
-+    jbsr __m68k_read_tp@PLTPC;						      \
-+    lea (_GLOBAL_OFFSET_TABLE_@GOTPC, %pc), %a1;			      \
-+    add.l (SYSCALL_ERROR_ERRNO@TLSIE, %a1), %a0;			      \
-+    move.l (%sp)+, (%a0);						      \
-+    move.l &-1, %d0;							      \
-+    /* Copy return value to %a0 for syscalls that are declared to return      \
-+       a pointer (e.g., mmap).  */					      \
-+    move.l %d0, %a0;							      \
-+    rts;
-+# elif defined _LIBC_REENTRANT
-+#  define SYSCALL_ERROR_HANDLER						      \
- SYSCALL_ERROR_LABEL:							      \
-     neg.l %d0;								      \
-     move.l %d0, -(%sp);							      \
-@@ -125,8 +142,9 @@ SYSCALL_ERROR_LABEL:							      \
-        a pointer (e.g., mmap).  */					      \
-     move.l %d0, %a0;							      \
-     rts;
--#  else /* !_LIBC_REENTRANT */
--#   define SYSCALL_ERROR_HANDLER					      \
-+# else /* !_LIBC_REENTRANT */
-+/* Store (- %d0) into errno through the GOT.  */
-+#  define SYSCALL_ERROR_HANDLER						      \
- SYSCALL_ERROR_LABEL:							      \
-     move.l (errno@GOTPC, %pc), %a0;					      \
-     neg.l %d0;								      \
-@@ -136,8 +154,7 @@ SYSCALL_ERROR_LABEL:							      \
-        a pointer (e.g., mmap).  */					      \
-     move.l %d0, %a0;							      \
-     rts;
--#  endif /* _LIBC_REENTRANT */
--# endif /* RTLD_PRIVATE_ERRNO */
-+# endif /* _LIBC_REENTRANT */
- #else
- # define SYSCALL_ERROR_HANDLER	/* Nothing here; code in sysdep.S is used.  */
- #endif /* PIC */
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Sat, 13 Mar 2010 15:59:42 +0000 (+0100)
-Subject: m68k: define __signbit inlines
-X-Git-Tag: glibc-2.12~33
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=326a03edf9a702f60ea2116364d8177dc682b9a5
-
-m68k: define __signbit inlines
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index b16fde2..1c8d232 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,5 +1,8 @@
- 2010-03-13  Andreas Schwab  <schwab@linux-m68k.org>
- 
-+	* sysdeps/m68k/m680x0/fpu/bits/mathinline.h (__signbit)
-+	(__signbitf, __signbitl): Define.
-+
- 	* sysdeps/unix/sysv/linux/m68k/sysdep.h (SYSCALL_ERROR_HANDLER):
- 	Add variant for USE__THREAD.
- 
-diff --git a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-index 6b69f7a..0da98e4 100644
---- a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-+++ b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-@@ -1,5 +1,5 @@
- /* Definitions of inline math functions implemented by the m68881/2.
--   Copyright (C) 1991,92,93,94,96,97,98,99,2000,2002, 2003, 2004, 2008
-+   Copyright (C) 1991,92,93,94,96,97,98,99,2000,2002, 2003, 2004, 2008, 2010
-      Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -85,6 +85,26 @@
- 	       : "=dm" (__result) : "f" (x), "f" (y));	\
-       __result != 0; })
- # endif /* GCC 3.1 */
-+
-+/* Test for negative number.  Used in the signbit() macro.  */
-+__MATH_INLINE int
-+__NTH (__signbitf (float __x))
-+{
-+  __extension__ union { float __f; int __i; } __u = { __f: __x };
-+  return __u.__i < 0;
-+}
-+__MATH_INLINE int
-+__NTH (__signbit (double __x))
-+{
-+  __extension__ union { double __d; int __i[2]; } __u = { __d: __x };
-+  return __u.__i[0] < 0;
-+}
-+__MATH_INLINE int
-+__NTH (__signbitl (long double __x))
-+{
-+  __extension__ union { long double __d; int __i[3]; } __u = { __d: __x };
-+  return __u.__i[0] < 0;
-+}
- #endif
- 
- 
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Sat, 13 Mar 2010 16:28:12 +0000 (+0100)
-Subject: m68k: remove duplicate __signbit definitions
-X-Git-Tag: glibc-2.12~32
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=b5e933757cbe34989698fc1b1390c9b2a9a6b0be
-
-m68k: remove duplicate __signbit definitions
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 1c8d232..9fafc08 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,7 +1,7 @@
- 2010-03-13  Andreas Schwab  <schwab@linux-m68k.org>
- 
- 	* sysdeps/m68k/m680x0/fpu/bits/mathinline.h (__signbit)
--	(__signbitf, __signbitl): Define.
-+	(__signbitf, __signbitl): Always define as inline.
- 
- 	* sysdeps/unix/sysv/linux/m68k/sysdep.h (SYSCALL_ERROR_HANDLER):
- 	Add variant for USE__THREAD.
-diff --git a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-index 0da98e4..975ffd8 100644
---- a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-+++ b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-@@ -301,17 +301,7 @@ __inline_functions(long double,l)
- #ifdef __USE_ISOC99
- 
- # define __inline_functions(float_type, s)				  \
--__m81_defun (int, __CONCAT(__signbit,s), (float_type __value))	  	  \
--{									  \
--  /* There is no branch-condition for the sign bit, so we must extract	  \
--     and examine the condition codes manually.  */			  \
--  unsigned long int __fpsr;						  \
--  __asm ("ftst%.x %1\n"							  \
--	 "fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value));	  \
--  return (__fpsr >> 27) & 1;						  \
--}									  \
--									  \
--  __m81_defun (float_type, __CONCAT(__scalbln,s),			  \
-+__m81_defun (float_type, __CONCAT(__scalbln,s),			  \
- 	     (float_type __x, long int __n))				  \
- {									  \
-   return __CONCAT(__scalbn,s) (__x, __n);				  \
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Sat, 13 Mar 2010 17:14:35 +0000 (+0100)
-Subject: m68k: use signbit macro
-X-Git-Tag: glibc-2.12~31
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=92dd2ecf169ac81a2fa16cbe246a1036c6b94656
-
-m68k: use signbit macro
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 9fafc08..c7d068e 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,5 +1,8 @@
- 2010-03-13  Andreas Schwab  <schwab@linux-m68k.org>
- 
-+	* sysdeps/m68k/m680x0/fpu/s_ccosh.c: Use signbit macro.
-+	* sysdeps/m68k/m680x0/fpu/s_ccos.c: Likewise.
-+
- 	* sysdeps/m68k/m680x0/fpu/bits/mathinline.h (__signbit)
- 	(__signbitf, __signbitl): Always define as inline.
- 
-diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_ccos.c b/ports/sysdeps/m68k/m680x0/fpu/s_ccos.c
-index d302d3d..8239159 100644
---- a/ports/sysdeps/m68k/m680x0/fpu/s_ccos.c
-+++ b/ports/sysdeps/m68k/m680x0/fpu/s_ccos.c
-@@ -1,5 +1,5 @@
- /* Complex cosine function.  m68k fpu version
--   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
-+   Copyright (C) 1997, 1999, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
- 
-@@ -48,7 +48,7 @@ s(__ccos) (__complex__ float_type x)
- 	     : "f" (__real__ x));
-       __real__ retval = cos_rx * m81(__ieee754_cosh) (__imag__ x);
-       if (rx_cond & __M81_COND_ZERO)
--	__imag__ retval = (m81(__signbit) (__imag__ x)
-+	__imag__ retval = (signbit (__imag__ x)
- 			   ? __real__ x : -__real__ x);
-       else
- 	__imag__ retval = -sin_rx * m81(__ieee754_sinh) (__imag__ x);
-diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c b/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c
-index 1698881..d272e98 100644
---- a/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c
-+++ b/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c
-@@ -1,5 +1,5 @@
- /* Complex cosine hyperbole function.  m68k fpu version
--   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
-+   Copyright (C) 1997, 1999, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
- 
-@@ -48,7 +48,7 @@ s(__ccosh) (__complex__ float_type x)
- 	     : "f" (__imag__ x));
-       __real__ retval = cos_ix * m81(__ieee754_cosh) (__real__ x);
-       if (ix_cond & __M81_COND_ZERO)
--	__imag__ retval = (m81(__signbit) (__real__ x)
-+	__imag__ retval = (signbit (__real__ x)
- 			   ? -__imag__ x : __imag__ x);
-       else
- 	__imag__ retval = sin_ix * m81(__ieee754_sinh) (__real__ x);
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Sat, 22 May 2010 19:04:42 +0000 (+0200)
-Subject: m68k: add c++-types and localplt data for m68k-linux-gnu
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=0a124d8bc7a3d99f461af942aebdd3a8848672e9
-
-m68k: add c++-types and localplt data for m68k-linux-gnu
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index c7d068e..cdc0ab5 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2010-05-22  Andreas Schwab  <schwab@linux-m68k.org>
-+
-+	* data/c++-types-m68k-linux-gnu.data: New file.
-+	* data/localplt-m68k-linux-gnu.data: New file.
-+
- 2010-03-13  Andreas Schwab  <schwab@linux-m68k.org>
- 
- 	* sysdeps/m68k/m680x0/fpu/s_ccosh.c: Use signbit macro.
-diff --git a/ports/data/c++-types-m68k-linux-gnu.data b/ports/data/c++-types-m68k-linux-gnu.data
-new file mode 100644
-index 0000000..fde53bf
---- /dev/null
-+++ b/ports/data/c++-types-m68k-linux-gnu.data
-@@ -0,0 +1,67 @@
-+blkcnt64_t:x
-+blkcnt_t:l
-+blksize_t:l
-+caddr_t:Pc
-+clockid_t:i
-+clock_t:l
-+daddr_t:i
-+dev_t:y
-+fd_mask:l
-+fsblkcnt64_t:y
-+fsblkcnt_t:m
-+fsfilcnt64_t:y
-+fsfilcnt_t:m
-+fsid_t:8__fsid_t
-+gid_t:j
-+id_t:j
-+ino64_t:y
-+ino_t:m
-+int16_t:s
-+int32_t:i
-+int64_t:x
-+int8_t:a
-+intptr_t:i
-+key_t:i
-+loff_t:x
-+mode_t:j
-+nlink_t:j
-+off64_t:x
-+off_t:l
-+pid_t:i
-+pthread_attr_t:14pthread_attr_t
-+pthread_barrier_t:17pthread_barrier_t
-+pthread_barrierattr_t:21pthread_barrierattr_t
-+pthread_cond_t:14pthread_cond_t
-+pthread_condattr_t:18pthread_condattr_t
-+pthread_key_t:j
-+pthread_mutex_t:15pthread_mutex_t
-+pthread_mutexattr_t:19pthread_mutexattr_t
-+pthread_once_t:i
-+pthread_rwlock_t:16pthread_rwlock_t
-+pthread_rwlockattr_t:20pthread_rwlockattr_t
-+pthread_spinlock_t:i
-+pthread_t:m
-+quad_t:x
-+register_t:i
-+rlim64_t:y
-+rlim_t:m
-+sigset_t:10__sigset_t
-+size_t:j
-+socklen_t:j
-+ssize_t:i
-+suseconds_t:l
-+time_t:l
-+u_char:h
-+uid_t:j
-+uint:j
-+u_int:j
-+u_int16_t:t
-+u_int32_t:j
-+u_int64_t:y
-+u_int8_t:h
-+ulong:m
-+u_long:m
-+u_quad_t:y
-+useconds_t:j
-+ushort:t
-+u_short:t
-diff --git a/ports/data/localplt-m68k-linux-gnu.data b/ports/data/localplt-m68k-linux-gnu.data
-new file mode 100644
-index 0000000..d266b8f
---- /dev/null
-+++ b/ports/data/localplt-m68k-linux-gnu.data
-@@ -0,0 +1,8 @@
-+libc.so: _Unwind_Find_FDE
-+libc.so: __m68k_read_tp
-+libc.so: calloc
-+libc.so: free
-+libc.so: malloc
-+libc.so: memalign
-+libc.so: realloc
-+libm.so: matherr
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Fri, 11 Jun 2010 19:58:32 +0000 (+0200)
-Subject: m68k: force alignment of futex variables
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=0df56592854fa25ce091883cb60fc417283383b8
-
-m68k: force alignment of futex variables
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index cdc0ab5..6cf5d39 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2010-06-11  Andreas Schwab  <schwab@linux-m68k.org>
-+
-+	* sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h: Force
-+	alignment of futex variables.
-+
- 2010-05-22  Andreas Schwab  <schwab@linux-m68k.org>
- 
- 	* data/ports/c++-types-m68k-linux-gnu.data: New file.
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
-index 0140810..832609d 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
-@@ -57,7 +57,7 @@ typedef union
- {
-   struct __pthread_mutex_s
-   {
--    int __lock;
-+    int __lock __attribute__ ((__aligned__ (4)));
-     unsigned int __count;
-     int __owner;
-     /* KIND must stay at this position in the structure to maintain
-@@ -87,7 +87,7 @@ typedef union
- {
-   struct
-   {
--    int __lock;
-+    int __lock __attribute__ ((__aligned__ (4)));
-     unsigned int __futex;
-     __extension__ unsigned long long int __total_seq;
-     __extension__ unsigned long long int __wakeup_seq;
-@@ -112,7 +112,7 @@ typedef unsigned int pthread_key_t;
- 
- 
- /* Once-only execution */
--typedef int pthread_once_t;
-+typedef int __attribute__ ((__aligned__ (4))) pthread_once_t;
- 
- 
- #if defined __USE_UNIX98 || defined __USE_XOPEN2K
-@@ -122,7 +122,7 @@ typedef union
- {
-   struct
-   {
--    int __lock;
-+    int __lock __attribute__ ((__aligned__ (4)));
-     unsigned int __nr_readers;
-     unsigned int __readers_wakeup;
-     unsigned int __writer_wakeup;
-@@ -158,7 +158,7 @@ typedef volatile int pthread_spinlock_t;
- typedef union
- {
-   char __size[__SIZEOF_PTHREAD_BARRIER_T];
--  long int __align;
-+  long int __align __attribute__ ((__aligned__ (4)));
- } pthread_barrier_t;
- 
- typedef union
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Sun, 13 Jun 2010 19:09:38 +0000 (+0200)
-Subject: m68k: Add required definitions to sys/user.h
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=08b1b36387286ed1ba48c56a32e52429b5ef6963
-
-m68k: Add required definitions to sys/user.h
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index 6cf5d39..bbc8a8c 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2010-06-13  Andreas Schwab  <schwab@linux-m68k.org>
-+
-+	* sysdeps/unix/sysv/linux/m68k/sys/user.h (NBPG, UPAGES)
-+	(HOST_TEXT_START_ADDR, HOST_STACK_END_ADDR): Define.
-+
- 2010-06-11  Andreas Schwab  <schwab@linux-m68k.org>
- 
- 	* sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h: Force
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h b/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
-index f8b19fc..2663ac6 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2008 Free Software Foundation, Inc.
-+/* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -58,4 +58,9 @@ struct user {
- 	char u_comm[32];
- };
- 
-+#define NBPG 4096
-+#define UPAGES 1
-+#define HOST_TEXT_START_ADDR u.start_code
-+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
-+
- #endif
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Sun, 13 Jun 2010 20:30:17 +0000 (+0200)
-Subject: m68k: mark all inline math functions as non-throwing
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=9166f36fcc5390efb701e50564c63cb4534bd998
-
-m68k: mark all inline math functions as non-throwing
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index bbc8a8c..c5b5706 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,5 +1,8 @@
- 2010-06-13  Andreas Schwab  <schwab@linux-m68k.org>
- 
-+	* sysdeps/m68k/m680x0/fpu/bits/mathinline.h: Mark all functions as
-+	non-throwing.
-+
- 	* sysdeps/unix/sysv/linux/m68k/sys/user.h (NBPG, UPAGES)
- 	(HOST_TEXT_START_ADDR, HOST_STACK_END_ADDR): Define.
- 
-diff --git a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-index 975ffd8..8a17127 100644
---- a/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-+++ b/ports/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
-@@ -126,7 +126,7 @@ __NTH (__signbitl (long double __x))
- /* Define a const math function.  */
- #define __m81_defun(rettype, func, args)				      \
-   __m81_inline rettype __attribute__((__const__))			      \
--  __m81_u(func) args
-+  __NTH (__m81_u(func) args)
- 
- /* Define the three variants of a math function that has a direct
-    implementation in the m68k fpu.  FUNC is the name for C (which will be
-@@ -329,8 +329,8 @@ __m81_defun (long int, __CONCAT(__lrint,s), (float_type __x))		  \
- }									  \
- 									  \
- __m81_inline float_type							  \
--__m81_u(__CONCAT(__fma,s))(float_type __x, float_type __y,		  \
--			   float_type __z)				  \
-+__NTH (__m81_u(__CONCAT(__fma,s))(float_type __x, float_type __y,	  \
-+				  float_type __z))			  \
- {									  \
-   return (__x * __y) + __z;						  \
- }
-@@ -346,8 +346,8 @@ __inline_functions (long double,l)
- 
- # define __inline_functions(float_type, s)				\
- __m81_inline void							\
--__m81_u(__CONCAT(__sincos,s))(float_type __x, float_type *__sinx,	\
--			      float_type *__cosx)			\
-+__NTH (__m81_u(__CONCAT(__sincos,s))(float_type __x, float_type *__sinx, \
-+				     float_type *__cosx))		\
- {									\
-   __asm ("fsincos%.x %2,%1:%0"						\
- 	 : "=f" (*__sinx), "=f" (*__cosx) : "f" (__x));			\
-@@ -368,13 +368,13 @@ __inline_functions (long double,l)
-    NAME, to make token pasting work correctly with -traditional.  */
- # define __inline_forward_c(rettype, name, args1, args2)	\
- __MATH_INLINE rettype __attribute__((__const__))		\
--  name args1							\
-+__NTH (name args1)						\
- {								\
-   return __CONCAT(__,name) args2;				\
- }
- 
- # define __inline_forward(rettype, name, args1, args2)	\
--__MATH_INLINE rettype name args1			\
-+__MATH_INLINE rettype __NTH (name args1)		\
- {							\
-   return __CONCAT(__,name) args2;			\
- }
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Thu, 24 Jun 2010 16:18:51 +0000 (+0000)
-Subject: Define F_SETPIPE_SZ and F_GETPIPE_SZ for M68K.
-X-Git-Url: http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=71feaf72066abfe0e434e49d56e26b54152fb221
-
-Define F_SETPIPE_SZ and F_GETPIPE_SZ for M68K.
----
-
-diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
-index c5b5706..be4956b 100644
---- a/ports/ChangeLog.m68k
-+++ b/ports/ChangeLog.m68k
-@@ -1,3 +1,8 @@
-+2010-06-24  Joseph Myers  <joseph@codesourcery.com>
-+
-+	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h (F_SETPIPE_SZ,
-+	F_GETPIPE_SZ): Define.
-+
- 2010-06-13  Andreas Schwab  <schwab@linux-m68k.org>
- 
- 	* sysdeps/m68k/m680x0/fpu/bits/mathinline.h: Mark all functions as
-diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-index d1eb706..f36507b 100644
---- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-+++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-@@ -101,6 +101,8 @@
- # define F_SETLEASE	1024	/* Set a lease.	 */
- # define F_GETLEASE	1025	/* Enquire what lease is active.  */
- # define F_NOTIFY	1026	/* Request notfications on a directory.	 */
-+# define F_SETPIPE_SZ	1031	/* Set pipe page size array.  */
-+# define F_GETPIPE_SZ	1032	/* Set pipe page size array.  */
- #endif
- #ifdef __USE_XOPEN2K8
- # define F_DUPFD_CLOEXEC 1030	/* Duplicate file descriptor with

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-versions-def-2-12.patch
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-versions-def-2-12.patch	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/m68k/cvs-versions-def-2-12.patch	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,24 +0,0 @@
-
-make[2]: *** No rule to make target `/Volumes/btc-0.11/build/glibc-m68k-linux-gnu-3/ld.map', needed by `/Volumes/btc-0.11/build/glibc-m68k-linux-gnu-3/elf/ld.so'.  Stop.
-make[2]: Leaving directory `/Volumes/btc-0.11/build/glibc-2.10.1/elf'
-make[1]: *** [elf/subdir_lib] Error 2
-make[1]: Leaving directory `/Volumes/btc-0.11/build/glibc-2.10.1'
-make: *** [all] Error 2
-
-From glibc git commit 0079dd2382eba185d22410a1d3088dc7146bc00a.
-(eglibc svn revision 9281).
-
-It is needed to avoid the above error when backporting m68k TLS calls.
-
-diff --git a/Versions.def b/Versions.def
-index a8a9cd2..70de1c1 100644
---- a/Versions.def
-+++ b/Versions.def
-@@ -28,6 +28,7 @@ libc {
-   GLIBC_2.9
-   GLIBC_2.10
-   GLIBC_2.11
-+  GLIBC_2.12
- %ifdef USE_IN_LIBIO
-   HURD_CTHREADS_0.3
- %endif

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/mips/cvs-mips-atomic_h.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/mips/cvs-mips-atomic_h.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/mips/cvs-mips-atomic_h.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,134 +0,0 @@
-2010-03-23  Mischa Jonker  <mischa.jonker@viragelogic.com>
-
-	[BZ #11291]
-	* sysdeps/mips/bits/atomic.h
-	(__arch_compare_and_exchange_xxx_32_int,
-	__arch_compare_and_exchange_xxx_64_int,
-	__arch_exchange_xxx_32_int, __arch_exchange_xxx_64_int,
-	__arch_exchange_and_add_32_int, __arch_exchange_and_add_64_int):
-	Specify *mem as asm output as well as input.
-
-diff --git a/sysdeps/mips/bits/atomic.h b/sysdeps/mips/bits/atomic.h
-index 167d9a5..11b3467 100644
---- a/ports/sysdeps/mips/bits/atomic.h
-+++ b/ports/sysdeps/mips/bits/atomic.h
-@@ -69,16 +69,16 @@ typedef uintmax_t uatomic_max_t;
-      MIPS_PUSH_MIPS2							      \
-      rel	"\n"							      \
-      "1:\t"								      \
--     "ll	%0,%4\n\t"						      \
-+     "ll	%0,%5\n\t"						      \
-      "move	%1,$0\n\t"						      \
--     "bne	%0,%2,2f\n\t"						      \
--     "move	%1,%3\n\t"						      \
--     "sc	%1,%4\n\t"						      \
-+     "bne	%0,%3,2f\n\t"						      \
-+     "move	%1,%4\n\t"						      \
-+     "sc	%1,%2\n\t"						      \
-      "beqz	%1,1b\n"						      \
-      acq	"\n\t"							      \
-      ".set	pop\n"							      \
-      "2:\n\t"								      \
--	      : "=&r" (__prev), "=&r" (__cmp)				      \
-+	      : "=&r" (__prev), "=&r" (__cmp), "=m" (*mem)		      \
- 	      : "r" (oldval), "r" (newval), "m" (*mem)			      \
- 	      : "memory")
- 
-@@ -93,16 +93,16 @@ typedef uintmax_t uatomic_max_t;
-      MIPS_PUSH_MIPS2							      \
-      rel	"\n"							      \
-      "1:\t"								      \
--     "lld	%0,%4\n\t"						      \
-+     "lld	%0,%5\n\t"						      \
-      "move	%1,$0\n\t"						      \
--     "bne	%0,%2,2f\n\t"						      \
--     "move	%1,%3\n\t"						      \
--     "scd	%1,%4\n\t"						      \
-+     "bne	%0,%3,2f\n\t"						      \
-+     "move	%1,%4\n\t"						      \
-+     "scd	%1,%2\n\t"						      \
-      "beqz	%1,1b\n"						      \
-      acq	"\n\t"							      \
-      ".set	pop\n"							      \
-      "2:\n\t"								      \
--	      : "=&r" (__prev), "=&r" (__cmp)				      \
-+	      : "=&r" (__prev), "=&r" (__cmp), "=m" (*mem)		      \
- 	      : "r" (oldval), "r" (newval), "m" (*mem)			      \
- 	      : "memory")
- #endif
-@@ -189,14 +189,14 @@ typedef uintmax_t uatomic_max_t;
-      MIPS_PUSH_MIPS2							      \
-      rel	"\n"							      \
-      "1:\t"								      \
--     "ll	%0,%3\n\t"						      \
--     "move	%1,%2\n\t"						      \
--     "sc	%1,%3\n\t"						      \
-+     "ll	%0,%4\n\t"						      \
-+     "move	%1,%3\n\t"						      \
-+     "sc	%1,%2\n\t"						      \
-      "beqz	%1,1b\n"						      \
-      acq	"\n\t"							      \
-      ".set	pop\n"							      \
-      "2:\n\t"								      \
--	      : "=&r" (__prev), "=&r" (__cmp)				      \
-+	      : "=&r" (__prev), "=&r" (__cmp), "=m" (*mem)		      \
- 	      : "r" (newval), "m" (*mem)				      \
- 	      : "memory");						      \
-   __prev; })
-@@ -213,14 +213,14 @@ typedef uintmax_t uatomic_max_t;
-      MIPS_PUSH_MIPS2							      \
-      rel	"\n"							      \
-      "1:\n"								      \
--     "lld	%0,%3\n\t"						      \
--     "move	%1,%2\n\t"						      \
--     "scd	%1,%3\n\t"						      \
-+     "lld	%0,%4\n\t"						      \
-+     "move	%1,%3\n\t"						      \
-+     "scd	%1,%2\n\t"						      \
-      "beqz	%1,1b\n"						      \
-      acq	"\n\t"							      \
-      ".set	pop\n"							      \
-      "2:\n\t"								      \
--	      : "=&r" (__prev), "=&r" (__cmp)				      \
-+	      : "=&r" (__prev), "=&r" (__cmp), "=m" (*mem)		      \
- 	      : "r" (newval), "m" (*mem)				      \
- 	      : "memory");						      \
-   __prev; })
-@@ -248,14 +248,14 @@ typedef uintmax_t uatomic_max_t;
-      MIPS_PUSH_MIPS2							      \
-      rel	"\n"							      \
-      "1:\t"								      \
--     "ll	%0,%3\n\t"						      \
--     "addu	%1,%0,%2\n\t"						      \
--     "sc	%1,%3\n\t"						      \
-+     "ll	%0,%4\n\t"						      \
-+     "addu	%1,%0,%3\n\t"						      \
-+     "sc	%1,%2\n\t"						      \
-      "beqz	%1,1b\n"						      \
-      acq	"\n\t"							      \
-      ".set	pop\n"							      \
-      "2:\n\t"								      \
--	      : "=&r" (__prev), "=&r" (__cmp)				      \
-+	      : "=&r" (__prev), "=&r" (__cmp), "=m" (*mem)		      \
- 	      : "r" (value), "m" (*mem)					      \
- 	      : "memory");						      \
-   __prev; })
-@@ -272,14 +272,14 @@ typedef uintmax_t uatomic_max_t;
-      MIPS_PUSH_MIPS2							      \
-      rel	"\n"							      \
-      "1:\t"								      \
--     "lld	%0,%3\n\t"						      \
--     "daddu	%1,%0,%2\n\t"						      \
--     "scd	%1,%3\n\t"						      \
-+     "lld	%0,%4\n\t"						      \
-+     "daddu	%1,%0,%3\n\t"						      \
-+     "scd	%1,%2\n\t"						      \
-      "beqz	%1,1b\n"						      \
-      acq	"\n\t"							      \
-      ".set	pop\n"							      \
-      "2:\n\t"								      \
--	      : "=&r" (__prev), "=&r" (__cmp)				      \
-+	      : "=&r" (__prev), "=&r" (__cmp), "=m" (*mem)		      \
- 	      : "r" (value), "m" (*mem)					      \
- 	      : "memory");						      \
-   __prev; })

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/mips/cvs-non-pic-n32-64-syscall.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/mips/cvs-non-pic-n32-64-syscall.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/mips/cvs-non-pic-n32-64-syscall.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,30 +0,0 @@
-2010-08-13  Chandrakala Chavva  <cchavva@caviumnetworks.com>
-
-	* sysdeps/unix/mips/mips64/n64/sysdep.h (PSEUDO): Add 'nop' in
-	jump delay slot.
-	* sysdeps/unix/mips/mips64/n32/sysdep.h (PSEUDO): Ditto.
-
-diff --git a/ports/sysdeps/unix/mips/mips64/n32/sysdep.h b/ports/sysdeps/unix/mips/mips64/n32/sysdep.h
-index ec93fad..df1391d 100644
---- a/ports/sysdeps/unix/mips/mips64/n32/sysdep.h
-+++ b/ports/sysdeps/unix/mips/mips64/n32/sysdep.h
-@@ -45,6 +45,7 @@ L(syse1):
-   .set noreorder;							      \
-   .align 2;								      \
-   99: j __syscall_error;						      \
-+  nop;                                                                        \
-   ENTRY(name)								      \
-   .set noreorder;							      \
-   li v0, SYS_ify(syscall_name);						      \
-diff --git a/ports/sysdeps/unix/mips/mips64/n64/sysdep.h b/ports/sysdeps/unix/mips/mips64/n64/sysdep.h
-index 502b667..da5f6a0 100644
---- a/ports/sysdeps/unix/mips/mips64/n64/sysdep.h
-+++ b/ports/sysdeps/unix/mips/mips64/n64/sysdep.h
-@@ -45,6 +45,7 @@ L(syse1):
-   .set noreorder;							      \
-   .align 2;								      \
-   99: j __syscall_error;						      \
-+  nop;                                                                        \
-   ENTRY(name)								      \
-   .set noreorder;							      \
-   li v0, SYS_ify(syscall_name);						      \

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/s390/cvs-makecontext.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/s390/cvs-makecontext.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/s390/cvs-makecontext.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,225 +0,0 @@
-2010-04-13  Andreas Schwab  <schwab@redhat.com>
-
-	* sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c: Fix setup of
-	overflow area.
-	* sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c: Likewise.
-
----
- sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c |   64 ++++++++++-----------
- sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c |   62 ++++++++++----------
- 2 files changed, 63 insertions(+), 63 deletions(-)
-
---- a/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c
-+++ b/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2001 Free Software Foundation, Inc.
-+/* Copyright (C) 2001, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
- 
-@@ -28,15 +28,15 @@
-    double, complex and structure with sizes 0, 2, 4 or 8
-    won't work.
-    makecontext sets up a stack and the registers for the
--   context. The stack looks like this:
--           size                         offset
-+   user context. The stack looks like this:
-+	   size                         offset
-     %r15 ->    +-----------------------+
--             4 | back chain (zero)     |  0
--             4 | reserved              |  4
--            88 | save area for (*func) |  8
--               +-----------------------+
--             n | overflow parameters   | 96
--               +-----------------------+
-+	     4 | back chain (zero)     |  0
-+	     4 | reserved              |  4
-+	    88 | save area for (*func) |  8
-+	       +-----------------------+
-+	     n | overflow parameters   | 96
-+	       +-----------------------+
-    The registers are set up like this:
-      %r2-%r6: parameters 1 to 5
-      %r7    : (*func) pointer
-@@ -54,27 +54,27 @@
- __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
- {
-   extern void __makecontext_ret (void);
--  unsigned long *sp;
-+  unsigned long int *sp;
-   va_list ap;
--  int i;
- 
--  sp = (unsigned long *) (((unsigned long) ucp->uc_stack.ss_sp
--			   + ucp->uc_stack.ss_size) & -8L);
-+  sp = (unsigned long int *) (((unsigned long int) ucp->uc_stack.ss_sp
-+			       + ucp->uc_stack.ss_size) & -8L);
- 
-   /* Set the return address to trampoline.  */
--  ucp->uc_mcontext.gregs[14] = (long) __makecontext_ret;
-+  ucp->uc_mcontext.gregs[14] = (long int) __makecontext_ret;
- 
-   /* Set register parameters.  */
-   va_start (ap, argc);
--  for (i = 0; (i < argc) && (i < 5); i++)
--    ucp->uc_mcontext.gregs[2+i] = va_arg (ap, long);
-+  for (int i = 0; i < argc && i < 5; ++i)
-+    ucp->uc_mcontext.gregs[2 + i] = va_arg (ap, long int);
- 
-   /* The remaining arguments go to the overflow area.  */
--  if (argc > 5) {
--    sp -= argc - 5;
--    for (i = 5; i < argc; i++)
--      sp[i] = va_arg(ap, long);
--  }
-+  if (argc > 5)
-+    {
-+      sp -= argc - 5;
-+      for (int i = 5; i < argc; ++i)
-+	sp[i - 5] = va_arg (ap, long int);
-+    }
-   va_end (ap);
- 
-   /* Make room for the save area and set the backchain.  */
-@@ -82,24 +82,24 @@
-   *sp = 0;
- 
-   /* Pass (*func) to __start_context in %r7.  */
--  ucp->uc_mcontext.gregs[7] = (long) func;
-+  ucp->uc_mcontext.gregs[7] = (long int) func;
- 
-   /* Pass ucp->uc_link to __start_context in %r8.  */
--  ucp->uc_mcontext.gregs[8] = (long) ucp->uc_link;
-+  ucp->uc_mcontext.gregs[8] = (long int) ucp->uc_link;
- 
-   /* Pass address of setcontext in %r9.  */
--  ucp->uc_mcontext.gregs[9] = (long) &setcontext;
-+  ucp->uc_mcontext.gregs[9] = (long int) &setcontext;
- 
-   /* Set stack pointer.  */
--  ucp->uc_mcontext.gregs[15] = (long) sp;
-+  ucp->uc_mcontext.gregs[15] = (long int) sp;
- }
- 
--asm(".text\n"
--    ".type __makecontext_ret,@function\n"
--    "__makecontext_ret:\n"
--    "      basr  %r14,%r7\n"
--    "      lr    %r2,%r8\n"
--    "      br    %r9\n"
--    ".size __makecontext_ret, .-__makecontext_ret");
-+asm (".text\n"
-+     ".type __makecontext_ret,@function\n"
-+     "__makecontext_ret:\n"
-+     "      basr  %r14,%r7\n"
-+     "      lr    %r2,%r8\n"
-+     "      br    %r9\n"
-+     ".size __makecontext_ret, .-__makecontext_ret");
- 
- weak_alias (__makecontext, makecontext)
---- a/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c
-+++ b/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2001 Free Software Foundation, Inc.
-+/* Copyright (C) 2001, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
- 
-@@ -29,14 +29,14 @@
-    won't work.
-    makecontext sets up a stack and the registers for the
-    user context. The stack looks like this:
--           size                         offset
-+	   size                         offset
-     %r15 ->    +-----------------------+
--             8 | back chain (zero)     |  0
--             8 | reserved              |  8
--           144 | save area for (*func) | 16
--               +-----------------------+
--             n | overflow parameters   | 160
--               +-----------------------+
-+	     8 | back chain (zero)     |  0
-+	     8 | reserved              |  8
-+	   144 | save area for (*func) | 16
-+	       +-----------------------+
-+	     n | overflow parameters   | 160
-+	       +-----------------------+
-    The registers are set up like this:
-      %r2-%r6: parameters 1 to 5
-      %r7    : (*func) pointer
-@@ -54,27 +54,27 @@
- __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
- {
-   extern void __makecontext_ret (void);
--  unsigned long *sp;
-+  unsigned long int *sp;
-   va_list ap;
--  int i;
- 
--  sp = (unsigned long *) (((unsigned long) ucp->uc_stack.ss_sp
--			   + ucp->uc_stack.ss_size) & -8L);
-+  sp = (unsigned long int *) (((unsigned long int) ucp->uc_stack.ss_sp
-+			       + ucp->uc_stack.ss_size) & -8L);
- 
-   /* Set the return address to trampoline.  */
--  ucp->uc_mcontext.gregs[14] = (long) __makecontext_ret;
-+  ucp->uc_mcontext.gregs[14] = (long int) __makecontext_ret;
- 
-   /* Set register parameters.  */
-   va_start (ap, argc);
--  for (i = 0; (i < argc) && (i < 5); i++)
--    ucp->uc_mcontext.gregs[2+i] = va_arg (ap, long);
-+  for (int i = 0; i < argc && i < 5; ++i)
-+    ucp->uc_mcontext.gregs[2 + i] = va_arg (ap, long int);
- 
-   /* The remaining arguments go to the overflow area.  */
--  if (argc > 5) {
--    sp -= argc - 5;
--    for (i = 5; i < argc; i++)
--      sp[i] = va_arg(ap, long);
--  }
-+  if (argc > 5)
-+    {
-+      sp -= argc - 5;
-+      for (int i = 5; i < argc; ++i)
-+	sp[i - 5] = va_arg (ap, long int);
-+    }
-   va_end (ap);
- 
-   /* Make room for the save area and set the backchain.  */
-@@ -82,24 +82,24 @@
-   *sp = 0;
- 
-   /* Pass (*func) to __start_context in %r7.  */
--  ucp->uc_mcontext.gregs[7] = (long) func;
-+  ucp->uc_mcontext.gregs[7] = (long int) func;
- 
-   /* Pass ucp->uc_link to __start_context in %r8.  */
--  ucp->uc_mcontext.gregs[8] = (long) ucp->uc_link;
-+  ucp->uc_mcontext.gregs[8] = (long int) ucp->uc_link;
- 
-   /* Pass address of setcontext in %r9.  */
--  ucp->uc_mcontext.gregs[9] = (long) &setcontext;
-+  ucp->uc_mcontext.gregs[9] = (long int) &setcontext;
- 
-   /* Set stack pointer.  */
--  ucp->uc_mcontext.gregs[15] = (long) sp;
-+  ucp->uc_mcontext.gregs[15] = (long int) sp;
- }
- 
--asm(".text\n"
--    ".type __makecontext_ret,@function\n"
--    "__makecontext_ret:\n"
--    "      basr  %r14,%r7\n"
--    "      lgr   %r2,%r8\n"
--    "      br    %r9\n"
--    ".size __makecontext_ret, .-__makecontext_ret");
-+asm (".text\n"
-+     ".type __makecontext_ret,@function\n"
-+     "__makecontext_ret:\n"
-+     "      basr  %r14,%r7\n"
-+     "      lgr   %r2,%r8\n"
-+     "      br    %r9\n"
-+     ".size __makecontext_ret, .-__makecontext_ret");
- 
- weak_alias (__makecontext, makecontext)

Modified: glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-nexttowardf.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-nexttowardf.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-nexttowardf.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,9 +1,8 @@
 2008-05-05  Aurelien Jarno  <aurelien@aurel32.net>
 
 	* sysdeps/ieee754/ldbl-128/s_nexttowardf.c: Include float.h.
-	(__nexttowardf): Use math_opt_barrier and
-	math_force_eval macros.  If FLT_EVAL_METHOD is not 0, force
-	x to float using asm.
+	(__nexttowardf): If FLT_EVAL_METHOD is not 0, force x to float
+	using asm.
 
 ---
  sysdeps/ieee754/ldbl-128/s_nexttowardf.c |   26 ++++++++++++++++----------
@@ -11,7 +10,7 @@
 
 --- a/sysdeps/ieee754/ldbl-128/s_nexttowardf.c
 +++ b/sysdeps/ieee754/ldbl-128/s_nexttowardf.c
-@@ -19,7 +19,8 @@
+@@ -19,7 +19,8 @@ static char rcsid[] = "$NetBSD: $";
  #endif
  
  #include "math.h"
@@ -21,42 +20,18 @@
  
  #ifdef __STDC__
  	float __nexttowardf(float x, long double y)
-@@ -44,10 +45,12 @@
- 	   return x+y;
- 	if((long double) x==y) return y;	/* x=y, return y */
- 	if(ix==0) {				/* x == 0 */
--	    float x2;
-+	    float u;
- 	    SET_FLOAT_WORD(x,(u_int32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/
--	    x2 = x*x;
--	    if(x2==x) return x2; else return x;	/* raise underflow flag */
-+	    u = math_opt_barrier (x);
-+	    u = u * u;
-+	    math_force_eval (u);		/* raise underflow flag */
-+	    return x;
- 	}
- 	if(hx>=0) {				/* x > 0 */
- 	    if(hy<0||(ix>>23)>(iy>>48)-0x3f80
-@@ -67,13 +70,16 @@
+@@ -69,7 +70,13 @@ static char rcsid[] = "$NetBSD: $";
  	    }
  	}
  	hy = hx&0x7f800000;
 -	if(hy>=0x7f800000) return x+x;	/* overflow  */
-+	if(hy>=0x7f800000) {
-+	  x = x+x;	/* overflow  */
++        if(hy>=0x7f800000) {
++	  x = x+x;      /* overflow  */
 +	  if (FLT_EVAL_METHOD != 0)
 +	    /* Force conversion to float.  */
 +	    asm ("" : "+m"(x));
 +	  return x;
 +	}
- 	if(hy<0x00800000) {		/* underflow */
--	    float x2 = x*x;
--	    if(x2!=x) {		/* raise underflow flag */
--	        SET_FLOAT_WORD(x2,hx);
--		return x2;
--	    }
-+	    float u = x*x;
-+	    math_force_eval (u);	/* raise underflow flag */
- 	}
- 	SET_FLOAT_WORD(x,hx);
- 	return x;
+ 	if(hy<0x00800000) {
+ 	    float u = x*x;		/* underflow */
+ 	    math_force_eval (u);	/* raise underflow flag */

Modified: glibc-package/branches/eglibc-2.13/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series	2011-02-06 20:15:18 UTC (rev 4472)
@@ -29,7 +29,6 @@
 localedata/locale-hsb_DE.diff
 localedata/tailor-iso14651_t1-common.diff
 localedata/fix-lang.diff
-localedata/fr_BE-first_weekday.diff
 localedata/fr_CA-first_weekday.diff
 localedata/fr_CH-first_weekday.diff
 localedata/fr_LU-first_weekday.diff
@@ -38,40 +37,26 @@
 localedata/submitted-bz9725-locale-sv_SE.diff
 localedata/first_weekday.diff
 localedata/submitted-bz9912-locale-ru_UA.diff
-localedata/submitted-pt_BR.diff
 localedata/locale-et_EE.diff
-localedata/locale-es_CR.diff
 localedata/submitted-translit-colon.diff
 
 alpha/local-gcc4.1.diff
 alpha/submitted-creat64.diff
-alpha/submitted-dl-procinfo.diff
 alpha/submitted-dl-support.diff
 alpha/submitted-fdatasync.diff
-alpha/submitted-fpu-round.diff
-alpha/submitted-PTR_MANGLE.diff
 alpha/submitted-rtld-fPIC.diff
-alpha/submitted-asm-memchr.diff
-alpha/submitted-sock_nonblock.diff
-alpha/cvs-timer_settime.diff
-alpha/local-fcntl_h.diff
-alpha/local-longjmp-chk.diff
 alpha/local-lowlevellock.diff
-alpha/submitted-epoll.diff
 alpha/submitted-syscall.diff
 
 amd64/local-biarch.diff
 amd64/local-clone.diff
 amd64/local-linuxthreads-gscope.diff
 amd64/submitted-tst-audit6-avx.diff
-amd64/cvs-avx-tcb-alignment.diff
 
 arm/local-atomic.diff
 arm/local-eabi-wchar.diff
 arm/local-ioperm.diff
 arm/local-lowlevellock.diff
-arm/local-no-hwcap.diff
-arm/local-hwcap-updates.diff
 arm/local-sigaction.diff
 
 hppa/local-inlining.diff
@@ -80,12 +65,10 @@
 hppa/submitted-fadvise64_64.diff
 hppa/submitted-lt.diff
 hppa/submitted-nptl-carlos.diff
-hppa/cvs-nptl-compat.diff
 hppa/local-stack-grows-up.diff
 hppa/local-dlfptr.diff
 hppa/local-longjmp-chk.diff
 hppa/local-lowlevellock.diff
-hppa/cvs-vfork.diff
 
 hurd-i386/local-dl-dynamic-weak.diff
 hurd-i386/local-enable-ldconfig.diff
@@ -120,22 +103,13 @@
 hurd-i386/submitted-SOL_IP.patch
 hurd-i386/local-bigmem.diff
 hurd-i386/local-disable-ioctls.diff
-hurd-i386/submitted-rtld_lock_recursive.diff
 hurd-i386/local-longjmp_chk.diff
-hurd-i386/cvs-getcwd.diff
-hurd-i386/cvs-setsid.diff
 hurd-i386/local-locarchive.diff
 hurd-i386/submitted-regex_internal.diff
-hurd-i386/cvs-linkat.diff
-hurd-i386/cvs-ttyname.diff
-hurd-i386/cvs-getnprocs.diff
 hurd-i386/local-mkdir_root.diff
-hurd-i386/cvs-select.diff
 hurd-i386/local-i686.diff
 hurd-i386/local-no-hp-timing.diff
-hurd-i386/cvs-sched_param.diff
 hurd-i386/submitted-catch-signal.diff
-hurd-i386/cvs-sendmsg-leak.diff
 hurd-i386/local-sendmsg-SCM_RIGHTS.diff
 
 ia64/local-dlfptr.diff
@@ -150,9 +124,6 @@
 i386/local-pthread_cond_wait.diff
 i386/submitted-i686-timing.diff
 
-m68k/cvs-define-m68k-tls-relocations.patch
-m68k/cvs-tls-support.patch
-m68k/cvs-versions-def-2-12.patch
 m68k/local-compat.diff
 m68k/local-dwarf2-buildfix.diff
 m68k/local-fpic.diff
@@ -161,24 +132,15 @@
 m68k/local-pthread_lock.diff
 m68k/submitted-gcc34-seccomment.diff
 
-mips/cvs-mips-atomic_h.diff
-mips/cvs-non-pic-n32-64-syscall.diff
 mips/local-lowlevellock.diff
 mips/local-r10k.diff
 mips/submitted-rld_map.diff
 
-s390/cvs-makecontext.diff
 s390/submitted-nexttowardf.diff
 
-sh4/local-fpscr_values.diff
-sh4/submitted-set_fpscr.diff
-
 sparc/local-fork.diff
 sparc/local-sparcv9-target.diff
 sparc/submitted-timing.diff
-sparc/cvs-sparcv9-memchr.diff
-sparc/submitted-epoll.diff
-sparc/submitted-msgrcv.diff
 
 all/local-alias-UTF-8.diff
 all/local-alias-et_EE.diff
@@ -239,33 +201,14 @@
 any/local-getaddrinfo-interface.diff
 any/submitted-autotools.diff
 any/submitted-accept4-hidden.diff
-any/submitted-etc-resolv.conf.diff
 any/submitted-localedef-mmap.diff
 any/submitted-missing-etc-hosts.diff
 any/submitted-bits-fcntl_h-at.diff
-any/local-ntp-update.diff
-#any/cvs-futimens.diff
-any/cvs-resolv-bindv6only.diff
-any/submitted-nis-shadow.diff
 any/local-no-SOCK_NONBLOCK.diff
-any/cvs-malloc_info-init.diff
 any/submitted-stack-guard-quick-randomization.diff
 any/submitted-leading-zero-stack-guard.diff
-any/cvs-stat-issock.diff
-any/cvs-remove.diff
 any/submitted-nptl-invalid-td.patch
 any/local-gai-rfc1918-scope-global.patch
-any/cvs-getaddrinfo.diff
-any/cvs-umount-nofollow.diff
-any/cvs-glob.diff
 any/local-dlfptr.diff
 any/submitted-string2-strcmp.diff
-any/submitted-group_member.diff
-any/cvs-redirect-throw.diff
-#any/cvs-flush-cache-textrels.diff
-any/cvs-__block.diff
-any/cvs-sunrpc-license.diff
-any/submitted-resolv.conf-thread.diff
-any/cvs-audit-suid.diff
-any/cvs-dont-expand-dst-twice.diff
-any/cvs-ignore-origin-privileged.diff
+all/local-nis-shadow.diff

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/sh4/local-fpscr_values.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/sh4/local-fpscr_values.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/sh4/local-fpscr_values.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,32 +0,0 @@
----
- sysdeps/unix/sysv/linux/sh/Versions |    1 +
- sysdeps/unix/sysv/linux/sh/sysdep.S |   11 +++++++++++
- 2 files changed, 12 insertions(+)
-
---- a/sysdeps/unix/sysv/linux/sh/Versions
-+++ b/sysdeps/unix/sysv/linux/sh/Versions
-@@ -2,6 +2,7 @@
-   GLIBC_2.2 {
-     # functions used in other libraries
-     __xstat64; __fxstat64; __lxstat64;
-+    __fpscr_values;
- 
-     # a*
-     alphasort64;
---- a/sysdeps/unix/sysv/linux/sh/sysdep.S
-+++ b/sysdeps/unix/sysv/linux/sh/sysdep.S
-@@ -32,3 +32,14 @@
- 
- #define __syscall_error __syscall_error_1
- #include <sysdeps/unix/sh/sysdep.S>
-+
-+       .data
-+       .align 3
-+       .globl ___fpscr_values
-+       .type ___fpscr_values, @object
-+       .size ___fpscr_values, 8
-+___fpscr_values:
-+       .long 0
-+       .long 0x80000
-+weak_alias (___fpscr_values, __fpscr_values)
-+

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/sh4/submitted-set_fpscr.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/sh4/submitted-set_fpscr.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/sh4/submitted-set_fpscr.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,21 +0,0 @@
----
- sysdeps/sh/sh4/fpu/fpu_control.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/sysdeps/sh/sh4/fpu/fpu_control.h
-+++ b/sysdeps/sh/sh4/fpu/fpu_control.h
-@@ -45,6 +45,14 @@
- #define _FPU_GETCW(cw) __asm__ ("sts fpscr,%0" : "=r" (cw))
- 
- #if defined __GNUC__
-+/* Allow the use in C++ code.  */
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+extern void __set_fpscr(unsigned long);
-+#ifdef __cplusplus
-+}
-+#endif  /* C++ */
- #define _FPU_SETCW(cw) __set_fpscr ((cw))
- #else
- #define _FPU_SETCW(cw) __asm__ ("lds %0,fpscr" : : "r" (cw))

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/sparc/cvs-sparcv9-memchr.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/sparc/cvs-sparcv9-memchr.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/sparc/cvs-sparcv9-memchr.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,20 +0,0 @@
-2009-02-20  David S. Miller  <davem@davemloft.net>
- 
-	* sysdeps/sparc/sparc64/memchr.S: Use unsigned branch on greater to
-	test end of buffer.
-
----
- sysdeps/sparc/sparc64/memchr.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/sysdeps/sparc/sparc64/memchr.S
-+++ b/sysdeps/sparc/sparc64/memchr.S
-@@ -96,7 +96,7 @@
- 							 * %o4 =   value XOR c		*/
- 2:	cmp		%o0, %o2			/* IEU1		Group		*/
- 
--	bg,pn		%XCC, 11f			/* CTI				*/
-+	bgu,pn		%XCC, 11f			/* CTI				*/
- 	 ldxa		[%o0] ASI_PNF, %o3		/* Load				*/
- 	sub		%o4, %g1, %o5			/* IEU0		Group		*/
- 	add		%o0, 8, %o0			/* IEU1				*/

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/sparc/submitted-epoll.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/sparc/submitted-epoll.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/sparc/submitted-epoll.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,39 +0,0 @@
-2010-08-31  Mike Frysinger  <vapier@gentoo.org>
-
-	* sysdeps/unix/sysv/linux/sparc/sys/epoll.h (epoll_create2): Delete.
-	(epoll_create1): Add.
----
- sysdeps/unix/sysv/linux/sparc/sys/epoll.h |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/sysdeps/unix/sysv/linux/sparc/sys/epoll.h b/sysdeps/unix/sysv/linux/sparc/sys/epoll.h
-index cc0ddef..82a3490 100644
---- a/sysdeps/unix/sysv/linux/sparc/sys/epoll.h
-+++ b/sysdeps/unix/sysv/linux/sparc/sys/epoll.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002-2006, 2007, 2008 Free Software Foundation, Inc.
-+/* Copyright (C) 2002-2008, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -31,7 +31,7 @@ typedef __sigset_t sigset_t;
- #endif
- 
- 
--/* Flags to be passed to epoll_create2.  */
-+/* Flags to be passed to epoll_create1.  */
- enum
-   {
-     EPOLL_CLOEXEC = 0x400000,
-@@ -101,8 +101,9 @@ __BEGIN_DECLS
-    returned by epoll_create() should be closed with close().  */
- extern int epoll_create (int __size) __THROW;
- 
--/* Same as epoll_create but with an additional FLAGS parameter.  */
--extern int epoll_create2 (int __size, int __flags) __THROW;
-+/* Same as epoll_create but with an FLAGS parameter.  The unused SIZE
-+   parameter has been dropped.  */
-+extern int epoll_create1 (int __flags) __THROW;
- 
- 
- /* Manipulate an epoll instance "epfd". Returns 0 in case of success,

Deleted: glibc-package/branches/eglibc-2.13/debian/patches/sparc/submitted-msgrcv.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/sparc/submitted-msgrcv.diff	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/patches/sparc/submitted-msgrcv.diff	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,60 +0,0 @@
-2010-02-26  Aurelien Jarno  <aurelien@aurel32.net>
- 
-	* sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c: New file.
-
----
- sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c |   49 +++++++++++++++++++++++++
- 1 file changed, 49 insertions(+)
-
---- /dev/null
-+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c
-@@ -0,0 +1,49 @@
-+/* Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <errno.h>
-+#include <sys/msg.h>
-+#include <ipc_priv.h>
-+
-+#include <sysdep-cancel.h>
-+#include <sys/syscall.h>
-+
-+#include <bp-checks.h>
-+
-+ssize_t
-+__libc_msgrcv (msqid, msgp, msgsz, msgtyp, msgflg)
-+     int msqid;
-+     void *msgp;
-+     size_t msgsz;
-+     long int msgtyp;
-+     int msgflg;
-+{
-+  if (SINGLE_THREAD_P)
-+    return INLINE_SYSCALL (ipc, 6, IPCOP_msgrcv, msqid, msgsz, msgflg,
-+			   CHECK_N (msgp, msgsz), msgtyp);
-+
-+  int oldtype = LIBC_CANCEL_ASYNC ();
-+
-+  ssize_t result = INLINE_SYSCALL (ipc, 6, IPCOP_msgrcv, msqid, msgsz, msgflg,
-+				   CHECK_N (msgp, msgsz), msgtyp);
-+
-+  LIBC_CANCEL_RESET (oldtype);
-+
-+  return result;
-+}
-+weak_alias (__libc_msgrcv, msgrcv)

Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/alpha.mk
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/sysdeps/alpha.mk	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/sysdeps/alpha.mk	2011-02-06 20:15:18 UTC (rev 4472)
@@ -5,7 +5,6 @@
 # build an ev67 optimized library
 EGLIBC_PASSES += alphaev67
 DEB_ARCH_REGULAR_PACKAGES += libc6.1-alphaev67
-alphaev67_MIN_KERNEL_SUPPORTED = 2.6.9
 alphaev67_add-ons = ports nptl $(add-ons)
 alphaev67_configure_target = alphaev67-linux-gnu
 alphaev67_extra_cflags = -mcpu=ev67 -mtune=ev67 -O2

Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk	2011-02-06 20:15:18 UTC (rev 4472)
@@ -23,7 +23,6 @@
 i386_rtlddir = /lib
 i386_slibdir = /lib32
 i386_libdir = /usr/lib32
-i386_MIN_KERNEL_SUPPORTED = 6.0.0
 
 define libc0.1-dev-i386_extra_pkg_install
 mkdir -p debian/libc0.1-dev-i386/usr/include/gnu

Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd.mk	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd.mk	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,5 +1,5 @@
 EGLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*)
-MIN_KERNEL_SUPPORTED := 6.0.0
+MIN_KERNEL_SUPPORTED := 8.0.0
 libc = libc0.1
 
 # Linuxthreads Config

Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/sysdeps/linux.mk	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/sysdeps/linux.mk	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,5 +1,5 @@
 EGLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*)
-MIN_KERNEL_SUPPORTED := 2.6.18
+MIN_KERNEL_SUPPORTED := 2.6.26
 libc = libc6
 
 # NPTL Config

Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/m68k.mk
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/sysdeps/m68k.mk	2011-02-06 16:10:45 UTC (rev 4471)
+++ glibc-package/branches/eglibc-2.13/debian/sysdeps/m68k.mk	2011-02-06 20:15:18 UTC (rev 4472)
@@ -1,3 +1,2 @@
-libc_MIN_KERNEL_SUPPORTED = 2.4.1
-libc_add-ons = ports linuxthreads $(add-ons)
-libc_extra_config_options = $(extra_config_options) --disable-sanity-checks --without-__thread --without-tls
+libc_MIN_KERNEL_SUPPORTED = 2.6.32
+libc_add-ons = ports nptl $(add-ons)


Reply to: