r4294 - in glibc-package/trunk/debian: . debhelper.in patches patches/all patches/alpha patches/amd64 patches/any patches/arm patches/hppa patches/hurd-i386 patches/ia64 patches/kfreebsd patches/locale patches/localedata patches/mips patches/s390 patches/sh4 rules.d sysdeps testsuite-checking

[Aurelien Jarno <aurel32@alioth.debian.org>]

Author: aurel32
Date: 2010-05-28 22:51:08 +0000 (Fri, 28 May 2010)
New Revision: 4294

Added:
   glibc-package/trunk/debian/patches/alpha/cvs-timer_settime.diff
   glibc-package/trunk/debian/patches/alpha/local-fcntl_h.diff
   glibc-package/trunk/debian/patches/alpha/local-longjmp-chk.diff
   glibc-package/trunk/debian/patches/alpha/local-lowlevellock.diff
   glibc-package/trunk/debian/patches/amd64/submitted-tst-audit6-avx.diff
   glibc-package/trunk/debian/patches/any/cvs-getaddrinfo.diff
   glibc-package/trunk/debian/patches/any/cvs-glob.diff
   glibc-package/trunk/debian/patches/any/cvs-stat-issock.diff
   glibc-package/trunk/debian/patches/any/cvs-umount-nofollow.diff
   glibc-package/trunk/debian/patches/arm/local-atomic.diff
   glibc-package/trunk/debian/patches/hppa/local-dlfptr.diff
   glibc-package/trunk/debian/patches/hppa/local-longjmp-chk.diff
   glibc-package/trunk/debian/patches/hppa/local-lowlevellock.diff
   glibc-package/trunk/debian/patches/hurd-i386/local-longjmp_chk.diff
   glibc-package/trunk/debian/patches/hurd-i386/submitted-regex_internal.diff
   glibc-package/trunk/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff
   glibc-package/trunk/debian/patches/kfreebsd/local-dosavesse.diff
   glibc-package/trunk/debian/patches/kfreebsd/local-nosavesse.diff
   glibc-package/trunk/debian/patches/kfreebsd/local-syscalls_2.11.patch
   glibc-package/trunk/debian/patches/localedata/locale-hsb_DE.diff
   glibc-package/trunk/debian/patches/mips/local-lowlevellock.diff
   glibc-package/trunk/debian/patches/s390/cvs-makecontext.diff
   glibc-package/trunk/debian/patches/sh4/cvs-register_dump.diff
Removed:
   glibc-package/trunk/debian/patches/alpha/submitted-getsysstats.diff
   glibc-package/trunk/debian/patches/alpha/submitted-includes.diff
   glibc-package/trunk/debian/patches/alpha/submitted-lowlevellock.diff
   glibc-package/trunk/debian/patches/alpha/submitted-procfs_h.diff
   glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff
   glibc-package/trunk/debian/patches/any/cvs-getutmpx-compat.diff
   glibc-package/trunk/debian/patches/any/cvs-ksm.diff
   glibc-package/trunk/debian/patches/any/cvs-malloc_info-output.diff
   glibc-package/trunk/debian/patches/any/cvs-nis-not-configured.diff
   glibc-package/trunk/debian/patches/any/cvs-nptl-init.diff
   glibc-package/trunk/debian/patches/any/cvs-resolv-edns0.diff
   glibc-package/trunk/debian/patches/any/cvs-resolv-init.diff
   glibc-package/trunk/debian/patches/any/cvs-resolv-uninitialized.diff
   glibc-package/trunk/debian/patches/any/cvs-resolv-v6mapped.diff
   glibc-package/trunk/debian/patches/any/cvs-sched_h.diff
   glibc-package/trunk/debian/patches/any/local-dynamic-resolvconf.diff
   glibc-package/trunk/debian/patches/any/submitted-confname.h.diff
   glibc-package/trunk/debian/patches/any/submitted-getaddrinfo-nodata.diff
   glibc-package/trunk/debian/patches/any/submitted-getent-gshadow.diff
   glibc-package/trunk/debian/patches/any/submitted-gethostbyname3.diff
   glibc-package/trunk/debian/patches/any/submitted-stat-issock.diff
   glibc-package/trunk/debian/patches/arm/cvs-setjmp-longjmp-fpu.diff
   glibc-package/trunk/debian/patches/hppa/submitted-pie.diff
   glibc-package/trunk/debian/patches/hppa/submitted-sock_nonblock.diff
   glibc-package/trunk/debian/patches/hurd-i386/cvs-termios-IXANY.patch
   glibc-package/trunk/debian/patches/hurd-i386/submitted-getnprocs.diff
   glibc-package/trunk/debian/patches/ia64/cvs-memchr.diff
   glibc-package/trunk/debian/patches/ia64/submitted-siginfo.diff
   glibc-package/trunk/debian/patches/locale/cvs-C-first_weekday.diff
   glibc-package/trunk/debian/patches/mips/local-lazy-eval.diff
   glibc-package/trunk/debian/patches/s390/submitted-siginfo.diff
   glibc-package/trunk/debian/patches/svn-updates.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/copyright
   glibc-package/trunk/debian/debhelper.in/libc-alt.lintian-overrides
   glibc-package/trunk/debian/debhelper.in/libc-bin.lintian-overrides
   glibc-package/trunk/debian/debhelper.in/libc-otherbuild.lintian-overrides
   glibc-package/trunk/debian/debhelper.in/libc.lintian-overrides
   glibc-package/trunk/debian/debhelper.in/libc.postinst
   glibc-package/trunk/debian/debhelper.in/libc.preinst
   glibc-package/trunk/debian/debhelper.in/nscd.init
   glibc-package/trunk/debian/libc6.symbols.hppa
   glibc-package/trunk/debian/locales-depver
   glibc-package/trunk/debian/patches/all/local-pthread-manpages.diff
   glibc-package/trunk/debian/patches/any/local-libgcc-compat-main.diff
   glibc-package/trunk/debian/patches/any/local-linuxthreads-weak.diff
   glibc-package/trunk/debian/patches/any/submitted-missing-etc-hosts.diff
   glibc-package/trunk/debian/patches/arm/local-lowlevellock.diff
   glibc-package/trunk/debian/patches/hppa/cvs-nptl-compat.diff
   glibc-package/trunk/debian/patches/hppa/local-stack-grows-up.diff
   glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff
   glibc-package/trunk/debian/patches/hurd-i386/submitted-readlinkat.diff
   glibc-package/trunk/debian/patches/kfreebsd/local-readdir_r.diff
   glibc-package/trunk/debian/patches/localedata/first_weekday.diff
   glibc-package/trunk/debian/patches/localedata/tailor-iso14651_t1.diff
   glibc-package/trunk/debian/patches/series
   glibc-package/trunk/debian/patches/series.kfreebsd-amd64
   glibc-package/trunk/debian/patches/series.kfreebsd-i386
   glibc-package/trunk/debian/rules.d/build.mk
   glibc-package/trunk/debian/shlibver
   glibc-package/trunk/debian/symbols.wildcards
   glibc-package/trunk/debian/sysdeps/amd64.mk
   glibc-package/trunk/debian/sysdeps/i386.mk
   glibc-package/trunk/debian/testsuite-checking/expected-results-alpha-linux-gnu-libc
   glibc-package/trunk/debian/testsuite-checking/expected-results-alphaev67-linux-gnu-alphaev67
   glibc-package/trunk/debian/testsuite-checking/expected-results-arm-linux-gnueabi-libc
   glibc-package/trunk/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc
   glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc
   glibc-package/trunk/debian/testsuite-checking/expected-results-i486-kfreebsd-gnu-libc
   glibc-package/trunk/debian/testsuite-checking/expected-results-i686-kfreebsd-gnu-i386
   glibc-package/trunk/debian/testsuite-checking/expected-results-i686-kfreebsd-gnu-i686
   glibc-package/trunk/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc
   glibc-package/trunk/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
   glibc-package/trunk/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32
   glibc-package/trunk/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
   glibc-package/trunk/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64
   glibc-package/trunk/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64
   glibc-package/trunk/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
   glibc-package/trunk/debian/testsuite-checking/expected-results-sparc-linux-gnu-libc
   glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64-linux-gnu-libc
   glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64-linux-gnu-sparc64
   glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64b-linux-gnu-sparcv9b
   glibc-package/trunk/debian/testsuite-checking/expected-results-sparcv9b-linux-gnu-sparcv9b
   glibc-package/trunk/debian/testsuite-checking/expected-results-x86_64-kfreebsd-gnu-libc
Log:
Merge from the 2.11 branch


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/changelog	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,3 +1,114 @@
+eglibc (2.11.1-1) UNRELEASED; urgency=low
+
+  [ Clint Adams ]
+  * New upstream release:
+    - Fixes a house of mind attack.  Closes: bug#568488.
+    - Add the fallocate64() syscall.  Closes: bug#568924.
+    - Add RES_USE_DNSSEC support.  Closes: bug#569592.
+    - Don't abort in getifaddrs.  Closes: bug#582383.
+    - Update debian/patches/all/local-pthread-manpages.diff
+    - Remove debian/patches/alpha/submitted-getsysstats.diff (merged)
+    - Remove debian/patches/alpha/submitted-includes.diff (merged)
+    - Remove debian/patches/alpha/submitted-lowlevellock.diff (merged)
+    - Remove debian/patches/alpha/submitted-procfs_h.diff (merged)
+    - Remove debian/patches/any/cvs-broken-dns.diff (merged)
+    - Remove debian/patches/any/cvs-getutmpx-compat.diff (merged)
+    - Remove debian/patches/any/cvs-ksm.diff (merged)
+    - Remove debian/patches/any/cvs-malloc_info-output.diff (merged)
+    - Remove debian/patches/any/cvs-nis-not-configured.diff (merged)
+    - Remove debian/patches/any/cvs-nptl-init.diff (merged)
+    - Remove debian/patches/any/cvs-resolv-edns0.diff (merged)
+    - Remove debian/patches/any/cvs-resolv-init.diff (merged)
+    - Remove debian/patches/any/cvs-resolv-uninitialized.diff (merged)
+    - Remove debian/patches/any/cvs-resolv-v6mapped.diff (merged)
+    - Remove debian/patches/any/cvs-sched_h.diff (merged)
+    - Remove debian/patches/any/local-dynamic-resolvconf.diff (merged)
+    - Update debian/patches/any/local-libgcc-compat-main.diff
+    - Remove debian/patches/any/submitted-confname.h.diff (merged)
+    - Remove debian/patches/any/submitted-getent-gshadow.diff (merged)
+    - Remove debian/patches/any/submitted-getaddrinfo-nodata.diff (merged)
+    - Remove debian/patches/any/submitted-gethostbyname3.diff (merged)
+    - Update debian/patches/any/submitted-missing-etc-hosts.diff.
+    - Remove debian/patches/arm/cvs-setjmp-longjmp-fpu.diff (merged)
+    - Update debian/patches/hppa/cvs-nptl-compat.diff.
+    - Update debian/patches/hppa/local-stack-grows-up.diff from
+      Carlos O'Donell.
+    - Remove debian/patches/hppa/submitted-pie.diff (merged)
+    - Remove debian/patches/hppa/submitted-sock_nonblock.diff (merged)
+    - Update debian/patches/hurd-i386/cvs-setsid.diff.
+    - Remove debian/patches/hurd-i386/cvs-termios-IXANY.patch (merged)
+    - Remove debian/patches/hurd-i386/submitted-getnprocs.diff (merged)
+    - Update debian/patches/hurd-i386/submitted-readlinkat.diff
+    - Remove debian/patches/ia64/cvs-memchr.diff (merged)
+    - Remove debian/patches/ia64/submitted-memchr.diff (merged)
+    - Remove debian/patches/ia64/submitted-siginfo.diff (merged)
+    - Update debian/patches/kfreebsd/local-readdir_r.diff.
+    - Remove debian/patches/locale/cvs-C-first_weekday.diff (merged)
+    - Update debian/patches/localedata/first_weekday.diff
+    - Update debian/patches/localedata/tailor-iso14651_t1.diff
+    - Remove debian/patches/mips/local-lazy-eval.diff (obsolete)
+    - Remove debian/patches/s390/submitted-siginfo.diff (merged)
+    - testsuite-checking/expected-results-ia64-linux-gnu-libc: update
+    - Update testsuite-checking/expected-results-sparc-linux-gnu-libc
+    - Update testsuite-checking/expected-results-sparcv9b-linux-gnu-sparcv9b
+
+  * Add debian/patches/alpha/local-fcntl_h.diff.
+  * Add debian/patches/hppa/local-dlfptr.diff from Carlos O'Donnell.
+  * Add debian/patches/localedata/locale-hsb_DE.diff
+
+  [ Aurelien Jarno ]
+  * Enable multi-arch.
+  * Add debian/patches/kfreebsd/local-syscalls_2.11.patch to add the
+    lchflag syscalls on GNU/kFreeBSD.
+  * Add debian/patches/alpha/local-longjmp-chk.diff and
+    debian/patches/alpha/cvs-timer_settime.diff to fix FTBFS on alpha, and
+    debian/patches/alpha/local-lowlevellock.diff to fix the testsuite.
+  * Add debian/patches/mips/local-lowlevellock.diff to fix the testsuite
+    on mips.
+  * Re-enable the testsuite on mips/mipsel build daemons.
+  * Add debian/patches/arm/local-atomic.diff and 
+    debian/patches/arm/local-lowlevellock.diff to fix the testsuite on arm.
+  * Add debian/patches/hppa/local-longjmp-chk.diff to fix FTBFS on hppa.
+  * Add debian/patches/hppa/local-lowlevellock.diff to fix the testsuite
+    on hppa.
+  * Add debian/patches/s390/cvs-makecontext.diff from upstream to fix 
+    makecontext() on s390.
+  * Replace debian/patches/submitted/cvs-stat-issock.diff by the upstream patch
+    debian/patches/any/cvs-stat-issock.diff.
+  * Explictely call /sbin/start-stop-daemon in nscd.init.  Closes: bug#575404.
+  * Add debian/patches/any/cvs-getaddrinfo.diff from upstream to not abort
+    the getaddrinfo loop on the first successful.
+  * Add debian/patches/any/cvs-umount-nofollow.diff from upstream to define
+    UMOUNT_NOFOLLOW.
+  * Add debian/patches/any/cvs-glob.diff from upstream to fix glob() with empty
+    pattern.
+  * Add debian/patches/submitted-tst-audit6-avx.diff to skip AVX tests if if
+    AVX is not available.
+  * Allow failures of the testsuite on HPPA until bugs are fixed:
+    - tstdiomisc.out (due to bug #582787 on gcc-4.4)
+    - tst-fork1.out (due to bug #561203 on linux-2.6)
+  * Add debian/patches/sh4/cvs-register_dump.diff from upstream to fix 
+    iov[] size register-dump.h.
+  * Add debian/patches/hurd-i386/submitted-regex_internal.diff to fix FTBFS on
+    hurd-i386.
+
+  [ Samuel Thibault ]
+  * debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff: New patch to
+    fix elf/ build on hurd-i386.
+  * debian/patches/hurd-i386/local-longjmp_chk.diff: New patch to fix
+    debug/____longjmp_chk.S build on hurd-i386.
+  * Update debian/patches/hurd-i386/local-pthread.diff.
+  * Update debian/testsuite-checking/expected-results-i486-gnu-libc.
+
+  [ Petr Salinger]
+  * define __rtld_lock_initialize also in linuxthreads <bits/libc-lock.h>
+    variant (enhance local-linuxthreads-weak.diff).
+  * allow failure of tst-longjmp_chk.out on GNU/kFreeBSD
+  * Add kfreebsd/local-dosavesse.diff, which does not work,
+    so rather use also added kfreebsd/local-nosavesse.diff
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 29 May 2010 00:50:30 +0200
+
 eglibc (2.10.2-9) unstable; urgency=low
 
   [ Aurelien Jarno ]

Modified: glibc-package/trunk/debian/copyright
===================================================================
--- glibc-package/trunk/debian/copyright	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/copyright	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,5 +1,5 @@
 This is the Debian prepackaged version of the Embedded GNU C Library
-version 2.10.1.
+version 2.11.
 
 It was put together by the GNU Libc Maintainers <debian-glibc@lists.debian.org>
 from <svn://svn.eglibc.org>

Modified: glibc-package/trunk/debian/debhelper.in/libc-alt.lintian-overrides
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.lintian-overrides	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.lintian-overrides	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,6 +1,6 @@
 # libpthread must be stripped specially; GDB needs the non-dynamic 
 # symbol table in order to load the thread debugging library.
-LIBC-FLAVOR: unstripped-binary-or-object .SLIBDIR/libpthread-2.10.1.so
+LIBC-FLAVOR: unstripped-binary-or-object .SLIBDIR/libpthread-2.11.1.so
 
 # Those file are actually .o files not package in a ar archive, and
 # thus should not be stripped
@@ -8,8 +8,8 @@
 LIBC-FLAVOR: unstripped-binary-or-object .LIBDIR/libmcheck.a
 
 # ld.so must be executable, otherwise the system will not work
-LIBC-FLAVOR: shlib-with-executable-bit .SLIBDIR/ld-2.10.1.so 0755
+LIBC-FLAVOR: shlib-with-executable-bit .SLIBDIR/ld-2.11.1.so 0755
 
 # It is normal that the ELF dynamic linker does not need any other 
 # library
-LIBC-FLAVOR: shared-lib-without-dependency-information .SLIBDIR/ld-2.10.1.so
+LIBC-FLAVOR: shared-lib-without-dependency-information .SLIBDIR/ld-2.11.1.so

Modified: glibc-package/trunk/debian/debhelper.in/libc-bin.lintian-overrides
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.lintian-overrides	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.lintian-overrides	2010-05-28 22:51:08 UTC (rev 4294)
@@ -2,9 +2,6 @@
 # thus must be linked statically
 libc-bin: statically-linked-binary ./sbin/ldconfig
 
-# ld.so must be executable, otherwise the system will not work
-libc-bin: shlib-with-executable-bit lib/ld-2.9.so 0755
-
 # pt_chown must be setuid root, otherwise non-root users won't be able
 # to login
 libc-bin: setuid-binary usr/lib/pt_chown 4755 root/root

Modified: glibc-package/trunk/debian/debhelper.in/libc-otherbuild.lintian-overrides
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-otherbuild.lintian-overrides	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/debhelper.in/libc-otherbuild.lintian-overrides	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,3 +1,3 @@
 # libpthread must be stripped specially; GDB needs the non-dynamic 
 # symbol table in order to load the thread debugging library.
-LIBC-FLAVOR: unstripped-binary-or-object .SLIBDIR/libpthread-2.10.1.so
+LIBC-FLAVOR: unstripped-binary-or-object .SLIBDIR/libpthread-2.11.1.so

Modified: glibc-package/trunk/debian/debhelper.in/libc.lintian-overrides
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.lintian-overrides	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/debhelper.in/libc.lintian-overrides	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,13 +1,13 @@
 # libpthread must be stripped specially; GDB needs the non-dynamic 
 # symbol table in order to load the thread debugging library.
-LIBC: unstripped-binary-or-object .SLIBDIR/libpthread-2.10.1.so
+LIBC: unstripped-binary-or-object .SLIBDIR/libpthread-2.11.1.so
 
 # ld.so must be executable, otherwise the system will not work
-LIBC: shlib-with-executable-bit SLIBDIR/ld-2.10.1.so 0755
+LIBC: shlib-with-executable-bit SLIBDIR/ld-2.11.1.so 0755
 
 # It is normal that the ELF dynamic linker does not need any other 
 # library
-LIBC: shared-lib-without-dependency-information .SLIBDIR/ld-2.10.1.so
+LIBC: shared-lib-without-dependency-information .SLIBDIR/ld-2.11.1.so
 
 # dependency on debconf is not needed, as glibc has a fallback to tty 
 LIBC: missing-debconf-dependency-for-preinst

Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst	2010-05-28 22:51:08 UTC (rev 4294)
@@ -90,7 +90,7 @@
 	if [ ! -d /var/mail ] && [ ! -L /var/mail ]; then
 	    ln -sf spool/mail /var/mail
 	fi
-	if dpkg --compare-versions "$preversion" lt 2.10-2; then
+	if dpkg --compare-versions "$preversion" lt 2.11-1; then
 	    check="apache2-common apache apache-ssl apache-perl autofs at"
 	    check="$check boa cucipop courier-authdaemon cron cups exim"
 	    check="$check exim4-base dovecot-common cucipop incron lprng lpr"
@@ -209,7 +209,7 @@
 	    else
 		echo "Nothing to restart."
 	    fi
-	fi # end upgrading and $preversion lt 2.10-2
+	fi # end upgrading and $preversion lt 2.11-1
     fi # Upgrading
 
     if [ "`uname -s`" = Linux ]; then

Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst	2010-05-28 22:51:08 UTC (rev 4294)
@@ -62,7 +62,7 @@
 
     if [ -n "$preversion" ]; then
 	# NSS authentication trouble guard
-	if dpkg --compare-versions "$preversion" lt 2.10-2; then
+	if dpkg --compare-versions "$preversion" lt 2.11-1; then
 	    if pidof xscreensaver xlockmore >/dev/null; then
 		if [ -f /usr/share/debconf/confmodule ] ; then
 		    db_version 2.0
@@ -140,7 +140,7 @@
 	            exit 1
 		fi
 	    fi
-	fi # end upgrading and $preversion lt 2.10-2
+	fi # end upgrading and $preversion lt 2.11-1
     fi # Upgrading
 
     # This will keep us from using hwcap libs (optimized) during an

Modified: glibc-package/trunk/debian/debhelper.in/nscd.init
===================================================================
--- glibc-package/trunk/debian/debhelper.in/nscd.init	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/debhelper.in/nscd.init	2010-05-28 22:51:08 UTC (rev 4294)
@@ -34,8 +34,8 @@
 	# Return
 	#   0 if daemon has been started or was already running
 	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null || return 0
-	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" || return 2
+	/sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null || return 0
+	/sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" || return 2
 }
 
 stop_nscd()
@@ -49,13 +49,13 @@
 	# in that case, fallback to "good old methods"
 	RETVAL=0
 	if ! $DAEMON --shutdown; then
-		start-stop-daemon --stop --quiet --pidfile "$PIDFILE" --name "$NAME" --test > /dev/null
+		/sbin/start-stop-daemon --stop --quiet --pidfile "$PIDFILE" --name "$NAME" --test > /dev/null
 		RETVAL="$?"
 		[ "$?" -ne 0  -a  "$?" -ne 1 ] && return 2
 	fi
 
 	# Wait for children to finish too
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec "$DAEMON" > /dev/null
+	/sbin/start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec "$DAEMON" > /dev/null
 	[ "$?" -ne 0  -a  "$?" -ne 1 ] && return 2
 	rm -f "$PIDFILE"
 	return "$RETVAL"
@@ -66,7 +66,7 @@
 	# Return
 	#   0 if daemon is stopped
 	#   1 if daemon is running
-	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null || return 1
+	/sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null || return 1
 	return 0
 }
 

Modified: glibc-package/trunk/debian/libc6.symbols.hppa
===================================================================
--- glibc-package/trunk/debian/libc6.symbols.hppa	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/libc6.symbols.hppa	2010-05-28 22:51:08 UTC (rev 4294)
@@ -6,30 +6,30 @@
 ###
 ### Override headers already defined in libc6.symbols.common
 ###
-# Minimal dependency set to 2.10 due to linuxthreads -> NPTL transition
-libBrokenLocale.so.1 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+# Minimal dependency set to 2.11 due to linuxthreads -> NPTL transition
+libBrokenLocale.so.1 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libSegFault.so #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libSegFault.so #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libcidn.so.1 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libcidn.so.1 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libcrypt.so.1 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libcrypt.so.1 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libdl.so.2 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libdl.so.2 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libm.so.6 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libm.so.6 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libmemusage.so #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libmemusage.so #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libnsl.so.1 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libnsl.so.1 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libnss_compat.so.2 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libnss_compat.so.2 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libnss_dns.so.2 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libnss_dns.so.2 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libnss_files.so.2 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libnss_files.so.2 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libnss_hesiod.so.2 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libnss_hesiod.so.2 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"
-libnss_nis.so.2 #PACKAGE# (>= 2.10), #PACKAGE# #MINVER#
+libnss_nis.so.2 #PACKAGE# (>= 2.11), #PACKAGE# #MINVER#
 #include "symbols.wildcards"

Modified: glibc-package/trunk/debian/locales-depver
===================================================================
--- glibc-package/trunk/debian/locales-depver	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/locales-depver	2010-05-28 22:51:08 UTC (rev 4294)
@@ -13,11 +13,12 @@
 #  LOCALES_DEP_VER point to the highest value of LOCALES_COMPAT_VER when
 #  packages are available for all architectures in unstable.
 
-LOCALES_DEP_VER = 2.10-1
-LOCALES_COMPAT_VER = 2.10-1
+LOCALES_DEP_VER = 2.11-1
+LOCALES_COMPAT_VER = 2.11-1
 
 #  Previous versions:
 #    2.7-1: glibc 2.7
 #    2.8-1: glibc 2.8
-#    2.9-1: glibc 2.9
-#   2.10-1: glibc 2.10
+#    2.9-1: eglibc 2.9
+#   2.10-1: eglibc 2.10
+#   2.11-1: eglibc 2.11

Modified: glibc-package/trunk/debian/patches/all/local-pthread-manpages.diff
===================================================================
--- glibc-package/trunk/debian/patches/all/local-pthread-manpages.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/all/local-pthread-manpages.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -22,8 +22,10 @@
  linuxthreads/man/sem_init.man                      |   88 +++++++-------
  21 files changed, 568 insertions(+), 571 deletions(-)
 
---- a/linuxthreads/man/pthread_atfork.man
-+++ b/linuxthreads/man/pthread_atfork.man
+Index: eglibc-2.11/linuxthreads/man/pthread_atfork.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_atfork.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_atfork.man	2009-11-10 23:53:49.121005154 -0500
 @@ -10,44 +10,44 @@
  
  .SH DESCRIPTION
@@ -87,8 +89,10 @@
 +\fBfork\fP(2),
 +\fBpthread_mutex_lock\fP(3),
 +\fBpthread_mutex_unlock\fP(3).
---- a/linuxthreads/man/pthread_attr_init.man
-+++ b/linuxthreads/man/pthread_attr_init.man
+Index: eglibc-2.11/linuxthreads/man/pthread_attr_init.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_attr_init.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_attr_init.man	2009-11-10 23:53:49.125005023 -0500
 @@ -45,27 +45,27 @@
  .SH DESCRIPTION
  
@@ -333,8 +337,10 @@
 +\fBpthread_join\fP(3),
 +\fBpthread_detach\fP(3),
 +\fBpthread_setschedparam\fP(3).
---- a/linuxthreads/man/pthread_cancel.man
-+++ b/linuxthreads/man/pthread_cancel.man
+Index: eglibc-2.11/linuxthreads/man/pthread_cancel.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_cancel.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_cancel.man	2009-11-10 23:53:49.125005023 -0500
 @@ -27,119 +27,119 @@
  immediately, or defer it till it reaches a cancellation point.
  
@@ -504,8 +510,10 @@
  achieved as follows:
  
  .RS
---- a/linuxthreads/man/pthread_cleanup_push.man
-+++ b/linuxthreads/man/pthread_cleanup_push.man
+Index: eglibc-2.11/linuxthreads/man/pthread_cleanup_push.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_cleanup_push.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_cleanup_push.man	2009-11-10 23:53:49.125005023 -0500
 @@ -21,7 +21,7 @@
  .SH DESCRIPTION
  
@@ -623,8 +631,10 @@
  
  .RS
  .ft 3
---- a/linuxthreads/man/pthread_condattr_init.man
-+++ b/linuxthreads/man/pthread_condattr_init.man
+Index: eglibc-2.11/linuxthreads/man/pthread_condattr_init.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_condattr_init.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_condattr_init.man	2009-11-10 23:53:49.125005023 -0500
 @@ -15,25 +15,25 @@
  .SH DESCRIPTION
  
@@ -658,8 +668,10 @@
  .SH "SEE ALSO"
 -!pthread_cond_init!(3).
 +\fBpthread_cond_init\fP(3).
---- a/linuxthreads/man/pthread_cond_init.man
-+++ b/linuxthreads/man/pthread_cond_init.man
+Index: eglibc-2.11/linuxthreads/man/pthread_cond_init.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_cond_init.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_cond_init.man	2009-11-10 23:53:49.125005023 -0500
 @@ -40,31 +40,31 @@
  variable and another thread signals the condition just before the
  first thread actually waits on it.
@@ -862,8 +874,10 @@
  seconds, do:
  
  .RS
---- a/linuxthreads/man/pthread_create.man
-+++ b/linuxthreads/man/pthread_create.man
+Index: eglibc-2.11/linuxthreads/man/pthread_create.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_create.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_create.man	2009-11-10 23:53:49.125005023 -0500
 @@ -9,38 +9,38 @@
  int pthread_create(pthread_t * thread, pthread_attr_t * attr, void * (*start_routine)(void *), void * arg);
  
@@ -921,8 +935,10 @@
 +\fBpthread_join\fP(3),
 +\fBpthread_detach\fP(3),
 +\fBpthread_attr_init\fP(3).
---- a/linuxthreads/man/pthread_detach.man
-+++ b/linuxthreads/man/pthread_detach.man
+Index: eglibc-2.11/linuxthreads/man/pthread_detach.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_detach.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_detach.man	2009-11-10 23:53:49.125005023 -0500
 @@ -9,36 +9,36 @@
  int pthread_detach(pthread_t th);
  
@@ -979,8 +995,10 @@
 +\fBpthread_join\fP(3),
 +\fBpthread_attr_setdetachstate\fP(3).
 \ No newline at end of file
---- a/linuxthreads/man/pthread_equal.man
-+++ b/linuxthreads/man/pthread_equal.man
+Index: eglibc-2.11/linuxthreads/man/pthread_equal.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_equal.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_equal.man	2009-11-10 23:53:49.125005023 -0500
 @@ -9,15 +9,15 @@
  int pthread_equal(pthread_t thread1, pthread_t thread2);
  
@@ -1000,8 +1018,10 @@
  .SH "SEE ALSO"
 -!pthread_self!(3).
 +\fBpthread_self\fP(3).
---- a/linuxthreads/man/pthread_exit.man
-+++ b/linuxthreads/man/pthread_exit.man
+Index: eglibc-2.11/linuxthreads/man/pthread_exit.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_exit.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_exit.man	2009-11-10 23:53:49.125005023 -0500
 @@ -9,24 +9,24 @@
  void pthread_exit(void *retval);
  
@@ -1036,8 +1056,10 @@
 -!pthread_join!(3).
 +\fBpthread_create\fP(3),
 +\fBpthread_join\fP(3).
---- a/linuxthreads/man/pthread_join.man
-+++ b/linuxthreads/man/pthread_join.man
+Index: eglibc-2.11/linuxthreads/man/pthread_join.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_join.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_join.man	2009-11-10 23:53:49.125005023 -0500
 @@ -9,62 +9,62 @@
  int pthread_join(pthread_t th, void **thread_return);
  
@@ -1133,8 +1155,10 @@
 +\fBpthread_attr_setdetachstate\fP(3),
 +\fBpthread_cleanup_push\fP(3),
 +\fBpthread_key_create\fP(3).
---- a/linuxthreads/man/pthread_key_create.man
-+++ b/linuxthreads/man/pthread_key_create.man
+Index: eglibc-2.11/linuxthreads/man/pthread_key_create.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_key_create.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_key_create.man	2009-11-10 23:53:49.129005170 -0500
 @@ -23,81 +23,81 @@
  
  Each thread possesses a private memory block, the thread-specific data
@@ -1248,8 +1272,10 @@
  allocated TSD key.
  
  .SH AUTHOR
---- a/linuxthreads/man/pthread_kill_other_threads_np.man
-+++ b/linuxthreads/man/pthread_kill_other_threads_np.man
+Index: eglibc-2.11/linuxthreads/man/pthread_kill_other_threads_np.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_kill_other_threads_np.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_kill_other_threads_np.man	2009-11-10 23:53:49.129005170 -0500
 @@ -9,14 +9,14 @@
  void pthread_kill_other_threads_np(void);
  
@@ -1293,8 +1319,10 @@
 +Calling \fBpthread_kill_other_threads_np\fP before \fBexec*\fP achieves much
 +of the same behavior, except that if \fBexec*\fP ultimately fails, then
  all other threads are already killed.
---- a/linuxthreads/man/pthread_mutexattr_init.man
-+++ b/linuxthreads/man/pthread_mutexattr_init.man
+Index: eglibc-2.11/linuxthreads/man/pthread_mutexattr_init.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_mutexattr_init.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_mutexattr_init.man	2009-11-10 23:53:49.129005170 -0500
 @@ -21,64 +21,64 @@
  .SH DESCRIPTION
  
@@ -1391,8 +1419,10 @@
 +\fBpthread_mutex_init\fP(3),
 +\fBpthread_mutex_lock\fP(3),
 +\fBpthread_mutex_unlock\fP(3).
---- a/linuxthreads/man/pthread_mutexattr_setkind_np.man
-+++ b/linuxthreads/man/pthread_mutexattr_setkind_np.man
+Index: eglibc-2.11/linuxthreads/man/pthread_mutexattr_setkind_np.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_mutexattr_setkind_np.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_mutexattr_setkind_np.man	2009-11-10 23:53:49.129005170 -0500
 @@ -14,26 +14,26 @@
  
  .SH DESCRIPTION
@@ -1430,8 +1460,10 @@
 -!pthread_mutexattr_gettype!(3).
 +\fBpthread_mutexattr_settype\fP(3),
 +\fBpthread_mutexattr_gettype\fP(3).
---- a/linuxthreads/man/pthread_mutex_init.man
-+++ b/linuxthreads/man/pthread_mutex_init.man
+Index: eglibc-2.11/linuxthreads/man/pthread_mutex_init.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_mutex_init.man	2009-11-10 20:01:35.000000000 -0500
++++ eglibc-2.11/linuxthreads/man/pthread_mutex_init.man	2009-11-10 23:56:31.976479148 -0500
 @@ -38,75 +38,75 @@
  that is already locked by another thread is suspended until the owning
  thread unlocks the mutex first.
@@ -1444,7 +1476,8 @@
 +If \fImutexattr\fP is \fBNULL\fP, default attributes are used instead.
  
  The LinuxThreads implementation supports only one mutex attributes,
- the |mutex kind|, which is either ``fast'', ``recursive'', or
+-the |mutex kind|, which is either ``fast'', ``recursive'', or
++the \fImutex kind\fP, which is either ``fast'', ``recursive'', or
  ``error checking''. The kind of a mutex determines whether
  it can be locked again by a thread that already owns it.
 -The default kind is ``fast''. See !pthread_mutexattr_init!(3) for more
@@ -1508,16 +1541,16 @@
  the calling thread), and only when this count reaches zero is the
  mutex actually unlocked.
  
--On ``error checking'' mutexes, !pthread_mutex_unlock! actually checks
-+On ``error checking'' mutexes, \fBpthread_mutex_unlock\fP actually checks
- at run-time that the mutex is locked on entrance, and that it was
--locked by the same thread that is now calling !pthread_mutex_unlock!.
-+locked by the same thread that is now calling \fBpthread_mutex_unlock\fP.
- If these conditions are not met, an error code is returned and the
- mutex remains unchanged.  ``Fast'' and ``recursive'' mutexes perform
- no such checks, thus allowing a locked mutex to be unlocked by a
- thread other than its owner. This is non-portable behavior and must
- not be relied upon.
+ On ``error checking'' and ``recursive'' mutexes,
+-!pthread_mutex_unlock! actually checks at run-time that the mutex is
++\fBpthread_mutex_unlock\fP actually checks at run-time that the mutex is
+ locked on entrance, and that it was locked by the same thread that is
+-now calling !pthread_mutex_unlock!.  If these conditions are not met,
++now calling \fBpthread_mutex_unlock\fP.  If these conditions are not met,
+ an error code is returned and the mutex remains unchanged.  ``Fast''
+ mutexes perform no such checks, thus allowing a locked mutex to be
+ unlocked by a thread other than its owner. This is non-portable behavior
+ and must not be relied upon.
  
 -!pthread_mutex_destroy! destroys a mutex object, freeing the resources
 +\fBpthread_mutex_destroy\fP destroys a mutex object, freeing the resources
@@ -1636,8 +1669,10 @@
  
  .RS
  .ft 3
---- a/linuxthreads/man/pthread_once.man
-+++ b/linuxthreads/man/pthread_once.man
+Index: eglibc-2.11/linuxthreads/man/pthread_once.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_once.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_once.man	2009-11-10 23:53:49.129005170 -0500
 @@ -12,19 +12,19 @@
  
  .SH DESCRIPTION
@@ -1667,8 +1702,10 @@
  
  .SH ERRORS
  None.
---- a/linuxthreads/man/pthread_self.man
-+++ b/linuxthreads/man/pthread_self.man
+Index: eglibc-2.11/linuxthreads/man/pthread_self.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_self.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_self.man	2009-11-10 23:53:49.129005170 -0500
 @@ -9,15 +9,15 @@
  pthread_t pthread_self(void);
  
@@ -1691,8 +1728,10 @@
 +\fBpthread_setschedparam\fP(3),
 +\fBpthread_getschedparam\fP(3).
  
---- a/linuxthreads/man/pthread_setschedparam.man
-+++ b/linuxthreads/man/pthread_setschedparam.man
+Index: eglibc-2.11/linuxthreads/man/pthread_setschedparam.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_setschedparam.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_setschedparam.man	2009-11-10 23:53:49.129005170 -0500
 @@ -14,66 +14,66 @@
  
  .SH DESCRIPTION
@@ -1791,8 +1830,10 @@
 +\fBsched_getparam\fP(2),
 +\fBpthread_attr_setschedpolicy\fP(3),
 +\fBpthread_attr_setschedparam\fP(3).
---- a/linuxthreads/man/pthread_sigmask.man
-+++ b/linuxthreads/man/pthread_sigmask.man
+Index: eglibc-2.11/linuxthreads/man/pthread_sigmask.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/pthread_sigmask.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/pthread_sigmask.man	2009-11-10 23:53:49.129005170 -0500
 @@ -19,36 +19,36 @@
  
  .SH DESCRIPTION
@@ -1936,8 +1977,10 @@
  signal handlers are shared between all threads, other threads must not
  attach their own signal handlers to these signals, or alternatively
  they should all block these signals (which is recommended anyway --
---- a/linuxthreads/man/sem_init.man
-+++ b/linuxthreads/man/sem_init.man
+Index: eglibc-2.11/linuxthreads/man/sem_init.man
+===================================================================
+--- eglibc-2.11.orig/linuxthreads/man/sem_init.man	2006-08-16 21:23:45.000000000 -0400
++++ eglibc-2.11/linuxthreads/man/sem_init.man	2009-11-10 23:53:49.129005170 -0500
 @@ -26,98 +26,98 @@
  
  .SH DESCRIPTION

Added: glibc-package/trunk/debian/patches/alpha/cvs-timer_settime.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/cvs-timer_settime.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/alpha/cvs-timer_settime.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,10 @@
+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.
+
+--- 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>

Added: glibc-package/trunk/debian/patches/alpha/local-fcntl_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/local-fcntl_h.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/alpha/local-fcntl_h.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,26 @@
+Index: eglibc-2.11/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
+===================================================================
+--- eglibc-2.11.orig/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h	2010-02-08 10:12:59.000000000 +0000
++++ eglibc-2.11/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h	2010-02-08 10:27:17.000000000 +0000
+@@ -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

Added: glibc-package/trunk/debian/patches/alpha/local-longjmp-chk.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/local-longjmp-chk.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/alpha/local-longjmp-chk.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,10 @@
+--- a/ports/sysdeps/unix/sysv/linux/alpha/____longjmp_chk.S
++++ 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>

Added: glibc-package/trunk/debian/patches/alpha/local-lowlevellock.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/local-lowlevellock.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/alpha/local-lowlevellock.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,14 @@
+2010-02-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h: remove
+	useless include.
+
+--- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
++++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
+@@ -23,7 +23,6 @@
+ #include <sys/param.h>
+ #include <bits/pthreadtypes.h>
+ #include <atomic.h>
+-#include <sysdep.h>
+ #include <kernel-features.h>
+ 

Deleted: glibc-package/trunk/debian/patches/alpha/submitted-getsysstats.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/submitted-getsysstats.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/alpha/submitted-getsysstats.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,30 +0,0 @@
-2009-05-16  Aurelien Jarno  <aurelien@aurel32.net>
-
-        * sysdeps/unix/sysv/linux/alpha/getsysstats.c (GET_NPROCS_PARSER):
-        Change parameters and use next_line.
-
----
- ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c
-@@ -20,15 +20,16 @@
- 
- 
- /* We need to define a special parser for /proc/cpuinfo.  */
--#define GET_NPROCS_PARSER(FP, BUFFER, RESULT)				   \
-+#define GET_NPROCS_PARSER(FD, BUFFER, CP, RE, BUFFER_END, RESULT)	   \
-   do									   \
-     {									   \
-       /* Find the line that contains the information about the number of   \
- 	 active cpus.  We don't have to fear extremely long lines since	   \
- 	 the kernel will not generate them.  8192 bytes are really enough. \
- 	 If there is no "CPUs ..." line then we are on a UP system.  */	   \
-+      char *l;								   \
-       (RESULT) = 1;							   \
--      while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL)	   \
-+      while ((l = next_line (FD, BUFFER, &CP, &RE, BUFFER_END)) != NULL)  \
- 	if ((sscanf (BUFFER, "cpus active : %d", &(RESULT)) == 1)	   \
- 	    || (sscanf (BUFFER, "CPUs probed %*d active %d",		   \
- 			&(RESULT)) == 1))  				   \

Deleted: glibc-package/trunk/debian/patches/alpha/submitted-includes.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/submitted-includes.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/alpha/submitted-includes.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,78 +0,0 @@
-2009-05-15  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/alpha/getdents64.c: Adjust include path.
-	* sysdeps/unix/sysv/linux/alpha/nptl/fork.c: Likewise.
-	* sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c: Likewise.
-	* sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c: Likewise.
-	* sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c: Likewise.
-	* sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c: Likewise.
-	* sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c: Likewise.
-	* sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c: Likewise.
-	* sysdeps/unix/sysv/linux/alpha/sysconf.c: Likewise.
-
----
- ports/sysdeps/unix/sysv/linux/alpha/getdents64.c          |    2 +-
- ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c           |    2 +-
- ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c       |    2 +-
- ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c   |    2 +-
- ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c   |    2 +-
- ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c |    2 +-
- ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c  |    2 +-
- ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c  |    2 +-
- ports/sysdeps/unix/sysv/linux/alpha/sysconf.c             |    2 +-
- 9 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/ports/sysdeps/unix/sysv/linux/alpha/getdents64.c
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/getdents64.c
-@@ -1 +1 @@
--#include "../getdents64.c"
-+#include <sysdeps/unix/sysv/linux/getdents64.c>
---- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c
-@@ -27,4 +27,4 @@
- 		  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD,	\
- 		  NULL, NULL, &THREAD_SELF->tid, NULL)
- 
--#include "../fork.c"
-+#include <sysdeps/unix/sysv/linux/fork.c>
---- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c
-@@ -2,4 +2,4 @@
-    the acquire/release semantics of atomic_exchange_and_add.  And even if
-    we don't do this, we should be using atomic_full_barrier or otherwise.  */
- #define __lll_rel_instr  "mb"
--#include "../sem_post.c"
-+#include <nptl/sysdeps/unix/sysv/linux/sem_post.c>
---- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c
-@@ -1 +1 @@
--#include "../x86_64/timer_create.c"
-+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c>
---- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c
-@@ -1 +1 @@
--#include "../x86_64/timer_delete.c"
-+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c>
---- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c
-@@ -1 +1 @@
--#include "../x86_64/timer_getoverr.c"
-+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c>
---- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c
-@@ -1 +1 @@
--#include "../x86_64/timer_gettime.c"
-+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
---- 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 "../x86_64/timer_settime.c"
-+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c>
---- a/ports/sysdeps/unix/sysv/linux/alpha/sysconf.c
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/sysconf.c
-@@ -149,4 +149,4 @@
- /* Now the generic Linux version.  */
- #undef __sysconf
- #define __sysconf static linux_sysconf
--#include "../sysconf.c"
-+#include <sysdeps/unix/sysv/linux/sysconf.c>

Deleted: glibc-package/trunk/debian/patches/alpha/submitted-lowlevellock.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/submitted-lowlevellock.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/alpha/submitted-lowlevellock.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,25 +0,0 @@
-2009-05-19  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h: Define
-	FUTEX_WAIT_BITSET, FUTEX_WAKE_BITSET, FUTEX_CLOCK_REALTIME and
-	FUTEX_BITSET_MATCH_ANY.
-
----
- ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
-@@ -37,7 +37,12 @@
- #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

Deleted: glibc-package/trunk/debian/patches/alpha/submitted-procfs_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/submitted-procfs_h.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/alpha/submitted-procfs_h.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,37 +0,0 @@
-2008-05-11  Aurelien Jarno  <aurelien@aurel32.net
-
-	* sysdeps/unix/sysv/linux/alpha/sys/procfs.h (ELF_NGREG,
-	ELF_NFPREG, elf_greg_t, elf_gregset_t, elf_fpreg_t,
-	elf_fpregset_t): Define. Don't include asm/elf.h.
-
----
- ports/sysdeps/unix/sysv/linux/alpha/sys/procfs.h |   15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
---- a/ports/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
-+++ b/ports/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
-@@ -29,10 +29,23 @@
- #include <sys/types.h>
- #include <sys/ucontext.h>
- #include <sys/user.h>
--#include <asm/elf.h>
- 
- __BEGIN_DECLS
- 
-+/*
-+ * The OSF/1 version of <sys/procfs.h> makes gregset_t 46 entries long.
-+ * I have no idea why that is so.  For now, we just leave it at 33
-+ * (32 general regs + processor status word).
-+ */
-+#define ELF_NGREG       33
-+#define ELF_NFPREG      32
-+
-+typedef unsigned long elf_greg_t;
-+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-+
-+typedef double elf_fpreg_t;
-+typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
-+
- struct elf_siginfo
-   {
-     int si_signo;			/* Signal number.  */

Added: glibc-package/trunk/debian/patches/amd64/submitted-tst-audit6-avx.diff
===================================================================
--- glibc-package/trunk/debian/patches/amd64/submitted-tst-audit6-avx.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/amd64/submitted-tst-audit6-avx.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,26 @@
+2010-05-25  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* elf/tst-audit6.c: always succeed if not AVX support.
+
+diff --git a/elf/tst-audit6.c b/elf/tst-audit6.c
+index 1f6dcb1..3a8411b 100644
+--- a/elf/tst-audit6.c
++++ b/elf/tst-audit6.c
+@@ -1,5 +1,6 @@
+ /* Test case for x86-64 preserved registers in dynamic linker.  */
+ 
++#ifdef __AVX__
+ #include <stdlib.h>
+ #include <string.h>
+ #include <cpuid.h>
+@@ -26,3 +27,10 @@ main (void)
+     }
+   return 0;
+ }
++#else
++int
++main (void)
++{
++  return 0;
++}
++#endif

Deleted: glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-broken-dns.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,156 +0,0 @@
-2009-06-26  Ulrich Drepper  <drepper@redhat.com>
-
-	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-	* resolv/res_init.c (res_setoptions): Recognize single-request-reopen
-	option.
-	* resolv/res_send.c (reopen): New function.  Broken out of...
-	(send_dg): ... here.  Recognize RES_SNGLKUPREOP.  Implement second
-	fallback mechanism.  If single-request fails switch to
-	single-request-reopen mode which opens a new socket for the second
-	request.
- 
----
- resolv/res_init.c |    3 ++
- resolv/res_send.c |   75 ++++++++++++++++++++++++++++++++++++------------------
- resolv/resolv.h   |    2 +
- 3 files changed, 56 insertions(+), 24 deletions(-)
-
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -908,24 +908,11 @@
- }
- 
- static int
--send_dg(res_state statp,
--	const u_char *buf, int buflen, const u_char *buf2, int buflen2,
--	u_char **ansp, int *anssizp,
--	int *terrno, int ns, int *v_circuit, int *gotsomewhere, u_char **anscp,
--	u_char **ansp2, int *anssizp2, int *resplen2)
-+reopen (res_state statp, int *terrno, int ns)
- {
--	const HEADER *hp = (HEADER *) buf;
--	const HEADER *hp2 = (HEADER *) buf2;
--	u_char *ans = *ansp;
--	int orig_anssizp = *anssizp;
--	struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns];
--	struct timespec now, timeout, finish;
--	struct pollfd pfd[1];
--        int ptimeout;
--	struct sockaddr_in6 from;
--	int resplen, n;
--
- 	if (EXT(statp).nssocks[ns] == -1) {
-+		struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns];
-+
- 		/* only try IPv6 if IPv6 NS and if not failed before */
- 		if ((EXT(statp).nscount6 > 0) && !statp->ipv6_unavail) {
- 			if (__builtin_expect (__have_o_nonblock >= 0, 1)) {
-@@ -1000,6 +987,26 @@
- 		}
- 	}
- 
-+	return 1;
-+}
-+
-+static int
-+send_dg(res_state statp,
-+	const u_char *buf, int buflen, const u_char *buf2, int buflen2,
-+	u_char **ansp, int *anssizp,
-+	int *terrno, int ns, int *v_circuit, int *gotsomewhere, u_char **anscp,
-+	u_char **ansp2, int *anssizp2, int *resplen2)
-+{
-+	const HEADER *hp = (HEADER *) buf;
-+	const HEADER *hp2 = (HEADER *) buf2;
-+	u_char *ans = *ansp;
-+	int orig_anssizp = *anssizp;
-+	struct timespec now, timeout, finish;
-+	struct pollfd pfd[1];
-+        int ptimeout;
-+	struct sockaddr_in6 from;
-+	int resplen, n;
-+
- 	/*
- 	 * Compute time for the total operation.
- 	 */
-@@ -1008,8 +1015,15 @@
- 		seconds /= statp->nscount;
- 	if (seconds <= 0)
- 		seconds = 1;
--	bool single_request = (statp->options & RES_SNGLKUP) != 0;// XXX
-+	bool single_request = (statp->options & RES_SNGLKUP) != 0;
-+	bool single_request_reopen = (statp->options & RES_SNGLKUPREOP) != 0;
- 	int save_gotsomewhere = *gotsomewhere;
-+
-+	int retval;
-+ retry_reopen:
-+	retval = reopen (statp, terrno, ns);
-+	if (retval <= 0)
-+		return retval;
-  retry:
- 	evNowTime(&now);
- 	evConsTime(&timeout, seconds, 0);
-@@ -1059,6 +1073,14 @@
- 			*gotsomewhere = save_gotsomewhere;
- 			goto retry;
- 		      }
-+		    else if (!single_request_reopen)
-+		      {
-+			statp->options |= RES_SNGLKUPREOP;
-+			single_request_reopen = true;
-+			*gotsomewhere = save_gotsomewhere;
-+			__res_iclose (statp, false);
-+			goto retry_reopen;
-+		      }
- 
- 		    *resplen2 = 1;
- 		    return resplen;
-@@ -1091,7 +1114,8 @@
- 			Perror(statp, stderr, "send", errno);
- 			goto err_out;
- 		}
--		if (nwritten != 0 || buf2 == NULL || single_request)
-+		if (nwritten != 0 || buf2 == NULL
-+		    || single_request || single_request_reopen)
- 		  pfd[0].events = POLLIN;
- 		else
- 		  pfd[0].events = POLLIN | POLLOUT;
-@@ -1305,8 +1325,15 @@
- 			recvresp2 = 1;
- 		/* Repeat waiting if we have a second answer to arrive.  */
- 		if ((recvresp1 & recvresp2) == 0) {
--			if (single_request)
-+			if (single_request || single_request_reopen) {
- 				pfd[0].events = POLLOUT;
-+				if (single_request_reopen) {
-+					__res_iclose (statp, false);
-+					retval = reopen (statp, terrno, ns);
-+					if (retval <= 0)
-+						return retval;
-+				}
-+			}
- 			goto wait;
- 		}
- 		/*
---- a/resolv/res_init.c
-+++ b/resolv/res_init.c
-@@ -540,6 +540,9 @@
- 			statp->options |= RES_NOCHECKNAME;
-                 } else if (!strncmp(cp, "edns0", sizeof("edns0") - 1)) {
- 			statp->options |= RES_USE_EDNS0;
-+                } else if (!strncmp(cp, "single-request-reopen",
-+				    sizeof("single-request-reopen") - 1)) {
-+			statp->options |= RES_SNGLKUPREOP;
-                 } else if (!strncmp(cp, "single-request",
- 				    sizeof("single-request") - 1)) {
- 			statp->options |= RES_SNGLKUP;
---- a/resolv/resolv.h
-+++ b/resolv/resolv.h
-@@ -216,6 +216,8 @@
- 					   reverse lookup */
- #define RES_USE_EDNS0	0x00100000	/* Use EDNS0.  */
- #define RES_SNGLKUP	0x00200000	/* one outstanding request at a time */
-+#define RES_SNGLKUPREOP	0x00400000	/* -"-, but open new socket for each
-+					   request */
- 
- #define RES_DEFAULT	(RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)
- 

Added: glibc-package/trunk/debian/patches/any/cvs-getaddrinfo.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-getaddrinfo.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-getaddrinfo.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,38 @@
+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.
+ 
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index 8b7e38f..597189f 100644
+--- 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/trunk/debian/patches/any/cvs-getutmpx-compat.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-getutmpx-compat.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-getutmpx-compat.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,24 +0,0 @@
-2009-10-29  Ulrich Drepper  <drepper@redhat.com>
-
-	[BZ #10847]
-	* sysdeps/gnu/getutmp.c: Allow compatibility code to play around with
-	getutmpx symbol.
- 
---- a/sysdeps/gnu/getutmp.c
-+++ b/sysdeps/gnu/getutmp.c
-@@ -19,10 +19,12 @@
- #include <assert.h>
- #include <string.h>
- #include <utmp.h>
-+#ifndef _UTMPX_H
- /* This is an ugly hack but we must not see the getutmpx declaration.  */
--#define getutmpx XXXgetutmpx
--#include <utmpx.h>
--#undef getutmpx
-+# define getutmpx XXXgetutmpx
-+# include <utmpx.h>
-+# undef getutmpx
-+#endif
- 
- void
- getutmp (const struct utmpx *utmpx, struct utmp *utmp)

Added: glibc-package/trunk/debian/patches/any/cvs-glob.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-glob.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-glob.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,271 @@
+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
+
+diff --git a/posix/glob.c b/posix/glob.c
+index 73081ec..3ae055d 100644
+--- 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')
+diff --git a/posix/tst-gnuglob.c b/posix/tst-gnuglob.c
+index 95bfbae..d4539bd 100644
+--- 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 @@ static struct
+       { "..", 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 @@ static struct
+       { "..", 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 *glob_errstring[] =
+ 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 @@ flagstr (int flags)
+     }
+ 
+   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 @@ main (void)
+   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 @@ main (void)
+ 	"dir2lev1/dir1lev2/.dir",
+ 	"dir2lev1/dir1lev2/.foo");
+ 
+-  test ("*/*/.*", GLOB_ALTDIRFUNC,
++  test ("*/*/.*", 0, 0,
+ 	"dir1lev1/dir1lev2/.",
+ 	"dir1lev1/dir1lev2/..",
+ 	"dir1lev1/dir2lev2/.",
+@@ -428,7 +457,7 @@ main (void)
+ 	"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 @@ main (void)
+ 	"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 @@ main (void)
+ 	"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/trunk/debian/patches/any/cvs-ksm.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-ksm.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-ksm.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,355 +0,0 @@
-2009-11-17  Ulrich Drepper  <drepper@redhat.com>
-
-	[BZ #10972]
-	* sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Add new MADV_*
-	constants from recent kernels.
-	* sysdeps/unix/sysv/linux/i386/bits/mman.h: Likewise.
-	* sysdeps/unix/sysv/linux/x86_64/bits/mman.h: Likewise.
-	* sysdeps/unix/sysv/linux/s390/bits/mman.h: Likewise.
-	* sysdeps/unix/sysv/linux/sparc/bits/mman.h: Likewise.
-	* sysdeps/unix/sysv/linux/sh/bits/mman.h: Likewise.
-	* sysdeps/unix/sysv/linux/ia64/bits/mman.h: Likewise.
-
-2009-11-17  Joseph Myers  <joseph@codesourcery.com>
- 
-	[BZ #10972]
-	* sysdeps/unix/sysv/linux/mips/bits/mman.h: Add new MADV_*
-	constants from recent kernels.
-	[BZ #10972]
-	* sysdeps/unix/sysv/linux/arm/bits/mman.h: Add new MADV_*
-	constants from recent kernels.
- 
---- a/sysdeps/unix/sysv/linux/i386/bits/mman.h
-+++ b/sysdeps/unix/sysv/linux/i386/bits/mman.h
-@@ -1,5 +1,5 @@
- /* Definitions for POSIX memory map interface.  Linux/i386 version.
--   Copyright (C) 1997, 2000, 2003, 2005, 2006 Free Software Foundation, Inc.
-+   Copyright (C) 1997,2000,2003,2005,2006,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
-@@ -84,14 +84,17 @@
- 
- /* Advice to `madvise'.  */
- #ifdef __USE_BSD
--# define MADV_NORMAL	 0	/* No further special treatment.  */
--# define MADV_RANDOM	 1	/* Expect random page references.  */
--# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
--# define MADV_WILLNEED	 3	/* Will need these pages.  */
--# define MADV_DONTNEED	 4	/* Don't need these pages.  */
--# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
--# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
--# define MADV_DOFORK	 11	/* Do inherit across fork.  */
-+# define MADV_NORMAL	  0	/* No further special treatment.  */
-+# define MADV_RANDOM	  1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL  2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED	  3	/* Will need these pages.  */
-+# define MADV_DONTNEED	  4	/* Don't need these pages.  */
-+# define MADV_REMOVE	  9	/* Remove these pages and resources.  */
-+# define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
-+# define MADV_DOFORK	  11	/* Do inherit across fork.  */
-+# define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
-+# define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
-+# define MADV_HWPOISON	  100	/* Poison a page for testing.  */
- #endif
- 
- /* The POSIX people had to invent similar names for the same things.  */
-diff --git a/sysdeps/unix/sysv/linux/ia64/bits/mman.h b/sysdeps/unix/sysv/linux/ia64/bits/mman.h
-index a27a30f..1b278c7 100644
---- a/sysdeps/unix/sysv/linux/ia64/bits/mman.h
-+++ b/sysdeps/unix/sysv/linux/ia64/bits/mman.h
-@@ -1,5 +1,6 @@
- /* Definitions for POSIX memory map interface.  Linux/ia64 version.
--   Copyright (C) 1997,1998,2000,2003,2005,2006 Free Software Foundation, Inc.
-+   Copyright (C) 1997,1998,2000,2003,2005,2006,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
-@@ -84,14 +85,17 @@
- 
- /* Advice to `madvise'.  */
- #ifdef __USE_BSD
--# define MADV_NORMAL	 0	/* No further special treatment.  */
--# define MADV_RANDOM	 1	/* Expect random page references.  */
--# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
--# define MADV_WILLNEED	 3	/* Will need these pages.  */
--# define MADV_DONTNEED	 4	/* Don't need these pages.  */
--# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
--# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
--# define MADV_DOFORK	 11	/* Do inherit across fork.  */
-+# define MADV_NORMAL	  0	/* No further special treatment.  */
-+# define MADV_RANDOM	  1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL  2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED	  3	/* Will need these pages.  */
-+# define MADV_DONTNEED	  4	/* Don't need these pages.  */
-+# define MADV_REMOVE	  9	/* Remove these pages and resources.  */
-+# define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
-+# define MADV_DOFORK	  11	/* Do inherit across fork.  */
-+# define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
-+# define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
-+# define MADV_HWPOISON	  100	/* Poison a page for testing.  */
- #endif
- 
- /* The POSIX people had to invent similar names for the same things.  */
-diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
-index d5729a1..e6580f8 100644
---- a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
-+++ b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
-@@ -1,5 +1,6 @@
- /* Definitions for POSIX memory map interface.  Linux/PowerPC version.
--   Copyright (C) 1997,2000,2003,2005,2006,2008 Free Software Foundation, Inc.
-+   Copyright (C) 1997,2000,2003,2005,2006,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
-@@ -85,14 +86,17 @@
- 
- /* Advice to `madvise'.  */
- #ifdef __USE_BSD
--# define MADV_NORMAL	 0	/* No further special treatment.  */
--# define MADV_RANDOM	 1	/* Expect random page references.  */
--# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
--# define MADV_WILLNEED	 3	/* Will need these pages.  */
--# define MADV_DONTNEED	 4	/* Don't need these pages.  */
--# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
--# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
--# define MADV_DOFORK	 11	/* Do inherit across fork.  */
-+# define MADV_NORMAL	  0	/* No further special treatment.  */
-+# define MADV_RANDOM	  1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL  2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED	  3	/* Will need these pages.  */
-+# define MADV_DONTNEED	  4	/* Don't need these pages.  */
-+# define MADV_REMOVE	  9	/* Remove these pages and resources.  */
-+# define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
-+# define MADV_DOFORK	  11	/* Do inherit across fork.  */
-+# define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
-+# define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
-+# define MADV_HWPOISON	  100	/* Poison a page for testing.  */
- #endif
- 
- /* The POSIX people had to invent similar names for the same things.  */
-diff --git a/sysdeps/unix/sysv/linux/s390/bits/mman.h b/sysdeps/unix/sysv/linux/s390/bits/mman.h
-index d25531c..daeafd4 100644
---- a/sysdeps/unix/sysv/linux/s390/bits/mman.h
-+++ b/sysdeps/unix/sysv/linux/s390/bits/mman.h
-@@ -1,5 +1,5 @@
- /* Definitions for POSIX memory map interface.  Linux/s390 version.
--   Copyright (C) 2000,2001,2002,2003,2005,2006 Free Software Foundation, Inc.
-+   Copyright (C) 2000-2003,2005,2006,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
-@@ -84,14 +84,17 @@
- 
- /* Advice to `madvise'.  */
- #ifdef __USE_BSD
--# define MADV_NORMAL	 0	/* No further special treatment.  */
--# define MADV_RANDOM	 1	/* Expect random page references.  */
--# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
--# define MADV_WILLNEED	 3	/* Will need these pages.  */
--# define MADV_DONTNEED	 4	/* Don't need these pages.  */
--# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
--# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
--# define MADV_DOFORK	 11	/* Do inherit across fork.  */
-+# define MADV_NORMAL	  0	/* No further special treatment.  */
-+# define MADV_RANDOM	  1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL  2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED	  3	/* Will need these pages.  */
-+# define MADV_DONTNEED	  4	/* Don't need these pages.  */
-+# define MADV_REMOVE	  9	/* Remove these pages and resources.  */
-+# define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
-+# define MADV_DOFORK	  11	/* Do inherit across fork.  */
-+# define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
-+# define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
-+# define MADV_HWPOISON	  100	/* Poison a page for testing.  */
- #endif
- 
- /* The POSIX people had to invent similar names for the same things.  */
-diff --git a/sysdeps/unix/sysv/linux/sh/bits/mman.h b/sysdeps/unix/sysv/linux/sh/bits/mman.h
-index 7a6b572..aee0011 100644
---- a/sysdeps/unix/sysv/linux/sh/bits/mman.h
-+++ b/sysdeps/unix/sysv/linux/sh/bits/mman.h
-@@ -1,5 +1,6 @@
- /* Definitions for POSIX memory map interface.  Linux/SH version.
--   Copyright (C) 1997,1999,2000,2003,2005,2006 Free Software Foundation, Inc.
-+   Copyright (C) 1997,1999,2000,2003,2005,2006,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
-@@ -83,14 +84,17 @@
- 
- /* Advice to `madvise'.  */
- #ifdef __USE_BSD
--# define MADV_NORMAL	 0	/* No further special treatment.  */
--# define MADV_RANDOM	 1	/* Expect random page references.  */
--# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
--# define MADV_WILLNEED	 3	/* Will need these pages.  */
--# define MADV_DONTNEED	 4	/* Don't need these pages.  */
--# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
--# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
--# define MADV_DOFORK	 11	/* Do inherit across fork.  */
-+# define MADV_NORMAL	  0	/* No further special treatment.  */
-+# define MADV_RANDOM	  1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL  2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED	  3	/* Will need these pages.  */
-+# define MADV_DONTNEED	  4	/* Don't need these pages.  */
-+# define MADV_REMOVE	  9	/* Remove these pages and resources.  */
-+# define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
-+# define MADV_DOFORK	  11	/* Do inherit across fork.  */
-+# define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
-+# define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
-+# define MADV_HWPOISON	  100	/* Poison a page for testing.  */
- #endif
- 
- /* The POSIX people had to invent similar names for the same things.  */
-diff --git a/sysdeps/unix/sysv/linux/sparc/bits/mman.h b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
-index be2b7eb..71a3aa6 100644
---- a/sysdeps/unix/sysv/linux/sparc/bits/mman.h
-+++ b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
-@@ -1,5 +1,6 @@
- /* Definitions for POSIX memory map interface.  Linux/SPARC version.
--   Copyright (C) 1997,1999,2000,2003,2005,2006 Free Software Foundation, Inc.
-+   Copyright (C) 1997,1999,2000,2003,2005,2006,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
-@@ -85,15 +86,18 @@
- 
- /* Advice to `madvise'.  */
- #ifdef __USE_BSD
--# define MADV_NORMAL	 0	/* No further special treatment.  */
--# define MADV_RANDOM	 1	/* Expect random page references.  */
--# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
--# define MADV_WILLNEED	 3	/* Will need these pages.  */
--# define MADV_DONTNEED	 4	/* Don't need these pages.  */
--# define MADV_FREE	 5	/* Content can be freed (Solaris).  */
--# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
--# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
--# define MADV_DOFORK	 11	/* Do inherit across fork.  */
-+# define MADV_NORMAL	  0	/* No further special treatment.  */
-+# define MADV_RANDOM	  1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL  2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED	  3	/* Will need these pages.  */
-+# define MADV_DONTNEED	  4	/* Don't need these pages.  */
-+# define MADV_FREE	  5	/* Content can be freed (Solaris).  */
-+# define MADV_REMOVE	  9	/* Remove these pages and resources.  */
-+# define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
-+# define MADV_DOFORK	  11	/* Do inherit across fork.  */
-+# define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
-+# define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
-+# define MADV_HWPOISON	  100	/* Poison a page for testing.  */
- #endif
- 
- /* The POSIX people had to invent similar names for the same things.  */
-diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/mman.h b/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
-index 7810682..3dcbf9c 100644
---- a/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
-+++ b/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
-@@ -1,5 +1,5 @@
- /* Definitions for POSIX memory map interface.  Linux/x86_64 version.
--   Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
-+   Copyright (C) 2001, 2003, 2005, 2006, 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
-@@ -85,14 +85,17 @@
- 
- /* Advice to `madvise'.  */
- #ifdef __USE_BSD
--# define MADV_NORMAL	 0	/* No further special treatment.  */
--# define MADV_RANDOM	 1	/* Expect random page references.  */
--# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
--# define MADV_WILLNEED	 3	/* Will need these pages.  */
--# define MADV_DONTNEED	 4	/* Don't need these pages.  */
--# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
--# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
--# define MADV_DOFORK	 11	/* Do inherit across fork.  */
-+# define MADV_NORMAL	  0	/* No further special treatment.  */
-+# define MADV_RANDOM	  1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL  2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED	  3	/* Will need these pages.  */
-+# define MADV_DONTNEED	  4	/* Don't need these pages.  */
-+# define MADV_REMOVE	  9	/* Remove these pages and resources.  */
-+# define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
-+# define MADV_DOFORK	  11	/* Do inherit across fork.  */
-+# define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
-+# define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
-+# define MADV_HWPOISON	  100	/* Poison a page for testing.  */
- #endif
- 
- /* The POSIX people had to invent similar names for the same things.  */
---- a/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h
-+++ b/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h
-@@ -1,5 +1,6 @@
- /* Definitions for POSIX memory map interface.  Linux/ARM version.
--   Copyright (C) 1997, 2000, 2003, 2005, 2006 Free Software Foundation, Inc.
-+   Copyright (C) 1997, 2000, 2003, 2005, 2006, 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
-@@ -83,14 +84,17 @@
- 
- /* Advice to `madvise'.  */
- #ifdef __USE_BSD
--# define MADV_NORMAL	 0	/* No further special treatment.  */
--# define MADV_RANDOM	 1	/* Expect random page references.  */
--# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
--# define MADV_WILLNEED	 3	/* Will need these pages.  */
--# define MADV_DONTNEED	 4	/* Don't need these pages.  */
--# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
--# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
--# define MADV_DOFORK	 11	/* Do inherit across fork.  */
-+# define MADV_NORMAL	  0	/* No further special treatment.  */
-+# define MADV_RANDOM	  1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL  2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED	  3	/* Will need these pages.  */
-+# define MADV_DONTNEED	  4	/* Don't need these pages.  */
-+# define MADV_REMOVE	  9	/* Remove these pages and resources.  */
-+# define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
-+# define MADV_DOFORK	  11	/* Do inherit across fork.  */
-+# define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
-+# define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
-+# define MADV_HWPOISON	  100	/* Poison a page for testing.  */
- #endif
- 
- /* The POSIX people had to invent similar names for the same things.  */
---- a/ports/sysdeps/unix/sysv/linux/mips/bits/mman.h
-+++ b/ports/sysdeps/unix/sysv/linux/mips/bits/mman.h
-@@ -1,5 +1,5 @@
- /* Definitions for POSIX memory map interface.  Linux/MIPS version.
--   Copyright (C) 1997, 2000, 2003, 2004, 2005, 2006
-+   Copyright (C) 1997, 2000, 2003, 2004, 2005, 2006, 2009
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -86,14 +86,17 @@
- 
- /* Advice to `madvise'.  */
- #ifdef __USE_BSD
--# define MADV_NORMAL	 0	/* No further special treatment.  */
--# define MADV_RANDOM	 1	/* Expect random page references.  */
--# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
--# define MADV_WILLNEED	 3	/* Will need these pages.  */
--# define MADV_DONTNEED	 4	/* Don't need these pages.  */
--# define MADV_REMOVE	 9	/* Remove these pages and resources.  */
--# define MADV_DONTFORK	 10	/* Do not inherit across fork.  */
--# define MADV_DOFORK	 11	/* Do inherit across fork.  */
-+# define MADV_NORMAL	  0	/* No further special treatment.  */
-+# define MADV_RANDOM	  1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL  2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED	  3	/* Will need these pages.  */
-+# define MADV_DONTNEED	  4	/* Don't need these pages.  */
-+# define MADV_REMOVE	  9	/* Remove these pages and resources.  */
-+# define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
-+# define MADV_DOFORK	  11	/* Do inherit across fork.  */
-+# define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
-+# define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
-+# define MADV_HWPOISON	  100	/* Poison a page for testing.  */
- #endif
- 
- /* The POSIX people had to invent similar names for the same things.  */

Deleted: glibc-package/trunk/debian/patches/any/cvs-malloc_info-output.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-malloc_info-output.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-malloc_info-output.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,19 +0,0 @@
-2009-10-29  Ulrich Drepper  <drepper@redhat.com>
- 
-	[BZ #10553]
-	* malloc/malloc.c (malloc_info): Fix typos in format strings.
-	Patch by John Sullivan <jsrhbz@kanargh.force9.co.uk>.
-
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -6474,8 +6474,8 @@ malloc_info (int options, FILE *fp)
-   fprintf (fp,
- 	   "<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n"
- 	   "<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n"
--	   "<system type=\"current\" size=\"%zu\n/>\n"
--	   "<system type=\"max\" size=\"%zu\n/>\n"
-+	   "<system type=\"current\" size=\"%zu\"/>\n"
-+	   "<system type=\"max\" size=\"%zu\"/>\n"
- 	   "<aspace type=\"total\" size=\"%zu\"/>\n"
- 	   "<aspace type=\"mprotect\" size=\"%zu\"/>\n"
- 	   "</malloc>\n",

Deleted: glibc-package/trunk/debian/patches/any/cvs-nis-not-configured.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-nis-not-configured.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-nis-not-configured.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,269 +0,0 @@
-2009-12-10  Ulrich Drepper  <drepper@redhat.com>
-
-	[BZ #11000]
-	* nis/nss_nis/nis-hosts.c (_nss_nis_gethostbyname4_r): Always set
-	*herrnop before returning.
-	* nis/nss_nisplus/nisplus-hosts.c (internal_gethostbyname2_r):
-	Likewise.
-	* nss/nss_files/files-hosts.c (_nss_files_gethostbyname4_r): Handle
-	TRYAGAIN errors separately.
-	* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix error handling of
-	*name4_r after functions.
-
-
---- a/nis/nss_nis/nis-hosts.c
-+++ b/nis/nss_nis/nis-hosts.c
-@@ -70,20 +70,20 @@ LINE_PARSER
-      {
-        assert ((flags & AI_V4MAPPED) == 0 || af != AF_UNSPEC);
-        if (flags & AI_V4MAPPED)
--         {
--           map_v4v6_address ((char *) entdata->host_addr,
--                             (char *) entdata->host_addr);
--           result->h_addrtype = AF_INET6;
--           result->h_length = IN6ADDRSZ;
--         }
-+	 {
-+	   map_v4v6_address ((char *) entdata->host_addr,
-+			     (char *) entdata->host_addr);
-+	   result->h_addrtype = AF_INET6;
-+	   result->h_length = IN6ADDRSZ;
-+	 }
-        else
--         {
--           result->h_addrtype = AF_INET;
--           result->h_length = INADDRSZ;
--         }
-+	 {
-+	   result->h_addrtype = AF_INET;
-+	   result->h_length = INADDRSZ;
-+	 }
-      }
-    else if (af != AF_INET
--            && inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
-+	    && inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
-      {
-        result->h_addrtype = AF_INET6;
-        result->h_length = IN6ADDRSZ;
-@@ -164,14 +164,14 @@ internal_nis_gethostent_r (struct hostent *host, char *buffer,
-       int keylen;
-       int yperr;
-       if (new_start)
--        yperr = yp_first (domain, "hosts.byname", &outkey, &keylen, &result,
-+	yperr = yp_first (domain, "hosts.byname", &outkey, &keylen, &result,
- 			  &len);
-       else
--        yperr = yp_next (domain, "hosts.byname", oldkey, oldkeylen, &outkey,
-+	yperr = yp_next (domain, "hosts.byname", oldkey, oldkeylen, &outkey,
- 			 &keylen, &result, &len);
- 
-       if (__builtin_expect (yperr != YPERR_SUCCESS, 0))
--        {
-+	{
- 	  enum nss_status retval = yperr2nss (yperr);
- 
- 	  switch (retval)
-@@ -191,12 +191,12 @@ internal_nis_gethostent_r (struct hostent *host, char *buffer,
- 	}
- 
-       if (__builtin_expect ((size_t) (len + 1) > linebuflen, 0))
--        {
--          free (result);
-+	{
-+	  free (result);
- 	  *h_errnop = NETDB_INTERNAL;
--          *errnop = ERANGE;
--          return NSS_STATUS_TRYAGAIN;
--        }
-+	  *errnop = ERANGE;
-+	  return NSS_STATUS_TRYAGAIN;
-+	}
- 
-       char *p = strncpy (data->linebuffer, result, len);
-       data->linebuffer[len] = '\0';
-@@ -233,7 +233,7 @@ _nss_nis_gethostent_r (struct hostent *host, char *buffer, size_t buflen,
-   __libc_lock_lock (lock);
- 
-   status = internal_nis_gethostent_r (host, buffer, buflen, errnop, h_errnop,
--		        ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET),
-+			((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET),
- 			((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0 ));
- 
-   __libc_lock_unlock (lock);
-@@ -346,7 +346,7 @@ _nss_nis_gethostbyname2_r (const char *name, int af, struct hostent *host,
- 
-   return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop,
- 				    h_errnop,
--		        ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0));
-+			((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0));
- }
- 
- 
-@@ -456,7 +456,10 @@ _nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
- {
-   char *domain;
-   if (yp_get_default_domain (&domain))
--    return NSS_STATUS_UNAVAIL;
-+    {
-+      *herrnop = NO_DATA;
-+      return NSS_STATUS_UNAVAIL;
-+    }
- 
-   /* Convert name to lowercase.  */
-   size_t namlen = strlen (name);
---- a/nis/nss_nisplus/nisplus-hosts.c
-+++ b/nis/nss_nisplus/nisplus-hosts.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1997-2003, 2005, 2006, 2008 Free Software Foundation, Inc.
-+/* Copyright (C) 1997-2003, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
- 
-@@ -38,10 +38,10 @@ static nis_name tablename_val;
- static u_long tablename_len;
- 
- #define NISENTRYVAL(idx, col, res) \
--        (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val)
-+	(NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val)
- 
- #define NISENTRYLEN(idx, col, res) \
--        (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len)
-+	(NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len)
- 
- /* Get implementation for some internal functions. */
- #include <resolv/mapv4v6addr.h>
-@@ -287,15 +287,15 @@ internal_nisplus_gethostent_r (struct hostent *host, char *buffer,
- 	      return NSS_STATUS_TRYAGAIN;
- 	    }
- 	  if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
--            {
--              enum nss_status retval = niserr2nss (result->status);
--              if (retval == NSS_STATUS_TRYAGAIN)
--                {
--                  *herrnop = NETDB_INTERNAL;
--                  *errnop = errno;
--                }
--              return retval;
--            }
-+	    {
-+	      enum nss_status retval = niserr2nss (result->status);
-+	      if (retval == NSS_STATUS_TRYAGAIN)
-+		{
-+		  *herrnop = NETDB_INTERNAL;
-+		  *errnop = errno;
-+		}
-+	      return retval;
-+	    }
- 
- 	}
-       else
-@@ -308,18 +308,18 @@ internal_nisplus_gethostent_r (struct hostent *host, char *buffer,
- 	      return NSS_STATUS_TRYAGAIN;
- 	    }
- 	  if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
--            {
--              enum nss_status retval= niserr2nss (result->status);
-+	    {
-+	      enum nss_status retval= niserr2nss (result->status);
- 
- 	      nis_freeresult (result);
- 	      result = saved_res;
--              if (retval == NSS_STATUS_TRYAGAIN)
--                {
--                  *herrnop = NETDB_INTERNAL;
-+	      if (retval == NSS_STATUS_TRYAGAIN)
-+		{
-+		  *herrnop = NETDB_INTERNAL;
- 		  *errnop = errno;
--                }
--              return retval;
--            }
-+		}
-+	      return retval;
-+	    }
- 	}
- 
-       if (_res.options & RES_USE_INET6)
-@@ -330,13 +330,13 @@ internal_nisplus_gethostent_r (struct hostent *host, char *buffer,
- 						buflen, errnop, 0);
- 
-       if (parse_res == -1)
--        {
-+	{
- 	  nis_freeresult (result);
- 	  result = saved_res;
--          *herrnop = NETDB_INTERNAL;
-+	  *herrnop = NETDB_INTERNAL;
- 	  *errnop = ERANGE;
--          return NSS_STATUS_TRYAGAIN;
--        }
-+	  return NSS_STATUS_TRYAGAIN;
-+	}
-       if (saved_res != NULL)
- 	nis_freeresult (saved_res);
- 
-@@ -435,6 +435,7 @@ internal_gethostbyname2_r (const char *name, int af, struct hostent *host,
-   if (result == NULL)
-     {
-       *errnop = ENOMEM;
-+      *herrnop = NETDB_INTERNAL;
-       return NSS_STATUS_TRYAGAIN;
-     }
- 
-@@ -444,10 +445,13 @@ internal_gethostbyname2_r (const char *name, int af, struct hostent *host,
-       if (retval == NSS_STATUS_TRYAGAIN)
- 	{
- 	  *errnop = errno;
--	  *herrnop = NETDB_INTERNAL;
-+	  *herrnop = TRY_AGAIN;
- 	}
-       else
--	__set_errno (olderr);
-+	{
-+	  __set_errno (olderr);
-+	  *herrnop = NETDB_INTERNAL;
-+	}
-       nis_freeresult (result);
-       return retval;
-     }
-@@ -502,7 +506,7 @@ _nss_nisplus_gethostbyname_r (const char *name, struct hostent *host,
- 					  buflen, errnop, h_errnop,
- 					  AI_V4MAPPED);
-       if (status == NSS_STATUS_SUCCESS)
--        return status;
-+	return status;
-     }
- 
-   return internal_gethostbyname2_r (name, AF_INET, host, buffer,
---- a/nss/nss_files/files-hosts.c
-+++ b/nss/nss_files/files-hosts.c
-@@ -423,6 +423,11 @@ _nss_files_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
-       if (! keep_stream)
- 	internal_endent ();
-     }
-+  else if (status == NSS_STATUS_TRYAGAIN)
-+    {
-+      *errnop = errno;
-+      *herrnop = TRY_AGAIN;
-+    }
-   else
-     {
-       *errnop = errno;
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -719,13 +719,8 @@ gaih_inet (const char *name, const struct gaih_service *service,
- 		      if (status != NSS_STATUS_TRYAGAIN
- 			  || rc != ERANGE || herrno != NETDB_INTERNAL)
- 			{
--			  if (herrno == NETDB_INTERNAL)
--			    {
--			      __set_h_errno (herrno);
--			      _res.options = old_res_options;
--			      return -EAI_SYSTEM;
--			    }
--			  if (herrno == TRY_AGAIN)
-+			  if (status == NSS_STATUS_TRYAGAIN
-+			      && herrno == TRY_AGAIN)
- 			    no_data = EAI_AGAIN;
- 			  else
- 			    no_data = herrno == NO_DATA;

Deleted: glibc-package/trunk/debian/patches/any/cvs-nptl-init.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-nptl-init.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-nptl-init.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,944 +0,0 @@
-2009-05-16  Ulrich Drepper  <drepper@redhat.com>
-
-	[BZ #9924]
-	* nptl-init.c: Renamed from init.c.
-	* Makefile: Change all occurences of init.c to nptl-init.c.
-
----
- nptl/Makefile    |    6 
- nptl/init.c      |  452 -------------------------------------------------------
- nptl/nptl-init.c |  452 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 455 insertions(+), 455 deletions(-)
-
---- a/nptl/Makefile
-+++ b/nptl/Makefile
-@@ -33,7 +33,7 @@
- routines = alloca_cutoff forward libc-lowlevellock libc-cancellation
- shared-only-routines = forward
- 
--libpthread-routines = init vars events version \
-+libpthread-routines = nptl-init vars events version \
- 		      pthread_create pthread_exit pthread_detach \
- 		      pthread_join pthread_tryjoin pthread_timedjoin \
- 		      pthread_self pthread_equal pthread_yield \
-@@ -143,8 +143,8 @@
- # we have to compile some files with exception handling enabled, some
- # even with asynchronous unwind tables.
- 
--# init.c contains sigcancel_handler().
--CFLAGS-init.c = -fexceptions -fasynchronous-unwind-tables
-+# nptl-init.c contains sigcancel_handler().
-+CFLAGS-nptl-init.c = -fexceptions -fasynchronous-unwind-tables
- # The unwind code itself,
- CFLAGS-unwind.c = -fexceptions
- CFLAGS-unwind-forcedunwind.c = -fexceptions -fasynchronous-unwind-tables
---- a/nptl/init.c
-+++ /dev/null
-@@ -1,452 +0,0 @@
--/* Copyright (C) 2002-2007, 2008, 2009 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
--
--   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 <assert.h>
--#include <errno.h>
--#include <limits.h>
--#include <signal.h>
--#include <stdlib.h>
--#include <unistd.h>
--#include <sys/param.h>
--#include <sys/resource.h>
--#include <pthreadP.h>
--#include <atomic.h>
--#include <ldsodefs.h>
--#include <tls.h>
--#include <fork.h>
--#include <version.h>
--#include <shlib-compat.h>
--#include <smp.h>
--#include <lowlevellock.h>
--#include <kernel-features.h>
--
--
--/* Size and alignment of static TLS block.  */
--size_t __static_tls_size;
--size_t __static_tls_align_m1;
--
--#ifndef __ASSUME_SET_ROBUST_LIST
--/* Negative if we do not have the system call and we can use it.  */
--int __set_robust_list_avail;
--# define set_robust_list_not_avail() \
--  __set_robust_list_avail = -1
--#else
--# define set_robust_list_not_avail() do { } while (0)
--#endif
--
--#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
--/* Nonzero if we do not have FUTEX_CLOCK_REALTIME.  */
--int __have_futex_clock_realtime;
--# define __set_futex_clock_realtime() \
--  __have_futex_clock_realtime = 1
--#else
--#define __set_futex_clock_realtime() do { } while (0)
--#endif
--
--/* Version of the library, used in libthread_db to detect mismatches.  */
--static const char nptl_version[] __attribute_used__ = VERSION;
--
--
--#ifndef SHARED
--extern void __libc_setup_tls (size_t tcbsize, size_t tcbalign);
--#endif
--
--#ifdef SHARED
--static void nptl_freeres (void);
--
--
--static const struct pthread_functions pthread_functions =
--  {
--    .ptr_pthread_attr_destroy = __pthread_attr_destroy,
--# if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
--    .ptr___pthread_attr_init_2_0 = __pthread_attr_init_2_0,
--# endif
--    .ptr___pthread_attr_init_2_1 = __pthread_attr_init_2_1,
--    .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate,
--    .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate,
--    .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched,
--    .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched,
--    .ptr_pthread_attr_getschedparam = __pthread_attr_getschedparam,
--    .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
--    .ptr_pthread_attr_getschedpolicy = __pthread_attr_getschedpolicy,
--    .ptr_pthread_attr_setschedpolicy = __pthread_attr_setschedpolicy,
--    .ptr_pthread_attr_getscope = __pthread_attr_getscope,
--    .ptr_pthread_attr_setscope = __pthread_attr_setscope,
--    .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
--    .ptr_pthread_condattr_init = __pthread_condattr_init,
--    .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
--    .ptr___pthread_cond_destroy = __pthread_cond_destroy,
--    .ptr___pthread_cond_init = __pthread_cond_init,
--    .ptr___pthread_cond_signal = __pthread_cond_signal,
--    .ptr___pthread_cond_wait = __pthread_cond_wait,
--    .ptr___pthread_cond_timedwait = __pthread_cond_timedwait,
--# if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
--    .ptr___pthread_cond_broadcast_2_0 = __pthread_cond_broadcast_2_0,
--    .ptr___pthread_cond_destroy_2_0 = __pthread_cond_destroy_2_0,
--    .ptr___pthread_cond_init_2_0 = __pthread_cond_init_2_0,
--    .ptr___pthread_cond_signal_2_0 = __pthread_cond_signal_2_0,
--    .ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0,
--    .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
--# endif
--    .ptr_pthread_equal = __pthread_equal,
--    .ptr___pthread_exit = __pthread_exit,
--    .ptr_pthread_getschedparam = __pthread_getschedparam,
--    .ptr_pthread_setschedparam = __pthread_setschedparam,
--    .ptr_pthread_mutex_destroy = INTUSE(__pthread_mutex_destroy),
--    .ptr_pthread_mutex_init = INTUSE(__pthread_mutex_init),
--    .ptr_pthread_mutex_lock = INTUSE(__pthread_mutex_lock),
--    .ptr_pthread_mutex_unlock = INTUSE(__pthread_mutex_unlock),
--    .ptr_pthread_self = __pthread_self,
--    .ptr_pthread_setcancelstate = __pthread_setcancelstate,
--    .ptr_pthread_setcanceltype = __pthread_setcanceltype,
--    .ptr___pthread_cleanup_upto = __pthread_cleanup_upto,
--    .ptr___pthread_once = __pthread_once_internal,
--    .ptr___pthread_rwlock_rdlock = __pthread_rwlock_rdlock_internal,
--    .ptr___pthread_rwlock_wrlock = __pthread_rwlock_wrlock_internal,
--    .ptr___pthread_rwlock_unlock = __pthread_rwlock_unlock_internal,
--    .ptr___pthread_key_create = __pthread_key_create_internal,
--    .ptr___pthread_getspecific = __pthread_getspecific_internal,
--    .ptr___pthread_setspecific = __pthread_setspecific_internal,
--    .ptr__pthread_cleanup_push_defer = __pthread_cleanup_push_defer,
--    .ptr__pthread_cleanup_pop_restore = __pthread_cleanup_pop_restore,
--    .ptr_nthreads = &__nptl_nthreads,
--    .ptr___pthread_unwind = &__pthread_unwind,
--    .ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd,
--    .ptr__nptl_setxid = __nptl_setxid,
--    /* For now only the stack cache needs to be freed.  */
--    .ptr_freeres = nptl_freeres
--  };
--# define ptr_pthread_functions &pthread_functions
--#else
--# define ptr_pthread_functions NULL
--#endif
--
--
--#ifdef SHARED
--/* This function is called indirectly from the freeres code in libc.  */
--static void
--__libc_freeres_fn_section
--nptl_freeres (void)
--{
--  __unwind_freeres ();
--  __free_stacks (0);
--}
--#endif
--
--
--/* For asynchronous cancellation we use a signal.  This is the handler.  */
--static void
--sigcancel_handler (int sig, siginfo_t *si, void *ctx)
--{
--#ifdef __ASSUME_CORRECT_SI_PID
--  /* Determine the process ID.  It might be negative if the thread is
--     in the middle of a fork() call.  */
--  pid_t pid = THREAD_GETMEM (THREAD_SELF, pid);
--  if (__builtin_expect (pid < 0, 0))
--    pid = -pid;
--#endif
--
--  /* Safety check.  It would be possible to call this function for
--     other signals and send a signal from another process.  This is not
--     correct and might even be a security problem.  Try to catch as
--     many incorrect invocations as possible.  */
--  if (sig != SIGCANCEL
--#ifdef __ASSUME_CORRECT_SI_PID
--      /* Kernels before 2.5.75 stored the thread ID and not the process
--	 ID in si_pid so we skip this test.  */
--      || si->si_pid != pid
--#endif
--      || si->si_code != SI_TKILL)
--    return;
--
--  struct pthread *self = THREAD_SELF;
--
--  int oldval = THREAD_GETMEM (self, cancelhandling);
--  while (1)
--    {
--      /* We are canceled now.  When canceled by another thread this flag
--	 is already set but if the signal is directly send (internally or
--	 from another process) is has to be done here.  */
--      int newval = oldval | CANCELING_BITMASK | CANCELED_BITMASK;
--
--      if (oldval == newval || (oldval & EXITING_BITMASK) != 0)
--	/* Already canceled or exiting.  */
--	break;
--
--      int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling, newval,
--					      oldval);
--      if (curval == oldval)
--	{
--	  /* Set the return value.  */
--	  THREAD_SETMEM (self, result, PTHREAD_CANCELED);
--
--	  /* Make sure asynchronous cancellation is still enabled.  */
--	  if ((newval & CANCELTYPE_BITMASK) != 0)
--	    /* Run the registered destructors and terminate the thread.  */
--	    __do_cancel ();
--
--	  break;
--	}
--
--      oldval = curval;
--    }
--}
--
--
--struct xid_command *__xidcmd attribute_hidden;
--
--/* For asynchronous cancellation we use a signal.  This is the handler.  */
--static void
--sighandler_setxid (int sig, siginfo_t *si, void *ctx)
--{
--#ifdef __ASSUME_CORRECT_SI_PID
--  /* Determine the process ID.  It might be negative if the thread is
--     in the middle of a fork() call.  */
--  pid_t pid = THREAD_GETMEM (THREAD_SELF, pid);
--  if (__builtin_expect (pid < 0, 0))
--    pid = -pid;
--#endif
--
--  /* Safety check.  It would be possible to call this function for
--     other signals and send a signal from another process.  This is not
--     correct and might even be a security problem.  Try to catch as
--     many incorrect invocations as possible.  */
--  if (sig != SIGSETXID
--#ifdef __ASSUME_CORRECT_SI_PID
--      /* Kernels before 2.5.75 stored the thread ID and not the process
--	 ID in si_pid so we skip this test.  */
--      || si->si_pid != pid
--#endif
--      || si->si_code != SI_TKILL)
--    return;
--
--  INTERNAL_SYSCALL_DECL (err);
--  INTERNAL_SYSCALL_NCS (__xidcmd->syscall_no, err, 3, __xidcmd->id[0],
--			__xidcmd->id[1], __xidcmd->id[2]);
--
--  /* Reset the SETXID flag.  */
--  struct pthread *self = THREAD_SELF;
--  int flags, newval;
--  do
--    {
--      flags = THREAD_GETMEM (self, cancelhandling);
--      newval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling,
--					  flags & ~SETXID_BITMASK, flags);
--    }
--  while (flags != newval);
--
--  /* And release the futex.  */
--  self->setxid_futex = 1;
--  lll_futex_wake (&self->setxid_futex, 1, LLL_PRIVATE);
--
--  if (atomic_decrement_val (&__xidcmd->cntr) == 0)
--    lll_futex_wake (&__xidcmd->cntr, 1, LLL_PRIVATE);
--}
--
--
--/* When using __thread for this, we do it in libc so as not
--   to give libpthread its own TLS segment just for this.  */
--extern void **__libc_dl_error_tsd (void) __attribute__ ((const));
--
--
--/* This can be set by the debugger before initialization is complete.  */
--static bool __nptl_initial_report_events __attribute_used__;
--
--void
--__pthread_initialize_minimal_internal (void)
--{
--#ifndef SHARED
--  /* Unlike in the dynamically linked case the dynamic linker has not
--     taken care of initializing the TLS data structures.  */
--  __libc_setup_tls (TLS_TCB_SIZE, TLS_TCB_ALIGN);
--
--  /* We must prevent gcc from being clever and move any of the
--     following code ahead of the __libc_setup_tls call.  This function
--     will initialize the thread register which is subsequently
--     used.  */
--  __asm __volatile ("");
--#endif
--
--  /* Minimal initialization of the thread descriptor.  */
--  struct pthread *pd = THREAD_SELF;
--  INTERNAL_SYSCALL_DECL (err);
--  pd->pid = pd->tid = INTERNAL_SYSCALL (set_tid_address, err, 1, &pd->tid);
--  THREAD_SETMEM (pd, specific[0], &pd->specific_1stblock[0]);
--  THREAD_SETMEM (pd, user_stack, true);
--  if (LLL_LOCK_INITIALIZER != 0)
--    THREAD_SETMEM (pd, lock, LLL_LOCK_INITIALIZER);
--#if HP_TIMING_AVAIL
--  THREAD_SETMEM (pd, cpuclock_offset, GL(dl_cpuclock_offset));
--#endif
--
--  /* Initialize the robust mutex data.  */
--#ifdef __PTHREAD_MUTEX_HAVE_PREV
--  pd->robust_prev = &pd->robust_head;
--#endif
--  pd->robust_head.list = &pd->robust_head;
--#ifdef __NR_set_robust_list
--  pd->robust_head.futex_offset = (offsetof (pthread_mutex_t, __data.__lock)
--				  - offsetof (pthread_mutex_t,
--					      __data.__list.__next));
--  int res = INTERNAL_SYSCALL (set_robust_list, err, 2, &pd->robust_head,
--			      sizeof (struct robust_list_head));
--  if (INTERNAL_SYSCALL_ERROR_P (res, err))
--#endif
--    set_robust_list_not_avail ();
--
--#ifndef __ASSUME_PRIVATE_FUTEX
--  /* Private futexes are always used (at least internally) so that
--     doing the test once this early is beneficial.  */
--  {
--    int word = 0;
--    word = INTERNAL_SYSCALL (futex, err, 3, &word,
--			    FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1);
--    if (!INTERNAL_SYSCALL_ERROR_P (word, err))
--      THREAD_SETMEM (pd, header.private_futex, FUTEX_PRIVATE_FLAG);
--  }
--
--  /* Private futexes have been introduced earlier than the
--     FUTEX_CLOCK_REALTIME flag.  We don't have to run the test if we
--     know the former are not supported.  This also means we know the
--     kernel will return ENOSYS for unknown operations.  */
--  if (THREAD_GETMEM (pd, header.private_futex) != 0)
--#endif
--#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
--    {
--      int word = 0;
--      /* NB: the syscall actually takes six parameters.  The last is the
--	 bit mask.  But since we will not actually wait at all the value
--	 is irrelevant.  Given that passing six parameters is difficult
--	 on some architectures we just pass whatever random value the
--	 calling convention calls for to the kernel.  It causes no harm.  */
--      word = INTERNAL_SYSCALL (futex, err, 5, &word,
--			       FUTEX_WAIT_BITSET | FUTEX_CLOCK_REALTIME
--			       | FUTEX_PRIVATE_FLAG, 1, NULL, 0);
--      assert (INTERNAL_SYSCALL_ERROR_P (word, err));
--      if (INTERNAL_SYSCALL_ERRNO (word, err) != ENOSYS)
--	__set_futex_clock_realtime ();
--    }
--#endif
--
--  /* Set initial thread's stack block from 0 up to __libc_stack_end.
--     It will be bigger than it actually is, but for unwind.c/pt-longjmp.c
--     purposes this is good enough.  */
--  THREAD_SETMEM (pd, stackblock_size, (size_t) __libc_stack_end);
--
--  /* Initialize the list of all running threads with the main thread.  */
--  INIT_LIST_HEAD (&__stack_user);
--  list_add (&pd->list, &__stack_user);
--
--  /* Before initializing __stack_user, the debugger could not find us and
--     had to set __nptl_initial_report_events.  Propagate its setting.  */
--  THREAD_SETMEM (pd, report_events, __nptl_initial_report_events);
--
--  /* Install the cancellation signal handler.  If for some reason we
--     cannot install the handler we do not abort.  Maybe we should, but
--     it is only asynchronous cancellation which is affected.  */
--  struct sigaction sa;
--  sa.sa_sigaction = sigcancel_handler;
--  sa.sa_flags = SA_SIGINFO;
--  __sigemptyset (&sa.sa_mask);
--
--  (void) __libc_sigaction (SIGCANCEL, &sa, NULL);
--
--  /* Install the handle to change the threads' uid/gid.  */
--  sa.sa_sigaction = sighandler_setxid;
--  sa.sa_flags = SA_SIGINFO | SA_RESTART;
--
--  (void) __libc_sigaction (SIGSETXID, &sa, NULL);
--
--  /* The parent process might have left the signals blocked.  Just in
--     case, unblock it.  We reuse the signal mask in the sigaction
--     structure.  It is already cleared.  */
--  __sigaddset (&sa.sa_mask, SIGCANCEL);
--  __sigaddset (&sa.sa_mask, SIGSETXID);
--  (void) INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_UNBLOCK, &sa.sa_mask,
--			   NULL, _NSIG / 8);
--
--  /* Get the size of the static and alignment requirements for the TLS
--     block.  */
--  size_t static_tls_align;
--  _dl_get_tls_static_info (&__static_tls_size, &static_tls_align);
--
--  /* Make sure the size takes all the alignments into account.  */
--  if (STACK_ALIGN > static_tls_align)
--    static_tls_align = STACK_ALIGN;
--  __static_tls_align_m1 = static_tls_align - 1;
--
--  __static_tls_size = roundup (__static_tls_size, static_tls_align);
--
--  /* Determine the default allowed stack size.  This is the size used
--     in case the user does not specify one.  */
--  struct rlimit limit;
--  if (getrlimit (RLIMIT_STACK, &limit) != 0
--      || limit.rlim_cur == RLIM_INFINITY)
--    /* The system limit is not usable.  Use an architecture-specific
--       default.  */
--    limit.rlim_cur = ARCH_STACK_DEFAULT_SIZE;
--  else if (limit.rlim_cur < PTHREAD_STACK_MIN)
--    /* The system limit is unusably small.
--       Use the minimal size acceptable.  */
--    limit.rlim_cur = PTHREAD_STACK_MIN;
--
--  /* Make sure it meets the minimum size that allocate_stack
--     (allocatestack.c) will demand, which depends on the page size.  */
--  const uintptr_t pagesz = __sysconf (_SC_PAGESIZE);
--  const size_t minstack = pagesz + __static_tls_size + MINIMAL_REST_STACK;
--  if (limit.rlim_cur < minstack)
--    limit.rlim_cur = minstack;
--
--  /* Round the resource limit up to page size.  */
--  limit.rlim_cur = (limit.rlim_cur + pagesz - 1) & -pagesz;
--  __default_stacksize = limit.rlim_cur;
--
--#ifdef SHARED
--  /* Transfer the old value from the dynamic linker's internal location.  */
--  *__libc_dl_error_tsd () = *(*GL(dl_error_catch_tsd)) ();
--  GL(dl_error_catch_tsd) = &__libc_dl_error_tsd;
--
--  /* Make __rtld_lock_{,un}lock_recursive use pthread_mutex_{,un}lock,
--     keep the lock count from the ld.so implementation.  */
--  GL(dl_rtld_lock_recursive) = (void *) INTUSE (__pthread_mutex_lock);
--  GL(dl_rtld_unlock_recursive) = (void *) INTUSE (__pthread_mutex_unlock);
--  unsigned int rtld_lock_count = GL(dl_load_lock).mutex.__data.__count;
--  GL(dl_load_lock).mutex.__data.__count = 0;
--  while (rtld_lock_count-- > 0)
--    INTUSE (__pthread_mutex_lock) (&GL(dl_load_lock).mutex);
--
--  GL(dl_make_stack_executable_hook) = &__make_stacks_executable;
--#endif
--
--  GL(dl_init_static_tls) = &__pthread_init_static_tls;
--
--  GL(dl_wait_lookup_done) = &__wait_lookup_done;
--
--  /* Register the fork generation counter with the libc.  */
--#ifndef TLS_MULTIPLE_THREADS_IN_TCB
--  __libc_multiple_threads_ptr =
--#endif
--    __libc_pthread_init (&__fork_generation, __reclaim_stacks,
--			 ptr_pthread_functions);
--
--  /* Determine whether the machine is SMP or not.  */
--  __is_smp = is_smp_system ();
--}
--strong_alias (__pthread_initialize_minimal_internal,
--	      __pthread_initialize_minimal)
---- /dev/null
-+++ b/nptl/nptl-init.c
-@@ -0,0 +1,452 @@
-+/* Copyright (C) 2002-2007, 2008, 2009 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-+
-+   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 <assert.h>
-+#include <errno.h>
-+#include <limits.h>
-+#include <signal.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/param.h>
-+#include <sys/resource.h>
-+#include <pthreadP.h>
-+#include <atomic.h>
-+#include <ldsodefs.h>
-+#include <tls.h>
-+#include <fork.h>
-+#include <version.h>
-+#include <shlib-compat.h>
-+#include <smp.h>
-+#include <lowlevellock.h>
-+#include <kernel-features.h>
-+
-+
-+/* Size and alignment of static TLS block.  */
-+size_t __static_tls_size;
-+size_t __static_tls_align_m1;
-+
-+#ifndef __ASSUME_SET_ROBUST_LIST
-+/* Negative if we do not have the system call and we can use it.  */
-+int __set_robust_list_avail;
-+# define set_robust_list_not_avail() \
-+  __set_robust_list_avail = -1
-+#else
-+# define set_robust_list_not_avail() do { } while (0)
-+#endif
-+
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
-+/* Nonzero if we do not have FUTEX_CLOCK_REALTIME.  */
-+int __have_futex_clock_realtime;
-+# define __set_futex_clock_realtime() \
-+  __have_futex_clock_realtime = 1
-+#else
-+#define __set_futex_clock_realtime() do { } while (0)
-+#endif
-+
-+/* Version of the library, used in libthread_db to detect mismatches.  */
-+static const char nptl_version[] __attribute_used__ = VERSION;
-+
-+
-+#ifndef SHARED
-+extern void __libc_setup_tls (size_t tcbsize, size_t tcbalign);
-+#endif
-+
-+#ifdef SHARED
-+static void nptl_freeres (void);
-+
-+
-+static const struct pthread_functions pthread_functions =
-+  {
-+    .ptr_pthread_attr_destroy = __pthread_attr_destroy,
-+# if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
-+    .ptr___pthread_attr_init_2_0 = __pthread_attr_init_2_0,
-+# endif
-+    .ptr___pthread_attr_init_2_1 = __pthread_attr_init_2_1,
-+    .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate,
-+    .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate,
-+    .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched,
-+    .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched,
-+    .ptr_pthread_attr_getschedparam = __pthread_attr_getschedparam,
-+    .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam,
-+    .ptr_pthread_attr_getschedpolicy = __pthread_attr_getschedpolicy,
-+    .ptr_pthread_attr_setschedpolicy = __pthread_attr_setschedpolicy,
-+    .ptr_pthread_attr_getscope = __pthread_attr_getscope,
-+    .ptr_pthread_attr_setscope = __pthread_attr_setscope,
-+    .ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
-+    .ptr_pthread_condattr_init = __pthread_condattr_init,
-+    .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
-+    .ptr___pthread_cond_destroy = __pthread_cond_destroy,
-+    .ptr___pthread_cond_init = __pthread_cond_init,
-+    .ptr___pthread_cond_signal = __pthread_cond_signal,
-+    .ptr___pthread_cond_wait = __pthread_cond_wait,
-+    .ptr___pthread_cond_timedwait = __pthread_cond_timedwait,
-+# if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
-+    .ptr___pthread_cond_broadcast_2_0 = __pthread_cond_broadcast_2_0,
-+    .ptr___pthread_cond_destroy_2_0 = __pthread_cond_destroy_2_0,
-+    .ptr___pthread_cond_init_2_0 = __pthread_cond_init_2_0,
-+    .ptr___pthread_cond_signal_2_0 = __pthread_cond_signal_2_0,
-+    .ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0,
-+    .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
-+# endif
-+    .ptr_pthread_equal = __pthread_equal,
-+    .ptr___pthread_exit = __pthread_exit,
-+    .ptr_pthread_getschedparam = __pthread_getschedparam,
-+    .ptr_pthread_setschedparam = __pthread_setschedparam,
-+    .ptr_pthread_mutex_destroy = INTUSE(__pthread_mutex_destroy),
-+    .ptr_pthread_mutex_init = INTUSE(__pthread_mutex_init),
-+    .ptr_pthread_mutex_lock = INTUSE(__pthread_mutex_lock),
-+    .ptr_pthread_mutex_unlock = INTUSE(__pthread_mutex_unlock),
-+    .ptr_pthread_self = __pthread_self,
-+    .ptr_pthread_setcancelstate = __pthread_setcancelstate,
-+    .ptr_pthread_setcanceltype = __pthread_setcanceltype,
-+    .ptr___pthread_cleanup_upto = __pthread_cleanup_upto,
-+    .ptr___pthread_once = __pthread_once_internal,
-+    .ptr___pthread_rwlock_rdlock = __pthread_rwlock_rdlock_internal,
-+    .ptr___pthread_rwlock_wrlock = __pthread_rwlock_wrlock_internal,
-+    .ptr___pthread_rwlock_unlock = __pthread_rwlock_unlock_internal,
-+    .ptr___pthread_key_create = __pthread_key_create_internal,
-+    .ptr___pthread_getspecific = __pthread_getspecific_internal,
-+    .ptr___pthread_setspecific = __pthread_setspecific_internal,
-+    .ptr__pthread_cleanup_push_defer = __pthread_cleanup_push_defer,
-+    .ptr__pthread_cleanup_pop_restore = __pthread_cleanup_pop_restore,
-+    .ptr_nthreads = &__nptl_nthreads,
-+    .ptr___pthread_unwind = &__pthread_unwind,
-+    .ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd,
-+    .ptr__nptl_setxid = __nptl_setxid,
-+    /* For now only the stack cache needs to be freed.  */
-+    .ptr_freeres = nptl_freeres
-+  };
-+# define ptr_pthread_functions &pthread_functions
-+#else
-+# define ptr_pthread_functions NULL
-+#endif
-+
-+
-+#ifdef SHARED
-+/* This function is called indirectly from the freeres code in libc.  */
-+static void
-+__libc_freeres_fn_section
-+nptl_freeres (void)
-+{
-+  __unwind_freeres ();
-+  __free_stacks (0);
-+}
-+#endif
-+
-+
-+/* For asynchronous cancellation we use a signal.  This is the handler.  */
-+static void
-+sigcancel_handler (int sig, siginfo_t *si, void *ctx)
-+{
-+#ifdef __ASSUME_CORRECT_SI_PID
-+  /* Determine the process ID.  It might be negative if the thread is
-+     in the middle of a fork() call.  */
-+  pid_t pid = THREAD_GETMEM (THREAD_SELF, pid);
-+  if (__builtin_expect (pid < 0, 0))
-+    pid = -pid;
-+#endif
-+
-+  /* Safety check.  It would be possible to call this function for
-+     other signals and send a signal from another process.  This is not
-+     correct and might even be a security problem.  Try to catch as
-+     many incorrect invocations as possible.  */
-+  if (sig != SIGCANCEL
-+#ifdef __ASSUME_CORRECT_SI_PID
-+      /* Kernels before 2.5.75 stored the thread ID and not the process
-+	 ID in si_pid so we skip this test.  */
-+      || si->si_pid != pid
-+#endif
-+      || si->si_code != SI_TKILL)
-+    return;
-+
-+  struct pthread *self = THREAD_SELF;
-+
-+  int oldval = THREAD_GETMEM (self, cancelhandling);
-+  while (1)
-+    {
-+      /* We are canceled now.  When canceled by another thread this flag
-+	 is already set but if the signal is directly send (internally or
-+	 from another process) is has to be done here.  */
-+      int newval = oldval | CANCELING_BITMASK | CANCELED_BITMASK;
-+
-+      if (oldval == newval || (oldval & EXITING_BITMASK) != 0)
-+	/* Already canceled or exiting.  */
-+	break;
-+
-+      int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling, newval,
-+					      oldval);
-+      if (curval == oldval)
-+	{
-+	  /* Set the return value.  */
-+	  THREAD_SETMEM (self, result, PTHREAD_CANCELED);
-+
-+	  /* Make sure asynchronous cancellation is still enabled.  */
-+	  if ((newval & CANCELTYPE_BITMASK) != 0)
-+	    /* Run the registered destructors and terminate the thread.  */
-+	    __do_cancel ();
-+
-+	  break;
-+	}
-+
-+      oldval = curval;
-+    }
-+}
-+
-+
-+struct xid_command *__xidcmd attribute_hidden;
-+
-+/* For asynchronous cancellation we use a signal.  This is the handler.  */
-+static void
-+sighandler_setxid (int sig, siginfo_t *si, void *ctx)
-+{
-+#ifdef __ASSUME_CORRECT_SI_PID
-+  /* Determine the process ID.  It might be negative if the thread is
-+     in the middle of a fork() call.  */
-+  pid_t pid = THREAD_GETMEM (THREAD_SELF, pid);
-+  if (__builtin_expect (pid < 0, 0))
-+    pid = -pid;
-+#endif
-+
-+  /* Safety check.  It would be possible to call this function for
-+     other signals and send a signal from another process.  This is not
-+     correct and might even be a security problem.  Try to catch as
-+     many incorrect invocations as possible.  */
-+  if (sig != SIGSETXID
-+#ifdef __ASSUME_CORRECT_SI_PID
-+      /* Kernels before 2.5.75 stored the thread ID and not the process
-+	 ID in si_pid so we skip this test.  */
-+      || si->si_pid != pid
-+#endif
-+      || si->si_code != SI_TKILL)
-+    return;
-+
-+  INTERNAL_SYSCALL_DECL (err);
-+  INTERNAL_SYSCALL_NCS (__xidcmd->syscall_no, err, 3, __xidcmd->id[0],
-+			__xidcmd->id[1], __xidcmd->id[2]);
-+
-+  /* Reset the SETXID flag.  */
-+  struct pthread *self = THREAD_SELF;
-+  int flags, newval;
-+  do
-+    {
-+      flags = THREAD_GETMEM (self, cancelhandling);
-+      newval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling,
-+					  flags & ~SETXID_BITMASK, flags);
-+    }
-+  while (flags != newval);
-+
-+  /* And release the futex.  */
-+  self->setxid_futex = 1;
-+  lll_futex_wake (&self->setxid_futex, 1, LLL_PRIVATE);
-+
-+  if (atomic_decrement_val (&__xidcmd->cntr) == 0)
-+    lll_futex_wake (&__xidcmd->cntr, 1, LLL_PRIVATE);
-+}
-+
-+
-+/* When using __thread for this, we do it in libc so as not
-+   to give libpthread its own TLS segment just for this.  */
-+extern void **__libc_dl_error_tsd (void) __attribute__ ((const));
-+
-+
-+/* This can be set by the debugger before initialization is complete.  */
-+static bool __nptl_initial_report_events __attribute_used__;
-+
-+void
-+__pthread_initialize_minimal_internal (void)
-+{
-+#ifndef SHARED
-+  /* Unlike in the dynamically linked case the dynamic linker has not
-+     taken care of initializing the TLS data structures.  */
-+  __libc_setup_tls (TLS_TCB_SIZE, TLS_TCB_ALIGN);
-+
-+  /* We must prevent gcc from being clever and move any of the
-+     following code ahead of the __libc_setup_tls call.  This function
-+     will initialize the thread register which is subsequently
-+     used.  */
-+  __asm __volatile ("");
-+#endif
-+
-+  /* Minimal initialization of the thread descriptor.  */
-+  struct pthread *pd = THREAD_SELF;
-+  INTERNAL_SYSCALL_DECL (err);
-+  pd->pid = pd->tid = INTERNAL_SYSCALL (set_tid_address, err, 1, &pd->tid);
-+  THREAD_SETMEM (pd, specific[0], &pd->specific_1stblock[0]);
-+  THREAD_SETMEM (pd, user_stack, true);
-+  if (LLL_LOCK_INITIALIZER != 0)
-+    THREAD_SETMEM (pd, lock, LLL_LOCK_INITIALIZER);
-+#if HP_TIMING_AVAIL
-+  THREAD_SETMEM (pd, cpuclock_offset, GL(dl_cpuclock_offset));
-+#endif
-+
-+  /* Initialize the robust mutex data.  */
-+#ifdef __PTHREAD_MUTEX_HAVE_PREV
-+  pd->robust_prev = &pd->robust_head;
-+#endif
-+  pd->robust_head.list = &pd->robust_head;
-+#ifdef __NR_set_robust_list
-+  pd->robust_head.futex_offset = (offsetof (pthread_mutex_t, __data.__lock)
-+				  - offsetof (pthread_mutex_t,
-+					      __data.__list.__next));
-+  int res = INTERNAL_SYSCALL (set_robust_list, err, 2, &pd->robust_head,
-+			      sizeof (struct robust_list_head));
-+  if (INTERNAL_SYSCALL_ERROR_P (res, err))
-+#endif
-+    set_robust_list_not_avail ();
-+
-+#ifndef __ASSUME_PRIVATE_FUTEX
-+  /* Private futexes are always used (at least internally) so that
-+     doing the test once this early is beneficial.  */
-+  {
-+    int word = 0;
-+    word = INTERNAL_SYSCALL (futex, err, 3, &word,
-+			    FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1);
-+    if (!INTERNAL_SYSCALL_ERROR_P (word, err))
-+      THREAD_SETMEM (pd, header.private_futex, FUTEX_PRIVATE_FLAG);
-+  }
-+
-+  /* Private futexes have been introduced earlier than the
-+     FUTEX_CLOCK_REALTIME flag.  We don't have to run the test if we
-+     know the former are not supported.  This also means we know the
-+     kernel will return ENOSYS for unknown operations.  */
-+  if (THREAD_GETMEM (pd, header.private_futex) != 0)
-+#endif
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
-+    {
-+      int word = 0;
-+      /* NB: the syscall actually takes six parameters.  The last is the
-+	 bit mask.  But since we will not actually wait at all the value
-+	 is irrelevant.  Given that passing six parameters is difficult
-+	 on some architectures we just pass whatever random value the
-+	 calling convention calls for to the kernel.  It causes no harm.  */
-+      word = INTERNAL_SYSCALL (futex, err, 5, &word,
-+			       FUTEX_WAIT_BITSET | FUTEX_CLOCK_REALTIME
-+			       | FUTEX_PRIVATE_FLAG, 1, NULL, 0);
-+      assert (INTERNAL_SYSCALL_ERROR_P (word, err));
-+      if (INTERNAL_SYSCALL_ERRNO (word, err) != ENOSYS)
-+	__set_futex_clock_realtime ();
-+    }
-+#endif
-+
-+  /* Set initial thread's stack block from 0 up to __libc_stack_end.
-+     It will be bigger than it actually is, but for unwind.c/pt-longjmp.c
-+     purposes this is good enough.  */
-+  THREAD_SETMEM (pd, stackblock_size, (size_t) __libc_stack_end);
-+
-+  /* Initialize the list of all running threads with the main thread.  */
-+  INIT_LIST_HEAD (&__stack_user);
-+  list_add (&pd->list, &__stack_user);
-+
-+  /* Before initializing __stack_user, the debugger could not find us and
-+     had to set __nptl_initial_report_events.  Propagate its setting.  */
-+  THREAD_SETMEM (pd, report_events, __nptl_initial_report_events);
-+
-+  /* Install the cancellation signal handler.  If for some reason we
-+     cannot install the handler we do not abort.  Maybe we should, but
-+     it is only asynchronous cancellation which is affected.  */
-+  struct sigaction sa;
-+  sa.sa_sigaction = sigcancel_handler;
-+  sa.sa_flags = SA_SIGINFO;
-+  __sigemptyset (&sa.sa_mask);
-+
-+  (void) __libc_sigaction (SIGCANCEL, &sa, NULL);
-+
-+  /* Install the handle to change the threads' uid/gid.  */
-+  sa.sa_sigaction = sighandler_setxid;
-+  sa.sa_flags = SA_SIGINFO | SA_RESTART;
-+
-+  (void) __libc_sigaction (SIGSETXID, &sa, NULL);
-+
-+  /* The parent process might have left the signals blocked.  Just in
-+     case, unblock it.  We reuse the signal mask in the sigaction
-+     structure.  It is already cleared.  */
-+  __sigaddset (&sa.sa_mask, SIGCANCEL);
-+  __sigaddset (&sa.sa_mask, SIGSETXID);
-+  (void) INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_UNBLOCK, &sa.sa_mask,
-+			   NULL, _NSIG / 8);
-+
-+  /* Get the size of the static and alignment requirements for the TLS
-+     block.  */
-+  size_t static_tls_align;
-+  _dl_get_tls_static_info (&__static_tls_size, &static_tls_align);
-+
-+  /* Make sure the size takes all the alignments into account.  */
-+  if (STACK_ALIGN > static_tls_align)
-+    static_tls_align = STACK_ALIGN;
-+  __static_tls_align_m1 = static_tls_align - 1;
-+
-+  __static_tls_size = roundup (__static_tls_size, static_tls_align);
-+
-+  /* Determine the default allowed stack size.  This is the size used
-+     in case the user does not specify one.  */
-+  struct rlimit limit;
-+  if (getrlimit (RLIMIT_STACK, &limit) != 0
-+      || limit.rlim_cur == RLIM_INFINITY)
-+    /* The system limit is not usable.  Use an architecture-specific
-+       default.  */
-+    limit.rlim_cur = ARCH_STACK_DEFAULT_SIZE;
-+  else if (limit.rlim_cur < PTHREAD_STACK_MIN)
-+    /* The system limit is unusably small.
-+       Use the minimal size acceptable.  */
-+    limit.rlim_cur = PTHREAD_STACK_MIN;
-+
-+  /* Make sure it meets the minimum size that allocate_stack
-+     (allocatestack.c) will demand, which depends on the page size.  */
-+  const uintptr_t pagesz = __sysconf (_SC_PAGESIZE);
-+  const size_t minstack = pagesz + __static_tls_size + MINIMAL_REST_STACK;
-+  if (limit.rlim_cur < minstack)
-+    limit.rlim_cur = minstack;
-+
-+  /* Round the resource limit up to page size.  */
-+  limit.rlim_cur = (limit.rlim_cur + pagesz - 1) & -pagesz;
-+  __default_stacksize = limit.rlim_cur;
-+
-+#ifdef SHARED
-+  /* Transfer the old value from the dynamic linker's internal location.  */
-+  *__libc_dl_error_tsd () = *(*GL(dl_error_catch_tsd)) ();
-+  GL(dl_error_catch_tsd) = &__libc_dl_error_tsd;
-+
-+  /* Make __rtld_lock_{,un}lock_recursive use pthread_mutex_{,un}lock,
-+     keep the lock count from the ld.so implementation.  */
-+  GL(dl_rtld_lock_recursive) = (void *) INTUSE (__pthread_mutex_lock);
-+  GL(dl_rtld_unlock_recursive) = (void *) INTUSE (__pthread_mutex_unlock);
-+  unsigned int rtld_lock_count = GL(dl_load_lock).mutex.__data.__count;
-+  GL(dl_load_lock).mutex.__data.__count = 0;
-+  while (rtld_lock_count-- > 0)
-+    INTUSE (__pthread_mutex_lock) (&GL(dl_load_lock).mutex);
-+
-+  GL(dl_make_stack_executable_hook) = &__make_stacks_executable;
-+#endif
-+
-+  GL(dl_init_static_tls) = &__pthread_init_static_tls;
-+
-+  GL(dl_wait_lookup_done) = &__wait_lookup_done;
-+
-+  /* Register the fork generation counter with the libc.  */
-+#ifndef TLS_MULTIPLE_THREADS_IN_TCB
-+  __libc_multiple_threads_ptr =
-+#endif
-+    __libc_pthread_init (&__fork_generation, __reclaim_stacks,
-+			 ptr_pthread_functions);
-+
-+  /* Determine whether the machine is SMP or not.  */
-+  __is_smp = is_smp_system ();
-+}
-+strong_alias (__pthread_initialize_minimal_internal,
-+	      __pthread_initialize_minimal)

Deleted: glibc-package/trunk/debian/patches/any/cvs-resolv-edns0.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-resolv-edns0.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-resolv-edns0.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,19 +0,0 @@
-2009-07-16  Ulrich Drepper  <drepper@redhat.com>
-
-	[BZ #10360]
-	* resolv/res-mkquery.c (__res_nopt): If anslen is > 0xffff store
-	0xffff in the EDNS0 record.
-
-diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
-index ae0cdb4..2dda4c0 100644
---- a/resolv/res_mkquery.c
-+++ b/resolv/res_mkquery.c
-@@ -244,7 +244,7 @@ __res_nopt(res_state statp,
- 	*cp++ = 0;	/* "." */
- 
- 	NS_PUT16(T_OPT, cp);	/* TYPE */
--	NS_PUT16(anslen & 0xffff, cp);	/* CLASS = UDP payload size */
-+	NS_PUT16(MIN(anslen, 0xffff), cp);	/* CLASS = UDP payload size */
- 	*cp++ = NOERROR;	/* extended RCODE */
- 	*cp++ = 0;		/* EDNS version */
- 	/* XXX Once we support DNSSEC we change the flag value here.  */

Deleted: glibc-package/trunk/debian/patches/any/cvs-resolv-init.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-resolv-init.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-resolv-init.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,101 +0,0 @@
-2009-10-29  Ulrich Drepper  <drepper@redhat.com>
-
-	* resolv/res_send.c (__libc_res_nsend): Fix copying of IPv4 server
-	addresses.  Patch by Petar Bogdanovic <petar@smokva.net>.
-
-diff --git a/resolv/res_send.c b/resolv/res_send.c
-index 4c14db1..fa48bd9 100644
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -219,33 +219,33 @@ res_ourserver_p(const res_state statp, const struct sockaddr_in6 *inp)
- {
- 	int ns;
- 
--        if (inp->sin6_family == AF_INET) {
--            struct sockaddr_in *in4p = (struct sockaddr_in *) inp;
-+	if (inp->sin6_family == AF_INET) {
-+	    struct sockaddr_in *in4p = (struct sockaddr_in *) inp;
- 	    in_port_t port = in4p->sin_port;
- 	    in_addr_t addr = in4p->sin_addr.s_addr;
- 
--            for (ns = 0;  ns < MAXNS;  ns++) {
--                const struct sockaddr_in *srv =
-+	    for (ns = 0;  ns < MAXNS;  ns++) {
-+		const struct sockaddr_in *srv =
- 		    (struct sockaddr_in *)EXT(statp).nsaddrs[ns];
- 
--                if ((srv != NULL) && (srv->sin_family == AF_INET) &&
--                    (srv->sin_port == port) &&
--                    (srv->sin_addr.s_addr == INADDR_ANY ||
--                     srv->sin_addr.s_addr == addr))
--                    return (1);
--            }
--        } else if (inp->sin6_family == AF_INET6) {
--            for (ns = 0;  ns < MAXNS;  ns++) {
--                const struct sockaddr_in6 *srv = EXT(statp).nsaddrs[ns];
--                if ((srv != NULL) && (srv->sin6_family == AF_INET6) &&
--                    (srv->sin6_port == inp->sin6_port) &&
--                    !(memcmp(&srv->sin6_addr, &in6addr_any,
--                             sizeof (struct in6_addr)) &&
--                      memcmp(&srv->sin6_addr, &inp->sin6_addr,
--                             sizeof (struct in6_addr))))
--                    return (1);
--            }
--        }
-+		if ((srv != NULL) && (srv->sin_family == AF_INET) &&
-+		    (srv->sin_port == port) &&
-+		    (srv->sin_addr.s_addr == INADDR_ANY ||
-+		     srv->sin_addr.s_addr == addr))
-+		    return (1);
-+	    }
-+	} else if (inp->sin6_family == AF_INET6) {
-+	    for (ns = 0;  ns < MAXNS;  ns++) {
-+		const struct sockaddr_in6 *srv = EXT(statp).nsaddrs[ns];
-+		if ((srv != NULL) && (srv->sin6_family == AF_INET6) &&
-+		    (srv->sin6_port == inp->sin6_port) &&
-+		    !(memcmp(&srv->sin6_addr, &in6addr_any,
-+			     sizeof (struct in6_addr)) &&
-+		      memcmp(&srv->sin6_addr, &inp->sin6_addr,
-+			     sizeof (struct in6_addr))))
-+		    return (1);
-+	    }
-+	}
- 	return (0);
- }
- 
-@@ -445,7 +445,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
- 				    malloc(sizeof (struct sockaddr_in6));
- 			if (EXT(statp).nsaddrs[n] != NULL) {
- 				memset (mempcpy(EXT(statp).nsaddrs[n],
--						&statp->nsaddr_list[ns],
-+						&statp->nsaddr_list[n],
- 						sizeof (struct sockaddr_in)),
- 					'\0',
- 					sizeof (struct sockaddr_in6)
-@@ -1003,7 +1003,7 @@ send_dg(res_state statp,
- 	int orig_anssizp = *anssizp;
- 	struct timespec now, timeout, finish;
- 	struct pollfd pfd[1];
--        int ptimeout;
-+	int ptimeout;
- 	struct sockaddr_in6 from;
- 	int resplen, n;
- 
-@@ -1050,7 +1050,7 @@ send_dg(res_state statp,
- 		evSubTime(&timeout, &finish, &now);
- 		need_recompute = 0;
- 	}
--        /* Convert struct timespec in milliseconds.  */
-+	/* Convert struct timespec in milliseconds.  */
- 	ptimeout = timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000;
- 
- 	n = 0;
-@@ -1244,7 +1244,7 @@ send_dg(res_state statp,
- 			/* record the error */
- 			statp->_flags |= RES_F_EDNS0ERR;
- 			goto err_out;
--        }
-+	}
- #endif
- 		if (!(statp->options & RES_INSECURE2)
- 		    && (recvresp1 || !res_queriesmatch(buf, buf + buflen,

Deleted: glibc-package/trunk/debian/patches/any/cvs-resolv-uninitialized.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-resolv-uninitialized.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-resolv-uninitialized.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,19 +0,0 @@
-2009-10-29  Ulrich Drepper  <drepper@redhat.com>
- 
-	[BZ #10391]
-	* resolv/res_send.c (send_dg): Initialize resplen.
-
-diff --git a/resolv/res_send.c b/resolv/res_send.c
-index fa48bd9..e2bbfcc 100644
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -1005,7 +1005,8 @@ send_dg(res_state statp,
- 	struct pollfd pfd[1];
- 	int ptimeout;
- 	struct sockaddr_in6 from;
--	int resplen, n;
-+	int resplen = 0;
-+	int n;
- 
- 	/*
- 	 * Compute time for the total operation.

Deleted: glibc-package/trunk/debian/patches/any/cvs-resolv-v6mapped.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-resolv-v6mapped.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-resolv-v6mapped.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,71 +0,0 @@
-2009-11-10  Andreas Schwab  <schwab@redhat.com>
-
-	* resolv/mapv4v6hostent.h (map_v4v6_hostent): Return non-zero if
-	out of buffer space.
-	* resolv/nss_dns/dns-host.c (getanswer_r): Check for
-	map_v4v6_hostent running out of space.
- 
-diff --git a/resolv/mapv4v6hostent.h b/resolv/mapv4v6hostent.h
-index 4151ce3..c11038a 100644
---- a/resolv/mapv4v6hostent.h
-+++ b/resolv/mapv4v6hostent.h
-@@ -57,13 +57,13 @@ typedef union {
-     char ac;
- } align;
- 
--static void
-+static int
- map_v4v6_hostent (struct hostent *hp, char **bpp, int *lenp)
- {
-   char **ap;
- 
-   if (hp->h_addrtype != AF_INET || hp->h_length != INADDRSZ)
--    return;
-+    return 0;
-   hp->h_addrtype = AF_INET6;
-   hp->h_length = IN6ADDRSZ;
-   for (ap = hp->h_addr_list; *ap; ap++)
-@@ -71,11 +71,8 @@ map_v4v6_hostent (struct hostent *hp, char **bpp, int *lenp)
-       int i = sizeof (align) - ((u_long) *bpp % sizeof (align));
- 
-       if (*lenp < (i + IN6ADDRSZ))
--	{
--	  /* Out of memory.  Truncate address list here.  XXX */
--	  *ap = NULL;
--	  return;
--	}
-+	/* Out of memory.  */
-+	return 1;
-       *bpp += i;
-       *lenp -= i;
-       map_v4v6_address (*ap, *bpp);
-@@ -83,4 +80,5 @@ map_v4v6_hostent (struct hostent *hp, char **bpp, int *lenp)
-       *bpp += IN6ADDRSZ;
-       *lenp -= IN6ADDRSZ;
-     }
-+  return 0;
- }
-diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
-index 62e67e8..818a40a 100644
---- a/resolv/nss_dns/dns-host.c
-+++ b/resolv/nss_dns/dns-host.c
-@@ -878,7 +878,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
- 		}
- 	      bp += n;
- 	      linebuflen -= n;
--	      map_v4v6_hostent (result, &bp, &linebuflen);
-+	      if (map_v4v6_hostent (result, &bp, &linebuflen))
-+		goto too_small;
- 	    }
- 	  *h_errnop = NETDB_SUCCESS;
- 	  return NSS_STATUS_SUCCESS;
-@@ -953,7 +954,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
- 	}
- 
-       if (have_to_map)
--	map_v4v6_hostent (result, &bp, &linebuflen);
-+	if (map_v4v6_hostent (result, &bp, &linebuflen))
-+	  goto too_small;
-       *h_errnop = NETDB_SUCCESS;
-       return NSS_STATUS_SUCCESS;
-     }

Deleted: glibc-package/trunk/debian/patches/any/cvs-sched_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-sched_h.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/cvs-sched_h.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,49 +0,0 @@
-2009-11-19  Ulrich Drepper  <drepper@redhat.com>
- 
-	[BZ #10918]
-	* sysdeps/unix/sysv/linux/bits/sched.h (__CPU_ISSET_S): Use __const
-	in cast to not throw away const-ness of parameters.
-	(__CPU_EQUAL_S): Likewise.
-	(__CPU_OP_S): Likewise.
-
---- a/sysdeps/unix/sysv/linux/bits/sched.h
-+++ b/sysdeps/unix/sysv/linux/bits/sched.h
-@@ -1,6 +1,6 @@
- /* Definitions of constants and data structure for POSIX 1003.1b-1993
-    scheduling interface.
--   Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008
-+   Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008,2009
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-@@ -154,7 +154,7 @@ typedef struct
-   (__extension__							      \
-    ({ size_t __cpu = (cpu);						      \
-       __cpu < 8 * (setsize)						      \
--      ? ((((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]	      \
-+      ? ((((__const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]      \
- 	  & __CPUMASK (__cpu))) != 0					      \
-       : 0; }))
- 
-@@ -167,8 +167,8 @@ typedef struct
- # else
- #  define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-   (__extension__							      \
--   ({ __cpu_mask *__arr1 = (cpusetp1)->__bits;				      \
--      __cpu_mask *__arr2 = (cpusetp2)->__bits;				      \
-+   ({ __const __cpu_mask *__arr1 = (cpusetp1)->__bits;			      \
-+      __const __cpu_mask *__arr2 = (cpusetp2)->__bits;			      \
-       size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
-       size_t __i;							      \
-       for (__i = 0; __i < __imax; ++__i)				      \
-@@ -180,8 +180,8 @@ typedef struct
- # define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
-   (__extension__							      \
-    ({ cpu_set_t *__dest = (destset);					      \
--      __cpu_mask *__arr1 = (srcset1)->__bits;				      \
--      __cpu_mask *__arr2 = (srcset2)->__bits;				      \
-+      __const __cpu_mask *__arr1 = (srcset1)->__bits;			      \
-+      __const __cpu_mask *__arr2 = (srcset2)->__bits;			      \
-       size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
-       size_t __i;							      \
-       for (__i = 0; __i < __imax; ++__i)				      \

Added: glibc-package/trunk/debian/patches/any/cvs-stat-issock.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-stat-issock.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-stat-issock.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,28 @@
+2010-04-04  Ulrich Drepper  <drepper@redhat.com>
+ 
+	[BZ #11279]
+	* io/sys/stat.h: Always define S_ISSOCK for XPG6 and up.
+
+diff --git a/io/sys/stat.h b/io/sys/stat.h
+index 733a927..ac740ca 100644
+--- 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 @@ __BEGIN_DECLS
+ # 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

Added: glibc-package/trunk/debian/patches/any/cvs-umount-nofollow.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-umount-nofollow.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-umount-nofollow.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,20 @@
+2010-03-12  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sys/mount.h (UMOUNT_NOFOLLOW): Define.
+
+diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h
+index a41220d..923b461 100644
+--- a/sysdeps/unix/sysv/linux/sys/mount.h
++++ b/sysdeps/unix/sysv/linux/sys/mount.h
+@@ -123,8 +123,10 @@ enum
+ #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
+ };
+ 
+ 

Deleted: glibc-package/trunk/debian/patches/any/local-dynamic-resolvconf.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-dynamic-resolvconf.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/local-dynamic-resolvconf.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,40 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: allow dynamic long-running processes to
-# DP: re-read a dynamically updated resolv.conf on the fly
-# DP: Dpatch author: Adam Conrad <adconrad@ubuntu.com>
-# DP: Patch author: Thorsten Kukuk <kukuk@suse.de>
-# DP: Upstream status: Ubuntu-Specific
-# DP: Date: 2006-01-13 08:14:21 UTC
-
----
- resolv/res_libc.c |   11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
---- a/resolv/res_libc.c
-+++ b/resolv/res_libc.c
-@@ -22,7 +22,7 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <bits/libc-lock.h>
--
-+#include <sys/stat.h>
- 
- /* The following bit is copied from res_data.c (where it is #ifdef'ed
-    out) since res_init() should go into libc.so but the rest of that
-@@ -94,8 +94,15 @@
- int
- __res_maybe_init (res_state resp, int preinit)
- {
-+	static time_t last_mtime;
-+	struct stat statbuf;
-+	int ret;
-+
- 	if (resp->options & RES_INIT) {
--		if (__res_initstamp != resp->_u._ext.initstamp) {
-+		ret = stat (_PATH_RESCONF, &statbuf);
-+		if ((__res_initstamp != resp->_u._ext.initstamp)
-+		    || ((ret == 0) && (last_mtime != statbuf.st_mtime))) {
-+			last_mtime = statbuf.st_mtime;
- 			if (resp->nscount > 0)
- 				__res_iclose (resp, true);
- 			return __res_vinit (resp, 1);

Modified: glibc-package/trunk/debian/patches/any/local-libgcc-compat-main.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-libgcc-compat-main.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/local-libgcc-compat-main.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -20,8 +20,10 @@
  sysdeps/sparc/sparc32/libgcc-compat.c |  121 +++++++++++
  13 files changed, 433 insertions(+), 352 deletions(-)
 
---- /dev/null
-+++ b/sysdeps/i386/libgcc-compat.c
+Index: eglibc-2.11/sysdeps/i386/libgcc-compat.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.11/sysdeps/i386/libgcc-compat.c	2009-11-10 23:58:11.812004885 -0500
 @@ -0,0 +1,75 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -98,12 +100,14 @@
 +symbol_version (__floatdidf_internal, __floatdidf, GLIBC_2.0);
 +
 +#endif
---- a/sysdeps/i386/Makefile
-+++ b/sysdeps/i386/Makefile
+Index: eglibc-2.11/sysdeps/i386/Makefile
+===================================================================
+--- eglibc-2.11.orig/sysdeps/i386/Makefile	2009-06-25 11:46:40.000000000 -0400
++++ eglibc-2.11/sysdeps/i386/Makefile	2009-11-10 23:58:40.240023370 -0500
 @@ -9,6 +9,11 @@
  # On i686 we must avoid generating the trampoline functions generated
  # to get the GOT pointer.
- CFLAGS-initfini.s += -march=i386 -mtune=i386
+ CFLAGS-initfini.s += -march=i386 -mtune=i386 -fno-asynchronous-unwind-tables -fno-unwind-tables
 +ifeq (yes,$(build-shared))
 +# Compatibility
 +sysdep_routines += libgcc-compat
@@ -111,9 +115,11 @@
 +endif
  endif
  
- ifeq ($(subdir),gmon)
---- a/sysdeps/i386/Versions
-+++ b/sysdeps/i386/Versions
+ ifeq ($(subdir),nptl)
+Index: eglibc-2.11/sysdeps/i386/Versions
+===================================================================
+--- eglibc-2.11.orig/sysdeps/i386/Versions	2006-08-16 21:18:26.000000000 -0400
++++ eglibc-2.11/sysdeps/i386/Versions	2009-11-10 23:58:11.812004885 -0500
 @@ -2,6 +2,9 @@
    GLIBC_2.0 {
      # Functions from libgcc.
@@ -124,8 +130,10 @@
    }
    GLIBC_2.1 {
      # global variable
---- /dev/null
-+++ b/sysdeps/sparc/sparc32/libgcc-compat.c
+Index: eglibc-2.11/sysdeps/sparc/sparc32/libgcc-compat.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.11/sysdeps/sparc/sparc32/libgcc-compat.c	2009-11-10 23:58:11.812004885 -0500
 @@ -0,0 +1,121 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -248,8 +256,10 @@
 +symbol_version (__muldi3_internal, __muldi3, GLIBC_2.0);
 +
 +#endif
---- a/sysdeps/sparc/sparc32/Makefile
-+++ b/sysdeps/sparc/sparc32/Makefile
+Index: eglibc-2.11/sysdeps/sparc/sparc32/Makefile
+===================================================================
+--- eglibc-2.11.orig/sysdeps/sparc/sparc32/Makefile	2008-05-07 07:51:22.000000000 -0400
++++ eglibc-2.11/sysdeps/sparc/sparc32/Makefile	2009-11-10 23:58:11.812004885 -0500
 @@ -24,6 +24,14 @@
  CFLAGS-initfini.s += -mcpu=v7
  endif
@@ -265,8 +275,10 @@
  # We distribute these files, even though they are generated,
  # so as to avoid the need for a functioning m4 to build the library.
  divrem := sdiv udiv rem urem
---- a/sysdeps/sparc/sparc32/Versions
-+++ b/sysdeps/sparc/sparc32/Versions
+Index: eglibc-2.11/sysdeps/sparc/sparc32/Versions
+===================================================================
+--- eglibc-2.11.orig/sysdeps/sparc/sparc32/Versions	2006-08-16 21:18:26.000000000 -0400
++++ eglibc-2.11/sysdeps/sparc/sparc32/Versions	2009-11-10 23:58:11.812004885 -0500
 @@ -1,5 +1,9 @@
  libc {
    GLIBC_2.0 {
@@ -277,8 +289,10 @@
 +    __floatdidf; __floatdisf;
    }
  }
---- a/sysdeps/ia64/Makefile
-+++ b/sysdeps/ia64/Makefile
+Index: eglibc-2.11/sysdeps/ia64/Makefile
+===================================================================
+--- eglibc-2.11.orig/sysdeps/ia64/Makefile	2006-08-16 21:18:26.000000000 -0400
++++ eglibc-2.11/sysdeps/ia64/Makefile	2009-11-10 23:58:11.812004885 -0500
 @@ -12,8 +12,8 @@
  
  ifeq (yes,$(build-shared))
@@ -290,8 +304,10 @@
  endif
  endif
  
---- a/sysdeps/ia64/Versions
-+++ b/sysdeps/ia64/Versions
+Index: eglibc-2.11/sysdeps/ia64/Versions
+===================================================================
+--- eglibc-2.11.orig/sysdeps/ia64/Versions	2006-08-16 21:18:26.000000000 -0400
++++ eglibc-2.11/sysdeps/ia64/Versions	2009-11-10 23:58:11.812004885 -0500
 @@ -10,6 +10,10 @@
      # Functions from libgcc.
      __divtf3; __divdf3; __divsf3; __divdi3; __moddi3; __udivdi3; __umoddi3;
@@ -303,8 +319,10 @@
    }
  }
  libm {
---- a/sysdeps/ia64/ia64libgcc.S
-+++ /dev/null
+Index: eglibc-2.11/sysdeps/ia64/ia64libgcc.S
+===================================================================
+--- eglibc-2.11.orig/sysdeps/ia64/ia64libgcc.S	2006-08-16 21:18:26.000000000 -0400
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -656,8 +674,10 @@
 -	.symver	___multi3, __multi3@GLIBC_2.2
 -
 -#endif
---- /dev/null
-+++ b/sysdeps/ia64/libgcc-compat.c
+Index: eglibc-2.11/sysdeps/ia64/libgcc-compat.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.11/sysdeps/ia64/libgcc-compat.c	2009-11-10 23:58:11.816005172 -0500
 @@ -0,0 +1,112 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -771,8 +791,10 @@
 +symbol_version (INTUSE (__umodsi3), __umodsi3, GLIBC_2.2);
 +
 +#endif
---- a/sysdeps/s390/s390-32/Makefile
-+++ b/sysdeps/s390/s390-32/Makefile
+Index: eglibc-2.11/sysdeps/s390/s390-32/Makefile
+===================================================================
+--- eglibc-2.11.orig/sysdeps/s390/s390-32/Makefile	2006-08-16 21:18:26.000000000 -0400
++++ eglibc-2.11/sysdeps/s390/s390-32/Makefile	2009-11-10 23:58:11.816005172 -0500
 @@ -9,3 +9,11 @@
  CFLAGS-dl-load.c += -Wno-unused
  CFLAGS-dl-reloc.c += -Wno-unused
@@ -785,8 +807,10 @@
 +shared-only-routines += libgcc-compat
 +endif
 +endif
---- a/sysdeps/s390/s390-32/Versions
-+++ b/sysdeps/s390/s390-32/Versions
+Index: eglibc-2.11/sysdeps/s390/s390-32/Versions
+===================================================================
+--- eglibc-2.11.orig/sysdeps/s390/s390-32/Versions	2006-08-16 21:18:26.000000000 -0400
++++ eglibc-2.11/sysdeps/s390/s390-32/Versions	2009-11-10 23:58:11.816005172 -0500
 @@ -2,5 +2,13 @@
    GLIBC_2.0 {
      # Functions from libgcc.
@@ -801,8 +825,10 @@
 +    __ucmpdi2;
    }
  }
---- /dev/null
-+++ b/sysdeps/s390/s390-32/libgcc-compat.c
+Index: eglibc-2.11/sysdeps/s390/s390-32/libgcc-compat.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.11/sysdeps/s390/s390-32/libgcc-compat.c	2009-11-10 23:58:11.816005172 -0500
 @@ -0,0 +1,83 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2003 Free Software Foundation, Inc.

Modified: glibc-package/trunk/debian/patches/any/local-linuxthreads-weak.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-linuxthreads-weak.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/local-linuxthreads-weak.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -15,6 +15,16 @@
  #endif
  
  /* Mutex type.  */
+@@ -158,6 +162,9 @@
+ #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)
++
+ /* Finalize the named lock variable, which must be locked.  It cannot be
+    used again until __libc_lock_init is called again on it.  This must be
+    called on a lock variable before the containing storage is reused.  */
 @@ -379,8 +383,10 @@
  weak_extern (__pthread_atfork)
  weak_extern (BP_SYM (_pthread_cleanup_push))

Deleted: glibc-package/trunk/debian/patches/any/submitted-confname.h.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-confname.h.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/submitted-confname.h.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,17 +0,0 @@
-2009-10-29  Aurelien Jarno <aurelien@aurel32.net>
-
-	* sysdeps/x86_64/multiarch/Makefile: remove comma at end of
-	enumerator list.
-
---- a/bits/confname.h
-+++ b/bits/confname.h
-@@ -527,7 +527,7 @@ enum
- 
-     _SC_THREAD_ROBUST_PRIO_INHERIT,
- #define _SC_THREAD_ROBUST_PRIO_INHERIT	_SC_THREAD_ROBUST_PRIO_INHERIT
--    _SC_THREAD_ROBUST_PRIO_PROTECT,
-+    _SC_THREAD_ROBUST_PRIO_PROTECT
- #define _SC_THREAD_ROBUST_PRIO_PROTECT	_SC_THREAD_ROBUST_PRIO_PROTECT
-   };
- 
-

Deleted: glibc-package/trunk/debian/patches/any/submitted-getaddrinfo-nodata.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-getaddrinfo-nodata.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/submitted-getaddrinfo-nodata.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,14 +0,0 @@
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -715,7 +715,10 @@ gaih_inet (const char *name, const struct gaih_service *service,
- 						   tmpbuflen, &rc, &herrno,
- 						   NULL));
- 		      if (status == NSS_STATUS_SUCCESS)
--			break;
-+			{
-+			  no_data = 0;
-+			  break;
-+			}
- 		      if (status != NSS_STATUS_TRYAGAIN
- 			  || rc != ERANGE || herrno != NETDB_INTERNAL)
- 			{

Deleted: glibc-package/trunk/debian/patches/any/submitted-getent-gshadow.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-getent-gshadow.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/submitted-getent-gshadow.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,99 +0,0 @@
-2009-05-27  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* nss/getent.c (print_gshadow): New function. (gshadow_keys):
-	  Likewise.
-
----
- nss/getent.c |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 67 insertions(+)
-
---- a/nss/getent.c
-+++ b/nss/getent.c
-@@ -30,6 +30,7 @@
- #include <netdb.h>
- #include <pwd.h>
- #include <shadow.h>
-+#include <gshadow.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -752,6 +753,71 @@
-   return result;
- }
- 
-+/* This is for shadow */
-+static void
-+print_gshadow (struct sgrp *sg)
-+{
-+  unsigned int i = 0;
-+
-+  printf ("%s:%s:",
-+	  sg->sg_namp ? sg->sg_namp : "",
-+	  sg->sg_passwd ? sg->sg_passwd : "");
-+
-+  while (sg->sg_adm[i] != NULL)
-+    {
-+      fputs_unlocked (sg->sg_adm[i], stdout);
-+      ++i;
-+      if (sg->sg_adm[i] != NULL)
-+	putchar_unlocked (',');
-+    }
-+
-+  putchar_unlocked (':');
-+
-+  i = 0;
-+  while (sg->sg_mem[i] != NULL)
-+    {
-+      fputs_unlocked (sg->sg_mem[i], stdout);
-+      ++i;
-+      if (sg->sg_mem[i] != NULL)
-+	putchar_unlocked (',');
-+    }
-+
-+  putchar_unlocked ('\n');
-+}
-+
-+static int
-+gshadow_keys (int number, char *key[])
-+{
-+  int result = 0;
-+  int i;
-+
-+  if (number == 0)
-+    {
-+      struct sgrp *sg;
-+
-+      setsgent ();
-+      while ((sg = getsgent ()) != NULL)
-+	print_gshadow (sg);
-+      endsgent ();
-+      return result;
-+    }
-+
-+  for (i = 0; i < number; ++i)
-+    {
-+      struct sgrp *sg;
-+
-+      sg = getsgnam (key[i]);
-+
-+      if (sg == NULL)
-+	result = 2;
-+      else
-+	print_gshadow (sg);
-+    }
-+
-+  return result;
-+}
-+
-+
- struct
-   {
-     const char *name;
-@@ -786,6 +852,7 @@
- DN(rpc)
- DN(services)
- D(shadow)
-+D(gshadow)
- #undef D
-     { NULL, NULL }
-   };

Deleted: glibc-package/trunk/debian/patches/any/submitted-gethostbyname3.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-gethostbyname3.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/submitted-gethostbyname3.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,18 +0,0 @@
-2009-11-24  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname3_r): Return an
-	error for ETIMEDOUT.
-
-diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
-index 818a40a..1eba413 100644
---- a/resolv/nss_dns/dns-host.c
-+++ b/resolv/nss_dns/dns-host.c
-@@ -204,7 +204,7 @@ _nss_dns_gethostbyname3_r (const char *name, int af, struct hostent *result,
- 	  h_errno = TRY_AGAIN;
- 	}
-       else
--	status = (errno == ECONNREFUSED
-+	status = ((errno == ECONNREFUSED || errno == ETIMEDOUT)
- 		  ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND);
-       *h_errnop = h_errno;
-       if (h_errno == TRY_AGAIN)

Modified: glibc-package/trunk/debian/patches/any/submitted-missing-etc-hosts.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-missing-etc-hosts.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/submitted-missing-etc-hosts.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,20 +1,13 @@
-When /etc/hosts is missing, return NO_DATA instead of an internal error;
-otherwise getaddrinfo() fails instead of falling back to the next backend
-(DNS).
-
-Index: eglibc-2.10.1/nss/nss_files/files-hosts.c
+Index: eglibc-2.11/nss/nss_files/files-hosts.c
 ===================================================================
---- eglibc-2.10.1.orig/nss/nss_files/files-hosts.c
-+++ eglibc-2.10.1/nss/nss_files/files-hosts.c
-@@ -423,6 +423,11 @@
-       if (! keep_stream)
- 	internal_endent ();
-     }
-+  else
-+    {
-+      *errnop = errno;
+--- eglibc-2.11.orig/nss/nss_files/files-hosts.c	2009-11-13 01:45:45.604005510 -0500
++++ eglibc-2.11/nss/nss_files/files-hosts.c	2009-11-13 01:45:55.329187688 -0500
+@@ -426,7 +426,7 @@
+   else
+     {
+       *errnop = errno;
+-      *herrnop = NO_DATA;
 +      *herrnop = HOST_NOT_FOUND;
-+    }
+     }
  
    __libc_lock_unlock (lock);
- 

Deleted: glibc-package/trunk/debian/patches/any/submitted-stat-issock.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-stat-issock.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/any/submitted-stat-issock.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,18 +0,0 @@
-2010-02-13  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* io/sys/stat.h: The S_ISSOCK macro has been mandatory since 
-	POSIX 2001.
-
-diff --git a/io/sys/stat.h b/io/sys/stat.h
-index 733a927..f2d4d5b 100644
---- a/io/sys/stat.h
-+++ b/io/sys/stat.h
-@@ -143,7 +143,7 @@ __BEGIN_DECLS
- # 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)
- #endif

Deleted: glibc-package/trunk/debian/patches/arm/cvs-setjmp-longjmp-fpu.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/cvs-setjmp-longjmp-fpu.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/arm/cvs-setjmp-longjmp-fpu.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,44 +0,0 @@
---- a/ports/sysdeps/arm/eabi/__longjmp.S
-+++ b/ports/sysdeps/arm/eabi/__longjmp.S
-@@ -55,12 +55,12 @@
- 	beq	Lno_vfp
- 
- 	/* Restore the VFP registers.  */
--	/* Following instruction is fldmiax ip!, {d8-d15}.  */
--	ldc	p11, cr8, [r12], #68
-+	/* Following instruction is vldmia ip!, {d8-d15}.  */
-+	ldc	p11, cr8, [r12], #64
- 	/* Restore the floating-point status register.  */
--	ldr     r1, [ip], #4
--	/* Following instruction is fmxr fpscr, r1.  */
--	mcr	p10, 7, r1, cr1, cr0, 0
-+	ldr     a3, [ip], #4
-+	/* Following instruction is fmxr fpscr, a3.  */
-+	mcr	p10, 7, a3, cr1, cr0, 0
- Lno_vfp:
- 
- 	tst	a2, #HWCAP_ARM_IWMMXT
---- a/ports/sysdeps/arm/eabi/setjmp.S
-+++ b/ports/sysdeps/arm/eabi/setjmp.S
-@@ -52,13 +52,15 @@
- 	tst	a3, #HWCAP_ARM_VFP
- 	beq	Lno_vfp
- 
--	/* Store the VFP registers.  */
--	/* Following instruction is fstmiax ip!, {d8-d15}.  */
--	stc	p11, cr8, [r12], #68
-+	/* Store the VFP registers.
-+	   Don't use VFP instructions directly because this code
-+	   is used in non-VFP multilibs.  */
-+	/* Following instruction is vstmia ip!, {d8-d15}.  */
-+	stc	p11, cr8, [ip], #64
- 	/* Store the floating-point status register.  */
--	/* Following instruction is fmrx r2, fpscr.  */
--	mrc	p10, 7, r2, cr1, cr0, 0
--	str	r2, [ip], #4
-+	/* Following instruction is vmrs a4, fpscr.  */
-+	mrc	p10, 7, a4, cr1, cr0, 0
-+	str	a4, [ip], #4
- Lno_vfp:
- 
- 	tst	a3, #HWCAP_ARM_IWMMXT

Added: glibc-package/trunk/debian/patches/arm/local-atomic.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/local-atomic.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/arm/local-atomic.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,16 @@
+2010-02-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/unix/sysv/linux/arm/nptl/bits/atomic.h: remove useless
+	include.
+
+--- a/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/atomic.h
++++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/atomic.h
+@@ -17,7 +17,6 @@
+    02111-1307 USA.  */
+ 
+ #include <stdint.h>
+-#include <sysdep.h>
+ 
+ 
+ typedef int8_t atomic8_t;
+

Modified: glibc-package/trunk/debian/patches/arm/local-lowlevellock.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/local-lowlevellock.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/arm/local-lowlevellock.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,14 +1,15 @@
----
- ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h |    1 +
- 1 file changed, 1 insertion(+)
+2010-02-09  Aurelien Jarno  <aurelien@aurel32.net>
 
+	* sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h: remove
+	useless include.
+
 --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
 +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
-@@ -25,6 +25,7 @@
+@@ -24,7 +24,6 @@
+ #include <sys/param.h>
+ #include <bits/pthreadtypes.h>
  #include <atomic.h>
- #include <sysdep.h>
+-#include <sysdep.h>
  #include <kernel-features.h>
-+#include <tls.h>		/* Need THREAD_*, and header.*.  */
  
  #define FUTEX_WAIT		0
- #define FUTEX_WAKE		1

Modified: glibc-package/trunk/debian/patches/hppa/cvs-nptl-compat.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/cvs-nptl-compat.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/hppa/cvs-nptl-compat.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,1694 +1,32 @@
-diff -urN a/ports/sysdeps/unix/sysv/linux/hppa/internaltypes.h b/ports/sysdeps/unix/sysv/linux/hppa/internaltypes.h
---- a/ports/sysdeps/unix/sysv/linux/hppa/internaltypes.h	1969-12-31 19:00:00.000000000 -0500
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/internaltypes.h	2009-09-03 16:01:13.000000000 -0400
-@@ -0,0 +1,79 @@
-+#include_next <internaltypes.h>
-+#ifndef _INTERNAL_TYPES_H_HPPA_ 
-+#define _INTERNAL_TYPES_H_HPPA_ 1
-+#include <atomic.h>
-+
-+/* In GLIBC 2.10 HPPA switched from Linuxthreads to NPTL, and in order 
-+to maintain ABI compatibility with pthread_cond_t, some care had to be
-+taken.
-+
-+The NPTL pthread_cond_t grew in size. When HPPA switched to NPTL, we
-+dropped the use of ldcw, and switched to the kernel helper routine for
-+compare-and-swap.  This allowed HPPA to use the 4-word 16-byte aligned
-+lock words, and alignment words to store the additional pthread_cond_t
-+data. Once organized properly the new NPTL pthread_cond_t was 1 word
-+smaller than the Linuxthreads version.
-+
-+However, we were faced with the case that users may have initialized the
-+pthread_cond_t with PTHREAD_COND_INITIALIZER. In this case, the first
-+four words were set to one, and must be cleared before any NPTL code
-+used these words.
-+
-+We didn't want to use LDCW, because it continues to be a source of bugs
-+when applications memset pthread_cond_t to all zeroes by accident. This
-+works on all other architectures where lock words are unlocked at zero.
-+Remember that because of the semantics of LDCW, a locked word is set to
-+zero, and an unlocked word is set to 1.
-+
-+Instead we used atomic_compare_and_exchange_val_acq, but we couldn't use
-+this on any of the pthread_cond_t words, otherwise it might interfere
-+with the current operation of the structure. To solve this problem we
-+used the left over word.
-+
-+If the stucture was initialized by a legacy Linuxthread
-+PTHREAD_COND_INITIALIZER it contained a 1, and this indicates that the
-+structure requires zeroing for NPTL. The first thread to come upon a
-+pthread_cond_t with a 1 in the __initializer field, will
-+compare-and-swap the value, placing a 2 there which will cause all other
-+threads using the same pthread_cond_t to wait for the completion of the
-+initialization. Lastly, we use a store (with memory barrier) to change
-+__initializer from 2 to 0. Note that the store is strongly ordered, but
-+we use the PA 1.1 compatible form which is ",ma" with zero offset.
-+
-+In the future, when the application is recompiled with NPTL
-+PTHREAD_COND_INITIALIZER it will be a quick compare-and-swap, which
-+fails because __initializer is zero, and the structure will be used as
-+is correctly.  */
-+
-+#define cond_compat_clear(var) \
-+({											\
-+  int tmp = 0;										\
-+  var->__data.__lock = 0;								\
-+  var->__data.__futex = 0;								\
-+  var->__data.__mutex = NULL;								\
-+  /* Clear __initializer last, to indicate initialization is done.  */			\
-+  __asm__ __volatile__ ("stw,ma %1,0(%0)"						\
-+			: : "r" (&var->__data.__initializer), "r" (tmp) : "memory");	\
-+})
-+
-+#define cond_compat_check_and_clear(var) \
-+({								\
-+  int ret;							\
-+  volatile int *value = &var->__data.__initializer;		\
-+  if ((ret = atomic_compare_and_exchange_val_acq(value, 2, 1)))	\
-+    {								\
-+      if (ret == 1)						\
-+	{							\
-+	  /* Initialize structure.  */				\
-+	  cond_compat_clear (var);				\
-+	}							\
-+      else							\
-+        {							\
-+	  /* Yield until structure is initialized.  */		\
-+	  while (*value == 2) sched_yield ();			\
-+        }							\
-+    }								\
-+})
-+
-+#endif
-+
-diff -urN a/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h b/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h	2009-09-03 16:01:04.000000000 -0400
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h	2009-09-03 16:01:13.000000000 -0400
-@@ -34,7 +34,7 @@
- #define __SIZEOF_PTHREAD_ATTR_T 36
- #define __SIZEOF_PTHREAD_BARRIER_T 48
- #define __SIZEOF_PTHREAD_BARRIERATTR_T 4
--#define __SIZEOF_PTHREAD_COND_T 64
-+#define __SIZEOF_PTHREAD_COND_T 48 
- #define __SIZEOF_PTHREAD_CONDATTR_T 4
- #define __SIZEOF_PTHREAD_MUTEX_T 48 
- #define __SIZEOF_PTHREAD_MUTEXATTR_T 4
-@@ -64,18 +64,31 @@
+--- 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 @@ typedef union
  {
    struct __pthread_mutex_s
    {
 -    int __lock;
 +    /* Ensure that the entire structure when embedded in another
-+       structure retains the same alignment requirements as it 
++       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
-        binary compatibility.  */
-     int __kind;
-+    /* The old 4-word 16-byte aligned lock. This is initalized
-+       to all ones by the Linuxthreads PTHREAD_MUTEX_INITIALIZER. 
-+       Unused in NPTL.  */
-+    int __compat_padding[4];
-+    /* In the old structure there are 4 words left due to alignment.
-+       In NPTL two words are used.  */
-     unsigned int __nusers;
-     __extension__ union
-     {
-       int __spins;
-       __pthread_slist_t __list;
-     };
-+    /* Two more words are left before the NPTL
-+       pthread_mutex_t is larger than Linuxthreads.  */
-+    int __reserved1;
-+    int __reserved2;
-   } __data;
-   char __size[__SIZEOF_PTHREAD_MUTEX_T];
-   long int __align;
-@@ -89,19 +102,37 @@
- 
- 
- /* Data structure for conditional variable handling.  The structure of
--   the attribute type is not exposed on purpose.  */
-+   the attribute type is not exposed on purpose. However, this structure
-+   is exposed via PTHREAD_COND_INITIALIZER, and because of this, the
-+   Linuxthreads version sets the first four ints to one. In the NPTL
-+   version we must check, in every function using pthread_cond_t, 
-+   for the static Linuxthreads initializer and clear the appropriate
-+   words. */
- typedef union
- {
-   struct
-   {
+@@ -113,7 +116,7 @@ typedef union
+        start of the 4-word lock structure, the next four words
+        are set all to 1 by the Linuxthreads 
+        PTHREAD_COND_INITIALIZER.  */
 -    int __lock;
-+    /* In the old Linuxthreads pthread_cond_t, this is the
-+       start of the 4-word lock structure, the next four words
-+       are set all to 1 by the Linuxthreads 
-+       PTHREAD_COND_INITIALIZER.  */
 +    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.
-+       2  initialization in progress.  */
-+    int __initializer;
-     unsigned int __futex;
-+    void *__mutex;
-+    /* In the old Linuxthreads this would have been the start
-+       of the pthread_fastlock status word.  */
-     __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;
-+    /* The NPTL pthread_cond_t is exactly the same size as
-+       the Linuxthreads version, there are no words to spare.  */
-   } __data;
-   char __size[__SIZEOF_PTHREAD_COND_T];
-   __extension__ long long int __align;
-@@ -129,19 +160,34 @@
- {
-   struct
-   {
-+    /* In the old Linuxthreads pthread_rwlock_t, this is the
-+       start of the 4-word 16-byte algned lock structure. The
-+       next four words are all set to 1 by the Linuxthreads
-+       PTHREAD_RWLOCK_INITIALIZER. We ignore them in NPTL.  */
+     /* Tracks the initialization of this structure:
+        0  initialized with NPTL PTHREAD_COND_INITIALIZER.
+        1  initialized with Linuxthreads PTHREAD_COND_INITIALIZER.
+@@ -161,7 +164,7 @@ typedef union
+        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;
-     unsigned int __writer_wakeup;
-     unsigned int __nr_readers_queued;
-     unsigned int __nr_writers_queued;
-+    int __writer;
-+    /* An unused word, reserved for future use. It was added
-+       to maintain the location of the flags from the Linuxthreads
-+       layout of this structure.  */
-+    int __reserved1;
-     /* FLAGS must stay at this position in the structure to maintain
-        binary compatibility.  */
-     unsigned char __pad2;
-     unsigned char __pad1;
-     unsigned char __shared;
-     unsigned char __flags;
--    int __writer;
-+    /* The NPTL pthread_rwlock_t is 4 words smaller than the
-+       Linuxthreads version. One word is in the middle of the
-+       structure, the other three are at the end.  */
-+    int __reserved2;
-+    int __reserved3;
-+    int __reserved4;
-   } __data;
-   char __size[__SIZEOF_PTHREAD_RWLOCK_T];
-   long int __align;
-diff -urN a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_broadcast.c b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_broadcast.c
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_broadcast.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_broadcast.c	2009-09-03 16:01:13.000000000 -0400
-@@ -0,0 +1,43 @@
-+/* Copyright (C) 2009 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Carlos O'Donell <carlos@codesourcery.com>, 2009.
-+
-+   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 INCLUDED_SELF
-+# define INCLUDED_SELF
-+# include <pthread_cond_broadcast.c>
-+#else
-+# include <pthread.h>
-+# include <pthreadP.h>
-+# include <internaltypes.h>
-+# include <shlib-compat.h>
-+int
-+__pthread_cond_broadcast (cond)
-+     pthread_cond_t *cond;
-+{
-+  cond_compat_check_and_clear (cond);
-+  return __pthread_cond_broadcast_internal (cond);
-+}
-+versioned_symbol (libpthread, __pthread_cond_broadcast, pthread_cond_broadcast,
-+                  GLIBC_2_3_2);
-+# undef versioned_symbol
-+# define versioned_symbol(lib, local, symbol, version)
-+# undef __pthread_cond_broadcast
-+# define __pthread_cond_broadcast __pthread_cond_broadcast_internal
-+# include_next <pthread_cond_broadcast.c>
-+#endif
-+
-diff -urN a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_destroy.c b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_destroy.c
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_destroy.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_destroy.c	2009-09-03 16:01:13.000000000 -0400
-@@ -0,0 +1,43 @@
-+/* Copyright (C) 2009 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Carlos O'Donell <carlos@codesourcery.com>, 2009.
-+
-+   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 INCLUDED_SELF
-+# define INCLUDED_SELF
-+# include <pthread_cond_destroy.c>
-+#else
-+# include <pthread.h>
-+# include <pthreadP.h>
-+# include <internaltypes.h>
-+# include <shlib-compat.h>
-+int
-+__pthread_cond_destroy (cond)
-+     pthread_cond_t *cond;
-+{
-+  cond_compat_check_and_clear (cond);
-+  return __pthread_cond_destroy_internal (cond);
-+}
-+versioned_symbol (libpthread, __pthread_cond_destroy, pthread_cond_destroy,
-+                  GLIBC_2_3_2);
-+# undef versioned_symbol
-+# define versioned_symbol(lib, local, symbol, version)
-+# undef __pthread_cond_destroy
-+# define __pthread_cond_destroy __pthread_cond_destroy_internal
-+# include_next <pthread_cond_destroy.c>
-+#endif
-+
-diff -urN a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_init.c b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_init.c
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_init.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_init.c	2009-09-03 16:01:13.000000000 -0400
-@@ -0,0 +1,44 @@
-+/* Copyright (C) 2009 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Carlos O'Donell <carlos@codesourcery.com>, 2009.
-+
-+   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 INCLUDED_SELF
-+# define INCLUDED_SELF
-+# include <pthread_cond_init.c>
-+#else
-+# include <pthread.h>
-+# include <pthreadP.h>
-+# include <internaltypes.h>
-+# include <shlib-compat.h>
-+int
-+__pthread_cond_init (cond, cond_attr)
-+     pthread_cond_t *cond;
-+     const pthread_condattr_t *cond_attr;
-+{
-+  cond_compat_clear (cond);
-+  return __pthread_cond_init_internal (cond, cond_attr);
-+}
-+versioned_symbol (libpthread, __pthread_cond_init, pthread_cond_init,
-+                  GLIBC_2_3_2);
-+# undef versioned_symbol
-+# define versioned_symbol(lib, local, symbol, version)
-+# undef __pthread_cond_init
-+# define __pthread_cond_init __pthread_cond_init_internal
-+# include_next <pthread_cond_init.c>
-+#endif
-+
-diff -urN a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_signal.c b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_signal.c
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_signal.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_signal.c	2009-09-03 16:01:13.000000000 -0400
-@@ -0,0 +1,43 @@
-+/* Copyright (C) 2009 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Carlos O'Donell <carlos@codesourcery.com>, 2009.
-+
-+   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 INCLUDED_SELF
-+# define INCLUDED_SELF
-+# include <pthread_cond_signal.c>
-+#else
-+# include <pthread.h>
-+# include <pthreadP.h>
-+# include <internaltypes.h>
-+# include <shlib-compat.h>
-+int
-+__pthread_cond_signal (cond)
-+     pthread_cond_t *cond;
-+{
-+  cond_compat_check_and_clear (cond);
-+  return __pthread_cond_signal_internal (cond);
-+}
-+versioned_symbol (libpthread, __pthread_cond_signal, pthread_cond_signal,
-+                  GLIBC_2_3_2);
-+# undef versioned_symbol
-+# define versioned_symbol(lib, local, symbol, version)
-+# undef __pthread_cond_signal
-+# define __pthread_cond_signal __pthread_cond_signal_internal
-+# include_next <pthread_cond_signal.c>
-+#endif
-+
-diff -urN a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_timedwait.c b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_timedwait.c
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_timedwait.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_timedwait.c	2009-09-03 16:01:13.000000000 -0400
-@@ -0,0 +1,45 @@
-+/* Copyright (C) 2009 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Carlos O'Donell <carlos@codesourcery.com>, 2009.
-+
-+   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 INCLUDED_SELF
-+# define INCLUDED_SELF
-+# include <pthread_cond_timedwait.c>
-+#else
-+# include <pthread.h>
-+# include <pthreadP.h>
-+# include <internaltypes.h>
-+# include <shlib-compat.h>
-+int
-+__pthread_cond_timedwait (cond, mutex, abstime)
-+     pthread_cond_t *cond;
-+     pthread_mutex_t *mutex;
-+     const struct timespec *abstime;
-+{
-+  cond_compat_check_and_clear (cond);
-+  return __pthread_cond_timedwait_internal (cond, mutex, abstime);
-+}
-+versioned_symbol (libpthread, __pthread_cond_timedwait, pthread_cond_timedwait,
-+                  GLIBC_2_3_2);
-+# undef versioned_symbol
-+# define versioned_symbol(lib, local, symbol, version)
-+# undef __pthread_cond_timedwait
-+# define __pthread_cond_timedwait __pthread_cond_timedwait_internal
-+# include_next <pthread_cond_timedwait.c>
-+#endif
-+
-diff -urN a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_wait.c b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_wait.c
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_wait.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_wait.c	2009-09-03 16:01:13.000000000 -0400
-@@ -0,0 +1,44 @@
-+/* Copyright (C) 2009 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Carlos O'Donell <carlos@codesourcery.com>, 2009.
-+
-+   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 INCLUDED_SELF
-+# define INCLUDED_SELF
-+# include <pthread_cond_wait.c>
-+#else
-+# include <pthread.h>
-+# include <pthreadP.h>
-+# include <internaltypes.h>
-+# include <shlib-compat.h>
-+int
-+__pthread_cond_wait (cond, mutex)
-+     pthread_cond_t *cond;
-+     pthread_mutex_t *mutex;
-+{
-+  cond_compat_check_and_clear (cond);
-+  return __pthread_cond_wait_internal (cond, mutex);
-+}
-+versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
-+                  GLIBC_2_3_2);
-+# undef versioned_symbol
-+# define versioned_symbol(lib, local, symbol, version)
-+# undef __pthread_cond_wait
-+# define __pthread_cond_wait __pthread_cond_wait_internal
-+# include_next <pthread_cond_wait.c>
-+#endif
-+
-diff -urN a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h	1969-12-31 19:00:00.000000000 -0500
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h	2009-09-03 16:01:13.000000000 -0400
-@@ -0,0 +1,1178 @@
-+/* Copyright (C) 2002, 2003, 2004, 2005, 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 _PTHREAD_H
-+#define _PTHREAD_H	1
-+
-+#include <features.h>
-+#include <endian.h>
-+#include <sched.h>
-+#include <time.h>
-+
-+#define __need_sigset_t
-+#include <signal.h>
-+#include <bits/pthreadtypes.h>
-+#include <bits/setjmp.h>
-+#include <bits/wordsize.h>
-+
-+
-+/* Detach state.  */
-+enum
-+{
-+  PTHREAD_CREATE_JOINABLE,
-+#define PTHREAD_CREATE_JOINABLE	PTHREAD_CREATE_JOINABLE
-+  PTHREAD_CREATE_DETACHED
-+#define PTHREAD_CREATE_DETACHED	PTHREAD_CREATE_DETACHED
-+};
-+
-+
-+/* Mutex types.  */
-+enum
-+{
-+  PTHREAD_MUTEX_TIMED_NP,
-+  PTHREAD_MUTEX_RECURSIVE_NP,
-+  PTHREAD_MUTEX_ERRORCHECK_NP,
-+  PTHREAD_MUTEX_ADAPTIVE_NP
-+#ifdef __USE_UNIX98
-+  ,
-+  PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_TIMED_NP,
-+  PTHREAD_MUTEX_RECURSIVE = PTHREAD_MUTEX_RECURSIVE_NP,
-+  PTHREAD_MUTEX_ERRORCHECK = PTHREAD_MUTEX_ERRORCHECK_NP,
-+  PTHREAD_MUTEX_DEFAULT = PTHREAD_MUTEX_NORMAL
-+#endif
-+#ifdef __USE_GNU
-+  /* For compatibility.  */
-+  , PTHREAD_MUTEX_FAST_NP = PTHREAD_MUTEX_TIMED_NP
-+#endif
-+};
-+
-+
-+#ifdef __USE_XOPEN2K
-+/* Robust mutex or not flags.  */
-+enum
-+{
-+  PTHREAD_MUTEX_STALLED,
-+  PTHREAD_MUTEX_STALLED_NP = PTHREAD_MUTEX_STALLED,
-+  PTHREAD_MUTEX_ROBUST,
-+  PTHREAD_MUTEX_ROBUST_NP = PTHREAD_MUTEX_ROBUST
-+};
-+#endif
-+
-+
-+#ifdef __USE_UNIX98
-+/* Mutex protocols.  */
-+enum
-+{
-+  PTHREAD_PRIO_NONE,
-+  PTHREAD_PRIO_INHERIT,
-+  PTHREAD_PRIO_PROTECT
-+};
-+#endif
-+
-+
-+/* Mutex initializers.  */
-+#if __WORDSIZE == 64
-+# define PTHREAD_MUTEX_INITIALIZER \
-+  { { 0, 0, 0, 0, 0, 0, { 0, 0 } } }
-+# ifdef __USE_GNU
-+#  define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
-+  { { 0, 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, { 0, 0 } } }
-+#  define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
-+  { { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, 0, { 0, 0 } } }
-+#  define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
-+  { { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, 0, { 0, 0 } } }
-+# endif
-+#else
-+# define PTHREAD_MUTEX_INITIALIZER \
-+  { { 0, 0, 0, 0, 0, { 0 } } }
-+# ifdef __USE_GNU
-+#  define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
-+  { { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, { 0 } } }
-+#  define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
-+  { { 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, 0, { 0 } } }
-+#  define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
-+  { { 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, 0, { 0 } } }
-+# endif
-+#endif
-+
-+
-+/* Read-write lock types.  */
-+#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-+enum
-+{
-+  PTHREAD_RWLOCK_PREFER_READER_NP,
-+  PTHREAD_RWLOCK_PREFER_WRITER_NP,
-+  PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,
-+  PTHREAD_RWLOCK_DEFAULT_NP = PTHREAD_RWLOCK_PREFER_READER_NP
-+};
-+
-+/* Read-write lock initializers.  */
-+# define PTHREAD_RWLOCK_INITIALIZER \
-+  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
-+# ifdef __USE_GNU
-+#  if __WORDSIZE == 64
-+#   define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
-+  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,					      \
-+	PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
-+#  else
-+#   if __BYTE_ORDER == __LITTLE_ENDIAN
-+#    define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
-+  { { 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, \
-+      0, 0, 0, 0 } }
-+#   else
-+#    define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
-+  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,\
-+      0 } }
-+#   endif
-+#  endif
-+# endif
-+#endif  /* Unix98 or XOpen2K */
-+
-+
-+/* Scheduler inheritance.  */
-+enum
-+{
-+  PTHREAD_INHERIT_SCHED,
-+#define PTHREAD_INHERIT_SCHED   PTHREAD_INHERIT_SCHED
-+  PTHREAD_EXPLICIT_SCHED
-+#define PTHREAD_EXPLICIT_SCHED  PTHREAD_EXPLICIT_SCHED
-+};
-+
-+
-+/* Scope handling.  */
-+enum
-+{
-+  PTHREAD_SCOPE_SYSTEM,
-+#define PTHREAD_SCOPE_SYSTEM    PTHREAD_SCOPE_SYSTEM
-+  PTHREAD_SCOPE_PROCESS
-+#define PTHREAD_SCOPE_PROCESS   PTHREAD_SCOPE_PROCESS
-+};
-+
-+
-+/* Process shared or private flag.  */
-+enum
-+{
-+  PTHREAD_PROCESS_PRIVATE,
-+#define PTHREAD_PROCESS_PRIVATE PTHREAD_PROCESS_PRIVATE
-+  PTHREAD_PROCESS_SHARED
-+#define PTHREAD_PROCESS_SHARED  PTHREAD_PROCESS_SHARED
-+};
-+
-+
-+
-+/* Conditional variable handling.  */
-+#define PTHREAD_COND_INITIALIZER { { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }
-+
-+
-+/* Cleanup buffers */
-+struct _pthread_cleanup_buffer
-+{
-+  void (*__routine) (void *);             /* Function to call.  */
-+  void *__arg;                            /* Its argument.  */
-+  int __canceltype;                       /* Saved cancellation type. */
-+  struct _pthread_cleanup_buffer *__prev; /* Chaining of cleanup functions.  */
-+};
-+
-+/* Cancellation */
-+enum
-+{
-+  PTHREAD_CANCEL_ENABLE,
-+#define PTHREAD_CANCEL_ENABLE   PTHREAD_CANCEL_ENABLE
-+  PTHREAD_CANCEL_DISABLE
-+#define PTHREAD_CANCEL_DISABLE  PTHREAD_CANCEL_DISABLE
-+};
-+enum
-+{
-+  PTHREAD_CANCEL_DEFERRED,
-+#define PTHREAD_CANCEL_DEFERRED	PTHREAD_CANCEL_DEFERRED
-+  PTHREAD_CANCEL_ASYNCHRONOUS
-+#define PTHREAD_CANCEL_ASYNCHRONOUS	PTHREAD_CANCEL_ASYNCHRONOUS
-+};
-+#define PTHREAD_CANCELED ((void *) -1)
-+
-+
-+/* Single execution handling.  */
-+#define PTHREAD_ONCE_INIT 0
-+
-+
-+#ifdef __USE_XOPEN2K
-+/* Value returned by 'pthread_barrier_wait' for one of the threads after
-+   the required number of threads have called this function.
-+   -1 is distinct from 0 and all errno constants */
-+# define PTHREAD_BARRIER_SERIAL_THREAD -1
-+#endif
-+
-+
-+__BEGIN_DECLS
-+
-+/* Create a new thread, starting with execution of START-ROUTINE
-+   getting passed ARG.  Creation attributed come from ATTR.  The new
-+   handle is stored in *NEWTHREAD.  */
-+extern int pthread_create (pthread_t *__restrict __newthread,
-+			   __const pthread_attr_t *__restrict __attr,
-+			   void *(*__start_routine) (void *),
-+			   void *__restrict __arg) __THROW __nonnull ((1, 3));
-+
-+/* Terminate calling thread.
-+
-+   The registered cleanup handlers are called via exception handling
-+   so we cannot mark this function with __THROW.*/
-+extern void pthread_exit (void *__retval) __attribute__ ((__noreturn__));
-+
-+/* Make calling thread wait for termination of the thread TH.  The
-+   exit status of the thread is stored in *THREAD_RETURN, if THREAD_RETURN
-+   is not NULL.
-+
-+   This function is a cancellation point and therefore not marked with
-+   __THROW.  */
-+extern int pthread_join (pthread_t __th, void **__thread_return);
-+
-+#ifdef __USE_GNU
-+/* Check whether thread TH has terminated.  If yes return the status of
-+   the thread in *THREAD_RETURN, if THREAD_RETURN is not NULL.  */
-+extern int pthread_tryjoin_np (pthread_t __th, void **__thread_return) __THROW;
-+
-+/* Make calling thread wait for termination of the thread TH, but only
-+   until TIMEOUT.  The exit status of the thread is stored in
-+   *THREAD_RETURN, if THREAD_RETURN is not NULL.
-+
-+   This function is a cancellation point and therefore not marked with
-+   __THROW.  */
-+extern int pthread_timedjoin_np (pthread_t __th, void **__thread_return,
-+				 __const struct timespec *__abstime);
-+#endif
-+
-+/* Indicate that the thread TH is never to be joined with PTHREAD_JOIN.
-+   The resources of TH will therefore be freed immediately when it
-+   terminates, instead of waiting for another thread to perform PTHREAD_JOIN
-+   on it.  */
-+extern int pthread_detach (pthread_t __th) __THROW;
-+
-+
-+/* Obtain the identifier of the current thread.  */
-+extern pthread_t pthread_self (void) __THROW __attribute__ ((__const__));
-+
-+/* Compare two thread identifiers.  */
-+extern int pthread_equal (pthread_t __thread1, pthread_t __thread2) __THROW;
-+
-+
-+/* Thread attribute handling.  */
-+
-+/* Initialize thread attribute *ATTR with default attributes
-+   (detachstate is PTHREAD_JOINABLE, scheduling policy is SCHED_OTHER,
-+    no user-provided stack).  */
-+extern int pthread_attr_init (pthread_attr_t *__attr) __THROW __nonnull ((1));
-+
-+/* Destroy thread attribute *ATTR.  */
-+extern int pthread_attr_destroy (pthread_attr_t *__attr)
-+     __THROW __nonnull ((1));
-+
-+/* Get detach state attribute.  */
-+extern int pthread_attr_getdetachstate (__const pthread_attr_t *__attr,
-+					int *__detachstate)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set detach state attribute.  */
-+extern int pthread_attr_setdetachstate (pthread_attr_t *__attr,
-+					int __detachstate)
-+     __THROW __nonnull ((1));
-+
-+
-+/* Get the size of the guard area created for stack overflow protection.  */
-+extern int pthread_attr_getguardsize (__const pthread_attr_t *__attr,
-+				      size_t *__guardsize)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set the size of the guard area created for stack overflow protection.  */
-+extern int pthread_attr_setguardsize (pthread_attr_t *__attr,
-+				      size_t __guardsize)
-+     __THROW __nonnull ((1));
-+
-+
-+/* Return in *PARAM the scheduling parameters of *ATTR.  */
-+extern int pthread_attr_getschedparam (__const pthread_attr_t *__restrict
-+				       __attr,
-+				       struct sched_param *__restrict __param)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set scheduling parameters (priority, etc) in *ATTR according to PARAM.  */
-+extern int pthread_attr_setschedparam (pthread_attr_t *__restrict __attr,
-+				       __const struct sched_param *__restrict
-+				       __param) __THROW __nonnull ((1, 2));
-+
-+/* Return in *POLICY the scheduling policy of *ATTR.  */
-+extern int pthread_attr_getschedpolicy (__const pthread_attr_t *__restrict
-+					__attr, int *__restrict __policy)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set scheduling policy in *ATTR according to POLICY.  */
-+extern int pthread_attr_setschedpolicy (pthread_attr_t *__attr, int __policy)
-+     __THROW __nonnull ((1));
-+
-+/* Return in *INHERIT the scheduling inheritance mode of *ATTR.  */
-+extern int pthread_attr_getinheritsched (__const pthread_attr_t *__restrict
-+					 __attr, int *__restrict __inherit)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set scheduling inheritance mode in *ATTR according to INHERIT.  */
-+extern int pthread_attr_setinheritsched (pthread_attr_t *__attr,
-+					 int __inherit)
-+     __THROW __nonnull ((1));
-+
-+
-+/* Return in *SCOPE the scheduling contention scope of *ATTR.  */
-+extern int pthread_attr_getscope (__const pthread_attr_t *__restrict __attr,
-+				  int *__restrict __scope)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set scheduling contention scope in *ATTR according to SCOPE.  */
-+extern int pthread_attr_setscope (pthread_attr_t *__attr, int __scope)
-+     __THROW __nonnull ((1));
-+
-+/* Return the previously set address for the stack.  */
-+extern int pthread_attr_getstackaddr (__const pthread_attr_t *__restrict
-+				      __attr, void **__restrict __stackaddr)
-+     __THROW __nonnull ((1, 2)) __attribute_deprecated__;
-+
-+/* Set the starting address of the stack of the thread to be created.
-+   Depending on whether the stack grows up or down the value must either
-+   be higher or lower than all the address in the memory block.  The
-+   minimal size of the block must be PTHREAD_STACK_MIN.  */
-+extern int pthread_attr_setstackaddr (pthread_attr_t *__attr,
-+				      void *__stackaddr)
-+     __THROW __nonnull ((1)) __attribute_deprecated__;
-+
-+/* Return the currently used minimal stack size.  */
-+extern int pthread_attr_getstacksize (__const pthread_attr_t *__restrict
-+				      __attr, size_t *__restrict __stacksize)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Add information about the minimum stack size needed for the thread
-+   to be started.  This size must never be less than PTHREAD_STACK_MIN
-+   and must also not exceed the system limits.  */
-+extern int pthread_attr_setstacksize (pthread_attr_t *__attr,
-+				      size_t __stacksize)
-+     __THROW __nonnull ((1));
-+
-+#ifdef __USE_XOPEN2K
-+/* Return the previously set address for the stack.  */
-+extern int pthread_attr_getstack (__const pthread_attr_t *__restrict __attr,
-+				  void **__restrict __stackaddr,
-+				  size_t *__restrict __stacksize)
-+     __THROW __nonnull ((1, 2, 3));
-+
-+/* The following two interfaces are intended to replace the last two.  They
-+   require setting the address as well as the size since only setting the
-+   address will make the implementation on some architectures impossible.  */
-+extern int pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr,
-+				  size_t __stacksize) __THROW __nonnull ((1));
-+#endif
-+
-+#ifdef __USE_GNU
-+/* Thread created with attribute ATTR will be limited to run only on
-+   the processors represented in CPUSET.  */
-+extern int pthread_attr_setaffinity_np (pthread_attr_t *__attr,
-+					size_t __cpusetsize,
-+					__const cpu_set_t *__cpuset)
-+     __THROW __nonnull ((1, 3));
-+
-+/* Get bit set in CPUSET representing the processors threads created with
-+   ATTR can run on.  */
-+extern int pthread_attr_getaffinity_np (__const pthread_attr_t *__attr,
-+					size_t __cpusetsize,
-+					cpu_set_t *__cpuset)
-+     __THROW __nonnull ((1, 3));
-+
-+
-+/* Initialize thread attribute *ATTR with attributes corresponding to the
-+   already running thread TH.  It shall be called on uninitialized ATTR
-+   and destroyed with pthread_attr_destroy when no longer needed.  */
-+extern int pthread_getattr_np (pthread_t __th, pthread_attr_t *__attr)
-+     __THROW __nonnull ((2));
-+#endif
-+
-+
-+/* Functions for scheduling control.  */
-+
-+/* Set the scheduling parameters for TARGET_THREAD according to POLICY
-+   and *PARAM.  */
-+extern int pthread_setschedparam (pthread_t __target_thread, int __policy,
-+				  __const struct sched_param *__param)
-+     __THROW __nonnull ((3));
-+
-+/* Return in *POLICY and *PARAM the scheduling parameters for TARGET_THREAD. */
-+extern int pthread_getschedparam (pthread_t __target_thread,
-+				  int *__restrict __policy,
-+				  struct sched_param *__restrict __param)
-+     __THROW __nonnull ((2, 3));
-+
-+/* Set the scheduling priority for TARGET_THREAD.  */
-+extern int pthread_setschedprio (pthread_t __target_thread, int __prio)
-+     __THROW;
-+
-+
-+#ifdef __USE_UNIX98
-+/* Determine level of concurrency.  */
-+extern int pthread_getconcurrency (void) __THROW;
-+
-+/* Set new concurrency level to LEVEL.  */
-+extern int pthread_setconcurrency (int __level) __THROW;
-+#endif
-+
-+#ifdef __USE_GNU
-+/* Yield the processor to another thread or process.
-+   This function is similar to the POSIX `sched_yield' function but
-+   might be differently implemented in the case of a m-on-n thread
-+   implementation.  */
-+extern int pthread_yield (void) __THROW;
-+
-+
-+/* Limit specified thread TH to run only on the processors represented
-+   in CPUSET.  */
-+extern int pthread_setaffinity_np (pthread_t __th, size_t __cpusetsize,
-+				   __const cpu_set_t *__cpuset)
-+     __THROW __nonnull ((3));
-+
-+/* Get bit set in CPUSET representing the processors TH can run on.  */
-+extern int pthread_getaffinity_np (pthread_t __th, size_t __cpusetsize,
-+				   cpu_set_t *__cpuset)
-+     __THROW __nonnull ((3));
-+#endif
-+
-+
-+/* Functions for handling initialization.  */
-+
-+/* Guarantee that the initialization function INIT_ROUTINE will be called
-+   only once, even if pthread_once is executed several times with the
-+   same ONCE_CONTROL argument. ONCE_CONTROL must point to a static or
-+   extern variable initialized to PTHREAD_ONCE_INIT.
-+
-+   The initialization functions might throw exception which is why
-+   this function is not marked with __THROW.  */
-+extern int pthread_once (pthread_once_t *__once_control,
-+			 void (*__init_routine) (void)) __nonnull ((1, 2));
-+
-+
-+/* Functions for handling cancellation.
-+
-+   Note that these functions are explicitly not marked to not throw an
-+   exception in C++ code.  If cancellation is implemented by unwinding
-+   this is necessary to have the compiler generate the unwind information.  */
-+
-+/* Set cancelability state of current thread to STATE, returning old
-+   state in *OLDSTATE if OLDSTATE is not NULL.  */
-+extern int pthread_setcancelstate (int __state, int *__oldstate);
-+
-+/* Set cancellation state of current thread to TYPE, returning the old
-+   type in *OLDTYPE if OLDTYPE is not NULL.  */
-+extern int pthread_setcanceltype (int __type, int *__oldtype);
-+
-+/* Cancel THREAD immediately or at the next possibility.  */
-+extern int pthread_cancel (pthread_t __th);
-+
-+/* Test for pending cancellation for the current thread and terminate
-+   the thread as per pthread_exit(PTHREAD_CANCELED) if it has been
-+   cancelled.  */
-+extern void pthread_testcancel (void);
-+
-+
-+/* Cancellation handling with integration into exception handling.  */
-+
-+typedef struct
-+{
-+  struct
-+  {
-+    __jmp_buf __cancel_jmp_buf;
-+    int __mask_was_saved;
-+  } __cancel_jmp_buf[1];
-+  void *__pad[4];
-+} __pthread_unwind_buf_t __attribute__ ((__aligned__));
-+
-+/* No special attributes by default.  */
-+#ifndef __cleanup_fct_attribute
-+# define __cleanup_fct_attribute
-+#endif
-+
-+
-+/* Structure to hold the cleanup handler information.  */
-+struct __pthread_cleanup_frame
-+{
-+  void (*__cancel_routine) (void *);
-+  void *__cancel_arg;
-+  int __do_it;
-+  int __cancel_type;
-+};
-+
-+#if defined __GNUC__ && defined __EXCEPTIONS
-+# ifdef __cplusplus
-+/* Class to handle cancellation handler invocation.  */
-+class __pthread_cleanup_class
-+{
-+  void (*__cancel_routine) (void *);
-+  void *__cancel_arg;
-+  int __do_it;
-+  int __cancel_type;
-+
-+ public:
-+  __pthread_cleanup_class (void (*__fct) (void *), void *__arg)
-+    : __cancel_routine (__fct), __cancel_arg (__arg), __do_it (1) { }
-+  ~__pthread_cleanup_class () { if (__do_it) __cancel_routine (__cancel_arg); }
-+  void __setdoit (int __newval) { __do_it = __newval; }
-+  void __defer () { pthread_setcanceltype (PTHREAD_CANCEL_DEFERRED,
-+					   &__cancel_type); }
-+  void __restore () const { pthread_setcanceltype (__cancel_type, 0); }
-+};
-+
-+/* Install a cleanup handler: ROUTINE will be called with arguments ARG
-+   when the thread is canceled or calls pthread_exit.  ROUTINE will also
-+   be called with arguments ARG when the matching pthread_cleanup_pop
-+   is executed with non-zero EXECUTE argument.
-+
-+   pthread_cleanup_push and pthread_cleanup_pop are macros and must always
-+   be used in matching pairs at the same nesting level of braces.  */
-+#  define pthread_cleanup_push(routine, arg) \
-+  do {									      \
-+    __pthread_cleanup_class __clframe (routine, arg)
-+
-+/* Remove a cleanup handler installed by the matching pthread_cleanup_push.
-+   If EXECUTE is non-zero, the handler function is called. */
-+#  define pthread_cleanup_pop(execute) \
-+    __clframe.__setdoit (execute);					      \
-+  } while (0)
-+
-+#  ifdef __USE_GNU
-+/* Install a cleanup handler as pthread_cleanup_push does, but also
-+   saves the current cancellation type and sets it to deferred
-+   cancellation.  */
-+#   define pthread_cleanup_push_defer_np(routine, arg) \
-+  do {									      \
-+    __pthread_cleanup_class __clframe (routine, arg);			      \
-+    __clframe.__defer ()
-+
-+/* Remove a cleanup handler as pthread_cleanup_pop does, but also
-+   restores the cancellation type that was in effect when the matching
-+   pthread_cleanup_push_defer was called.  */
-+#   define pthread_cleanup_pop_restore_np(execute) \
-+    __clframe.__restore ();						      \
-+    __clframe.__setdoit (execute);					      \
-+  } while (0)
-+#  endif
-+# else
-+/* Function called to call the cleanup handler.  As an extern inline
-+   function the compiler is free to decide inlining the change when
-+   needed or fall back on the copy which must exist somewhere
-+   else.  */
-+__extern_inline void
-+__pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame)
-+{
-+  if (__frame->__do_it)
-+    __frame->__cancel_routine (__frame->__cancel_arg);
-+}
-+
-+/* Install a cleanup handler: ROUTINE will be called with arguments ARG
-+   when the thread is canceled or calls pthread_exit.  ROUTINE will also
-+   be called with arguments ARG when the matching pthread_cleanup_pop
-+   is executed with non-zero EXECUTE argument.
-+
-+   pthread_cleanup_push and pthread_cleanup_pop are macros and must always
-+   be used in matching pairs at the same nesting level of braces.  */
-+#  define pthread_cleanup_push(routine, arg) \
-+  do {									      \
-+    struct __pthread_cleanup_frame __clframe				      \
-+      __attribute__ ((__cleanup__ (__pthread_cleanup_routine)))		      \
-+      = { .__cancel_routine = (routine), .__cancel_arg = (arg),	 	      \
-+	  .__do_it = 1 };
-+
-+/* Remove a cleanup handler installed by the matching pthread_cleanup_push.
-+   If EXECUTE is non-zero, the handler function is called. */
-+#  define pthread_cleanup_pop(execute) \
-+    __clframe.__do_it = (execute);					      \
-+  } while (0)
-+
-+#  ifdef __USE_GNU
-+/* Install a cleanup handler as pthread_cleanup_push does, but also
-+   saves the current cancellation type and sets it to deferred
-+   cancellation.  */
-+#   define pthread_cleanup_push_defer_np(routine, arg) \
-+  do {									      \
-+    struct __pthread_cleanup_frame __clframe				      \
-+      __attribute__ ((__cleanup__ (__pthread_cleanup_routine)))		      \
-+      = { .__cancel_routine = (routine), .__cancel_arg = (arg),		      \
-+	  .__do_it = 1 };						      \
-+    (void) pthread_setcanceltype (PTHREAD_CANCEL_DEFERRED,		      \
-+				  &__clframe.__cancel_type)
-+
-+/* Remove a cleanup handler as pthread_cleanup_pop does, but also
-+   restores the cancellation type that was in effect when the matching
-+   pthread_cleanup_push_defer was called.  */
-+#   define pthread_cleanup_pop_restore_np(execute) \
-+    (void) pthread_setcanceltype (__clframe.__cancel_type, NULL);	      \
-+    __clframe.__do_it = (execute);					      \
-+  } while (0)
-+#  endif
-+# endif
-+#else
-+/* Install a cleanup handler: ROUTINE will be called with arguments ARG
-+   when the thread is canceled or calls pthread_exit.  ROUTINE will also
-+   be called with arguments ARG when the matching pthread_cleanup_pop
-+   is executed with non-zero EXECUTE argument.
-+
-+   pthread_cleanup_push and pthread_cleanup_pop are macros and must always
-+   be used in matching pairs at the same nesting level of braces.  */
-+# define pthread_cleanup_push(routine, arg) \
-+  do {									      \
-+    __pthread_unwind_buf_t __cancel_buf;				      \
-+    void (*__cancel_routine) (void *) = (routine);			      \
-+    void *__cancel_arg = (arg);						      \
-+    int not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *)	      \
-+				      __cancel_buf.__cancel_jmp_buf, 0);      \
-+    if (__builtin_expect (not_first_call, 0))				      \
-+      {									      \
-+	__cancel_routine (__cancel_arg);				      \
-+	__pthread_unwind_next (&__cancel_buf);				      \
-+	/* NOTREACHED */						      \
-+      }									      \
-+									      \
-+    __pthread_register_cancel (&__cancel_buf);				      \
-+    do {
-+extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
-+     __cleanup_fct_attribute;
-+
-+/* Remove a cleanup handler installed by the matching pthread_cleanup_push.
-+   If EXECUTE is non-zero, the handler function is called. */
-+# define pthread_cleanup_pop(execute) \
-+      do { } while (0);/* Empty to allow label before pthread_cleanup_pop.  */\
-+    } while (0);							      \
-+    __pthread_unregister_cancel (&__cancel_buf);			      \
-+    if (execute)							      \
-+      __cancel_routine (__cancel_arg);					      \
-+  } while (0)
-+extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
-+  __cleanup_fct_attribute;
-+
-+# ifdef __USE_GNU
-+/* Install a cleanup handler as pthread_cleanup_push does, but also
-+   saves the current cancellation type and sets it to deferred
-+   cancellation.  */
-+#  define pthread_cleanup_push_defer_np(routine, arg) \
-+  do {									      \
-+    __pthread_unwind_buf_t __cancel_buf;				      \
-+    void (*__cancel_routine) (void *) = (routine);			      \
-+    void *__cancel_arg = (arg);						      \
-+    int not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *)	      \
-+				      __cancel_buf.__cancel_jmp_buf, 0);      \
-+    if (__builtin_expect (not_first_call, 0))				      \
-+      {									      \
-+	__cancel_routine (__cancel_arg);				      \
-+	__pthread_unwind_next (&__cancel_buf);				      \
-+	/* NOTREACHED */						      \
-+      }									      \
-+									      \
-+    __pthread_register_cancel_defer (&__cancel_buf);			      \
-+    do {
-+extern void __pthread_register_cancel_defer (__pthread_unwind_buf_t *__buf)
-+     __cleanup_fct_attribute;
-+
-+/* Remove a cleanup handler as pthread_cleanup_pop does, but also
-+   restores the cancellation type that was in effect when the matching
-+   pthread_cleanup_push_defer was called.  */
-+#  define pthread_cleanup_pop_restore_np(execute) \
-+      do { } while (0);/* Empty to allow label before pthread_cleanup_pop.  */\
-+    } while (0);							      \
-+    __pthread_unregister_cancel_restore (&__cancel_buf);		      \
-+    if (execute)							      \
-+      __cancel_routine (__cancel_arg);					      \
-+  } while (0)
-+extern void __pthread_unregister_cancel_restore (__pthread_unwind_buf_t *__buf)
-+  __cleanup_fct_attribute;
-+# endif
-+
-+/* Internal interface to initiate cleanup.  */
-+extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf)
-+     __cleanup_fct_attribute __attribute__ ((__noreturn__))
-+# ifndef SHARED
-+     __attribute__ ((__weak__))
-+# endif
-+     ;
-+#endif
-+
-+/* Function used in the macros.  */
-+struct __jmp_buf_tag;
-+extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __THROW;
-+
-+
-+/* Mutex handling.  */
-+
-+/* Initialize a mutex.  */
-+extern int pthread_mutex_init (pthread_mutex_t *__mutex,
-+			       __const pthread_mutexattr_t *__mutexattr)
-+     __THROW __nonnull ((1));
-+
-+/* Destroy a mutex.  */
-+extern int pthread_mutex_destroy (pthread_mutex_t *__mutex)
-+     __THROW __nonnull ((1));
-+
-+/* Try locking a mutex.  */
-+extern int pthread_mutex_trylock (pthread_mutex_t *__mutex)
-+     __THROW __nonnull ((1));
-+
-+/* Lock a mutex.  */
-+extern int pthread_mutex_lock (pthread_mutex_t *__mutex)
-+     __THROW __nonnull ((1));
-+
-+#ifdef __USE_XOPEN2K
-+/* Wait until lock becomes available, or specified time passes. */
-+extern int pthread_mutex_timedlock (pthread_mutex_t *__restrict __mutex,
-+                                    __const struct timespec *__restrict
-+                                    __abstime) __THROW __nonnull ((1, 2));
-+#endif
-+
-+/* Unlock a mutex.  */
-+extern int pthread_mutex_unlock (pthread_mutex_t *__mutex)
-+     __THROW __nonnull ((1));
-+
-+
-+#ifdef __USE_UNIX98
-+/* Get the priority ceiling of MUTEX.  */
-+extern int pthread_mutex_getprioceiling (__const pthread_mutex_t *
-+					 __restrict __mutex,
-+					 int *__restrict __prioceiling)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set the priority ceiling of MUTEX to PRIOCEILING, return old
-+   priority ceiling value in *OLD_CEILING.  */
-+extern int pthread_mutex_setprioceiling (pthread_mutex_t *__restrict __mutex,
-+					 int __prioceiling,
-+					 int *__restrict __old_ceiling)
-+     __THROW __nonnull ((1, 3));
-+#endif
-+
-+
-+#ifdef __USE_XOPEN2K8
-+/* Declare the state protected by MUTEX as consistent.  */
-+extern int pthread_mutex_consistent_np (pthread_mutex_t *__mutex)
-+     __THROW __nonnull ((1));
-+# ifdef __USE_GNU
-+extern int pthread_mutex_consistent_np (pthread_mutex_t *__mutex)
-+     __THROW __nonnull ((1));
-+# endif
-+#endif
-+
-+
-+/* Functions for handling mutex attributes.  */
-+
-+/* Initialize mutex attribute object ATTR with default attributes
-+   (kind is PTHREAD_MUTEX_TIMED_NP).  */
-+extern int pthread_mutexattr_init (pthread_mutexattr_t *__attr)
-+     __THROW __nonnull ((1));
-+
-+/* Destroy mutex attribute object ATTR.  */
-+extern int pthread_mutexattr_destroy (pthread_mutexattr_t *__attr)
-+     __THROW __nonnull ((1));
-+
-+/* Get the process-shared flag of the mutex attribute ATTR.  */
-+extern int pthread_mutexattr_getpshared (__const pthread_mutexattr_t *
-+					 __restrict __attr,
-+					 int *__restrict __pshared)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set the process-shared flag of the mutex attribute ATTR.  */
-+extern int pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr,
-+					 int __pshared)
-+     __THROW __nonnull ((1));
-+
-+#ifdef __USE_UNIX98
-+/* Return in *KIND the mutex kind attribute in *ATTR.  */
-+extern int pthread_mutexattr_gettype (__const pthread_mutexattr_t *__restrict
-+				      __attr, int *__restrict __kind)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set the mutex kind attribute in *ATTR to KIND (either PTHREAD_MUTEX_NORMAL,
-+   PTHREAD_MUTEX_RECURSIVE, PTHREAD_MUTEX_ERRORCHECK, or
-+   PTHREAD_MUTEX_DEFAULT).  */
-+extern int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind)
-+     __THROW __nonnull ((1));
-+
-+/* Return in *PROTOCOL the mutex protocol attribute in *ATTR.  */
-+extern int pthread_mutexattr_getprotocol (__const pthread_mutexattr_t *
-+					  __restrict __attr,
-+					  int *__restrict __protocol)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set the mutex protocol attribute in *ATTR to PROTOCOL (either
-+   PTHREAD_PRIO_NONE, PTHREAD_PRIO_INHERIT, or PTHREAD_PRIO_PROTECT).  */
-+extern int pthread_mutexattr_setprotocol (pthread_mutexattr_t *__attr,
-+					  int __protocol)
-+     __THROW __nonnull ((1));
-+
-+/* Return in *PRIOCEILING the mutex prioceiling attribute in *ATTR.  */
-+extern int pthread_mutexattr_getprioceiling (__const pthread_mutexattr_t *
-+					     __restrict __attr,
-+					     int *__restrict __prioceiling)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set the mutex prioceiling attribute in *ATTR to PRIOCEILING.  */
-+extern int pthread_mutexattr_setprioceiling (pthread_mutexattr_t *__attr,
-+					     int __prioceiling)
-+     __THROW __nonnull ((1));
-+#endif
-+
-+#ifdef __USE_XOPEN2K
-+/* Get the robustness flag of the mutex attribute ATTR.  */
-+extern int pthread_mutexattr_getrobust (__const pthread_mutexattr_t *__attr,
-+					int *__robustness)
-+     __THROW __nonnull ((1, 2));
-+# ifdef __USE_GNU
-+extern int pthread_mutexattr_getrobust_np (__const pthread_mutexattr_t *__attr,
-+					   int *__robustness)
-+     __THROW __nonnull ((1, 2));
-+# endif
-+
-+/* Set the robustness flag of the mutex attribute ATTR.  */
-+extern int pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr,
-+					int __robustness)
-+     __THROW __nonnull ((1));
-+# ifdef __USE_GNU
-+extern int pthread_mutexattr_setrobust_np (pthread_mutexattr_t *__attr,
-+					   int __robustness)
-+     __THROW __nonnull ((1));
-+# endif
-+#endif
-+
-+
-+#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-+/* Functions for handling read-write locks.  */
-+
-+/* Initialize read-write lock RWLOCK using attributes ATTR, or use
-+   the default values if later is NULL.  */
-+extern int pthread_rwlock_init (pthread_rwlock_t *__restrict __rwlock,
-+				__const pthread_rwlockattr_t *__restrict
-+				__attr) __THROW __nonnull ((1));
-+
-+/* Destroy read-write lock RWLOCK.  */
-+extern int pthread_rwlock_destroy (pthread_rwlock_t *__rwlock)
-+     __THROW __nonnull ((1));
-+
-+/* Acquire read lock for RWLOCK.  */
-+extern int pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock)
-+     __THROW __nonnull ((1));
-+
-+/* Try to acquire read lock for RWLOCK.  */
-+extern int pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock)
-+  __THROW __nonnull ((1));
-+
-+# ifdef __USE_XOPEN2K
-+/* Try to acquire read lock for RWLOCK or return after specfied time.  */
-+extern int pthread_rwlock_timedrdlock (pthread_rwlock_t *__restrict __rwlock,
-+				       __const struct timespec *__restrict
-+				       __abstime) __THROW __nonnull ((1, 2));
-+# endif
-+
-+/* Acquire write lock for RWLOCK.  */
-+extern int pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock)
-+     __THROW __nonnull ((1));
-+
-+/* Try to acquire write lock for RWLOCK.  */
-+extern int pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock)
-+     __THROW __nonnull ((1));
-+
-+# ifdef __USE_XOPEN2K
-+/* Try to acquire write lock for RWLOCK or return after specfied time.  */
-+extern int pthread_rwlock_timedwrlock (pthread_rwlock_t *__restrict __rwlock,
-+				       __const struct timespec *__restrict
-+				       __abstime) __THROW __nonnull ((1, 2));
-+# endif
-+
-+/* Unlock RWLOCK.  */
-+extern int pthread_rwlock_unlock (pthread_rwlock_t *__rwlock)
-+     __THROW __nonnull ((1));
-+
-+
-+/* Functions for handling read-write lock attributes.  */
-+
-+/* Initialize attribute object ATTR with default values.  */
-+extern int pthread_rwlockattr_init (pthread_rwlockattr_t *__attr)
-+     __THROW __nonnull ((1));
-+
-+/* Destroy attribute object ATTR.  */
-+extern int pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr)
-+     __THROW __nonnull ((1));
-+
-+/* Return current setting of process-shared attribute of ATTR in PSHARED.  */
-+extern int pthread_rwlockattr_getpshared (__const pthread_rwlockattr_t *
-+					  __restrict __attr,
-+					  int *__restrict __pshared)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set process-shared attribute of ATTR to PSHARED.  */
-+extern int pthread_rwlockattr_setpshared (pthread_rwlockattr_t *__attr,
-+					  int __pshared)
-+     __THROW __nonnull ((1));
-+
-+/* Return current setting of reader/writer preference.  */
-+extern int pthread_rwlockattr_getkind_np (__const pthread_rwlockattr_t *
-+					  __restrict __attr,
-+					  int *__restrict __pref)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set reader/write preference.  */
-+extern int pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *__attr,
-+					  int __pref) __THROW __nonnull ((1));
-+#endif
-+
-+
-+/* Functions for handling conditional variables.  */
-+
-+/* Initialize condition variable COND using attributes ATTR, or use
-+   the default values if later is NULL.  */
-+extern int pthread_cond_init (pthread_cond_t *__restrict __cond,
-+			      __const pthread_condattr_t *__restrict
-+			      __cond_attr) __THROW __nonnull ((1));
-+
-+/* Destroy condition variable COND.  */
-+extern int pthread_cond_destroy (pthread_cond_t *__cond)
-+     __THROW __nonnull ((1));
-+
-+/* Wake up one thread waiting for condition variable COND.  */
-+extern int pthread_cond_signal (pthread_cond_t *__cond)
-+     __THROW __nonnull ((1));
-+
-+/* Wake up all threads waiting for condition variables COND.  */
-+extern int pthread_cond_broadcast (pthread_cond_t *__cond)
-+     __THROW __nonnull ((1));
-+
-+/* Wait for condition variable COND to be signaled or broadcast.
-+   MUTEX is assumed to be locked before.
-+
-+   This function is a cancellation point and therefore not marked with
-+   __THROW.  */
-+extern int pthread_cond_wait (pthread_cond_t *__restrict __cond,
-+			      pthread_mutex_t *__restrict __mutex)
-+     __nonnull ((1, 2));
-+
-+/* Wait for condition variable COND to be signaled or broadcast until
-+   ABSTIME.  MUTEX is assumed to be locked before.  ABSTIME is an
-+   absolute time specification; zero is the beginning of the epoch
-+   (00:00:00 GMT, January 1, 1970).
-+
-+   This function is a cancellation point and therefore not marked with
-+   __THROW.  */
-+extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond,
-+				   pthread_mutex_t *__restrict __mutex,
-+				   __const struct timespec *__restrict
-+				   __abstime) __nonnull ((1, 2, 3));
-+
-+/* Functions for handling condition variable attributes.  */
-+
-+/* Initialize condition variable attribute ATTR.  */
-+extern int pthread_condattr_init (pthread_condattr_t *__attr)
-+     __THROW __nonnull ((1));
-+
-+/* Destroy condition variable attribute ATTR.  */
-+extern int pthread_condattr_destroy (pthread_condattr_t *__attr)
-+     __THROW __nonnull ((1));
-+
-+/* Get the process-shared flag of the condition variable attribute ATTR.  */
-+extern int pthread_condattr_getpshared (__const pthread_condattr_t *
-+                                        __restrict __attr,
-+                                        int *__restrict __pshared)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set the process-shared flag of the condition variable attribute ATTR.  */
-+extern int pthread_condattr_setpshared (pthread_condattr_t *__attr,
-+                                        int __pshared) __THROW __nonnull ((1));
-+
-+#ifdef __USE_XOPEN2K
-+/* Get the clock selected for the conditon variable attribute ATTR.  */
-+extern int pthread_condattr_getclock (__const pthread_condattr_t *
-+				      __restrict __attr,
-+				      __clockid_t *__restrict __clock_id)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set the clock selected for the conditon variable attribute ATTR.  */
-+extern int pthread_condattr_setclock (pthread_condattr_t *__attr,
-+				      __clockid_t __clock_id)
-+     __THROW __nonnull ((1));
-+#endif
-+
-+
-+#ifdef __USE_XOPEN2K
-+/* Functions to handle spinlocks.  */
-+
-+/* Initialize the spinlock LOCK.  If PSHARED is nonzero the spinlock can
-+   be shared between different processes.  */
-+extern int pthread_spin_init (pthread_spinlock_t *__lock, int __pshared)
-+     __THROW __nonnull ((1));
-+
-+/* Destroy the spinlock LOCK.  */
-+extern int pthread_spin_destroy (pthread_spinlock_t *__lock)
-+     __THROW __nonnull ((1));
-+
-+/* Wait until spinlock LOCK is retrieved.  */
-+extern int pthread_spin_lock (pthread_spinlock_t *__lock)
-+     __THROW __nonnull ((1));
-+
-+/* Try to lock spinlock LOCK.  */
-+extern int pthread_spin_trylock (pthread_spinlock_t *__lock)
-+     __THROW __nonnull ((1));
-+
-+/* Release spinlock LOCK.  */
-+extern int pthread_spin_unlock (pthread_spinlock_t *__lock)
-+     __THROW __nonnull ((1));
-+
-+
-+/* Functions to handle barriers.  */
-+
-+/* Initialize BARRIER with the attributes in ATTR.  The barrier is
-+   opened when COUNT waiters arrived.  */
-+extern int pthread_barrier_init (pthread_barrier_t *__restrict __barrier,
-+				 __const pthread_barrierattr_t *__restrict
-+				 __attr, unsigned int __count)
-+     __THROW __nonnull ((1));
-+
-+/* Destroy a previously dynamically initialized barrier BARRIER.  */
-+extern int pthread_barrier_destroy (pthread_barrier_t *__barrier)
-+     __THROW __nonnull ((1));
-+
-+/* Wait on barrier BARRIER.  */
-+extern int pthread_barrier_wait (pthread_barrier_t *__barrier)
-+     __THROW __nonnull ((1));
-+
-+
-+/* Initialize barrier attribute ATTR.  */
-+extern int pthread_barrierattr_init (pthread_barrierattr_t *__attr)
-+     __THROW __nonnull ((1));
-+
-+/* Destroy previously dynamically initialized barrier attribute ATTR.  */
-+extern int pthread_barrierattr_destroy (pthread_barrierattr_t *__attr)
-+     __THROW __nonnull ((1));
-+
-+/* Get the process-shared flag of the barrier attribute ATTR.  */
-+extern int pthread_barrierattr_getpshared (__const pthread_barrierattr_t *
-+					   __restrict __attr,
-+					   int *__restrict __pshared)
-+     __THROW __nonnull ((1, 2));
-+
-+/* Set the process-shared flag of the barrier attribute ATTR.  */
-+extern int pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr,
-+                                           int __pshared)
-+     __THROW __nonnull ((1));
-+#endif
-+
-+
-+/* Functions for handling thread-specific data.  */
-+
-+/* Create a key value identifying a location in the thread-specific
-+   data area.  Each thread maintains a distinct thread-specific data
-+   area.  DESTR_FUNCTION, if non-NULL, is called with the value
-+   associated to that key when the key is destroyed.
-+   DESTR_FUNCTION is not called if the value associated is NULL when
-+   the key is destroyed.  */
-+extern int pthread_key_create (pthread_key_t *__key,
-+			       void (*__destr_function) (void *))
-+     __THROW __nonnull ((1));
-+
-+/* Destroy KEY.  */
-+extern int pthread_key_delete (pthread_key_t __key) __THROW;
-+
-+/* Return current value of the thread-specific data slot identified by KEY.  */
-+extern void *pthread_getspecific (pthread_key_t __key) __THROW;
-+
-+/* Store POINTER in the thread-specific data slot identified by KEY. */
-+extern int pthread_setspecific (pthread_key_t __key,
-+				__const void *__pointer) __THROW ;
-+
-+
-+#ifdef __USE_XOPEN2K
-+/* Get ID of CPU-time clock for thread THREAD_ID.  */
-+extern int pthread_getcpuclockid (pthread_t __thread_id,
-+				  __clockid_t *__clock_id)
-+     __THROW __nonnull ((2));
-+#endif
-+
-+
-+/* Install handlers to be called when a new process is created with FORK.
-+   The PREPARE handler is called in the parent process just before performing
-+   FORK. The PARENT handler is called in the parent process just after FORK.
-+   The CHILD handler is called in the child process.  Each of the three
-+   handlers can be NULL, meaning that no handler needs to be called at that
-+   point.
-+   PTHREAD_ATFORK can be called several times, in which case the PREPARE
-+   handlers are called in LIFO order (last added with PTHREAD_ATFORK,
-+   first called before FORK), and the PARENT and CHILD handlers are called
-+   in FIFO (first added, first called).  */
-+
-+extern int pthread_atfork (void (*__prepare) (void),
-+			   void (*__parent) (void),
-+			   void (*__child) (void)) __THROW;
-+
-+
-+#ifdef __USE_EXTERN_INLINES
-+/* Optimizations.  */
-+__extern_inline int
-+__NTH (pthread_equal (pthread_t __thread1, pthread_t __thread2))
-+{
-+  return __thread1 == __thread2;
-+}
-+#endif
-+
-+__END_DECLS
-+
-+#endif	/* pthread.h */
-+
-+#ifndef _PTHREAD_H_HPPA_ 
-+#define _PTHREAD_H_HPPA_ 1
-+
-+/* The pthread_cond_t initializer is compatible only with NPTL. We do not
-+   want to be forwards compatible, we eventually want to drop the code 
-+   that has to clear the old LT initializer.  */
-+#undef PTHREAD_COND_INITIALIZER
-+#define PTHREAD_COND_INITIALIZER { { 0, 0, 0, (void *) 0, 0, 0, 0, 0, 0 } }
-+
-+/* The pthread_mutex_t and pthread_rwlock_t initializers are compatible
-+   only with NPTL. NPTL assumes pthread_rwlock_t is all zero.  */
-+#undef PTHREAD_MUTEX_INITIALIZER
-+#undef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-+#undef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
-+#undef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
-+/* Mutex initializers.  */
-+#define PTHREAD_MUTEX_INITIALIZER \
-+  { { 0, 0, 0, 0, { 0, 0, 0, 0 }, 0, { 0 }, 0, 0 } }
-+#ifdef __USE_GNU
-+# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
-+  { { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, { 0, 0, 0, 0 }, 0, { 0 }, 0, 0 } }
-+# define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
-+  { { 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, { 0, 0, 0, 0 }, 0, { 0 }, 0, 0 } }
-+# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
-+  { { 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, { 0, 0, 0, 0 }, 0, { 0 }, 0, 0 } }
-+#endif
-+
-+#undef PTHREAD_RWLOCK_INITIALIZER
-+#undef PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP
-+/* Read-write lock initializers.  */
-+#define PTHREAD_RWLOCK_INITIALIZER \
-+  { { { 0, 0, 0, 0 }, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
-+#ifdef __USE_GNU
-+# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
-+  { { { 0, 0, 0, 0 }, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,\
-+      0, 0, 0 } }
-+#endif  /* Unix98 or XOpen2K */
-+ 
-+#endif
-+
-diff -urN a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h
---- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h	1969-12-31 19:00:00.000000000 -0500
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h	2009-09-03 16:01:13.000000000 -0400
-@@ -0,0 +1,17 @@
-+#include_next <pthreadP.h>
-+#ifndef _PTHREADP_H_HPPA_ 
-+#define _PTHREADP_H_HPPA_ 1
-+
-+/* Internal cond functions.  */
-+extern int __pthread_cond_broadcast_internal (pthread_cond_t *cond);
-+extern int __pthread_cond_destroy_internal (pthread_cond_t *cond);
-+extern int __pthread_cond_init_internal (pthread_cond_t *cond,
-+                                        const pthread_condattr_t *cond_attr);
-+extern int __pthread_cond_signal_internal (pthread_cond_t *cond);
-+extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond,
-+                                             pthread_mutex_t *mutex,
-+                                             const struct timespec *abstime);
-+extern int __pthread_cond_wait_internal (pthread_cond_t *cond,
-+                                        pthread_mutex_t *mutex);
-+#endif
-+

Added: glibc-package/trunk/debian/patches/hppa/local-dlfptr.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/local-dlfptr.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/hppa/local-dlfptr.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,70 @@
+diff --git a/elf/dl-fptr.c b/elf/dl-fptr.c
+index e068124..0853894 100644
+--- a/elf/dl-fptr.c
++++ b/elf/dl-fptr.c
+@@ -1,5 +1,5 @@
+ /* Manage function descriptors.  Generic version.
+-   Copyright (C) 1999-2004, 2006 Free Software Foundation, Inc.
++   Copyright (C) 1999-2004, 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
+@@ -56,7 +56,12 @@ static struct local
+   }
+ local =
+   {
++#ifndef SHARED
+     .root = &local.boot_table,
++#else
++    /* Address of .boot_table is not known until runtime.  */
++    .root = 0,
++#endif
+     .npages = 2,
+     .boot_table =
+       {
+@@ -93,6 +98,17 @@ new_fdesc_table (struct local *l, size_t *size)
+   return new_table;
+ }
+ 
++/* Must call _dl_fptr_init before using any other function.  */
++void 
++_dl_fptr_init (void)
++{
++  struct local *l;
++
++  ELF_MACHINE_LOAD_ADDRESS (l, local);
++  /* Initialize root once.  */
++  if (__builtin_expect (l->root == 0, 0))
++    l->root = &l->boot_table;
++}
+ 
+ static ElfW(Addr)
+ make_fdesc (ElfW(Addr) ip, ElfW(Addr) gp)
+diff --git a/sysdeps/generic/dl-fptr.h b/sysdeps/generic/dl-fptr.h
+index d47fb7b..b957fbb 100644
+--- a/sysdeps/generic/dl-fptr.h
++++ b/sysdeps/generic/dl-fptr.h
+@@ -40,6 +40,9 @@ struct link_map;
+ 
+ extern ElfW(Addr) _dl_boot_fptr_table [];
+ 
++/* Must be called before any other function.  */
++extern void _dl_fptr_init (void);
++
+ extern ElfW(Addr) _dl_make_fptr (struct link_map *, const ElfW(Sym) *,
+ 				 ElfW(Addr));
+ 
+diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h
+index e462fd3..ae4b6c1 100644
+--- a/ports/sysdeps/hppa/dl-machine.h
++++ b/ports/sysdeps/hppa/dl-machine.h
+@@ -64,7 +64,8 @@ __hppa_init_bootstrap_fdesc_table (struct link_map *map)
+ }
+ 
+ #define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info)		\
+-	__hppa_init_bootstrap_fdesc_table (&bootstrap_map);
++	__hppa_init_bootstrap_fdesc_table (&bootstrap_map);	\
++	_dl_fptr_init();
+ 
+ /* Return nonzero iff ELF header is compatible with the running host.  */
+ static inline int

Added: glibc-package/trunk/debian/patches/hppa/local-longjmp-chk.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/local-longjmp-chk.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/hppa/local-longjmp-chk.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,10 @@
+--- a/ports/sysdeps/unix/sysv/linux/hppa/____longjmp_chk.S
++++ b/ports/sysdeps/unix/sysv/linux/hppa/____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>

Added: glibc-package/trunk/debian/patches/hppa/local-lowlevellock.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/local-lowlevellock.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/hppa/local-lowlevellock.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,29 @@
+2010-02-11  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: remove
+	useless <sysdep.h> include. Move <tls.h> include to...
+	* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c: here.
+
+--- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c
++++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c
+@@ -22,6 +22,7 @@
+ #include <sysdep.h>
+ #include <lowlevellock.h>
+ #include <sys/time.h>
++#include <tls.h>		/* Need THREAD_*, and header.*.  */
+ 
+ void
+ __lll_lock_wait (lll_lock_t *futex, int private)
+--- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
++++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
+@@ -22,10 +22,8 @@
+ #include <time.h>
+ #include <sys/param.h>
+ #include <bits/pthreadtypes.h>
+-#include <sysdep.h>
+ #include <atomic.h>
+ #include <kernel-features.h>	/* Need __ASSUME_PRIVATE_FUTEX.  */
+-#include <tls.h>		/* Need THREAD_*, and header.*.  */
+ 
+ /* HPPA only has one atomic read and modify memory operation,
+    load and clear, so hppa uses a kernel helper routine to implement

Modified: glibc-package/trunk/debian/patches/hppa/local-stack-grows-up.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/local-stack-grows-up.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/hppa/local-stack-grows-up.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,7 +1,13 @@
 diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
-index 3c3585f..9fba661 100644
+index 3c3585f..68c4a8f 100644
 --- 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 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
    if (__builtin_expect (attr->flags & ATTR_FLAG_STACKADDR, 0))
      {
@@ -72,12 +78,12 @@
  
    return 0;
 diff --git a/nptl/pthread_attr_getstack.c b/nptl/pthread_attr_getstack.c
-index 1db135e..ae02c9d 100644
+index 1db135e..792f5d5 100644
 --- a/nptl/pthread_attr_getstack.c
 +++ b/nptl/pthread_attr_getstack.c
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002 Free Software Foundation, Inc.
-+/* Copyright (C) 2002, 2009 Free Software Foundation, Inc.
++/* Copyright (C) 2002, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
  
@@ -94,12 +100,12 @@
  
    return 0;
 diff --git a/nptl/pthread_attr_setstack.c b/nptl/pthread_attr_setstack.c
-index be79e32..acf61dd 100644
+index be79e32..a455a04 100644
 --- a/nptl/pthread_attr_setstack.c
 +++ b/nptl/pthread_attr_setstack.c
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
-+/* Copyright (C) 2002, 2003, 2006, 2009 Free Software Foundation, Inc.
++/* Copyright (C) 2002, 2003, 2006, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
  
@@ -127,14 +133,46 @@
    iattr->flags |= ATTR_FLAG_STACKADDR;
  
    return 0;
+diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
+index 89938b3..9e992ca 100644
+--- 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.
+ 
+@@ -383,12 +383,18 @@ start_thread (void *arg)
+ #ifdef _STACK_GROWS_DOWN
+   char *sp = CURRENT_STACK_FRAME;
+   size_t freesize = (sp - (char *) pd->stackblock) & ~pagesize_m1;
+-#else
+-# error "to do"
+-#endif
+   assert (freesize < pd->stackblock_size);
+   if (freesize > PTHREAD_STACK_MIN)
+     madvise (pd->stackblock, freesize - PTHREAD_STACK_MIN, MADV_DONTNEED);
++#else
++  char *sp = CURRENT_STACK_FRAME;
++  size_t freesize = ((char *) pd->stackblock + pd->stackblock_size - sp) 
++		     & ~pagesize_m1;
++  void *freeblock = (void *) (sp + PTHREAD_STACK_MIN);
++  assert (freesize < pd->stackblock_size);
++  if (freesize > PTHREAD_STACK_MIN)
++    madvise (freeblock, freesize - PTHREAD_STACK_MIN, MADV_DONTNEED);
++#endif
+ 
+   /* If the thread is detached free the TCB.  */
+   if (IS_DETACHED (pd))
 diff --git a/nptl/pthread_getattr_np.c b/nptl/pthread_getattr_np.c
-index 9c25caf..72da58c 100644
+index 9c25caf..80f0f3c 100644
 --- a/nptl/pthread_getattr_np.c
 +++ b/nptl/pthread_getattr_np.c
 @@ -1,4 +1,5 @@
 -/* Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006, 2007, 
-+   2009 Free Software Foundation, Inc.
++   2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
     Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
  

Deleted: glibc-package/trunk/debian/patches/hppa/submitted-pie.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/submitted-pie.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/hppa/submitted-pie.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,29 +0,0 @@
----
- ports/sysdeps/hppa/elf/start.S |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/ports/sysdeps/hppa/elf/start.S
-+++ b/ports/sysdeps/hppa/elf/start.S
-@@ -96,16 +96,16 @@
- 
- #if SHARED
- 	/* load main (1st argument) */
--	addil	LR'.Lpmain, %r19
--	ldw	RR'.Lpmain(%r1), %r26
-+	addil	LT'.Lpmain, %r19
-+	ldw	RT'.Lpmain(%r1), %r26
- 	ldw	0(%r26),%r26
- 	/* void (*init) (void) (4th argument) */
--	addil	LR'.Lp__libc_csu_init, %r19
--	ldw	RR'.Lp__libc_csu_init(%r1), %r23
-+	addil	LT'.Lp__libc_csu_init, %r19
-+	ldw	RT'.Lp__libc_csu_init(%r1), %r23
- 	ldw	0(%r23), %r23
- 	/* void (*fini) (void) (5th argument) */
--	addil	LR'.Lp__libc_csu_fini, %r19
--	ldw	RR'.Lp__libc_csu_fini(%r1), %r22
-+	addil	LT'.Lp__libc_csu_fini, %r19
-+	ldw	RT'.Lp__libc_csu_fini(%r1), %r22
- 	ldw	0(%r22), %r22
- #else
- 	/* load main (1st argument) */

Deleted: glibc-package/trunk/debian/patches/hppa/submitted-sock_nonblock.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/submitted-sock_nonblock.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/hppa/submitted-sock_nonblock.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,419 +0,0 @@
-2010-02-13  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/hppa/bits/socket.h: New file based on
-	the generic version, with SOCK_CLOEXEC and SOCK_NONBLOCK 
-	matching the kernel value.
-
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/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 */
--- 
-1.6.1.3
-

Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -5,11 +5,24 @@
     Hurd: Fix possibly uninitialized variable in _hurd_locked_install_cttyid.
 
 ---
+ ChangeLog        |    5 +++++
  hurd/hurdioctl.c |   24 ++++++++++--------------
  2 files changed, 15 insertions(+), 14 deletions(-)
 
-diff --git a/hurd/hurdioctl.c b/hurd/hurdioctl.c
-index 96d910b..7c68984 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -9,6 +9,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 @@
@@ -20,7 +33,7 @@
     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 @@ _hurd_locked_install_cttyid (mach_port_t cttyid)
+@@ -169,33 +170,28 @@
    for (i = 0; i < _hurd_dtablesize; ++i)
      {
        struct hurd_fd *const d = _hurd_dtable[i];

Deleted: glibc-package/trunk/debian/patches/hurd-i386/cvs-termios-IXANY.patch
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-termios-IXANY.patch	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-termios-IXANY.patch	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,24 +0,0 @@
-2009-09-28  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-	* bits/termios.h [__USE_UNIX98] (IXANY): Define macro.
-
----
- termios.h |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/bits/termios.h b/bits/termios.h
-index 293d0a6..b697dd1 100644
---- a/bits/termios.h
-+++ b/bits/termios.h
-@@ -124,8 +124,10 @@ struct termios
- #define	ICRNL	(1 << 8)	/* Map CR to NL on input.  */
- #define	IXON	(1 << 9)	/* Enable start/stop output control.  */
- #define	IXOFF	(1 << 10)	/* Enable start/stop input control.  */
--#ifdef	__USE_BSD
-+#if defined __USE_BSD || defined __USE_UNIX98
- # define IXANY	(1 << 11)	/* Any character will restart after stop.  */
-+#endif
-+#ifdef	__USE_BSD
- # define IMAXBEL (1 << 13)	/* Ring bell when input queue is full.  */
- #endif
- #ifdef __USE_GNU

Added: glibc-package/trunk/debian/patches/hurd-i386/local-longjmp_chk.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-longjmp_chk.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-longjmp_chk.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,145 @@
+From Thomas Schwinge.
+
+Provide ____longjmp_chk, still WIP.
+---
+ b/sysdeps/mach/hurd/i386/Makefile         |    4 +
+ sysdeps/mach/hurd/i386/____longjmp_chk.S  |  108 ++++++++++++++++++++++++++++++
+ sysdeps/mach/hurd/i386/signal-defines.sym |   10 ++
+ 3 files changed, 122 insertions(+)
+
+--- a/sysdeps/mach/hurd/i386/____longjmp_chk.S	2010-01-17 13:39:52.030010467 +0100
++++ b/sysdeps/mach/hurd/i386/____longjmp_chk.S	2010-01-17 20:26:36.000000000 +0100
+@@ -0,0 +1,108 @@
++/* Copyright (C) 2001,2004,2005,2006,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.  */
++
++#include <sysdep.h>
++#include <jmpbuf-offsets.h>
++#include <asm-syntax.h>
++
++#include <signal-defines.h>
++/* #include <signal.h> */
++#define SS_ONSTACK 1
++
++
++	.section .rodata.str1.1,"aMS",@progbits,1
++	.type	longjmp_msg,@object
++longjmp_msg:
++	.string "longjmp causes uninitialized stack frame"
++	.size	longjmp_msg, .-longjmp_msg
++
++
++#ifdef PIC
++# define CALL_FAIL	movl	%ebx, %ecx; /* TODO: what's this mov good for? */ \
++			cfi_register(%ebx,%ecx);			      \
++			LOAD_PIC_REG (bx);				      \
++			leal	longjmp_msg@GOTOFF(%ebx), %eax;		      \
++			call	HIDDEN_JUMPTARGET(__fortify_fail)
++#else
++# define CALL_FAIL	movl	$longjmp_msg, %eax;			      \
++			call	HIDDEN_JUMPTARGET(__fortify_fail)
++#endif
++
++
++	.text
++ENTRY (____longjmp_chk)
++	movl	4(%esp), %ecx	/* User's jmp_buf in %ecx.  */
++
++	/* Save the return address now.  */
++	movl	(JB_PC*4)(%ecx), %edx
++	/* Get the stack pointer.  */
++	movl	(JB_SP*4)(%ecx), %edi
++	cfi_undefined(%edi)
++	PTR_DEMANGLE (%edx)
++	PTR_DEMANGLE (%edi)
++
++	cmpl	%edi, %esp
++	/* Jumping to a higher-address frame is always allowed.  */
++	jbe	.Lok
++
++	/* Passing here, we're either about to do something invalid, or we're
++	executing on an alternative signal stack.  */
++
++	/* TODO: need locking?  */
++	/* struct hurd_sigstate * _hurd_self_sigstate (void) */
++	call	_hurd_self_sigstate
++	/* TODO: %eax and %eax->sigaltstack are always valid?  */
++
++	testl	$SS_ONSTACK, (HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_FLAGS__OFFSET)(%eax)
++	/* Fail if SS_ONSTACK is not set.  */
++	jz	.Lfail
++
++	movl	(HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_SP__OFFSET)(%eax), %ebx
++	addl	(HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_SIZE__OFFSET)(%eax), %ebx
++	subl	%edi, %ebx
++	cmpl	(HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_SIZE__OFFSET)(%eax), %ebx
++	/* TODO: comment this calculation.  */
++	jae	.Lok
++
++.Lfail:	CALL_FAIL
++
++.Lok:	/* We add unwind information for the target here.  */
++	cfi_def_cfa(%ecx, 0)
++	cfi_register(%eip, %edx)
++	cfi_register(%esp, %edi)
++	cfi_offset(%ebx, JB_BX*4)
++	cfi_offset(%esi, JB_SI*4)
++	cfi_offset(%edi, JB_DI*4)
++	cfi_offset(%ebp, JB_BP*4)
++
++	movl	8(%esp), %eax	/* Second argument is return value.  */
++	movl	%edi, %esp
++
++	/* Restore registers.  */
++	movl	(JB_BX*4)(%ecx), %ebx
++	movl	(JB_SI*4)(%ecx), %esi
++	movl	(JB_DI*4)(%ecx), %edi
++	movl	(JB_BP*4)(%ecx), %ebp
++	cfi_restore(%ebx)
++	cfi_restore(%esi)
++	cfi_restore(%edi)
++	cfi_restore(%ebp)
++
++	/* Jump to saved PC.  */
++	jmp	*%edx
++END (____longjmp_chk)
+--- a/sysdeps/mach/hurd/i386/signal-defines.sym
++++ b/sysdeps/mach/hurd/i386/signal-defines.sym
+@@ -0,0 +1,10 @@
++#include <hurd/signal.h>
++#include <signal.h>
++
++--
++
++HURD_SIGSTATE__SIGALTSTACK__OFFSET	offsetof(struct hurd_sigstate, sigaltstack)
++
++SIGALTSTACK__SS_SP__OFFSET		offsetof(struct sigaltstack, ss_sp)
++SIGALTSTACK__SS_SIZE__OFFSET		offsetof(struct sigaltstack, ss_size)
++SIGALTSTACK__SS_FLAGS__OFFSET		offsetof(struct sigaltstack, ss_flags)
+diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
+index 0eef17e..5f98809 100644
+--- a/sysdeps/mach/hurd/i386/Makefile
++++ b/sysdeps/mach/hurd/i386/Makefile
+@@ -2,3 +2,7 @@ ifeq ($(subdir),misc)
+ sysdep_routines += ioperm
+ sysdep_headers += sys/io.h
+ endif
++
++ifeq ($(subdir),debug)
++gen-as-const-headers += signal-defines.sym
++endif

Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-getnprocs.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-getnprocs.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-getnprocs.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,42 +0,0 @@
-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)

Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-readlinkat.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-readlinkat.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-readlinkat.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,40 +1,14 @@
 2009-09-27  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
-	* sysdeps/mach/hurd/mkdirat.c: Include <hurd/fd.h>
-        (mkdirat): Call __directory_name_split_at instead of
-        __directory_name_split.
 	* sysdeps/mach/hurd/readlinkat.c: New file, heavily inherited from
 	sysdeps/mach/hurd/readlink.c
 
 ---
- mkdirat.c    |    3 +-
  readlinkat.c |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 69 insertions(+), 1 deletion(-)
 
 diff --git a/sysdeps/mach/hurd/mkdirat.c b/sysdeps/mach/hurd/mkdirat.c
 index 321d59f..a300745 100644
---- a/sysdeps/mach/hurd/mkdirat.c
-+++ b/sysdeps/mach/hurd/mkdirat.c
-@@ -22,6 +22,7 @@
- #include <stddef.h>
- #include <sys/stat.h>
- #include <hurd.h>
-+#include <hurd/fd.h>
- 
- int
- mkdirat (fd, path, mode)
-@@ -31,7 +32,7 @@ mkdirat (fd, path, mode)
- {
-   error_t err;
-   const char *name;
--  file_t parent = __directory_name_split (path, (char **) &name);
-+  file_t parent = __directory_name_split_at (fd, path, (char **) &name);
-   if (parent == MACH_PORT_NULL)
-     return -1;
-   err = __dir_mkdir (parent, name, mode & ~_hurd_umask);
-diff --git a/sysdeps/mach/hurd/readlinkat.c b/sysdeps/mach/hurd/readlinkat.c
-new file mode 100644
-index 0000000..5e44dbb
 --- /dev/null
 +++ b/sysdeps/mach/hurd/readlinkat.c
 @@ -0,0 +1,67 @@

Added: glibc-package/trunk/debian/patches/hurd-i386/submitted-regex_internal.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-regex_internal.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-regex_internal.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,17 @@
+2010-05-26  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* posix/regex_internal.h: include <sys/param.h> to get MAX 
+	definition.
+
+diff --git a/posix/regex_internal.h b/posix/regex_internal.h
+index 65a9905..d83b9df 100644
+--- a/posix/regex_internal.h
++++ b/posix/regex_internal.h
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/param.h>
+ 
+ #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC
+ # include <langinfo.h>

Added: glibc-package/trunk/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,31 @@
+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.
+
+---
+ libc-lock.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sysdeps/mach/hurd/bits/libc-lock.h b/sysdeps/mach/hurd/bits/libc-lock.h
+index 0fa90bc..eadd98d 100644
+--- a/sysdeps/mach/hurd/bits/libc-lock.h
++++ b/sysdeps/mach/hurd/bits/libc-lock.h
+@@ -31,6 +31,7 @@ typedef struct
+   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))
+ 
+@@ -121,6 +122,8 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
+ 
+ #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) \

Deleted: glibc-package/trunk/debian/patches/ia64/cvs-memchr.diff
===================================================================
--- glibc-package/trunk/debian/patches/ia64/cvs-memchr.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/ia64/cvs-memchr.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,34 +0,0 @@
-2009-11-18  H.J. Lu  <hongjiu.lu@intel.com>
-
-	[BZ #10162]
-	* sysdeps/ia64/memchr.S: Don't use a simple loop on data shorter
-	than software pipeline.  Properly recover from shorter read.
-
-2009-11-09  H.J. Lu  <hongjiu.lu@intel.com>
-
-	[BZ #10162]
-	* sysdeps/ia64/memchr.S: Use a simple loop on data shorter than
-	software pipeline.
-
-diff --git a/sysdeps/ia64/memchr.S b/sysdeps/ia64/memchr.S
-index cd062b2..cdd71ca 100644
---- a/sysdeps/ia64/memchr.S
-+++ b/sysdeps/ia64/memchr.S
-@@ -126,7 +126,16 @@ ENTRY(__memchr)
- 	br.ret.sptk.many b0
- 
- .recovery:
--	adds	ret0 = -((MEMLAT + 1) * 8), ret0;;
-+#if MEMLAT != 6
-+# error "MEMLAT must be 6!"
-+#endif
-+(p[MEMLAT-6])	add	ret0 = -8, ret0;;
-+(p[MEMLAT-5])	add	ret0 = -8, ret0;;
-+(p[MEMLAT-4])	add	ret0 = -8, ret0;;
-+(p[MEMLAT-3])	add	ret0 = -8, ret0;;
-+(p[MEMLAT-2])	add	ret0 = -8, ret0;;
-+(p[MEMLAT-1])	add	ret0 = -8, ret0;;
-+(p[MEMLAT])	add	ret0 = -8, ret0;;
- (p[MEMLAT+1])	add	ret0 = -8, ret0;;
- (p[MEMLAT+2])	add	ret0 = -8, ret0;;
- .l4:

Deleted: glibc-package/trunk/debian/patches/ia64/submitted-siginfo.diff
===================================================================
--- glibc-package/trunk/debian/patches/ia64/submitted-siginfo.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/ia64/submitted-siginfo.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,22 +0,0 @@
-2009-07-25  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (struct sigevent):
-	Add _tid slot to maintain consistency with kernel.
-
----
- sysdeps/unix/sysv/linux/ia64/bits/siginfo.h |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
-+++ b/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
-@@ -310,6 +310,10 @@
-       {
- 	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.  */

Added: glibc-package/trunk/debian/patches/kfreebsd/local-dosavesse.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-dosavesse.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-dosavesse.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,116 @@
+ unfortunately, it does not work
+ in mean time use local-nosavesse.diff 
+
+--- a/linuxthreads/descr.h
++++ b/linuxthreads/descr.h
+@@ -114,6 +114,7 @@
+   /* This overlaps tcbhead_t (see tls.h), as used for TLS without threads.  */
+   union
+   {
++    tcbhead_t tcbheader;
+     struct
+     {
+       void *tcb;		/* Pointer to the TCB.  This is not always
+--- a/linuxthreads/sysdeps/x86_64/tcb-offsets.sym
++++ b/linuxthreads/sysdeps/x86_64/tcb-offsets.sym
+@@ -3,3 +3,4 @@
+ 
+ MULTIPLE_THREADS_OFFSET		offsetof (tcbhead_t, multiple_threads)
+ POINTER_GUARD			offsetof (tcbhead_t, pointer_guard)
++RTLD_SAVESPACE_SSE		offsetof (tcbhead_t, rtld_savespace_sse)
+--- a/linuxthreads/sysdeps/x86_64/tls.h
++++ b/linuxthreads/sysdeps/x86_64/tls.h
+@@ -26,6 +26,7 @@
+ # include <stdbool.h>
+ # include <stddef.h>
+ # include <stdint.h>
++# include <xmmintrin.h>
+ 
+ /* Type for the dtv.  */
+ typedef union dtv
+@@ -46,6 +47,7 @@
+   dtv_t *dtv;
+   void *self;		/* Pointer to the thread descriptor.  */
+   int multiple_threads;
++  int __unused1;
+   uintptr_t sysinfo;
+   uintptr_t stack_guard;
+   uintptr_t pointer_guard;
+@@ -53,7 +55,13 @@
+   long gscope_flag;
+ # else
+   int gscope_flag;
++  int __unused2;
+ # endif
++  void *__padding1[7];
++  int rtld_must_xmm_save;
++  int __unused3;
++   /* Have space for the post-AVX register size.  */
++  __m128 rtld_savespace_sse[8][4];
+ } tcbhead_t;
+ 
+ #else /* __ASSEMBLER__ */
+@@ -77,13 +85,19 @@
+ #  define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
+ 
+ /* Alignment requirements for the initial TCB.  */
+-#  define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
++//#  define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
++// 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_INIT_TCB_ALIGN 32
+ 
+ /* This is the size of the TCB.  */
+ #  define TLS_TCB_SIZE sizeof (struct _pthread_descr_struct)
+ 
+ /* Alignment requirements for the TCB.  */
+ #  define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
++// It is already 32B aligned
+ 
+ /* The TCB can have any size and the memory following the address the
+    thread pointer points to is unspecified.  Allocate the TCB there.  */
+@@ -189,7 +203,42 @@
+ #define THREAD_GSCOPE_WAIT() \
+   do { /* GL(dl_wait_lookup_done) () */ } while (0)
+ 
++
++# ifdef SHARED
++/* Defined in dl-trampoline.S.  */
++extern void _dl_x86_64_save_sse (void);
++extern void _dl_x86_64_restore_sse (void);
++
++# define RTLD_CHECK_FOREIGN_CALL \
++  (THREAD_GETMEM (THREAD_SELF, p_header.tcbheader.rtld_must_xmm_save) != 0)
++
++/* NB: Don't use the xchg operation because that would imply a lock
++   prefix which is expensive and unnecessary.  The cache line is also
++   not contested at all.  */
++#  define RTLD_ENABLE_FOREIGN_CALL \
++  int old_rtld_must_xmm_save = THREAD_GETMEM (THREAD_SELF,		      \
++					      p_header.tcbheader.rtld_must_xmm_save); \
++  THREAD_SETMEM (THREAD_SELF, p_header.tcbheader.rtld_must_xmm_save, 1)
++
++#  define RTLD_PREPARE_FOREIGN_CALL \
++  do if (THREAD_GETMEM (THREAD_SELF, p_header.tcbheader.rtld_must_xmm_save))  \
++    {									      \
++      _dl_x86_64_save_sse ();						      \
++      THREAD_SETMEM (THREAD_SELF, p_header.tcbheader.rtld_must_xmm_save, 0);  \
++    }									      \
++  while (0)
++
++#  define RTLD_FINALIZE_FOREIGN_CALL \
++  do {									      \
++    if (THREAD_GETMEM (THREAD_SELF, p_header.tcbheader.rtld_must_xmm_save) == 0) \
++      _dl_x86_64_restore_sse ();					      \
++    THREAD_SETMEM (THREAD_SELF, p_header.tcbheader.rtld_must_xmm_save,	      \
++		   old_rtld_must_xmm_save);				      \
++  } while (0)
++# endif
++
+ # endif	/* HAVE_TLS_SUPPORT */
++
+ #endif /* __ASSEMBLER__ */
+ 
+ #endif	/* tls.h */

Added: glibc-package/trunk/debian/patches/kfreebsd/local-nosavesse.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-nosavesse.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-nosavesse.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,14 @@
+
+ similar to 2.10 code
+
+--- a/sysdeps/x86_64/dl-trampoline.S
++++ b/sysdeps/x86_64/dl-trampoline.S
+@@ -163,7 +163,7 @@
+ #endif
+ 
+ 
+-#ifdef SHARED
++#if defined(SHARED) && defined(__linux__)
+ 	.globl _dl_x86_64_save_sse
+ 	.type _dl_x86_64_save_sse, @function
+ 	.align 16

Modified: glibc-package/trunk/debian/patches/kfreebsd/local-readdir_r.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-readdir_r.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-readdir_r.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -4,17 +4,20 @@
 
 --- a/sysdeps/unix/readdir_r.c
 +++ b/sysdeps/unix/readdir_r.c
-@@ -113,7 +113,35 @@
-   while (dp->d_ino == 0);
+@@ -114,14 +114,32 @@
  
    if (dp != NULL)
--    *result = memcpy (entry, dp, reclen);
-+    {
-+      /* The required size of *entry, according to POSIX, is
-+	   offsetof (DIRENT_TYPE, d_name[0]) + NAME_MAX + 1.
-+	 We must not write beyond the end of *entry.  On some operating
-+	 systems, dp->d_reclen may be larger; in this case, copy only as
-+	 many bytes as needed.  Also give an error if d_name is too long.  */
+     {
+-#ifdef GETDENTS_64BIT_ALIGNED
+-      /* The d_reclen value might include padding which is not part of
+-	 the DIRENT_TYPE data structure.  */
+-      reclen = MIN (reclen, sizeof (DIRENT_TYPE));
+-#endif
++	/* The required size of *entry, according to POSIX, is
++	offsetof (DIRENT_TYPE, d_name[0]) + NAME_MAX + 1.
++	We must not write beyond the end of *entry.  On some operating
++	systems, dp->d_reclen may be larger; in this case, copy only as
++	many bytes as needed.  Also give an error if d_name is too long.  */
 +#ifdef _DIRENT_HAVE_D_RECLEN
 +      /* DIRENT_TYPE is of variable size, with d_name as its last entry.  */
 +      size_t namelen;
@@ -29,15 +32,15 @@
 +			  offsetof (DIRENT_TYPE, d_name[0]) + namelen + 1);
 +      else
 +	{
-+	  errno = EOVERFLOW;
-+	  dp = NULL;
-+	  *result = NULL;
-+	}
++          errno = EOVERFLOW;
++          dp = NULL;
++          *result = NULL;
++        }
 +#else
 +      /* DIRENT_TYPE is of fixed size.  */
-+      *result = memcpy (entry, dp, reclen);
-+#endif
-+    }
+       *result = memcpy (entry, dp, reclen);
+-#ifdef GETDENTS_64BIT_ALIGNED
+-      entry->d_reclen = reclen;
+ #endif
+     }
    else
-     *result = NULL;
- 

Added: glibc-package/trunk/debian/patches/kfreebsd/local-syscalls_2.11.patch
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-syscalls_2.11.patch	                        (rev 0)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-syscalls_2.11.patch	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,50 @@
+To be merged in the kfreebsd/ directory when 2.11 is the default
+
+--- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Makefile
+--- b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Makefile
+@@ -36,7 +36,7 @@
+ # For <fcntl.h>.
+ sysdep_routines += sys_open sys_openat open_2
+ # For <sys/stat.h>.
+-sysdep_routines += sys_fchmodat sys_fstat sys_fstatat sys_lstat sys_mkdirat sys_mkfifoat sys_mknod sys_mknodat sys_nfstat sys_nlstat sys_nstat sys_stat
++sysdep_routines += sys_fchmodat sys_fstat sys_fstatat sys_lstat sys_mkdirat sys_mkfifoat sys_mknod sys_mknodat sys_nfstat sys_nlstat sys_nstat sys_stat lchflags
+ # For <sys/statfs.h>.
+ sysdep_routines += fstatfs64 statfs64 sys_fstatfs sys_statfs
+ # For <stdio.h>
+--- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list
+@@ -15,6 +15,7 @@@ -57,6 +59,7 @@
+ kldunload		-	kldunload		i:i		kldunload
+ kldunloadf		-	kldunloadf		i:ii		kldunloadf
+ ktrace			-	ktrace			i:siii		ktrace
++lchflags		-	lchflags		i:si		lchflags
+ lchmod			-	lchmod			i:si		__lchmod lchmod
+ lchown			-	lchown			i:sii		__lchown lchown
+ sys_lio_listio		-	lio_listio		i:ibnP		__syscall_lio_listio
+--- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
+@@ -87,6 +87,11 @@
+     kenv;
+     sysctlnametomib;
+   }
++  GLIBC_2.11 {
++    lchflags;
++    #errlist-compat 94
++    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
++  }
+   GLIBC_PRIVATE {
+     # needed by libpthread.
+     __clone; __libc_fork; __libc_sigaction;
+--- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/errno.h
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/errno.h
+@@ -155,8 +155,9 @@
+ #define	EMULTIHOP	90		/* Multihop attempted */
+ #define	ENOLINK		91		/* Link has been severed */
+ #define	EPROTO		92		/* Protocol error */
++#define	ENOTCAPABLE	93		/* Capabilities insufficient */
+ 
+-#define	ELAST		92		/* Must be equal largest errno */
++#define	ELAST		93		/* Must be equal largest errno */
+ 
+ # ifndef __ASSEMBLER__
+ /* Function to get address of global `errno' variable.  */

Deleted: glibc-package/trunk/debian/patches/locale/cvs-C-first_weekday.diff
===================================================================
--- glibc-package/trunk/debian/patches/locale/cvs-C-first_weekday.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/locale/cvs-C-first_weekday.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,22 +0,0 @@
-2009-10-05  Andreas Schwab  <schwab@redhat.com>
-
-	* locale/C-time.c: Revert week-1stday back to 19971130 and set
-	first_weekday to 1 and first_workday to 2.
-
-diff --git a/locale/C-time.c b/locale/C-time.c
-index a9275d9..368ffce 100644
---- a/locale/C-time.c
-+++ b/locale/C-time.c
-@@ -134,10 +134,10 @@ const struct locale_data _nl_C_LC_TIME attribute_hidden =
-     { .wstr = (const uint32_t *) L"" },
-     { .wstr = (const uint32_t *) L"" },
-     { .string = "\7" },
--    { .word = 19971201 },
-+    { .word = 19971130 },
-     { .string = "\4" },
--    { .string = "\7" },
-     { .string = "\1" },
-+    { .string = "\2" },
-     { .string = "\1" },
-     { .string = "" },
-     { .string = "%a %b %e %H:%M:%S %Z %Y" },

Modified: glibc-package/trunk/debian/patches/localedata/first_weekday.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/first_weekday.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/localedata/first_weekday.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -51,7 +51,6 @@
  localedata/locales/el_GR          |    2 ++
  localedata/locales/en_AU          |    2 ++
  localedata/locales/en_CA          |    2 ++
- localedata/locales/en_DK          |    3 +++
  localedata/locales/en_HK          |    2 ++
  localedata/locales/en_IE          |    2 ++
  localedata/locales/en_IN          |    2 ++
@@ -62,7 +61,6 @@
  localedata/locales/es_AR          |    2 ++
  localedata/locales/es_BO          |    2 ++
  localedata/locales/es_CL          |    2 ++
- localedata/locales/es_CO          |    2 ++
  localedata/locales/es_DO          |    2 ++
  localedata/locales/es_EC          |    2 ++
  localedata/locales/es_GT          |    2 ++
@@ -88,7 +86,6 @@
  localedata/locales/he_IL          |    2 ++
  localedata/locales/hi_IN          |    2 ++
  localedata/locales/hr_HR          |    2 ++
- localedata/locales/hsb_DE         |    2 ++
  localedata/locales/hy_AM          |    2 ++
  localedata/locales/id_ID          |    2 ++
  localedata/locales/is_IS          |    2 ++
@@ -110,7 +107,6 @@
  localedata/locales/ms_MY          |    2 ++
  localedata/locales/ne_NP          |    2 ++
  localedata/locales/nl_BE          |    2 ++
- localedata/locales/nl_NL          |    2 ++
  localedata/locales/nr_ZA          |    2 ++
  localedata/locales/nso_ZA         |    2 ++
  localedata/locales/oc_FR          |    2 ++
@@ -582,18 +578,6 @@
  END LC_TIME
  
  LC_MESSAGES
---- a/localedata/locales/en_DK
-+++ b/localedata/locales/en_DK
-@@ -106,6 +106,9 @@
- 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
-+first_workday 2
- END LC_TIME
- 
- LC_MESSAGES
 --- a/localedata/locales/en_HK
 +++ b/localedata/locales/en_HK
 @@ -133,6 +133,8 @@
@@ -704,17 +688,6 @@
  END LC_TIME
  
  LC_PAPER
---- a/localedata/locales/es_CO
-+++ b/localedata/locales/es_CO
-@@ -122,6 +122,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/es_DO
 +++ b/localedata/locales/es_DO
 @@ -122,6 +122,8 @@
@@ -987,17 +960,6 @@
  END LC_TIME
  
  LC_PAPER
---- a/localedata/locales/hsb_DE
-+++ b/localedata/locales/hsb_DE
-@@ -220,6 +220,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/hy_AM
 +++ b/localedata/locales/hy_AM
 @@ -147,6 +147,8 @@
@@ -1034,9 +996,9 @@
 --- a/localedata/locales/it_CH
 +++ b/localedata/locales/it_CH
 @@ -98,6 +98,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>"
+ date_fmt       "<U0025><U0061><U0020><U0025><U0065><U0020><U0025>/
+ <U0062><U0020><U0025><U0059><U002C><U0020><U0025><U0048><U002E>/
+ <U0025><U004D><U002E><U0025><U0053><U002C><U0020><U0025><U005A>"
 +%  FIXME: found in CLDR
 +first_weekday 2
  END LC_TIME
@@ -1045,9 +1007,9 @@
 --- a/localedata/locales/it_IT
 +++ b/localedata/locales/it_IT
 @@ -124,6 +124,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>"
+ date_fmt       "<U0025><U0061><U0020><U0025><U0065><U0020><U0025>/
+ <U0062><U0020><U0025><U0059><U002C><U0020><U0025><U0048><U002E>/
+ <U0025><U004D><U002E><U0025><U0053><U002C><U0020><U0025><U005A>"
 +%  FIXME: found in CLDR
 +first_weekday 2
  END LC_TIME
@@ -1229,17 +1191,6 @@
  END LC_TIME
  
  LC_PAPER
---- a/localedata/locales/nl_NL
-+++ b/localedata/locales/nl_NL
-@@ -123,6 +123,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/nr_ZA
 +++ b/localedata/locales/nr_ZA
 @@ -162,6 +162,8 @@

Added: glibc-package/trunk/debian/patches/localedata/locale-hsb_DE.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/locale-hsb_DE.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/localedata/locale-hsb_DE.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,2211 @@
+--- a/localedata/locales/hsb_DE
++++ b/localedata/locales/hsb_DE
+@@ -34,7 +34,14 @@
+ 
+ END LC_IDENTIFICATION
+ 
++LC_CTYPE
++copy "i18n"
++END LC_CTYPE
++
+ LC_COLLATE
++% Copy the template from ISO/IEC 14651
++copy "iso14651_t1"
++
+ collating-element <D-Z'> from "<U0044><U0179>"
+ collating-element <D-z'> from "<U0044><U017A>"
+ collating-element <d-Z'> from "<U0064><U0179>"
+@@ -44,2081 +51,122 @@
+ collating-element <c-H> from "<U0063><U0048>"
+ collating-element <c-h> from "<U0063><U0068>"
+ 
+-% Base collation scheme: 1994-03-22
++collating-symbol <ccaron>
++collating-symbol <d-z-sh>
++collating-symbol <ecaron>
++collating-symbol <ch>
++collating-symbol <lstroke>
++collating-symbol <nacute>
++collating-symbol <oacute>
++collating-symbol <rcaron>
++collating-symbol <scaron>
++collating-symbol <cacute>
++collating-symbol <zcaron>
++
++collating-symbol <CAP-MIN>
++collating-symbol <MIN-CAP>
++
++reorder-after <MIN>
++<MIN-CAP>
++<CAP-MIN>
++
++reorder-after <c>
++<ccaron>
++
++reorder-after <d>
++<d-z-sh>
++
++reorder-after <e>
++<ecaron>
++
++reorder-after <h>
++<ch>
++
++reorder-after <k>
++<lstroke>
++
++reorder-after <n>
++<nacute>
++
++%  Is oacute really used?
++reorder-after <o>
++<oacute>
++
++reorder-after <r>
++<rcaron>
++
++reorder-after <s>
++<scaron>
++
++reorder-after <t>
++<cacute>
++
++reorder-after <z>
++<zcaron>
++
++reorder-after <U010B>
++<U010D> <ccaron>;<PCT>;<MIN>;IGNORE
++reorder-after <U010A>
++<U010C> <ccaron>;<PCT>;<CAP>;IGNORE
++
++reorder-after <U0111>
++<d-z'> <d-z-sh>;<BAS>;<MIN>;IGNORE
++<d-Z'> <d-z-sh>;<BAS>;<MIN-CAP>;IGNORE
++reorder-after <U0110>
++<D-z'> <d-z-sh>;<BAS>;<CAP-MIN>;IGNORE
++<D-Z'> <d-z-sh>;<BAS>;<CAP>;IGNORE
++
++reorder-after <U0113>
++<U011B> <ecaron>;<BAS>;<MIN>;IGNORE
++reorder-after <U0112>
++<U011A> <ecaron>;<BAS>;<CAP>;IGNORE
++
++reorder-after <U0127>
++<c-h>  <ch>;<BAS>;<MIN>;IGNORE
++<c-H>  <ch>;<BAS>;<MIN-CAP>;IGNORE
++reorder-after <U0126>
++<C-h>  <ch>;<BAS>;<CAP-MIN>;IGNORE
++<C-H>  <ch>;<BAS>;<CAP>;IGNORE
++
++reorder-after <U0137>
++<U0142> <lstroke>;<BAS>;<MIN>;IGNORE
++reorder-after <U0136>
++<U0141> <lstroke>;<BAS>;<CAP>;IGNORE
++
++reorder-after <U0146>
++<U0144> <nacute>;<BAS>;<MIN>;IGNORE
++reorder-after <U0145>
++<U0143> <nacute>;<BAS>;<CAP>;IGNORE
++
++reorder-after <U006F>
++<U00F3> <oacute>;<BAS>;<MIN>;IGNORE
++reorder-after <U004F>
++<U00D3> <oacute>;<BAS>;<CAP>;IGNORE
++
++reorder-after <U0157>
++<U0159> <rcaron>;<BAS>;<MIN>;IGNORE
++reorder-after <U0156>
++<U0158> <rcaron>;<BAS>;<CAP>;IGNORE
++
++reorder-after <U015F>
++<U0161> <scaron>;<BAS>;<MIN>;IGNORE
++reorder-after <U015E>
++<U0160> <scaron>;<BAS>;<CAP>;IGNORE
++
++reorder-after <U0163>
++<U0107> <cacute>;<BAS>;<MIN>;IGNORE
++reorder-after <U0162>
++<U0106> <cacute>;<BAS>;<CAP>;IGNORE
++
++reorder-after <U017C>
++<U017E> <zcaron>;<BAS>;<MIN>;IGNORE
++reorder-after <U017B>
++<U017D> <zcaron>;<BAS>;<CAP>;IGNORE
+ 
+-% Ordering algorithm:
+-%  1. Spaces and hyphen (but not soft
+-%     hyphen) before punctuation
+-%     characters, punctuation characters
+-%     before numbers,
+-%     numbers before letters.
+-%  2. Letters with diacritical marks are
+-%     members of equivalence classes
+-%  3. A distinction is made with regards
+-%     to case as noted below.
+-%  4. Special characters are ignored
+-%     when comparing letters, but then
+-%     they are considered
+-%  5. The alphabets are sorted in order
+-%     of first appearance in ISO 10646:
+-%     Latin, Greek, Cyrillic, etc.
+-%
+-% According to Greek specifications,
+-% the steps 2. and 3. above are reversed
+-% for the Greek script
+-
+-% collating symbols
+-
+-% The collating symbol naming is
+-% mostly taken from ISO 10646-1,
+-% for example the case and accent
+-% names are from this standard.
+-
+-collating-symbol <CAPITAL>
+-collating-symbol <CAPITAL-SMALL>
+-collating-symbol <SMALL-CAPITAL>
+-collating-symbol <SMALL>
+-
+-% <CAPITAL-SMALL> and <SMALL-CAPITAL>
+-% are for cases like Danish <U0041><U0061>
+-% and Spanish <U0043><U0068> being treated
+-% as one letter.
+-
+-% The <a8> ...... <z8> collating
+-% symbols have defined weights as
+-% the last character in a group of
+-% Latin letters. They are used
+-% to specify deltas by locales using
+-% a locale as the default ordering
+-% and by "replace-after" statements
+-% specifying the changed placement
+-% in an ordering of a character.
+-
+-collating-symbol <a8>
+-collating-symbol <b8>
+-collating-symbol <c8>
+-collating-symbol <d8>
+-collating-symbol <e8>
+-collating-symbol <f8>
+-collating-symbol <g8>
+-collating-symbol <h8>
+-collating-symbol <i8>
+-collating-symbol <j8>
+-collating-symbol <k8>
+-collating-symbol <l8>
+-collating-symbol <m8>
+-collating-symbol <n8>
+-collating-symbol <o8>
+-collating-symbol <p8>
+-collating-symbol <q8>
+-collating-symbol <r8>
+-collating-symbol <s8>
+-collating-symbol <t8>
+-collating-symbol <u8>
+-collating-symbol <v8>
+-collating-symbol <w8>
+-collating-symbol <x8>
+-collating-symbol <y8>
+-collating-symbol <z8>
+-
+-collating-symbol <NONE>
+-collating-symbol <ACUTE>
+-collating-symbol <ACUTE+DOT>
+-collating-symbol <GRAVE>
+-collating-symbol <DOUBLE-GRAVE>
+-collating-symbol <BREVE>
+-collating-symbol <BREVE+ACUTE>
+-collating-symbol <BREVE+GRAVE>
+-collating-symbol <BREVE+MACRON>
+-collating-symbol <BREVE+HOOK>
+-collating-symbol <BREVE+TILDE>
+-collating-symbol <BREVE+DOT-BELOW>
+-collating-symbol <BREVE-BELOW>
+-collating-symbol <INVERTED-BREVE>
+-collating-symbol <CIRCUMFLEX>
+-collating-symbol <CIRCUMFLEX+ACUTE>
+-collating-symbol <CIRCUMFLEX+GRAVE>
+-collating-symbol <CIRCUMFLEX+HOOK>
+-collating-symbol <CIRCUMFLEX+TILDE>
+-collating-symbol <CIRCUMFLEX+DOT-BELOW>
+-collating-symbol <CARON>
+-collating-symbol <CARON+DIAERESIS>
+-collating-symbol <CARON+DOT>
+-collating-symbol <RING>
+-collating-symbol <RING+ACUTE>
+-collating-symbol <RING-BELOW>
+-collating-symbol <DIAERESIS>
+-collating-symbol <DIAERESIS+MACRON>
+-collating-symbol <DIAERESIS+ACUTE>
+-collating-symbol <DIAERESIS+GRAVE>
+-collating-symbol <DIAERESIS+CARON>
+-collating-symbol <DOUBLE-ACUTE>
+-collating-symbol <HOOK>
+-collating-symbol <TILDE>
+-collating-symbol <TILDE+ACUTE>
+-collating-symbol <TILDE+DIAERESIS>
+-collating-symbol <TILDE-BELOW>
+-collating-symbol <DOT>
+-collating-symbol <DOT-BELOW>
+-collating-symbol <DOT+DOT-BELOW>
+-collating-symbol <STROKE>
+-collating-symbol <STROKE+ACUTE>
+-collating-symbol <CEDILLA>
+-collating-symbol <CEDILLA+ACUTE>
+-collating-symbol <CEDILLA+GRAVE>
+-collating-symbol <CEDILLA+BREVE>
+-collating-symbol <OGONEK>
+-collating-symbol <OGONEK+MACRON>
+-collating-symbol <MACRON>
+-collating-symbol <MACRON+ACUTE>
+-collating-symbol <MACRON+GRAVE>
+-collating-symbol <MACRON+DIAERESIS>
+-collating-symbol <MACRON+DIAERESIS-BELOW>
+-collating-symbol <MACRON+DOT>
+-collating-symbol <MACRON+DOT-BELOW>
+-collating-symbol <MACRON+CIRCUMFLEX>
+-collating-symbol <LINE-BELOW>
+-collating-symbol <HORN>
+-collating-symbol <HORN+ACUTE>
+-collating-symbol <HORN+GRAVE>
+-collating-symbol <HORN+HOOK>
+-collating-symbol <HORN+TILDE>
+-collating-symbol <HORN+DOT-BELOW>
+-collating-symbol <PRECEDED-BY-APOSTROPHE>
+-collating-symbol <GREEK>
+-collating-symbol <TONOS>
+-collating-symbol <DIALYTICA>
+-collating-symbol <DIALYTICA+TONOS>
+-collating-symbol <CYRILLIC>
+-collating-symbol <HIRAGANA>
+-collating-symbol <KATAKANA>
+-collating-symbol <SPECIAL>
+-
+-% letter;accent;case;specials
+-
+-order_start forward;backward/
+-	    ;forward;position
+-
+-% <CAPITAL> or <SMALL> letters first:
+-
+-<SMALL>
+-<SMALL-CAPITAL>
+-<CAPITAL-SMALL>
+-<CAPITAL>
+-
+-% Accents:
+-
+-<NONE>
+-<ACUTE>
+-<ACUTE+DOT>
+-<GRAVE>
+-<DOUBLE-GRAVE>
+-<BREVE>
+-<BREVE+ACUTE>
+-<BREVE+GRAVE>
+-<BREVE+MACRON>
+-<BREVE+HOOK>
+-<BREVE+TILDE>
+-<BREVE+DOT-BELOW>
+-<BREVE-BELOW>
+-<INVERTED-BREVE>
+-<CIRCUMFLEX>
+-<CIRCUMFLEX+ACUTE>
+-<CIRCUMFLEX+GRAVE>
+-<CIRCUMFLEX+HOOK>
+-<CIRCUMFLEX+TILDE>
+-<CIRCUMFLEX+DOT-BELOW>
+-<CARON>
+-<CARON+DIAERESIS>
+-<CARON+DOT>
+-<RING>
+-<RING+ACUTE>
+-<RING-BELOW>
+-<DIAERESIS>
+-<DIAERESIS+MACRON>
+-<DIAERESIS+ACUTE>
+-<DIAERESIS+GRAVE>
+-<DIAERESIS+CARON>
+-<DOUBLE-ACUTE>
+-<HOOK>
+-<TILDE>
+-<TILDE+ACUTE>
+-<TILDE+DIAERESIS>
+-<TILDE-BELOW>
+-<DOT>
+-<DOT-BELOW>
+-<DOT+DOT-BELOW>
+-<STROKE>
+-<STROKE+ACUTE>
+-<CEDILLA>
+-<CEDILLA+ACUTE>
+-<CEDILLA+GRAVE>
+-<CEDILLA+BREVE>
+-<OGONEK>
+-<OGONEK+MACRON>
+-<MACRON>
+-<MACRON+ACUTE>
+-<MACRON+GRAVE>
+-<MACRON+DIAERESIS>
+-<MACRON+DIAERESIS-BELOW>
+-<MACRON+DOT>
+-<MACRON+DOT-BELOW>
+-<MACRON+CIRCUMFLEX>
+-<LINE-BELOW>
+-<HORN>
+-<HORN+ACUTE>
+-<HORN+GRAVE>
+-<HORN+HOOK>
+-<HORN+TILDE>
+-<HORN+DOT-BELOW>
+-<PRECEDED-BY-APOSTROPHE>
+-<GREEK>
+-<TONOS>
+-<DIALYTICA>
+-<DIALYTICA+TONOS>
+-<CYRILLIC>
+-<HIRAGANA>
+-<KATAKANA>
+-<SPECIAL>
+-
+-<U00A0>	<U00A0>;<U00A0>;<U00A0>;IGNORE
+-<U0020>	IGNORE;IGNORE;IGNORE;<U0020>
+-<U0009>	IGNORE;IGNORE;IGNORE;<U0009>
+-<U000B>	IGNORE;IGNORE;IGNORE;<U000B>
+-<U000D>	IGNORE;IGNORE;IGNORE;<U000D>
+-<U000A>	IGNORE;IGNORE;IGNORE;<U000A>
+-<U000C>	IGNORE;IGNORE;IGNORE;<U000C>
+-<U005F>	IGNORE;IGNORE;IGNORE;<U005F>
+-<U00AF>	IGNORE;IGNORE;IGNORE;<U00AF>
+-<U00AD>	IGNORE;IGNORE;IGNORE;<U00AD>
+-<U002D>	IGNORE;IGNORE;IGNORE;<U002D>
+-<U002C>	IGNORE;IGNORE;IGNORE;<U002C>
+-<U003B>	IGNORE;IGNORE;IGNORE;<U003B>
+-<U003A>	IGNORE;IGNORE;IGNORE;<U003A>
+-<U0021>	IGNORE;IGNORE;IGNORE;<U0021>
+-<U00A1>	IGNORE;IGNORE;IGNORE;<U00A1>
+-<U003F>	IGNORE;IGNORE;IGNORE;<U003F>
+-<U00BF>	IGNORE;IGNORE;IGNORE;<U00BF>
+-<U002F>	IGNORE;IGNORE;IGNORE;<U002F>
+-<U002E>	IGNORE;IGNORE;IGNORE;<U002E>
+-<U00B4>	IGNORE;IGNORE;IGNORE;<U00B4>
+-<U0060>	IGNORE;IGNORE;IGNORE;<U0060>
+-<U005E>	IGNORE;IGNORE;IGNORE;<U005E>
+-<U00A8>	IGNORE;IGNORE;IGNORE;<U00A8>
+-<U007E>	IGNORE;IGNORE;IGNORE;<U007E>
+-<U00B7>	IGNORE;IGNORE;IGNORE;<U00B7>
+-<U00B8>	IGNORE;IGNORE;IGNORE;<U00B8>
+-<U0027>	IGNORE;IGNORE;IGNORE;<U0027>
+-<U2018>	IGNORE;IGNORE;IGNORE;<U2018>
+-<U2019>	IGNORE;IGNORE;IGNORE;<U2019>
+-<U0022>	IGNORE;IGNORE;IGNORE;<U0022>
+-<U201C>	IGNORE;IGNORE;IGNORE;<U201C>
+-<U201D>	IGNORE;IGNORE;IGNORE;<U201D>
+-<U00AB>	IGNORE;IGNORE;IGNORE;<U00AB>
+-<U00BB>	IGNORE;IGNORE;IGNORE;<U00BB>
+-<U0028>	IGNORE;IGNORE;IGNORE;<U0028>
+-<U207D>	IGNORE;IGNORE;IGNORE;<U207D>
+-<U0029>	IGNORE;IGNORE;IGNORE;<U0029>
+-<U207E>	IGNORE;IGNORE;IGNORE;<U207E>
+-<U005B>	IGNORE;IGNORE;IGNORE;<U005B>
+-<U005D>	IGNORE;IGNORE;IGNORE;<U005D>
+-<U007B>	IGNORE;IGNORE;IGNORE;<U007B>
+-<U007D>	IGNORE;IGNORE;IGNORE;<U007D>
+-<U00A7>	IGNORE;IGNORE;IGNORE;<U00A7>
+-<U00B6>	IGNORE;IGNORE;IGNORE;<U00B6>
+-<U00A9>	IGNORE;IGNORE;IGNORE;<U00A9>
+-<U00AE>	IGNORE;IGNORE;IGNORE;<U00AE>
+-<U0040>	IGNORE;IGNORE;IGNORE;<U0040>
+-<U00A4>	IGNORE;IGNORE;IGNORE;<U00A4>
+-<U00A2>	IGNORE;IGNORE;IGNORE;<U00A2>
+-<U0024>	IGNORE;IGNORE;IGNORE;<U0024>
+-<U00A3>	IGNORE;IGNORE;IGNORE;<U00A3>
+-<U00A5>	IGNORE;IGNORE;IGNORE;<U00A5>
+-<U002A>	IGNORE;IGNORE;IGNORE;<U002A>
+-<U005C>	IGNORE;IGNORE;IGNORE;<U005C>
+-<U0026>	IGNORE;IGNORE;IGNORE;<U0026>
+-<U0023>	IGNORE;IGNORE;IGNORE;<U0023>
+-<U0025>	IGNORE;IGNORE;IGNORE;<U0025>
+-<U207B>	IGNORE;IGNORE;IGNORE;<U207B>
+-<U002B>	IGNORE;IGNORE;IGNORE;<U002B>
+-<U207A>	IGNORE;IGNORE;IGNORE;<U207A>
+-<U00B1>	IGNORE;IGNORE;IGNORE;<U00B1>
+-<U00F7>	IGNORE;IGNORE;IGNORE;<U00F7>
+-<U00D7>	IGNORE;IGNORE;IGNORE;<U00D7>
+-<U2260>	IGNORE;IGNORE;IGNORE;<U2260>
+-<U003C>	IGNORE;IGNORE;IGNORE;<U003C>
+-<U2264>	IGNORE;IGNORE;IGNORE;<U2264>
+-<U003D>	IGNORE;IGNORE;IGNORE;<U003D>
+-<U2265>	IGNORE;IGNORE;IGNORE;<U2265>
+-<U003E>	IGNORE;IGNORE;IGNORE;<U003E>
+-<U00AC>	IGNORE;IGNORE;IGNORE;<U00AC>
+-<U007C>	IGNORE;IGNORE;IGNORE;<U007C>
+-<U00A6>	IGNORE;IGNORE;IGNORE;<U00A6>
+-<U00B0>	IGNORE;IGNORE;IGNORE;<U00B0>
+-<U00B5>	IGNORE;IGNORE;IGNORE;<U00B5>
+-<U02C7>	IGNORE;IGNORE;IGNORE;<U02C7>
+-<U02D8>	IGNORE;IGNORE;IGNORE;<U02D8>
+-<U02D9>	IGNORE;IGNORE;IGNORE;<U02D9>
+-<U02DA>	IGNORE;IGNORE;IGNORE;<U02DA>
+-<U02DB>	IGNORE;IGNORE;IGNORE;<U02DB>
+-<U02DC>	IGNORE;IGNORE;IGNORE;<U02DC>
+-<U02DD>	IGNORE;IGNORE;IGNORE;<U02DD>
+-<U0374>	IGNORE;IGNORE;IGNORE;<U0374>
+-<U0375>	IGNORE;IGNORE;IGNORE;<U0375>
+-<U037A>	IGNORE;IGNORE;IGNORE;<U037A>
+-<U037E>	IGNORE;IGNORE;IGNORE;<U037E>
+-<U0384>	IGNORE;IGNORE;IGNORE;<U0384>
+-<U0385>	IGNORE;IGNORE;IGNORE;<U0385>
+-<U0387>	IGNORE;IGNORE;IGNORE;<U0387>
+-<U03D0>	IGNORE;IGNORE;IGNORE;<U03D0>
+-<U1FBF>	IGNORE;IGNORE;IGNORE;<U1FBF>
+-<U1FC0>	IGNORE;IGNORE;IGNORE;<U1FC0>
+-<U1FC1>	IGNORE;IGNORE;IGNORE;<U1FC1>
+-<U1FCD>	IGNORE;IGNORE;IGNORE;<U1FCD>
+-<U1FCE>	IGNORE;IGNORE;IGNORE;<U1FCE>
+-<U1FCF>	IGNORE;IGNORE;IGNORE;<U1FCF>
+-<U1FDD>	IGNORE;IGNORE;IGNORE;<U1FDD>
+-<U1FDE>	IGNORE;IGNORE;IGNORE;<U1FDE>
+-<U1FDF>	IGNORE;IGNORE;IGNORE;<U1FDF>
+-<U1FED>	IGNORE;IGNORE;IGNORE;<U1FED>
+-<U1FEF>	IGNORE;IGNORE;IGNORE;<U1FEF>
+-<U1FFE>	IGNORE;IGNORE;IGNORE;<U1FFE>
+-<U2002>	IGNORE;IGNORE;IGNORE;<U2002>
+-<U2003>	IGNORE;IGNORE;IGNORE;<U2003>
+-<U2004>	IGNORE;IGNORE;IGNORE;<U2004>
+-<U2005>	IGNORE;IGNORE;IGNORE;<U2005>
+-<U2006>	IGNORE;IGNORE;IGNORE;<U2006>
+-<U200E>	IGNORE;IGNORE;IGNORE;<U200E>
+-<U200F>	IGNORE;IGNORE;IGNORE;<U200F>
+-<U2009>	IGNORE;IGNORE;IGNORE;<U2009>
+-<U200A>	IGNORE;IGNORE;IGNORE;<U200A>
+-<U2010>	IGNORE;IGNORE;IGNORE;<U2010>
+-<U2013>	IGNORE;IGNORE;IGNORE;<U2013>
+-<U2014>	IGNORE;IGNORE;IGNORE;<U2014>
+-<U2015>	IGNORE;IGNORE;IGNORE;<U2015>
+-<U2016>	IGNORE;IGNORE;IGNORE;<U2016>
+-<U2017>	IGNORE;IGNORE;IGNORE;<U2017>
+-<U201A>	IGNORE;IGNORE;IGNORE;<U201A>
+-<U201B>	IGNORE;IGNORE;IGNORE;<U201B>
+-<U201E>	IGNORE;IGNORE;IGNORE;<U201E>
+-<U201F>	IGNORE;IGNORE;IGNORE;<U201F>
+-<U2020>	IGNORE;IGNORE;IGNORE;<U2020>
+-<U2021>	IGNORE;IGNORE;IGNORE;<U2021>
+-<U2219>	IGNORE;IGNORE;IGNORE;<U2219>
+-<U2025>	IGNORE;IGNORE;IGNORE;<U2025>
+-<U2026>	IGNORE;IGNORE;IGNORE;<U2026>
+-<U2030>	IGNORE;IGNORE;IGNORE;<U2030>
+-<U2032>	IGNORE;IGNORE;IGNORE;<U2032>
+-<U2033>	IGNORE;IGNORE;IGNORE;<U2033>
+-<U2034>	IGNORE;IGNORE;IGNORE;<U2034>
+-<U2035>	IGNORE;IGNORE;IGNORE;<U2035>
+-<U2036>	IGNORE;IGNORE;IGNORE;<U2036>
+-<U2037>	IGNORE;IGNORE;IGNORE;<U2037>
+-<U2038>	IGNORE;IGNORE;IGNORE;<U2038>
+-<U2039>	IGNORE;IGNORE;IGNORE;<U2039>
+-<U203A>	IGNORE;IGNORE;IGNORE;<U203A>
+-<U203B>	IGNORE;IGNORE;IGNORE;<U203B>
+-<U203C>	IGNORE;IGNORE;IGNORE;<U203C>
+-<U203E>	IGNORE;IGNORE;IGNORE;<U203E>
+-<U207C>	IGNORE;IGNORE;IGNORE;<U207C>
+-<U2080>	IGNORE;IGNORE;IGNORE;<U2080>
+-<U2081>	IGNORE;IGNORE;IGNORE;<U2081>
+-<U2082>	IGNORE;IGNORE;IGNORE;<U2082>
+-<U2083>	IGNORE;IGNORE;IGNORE;<U2083>
+-<U2084>	IGNORE;IGNORE;IGNORE;<U2084>
+-<U2085>	IGNORE;IGNORE;IGNORE;<U2085>
+-<U2086>	IGNORE;IGNORE;IGNORE;<U2086>
+-<U2087>	IGNORE;IGNORE;IGNORE;<U2087>
+-<U2088>	IGNORE;IGNORE;IGNORE;<U2088>
+-<U2089>	IGNORE;IGNORE;IGNORE;<U2089>
+-<U208A>	IGNORE;IGNORE;IGNORE;<U208A>
+-<U208B>	IGNORE;IGNORE;IGNORE;<U208B>
+-<U208C>	IGNORE;IGNORE;IGNORE;<U208C>
+-<U208D>	IGNORE;IGNORE;IGNORE;<U208D>
+-<U208E>	IGNORE;IGNORE;IGNORE;<U208E>
+-<U20A3>	IGNORE;IGNORE;IGNORE;<U20A3>
+-<U20A4>	IGNORE;IGNORE;IGNORE;<U20A4>
+-<U20A7>	IGNORE;IGNORE;IGNORE;<U20A7>
+-<U20A9>	IGNORE;IGNORE;IGNORE;<U20A9>
+-<U2103>	IGNORE;IGNORE;IGNORE;<U2103>
+-<U2105>	IGNORE;IGNORE;IGNORE;<U2105>
+-<U2109>	IGNORE;IGNORE;IGNORE;<U2109>
+-<U2116>	IGNORE;IGNORE;IGNORE;<U2116>
+-<U2117>	IGNORE;IGNORE;IGNORE;<U2117>
+-<U211E>	IGNORE;IGNORE;IGNORE;<U211E>
+-<U2120>	IGNORE;IGNORE;IGNORE;<U2120>
+-<U2122>	IGNORE;IGNORE;IGNORE;<U2122>
+-<U2126>	IGNORE;IGNORE;IGNORE;<U2126>
+-<U212B>	IGNORE;IGNORE;IGNORE;<U212B>
+-<U2153>	IGNORE;IGNORE;IGNORE;<U2153>
+-<U2154>	IGNORE;IGNORE;IGNORE;<U2154>
+-<U2155>	IGNORE;IGNORE;IGNORE;<U2155>
+-<U2156>	IGNORE;IGNORE;IGNORE;<U2156>
+-<U2157>	IGNORE;IGNORE;IGNORE;<U2157>
+-<U2158>	IGNORE;IGNORE;IGNORE;<U2158>
+-<U2159>	IGNORE;IGNORE;IGNORE;<U2159>
+-<U215A>	IGNORE;IGNORE;IGNORE;<U215A>
+-<U2160>	IGNORE;IGNORE;IGNORE;<U2160>
+-<U2161>	IGNORE;IGNORE;IGNORE;<U2161>
+-<U2162>	IGNORE;IGNORE;IGNORE;<U2162>
+-<U2163>	IGNORE;IGNORE;IGNORE;<U2163>
+-<U2164>	IGNORE;IGNORE;IGNORE;<U2164>
+-<U2165>	IGNORE;IGNORE;IGNORE;<U2165>
+-<U2166>	IGNORE;IGNORE;IGNORE;<U2166>
+-<U2167>	IGNORE;IGNORE;IGNORE;<U2167>
+-<U2168>	IGNORE;IGNORE;IGNORE;<U2168>
+-<U2169>	IGNORE;IGNORE;IGNORE;<U2169>
+-<U216A>	IGNORE;IGNORE;IGNORE;<U216A>
+-<U216B>	IGNORE;IGNORE;IGNORE;<U216B>
+-<U216C>	IGNORE;IGNORE;IGNORE;<U216C>
+-<U216D>	IGNORE;IGNORE;IGNORE;<U216D>
+-<U216E>	IGNORE;IGNORE;IGNORE;<U216E>
+-<U216F>	IGNORE;IGNORE;IGNORE;<U216F>
+-<U2170>	IGNORE;IGNORE;IGNORE;<U2170>
+-<U2171>	IGNORE;IGNORE;IGNORE;<U2171>
+-<U2172>	IGNORE;IGNORE;IGNORE;<U2172>
+-<U2173>	IGNORE;IGNORE;IGNORE;<U2173>
+-<U2174>	IGNORE;IGNORE;IGNORE;<U2174>
+-<U2175>	IGNORE;IGNORE;IGNORE;<U2175>
+-<U2176>	IGNORE;IGNORE;IGNORE;<U2176>
+-<U2177>	IGNORE;IGNORE;IGNORE;<U2177>
+-<U2178>	IGNORE;IGNORE;IGNORE;<U2178>
+-<U2179>	IGNORE;IGNORE;IGNORE;<U2179>
+-<U217A>	IGNORE;IGNORE;IGNORE;<U217A>
+-<U217B>	IGNORE;IGNORE;IGNORE;<U217B>
+-<U217C>	IGNORE;IGNORE;IGNORE;<U217C>
+-<U217D>	IGNORE;IGNORE;IGNORE;<U217D>
+-<U217E>	IGNORE;IGNORE;IGNORE;<U217E>
+-<U217F>	IGNORE;IGNORE;IGNORE;<U217F>
+-<U2180>	IGNORE;IGNORE;IGNORE;<U2180>
+-<U2181>	IGNORE;IGNORE;IGNORE;<U2181>
+-<U2182>	IGNORE;IGNORE;IGNORE;<U2182>
+-<U2191>	IGNORE;IGNORE;IGNORE;<U2191>
+-<U2193>	IGNORE;IGNORE;IGNORE;<U2193>
+-<U2194>	IGNORE;IGNORE;IGNORE;<U2194>
+-<U2195>	IGNORE;IGNORE;IGNORE;<U2195>
+-<U2196>	IGNORE;IGNORE;IGNORE;<U2196>
+-<U2197>	IGNORE;IGNORE;IGNORE;<U2197>
+-<U2198>	IGNORE;IGNORE;IGNORE;<U2198>
+-<U2199>	IGNORE;IGNORE;IGNORE;<U2199>
+-<U21A8>	IGNORE;IGNORE;IGNORE;<U21A8>
+-<U21C0>	IGNORE;IGNORE;IGNORE;<U21C0>
+-<U21D0>	IGNORE;IGNORE;IGNORE;<U21D0>
+-<U21D2>	IGNORE;IGNORE;IGNORE;<U21D2>
+-<U21D4>	IGNORE;IGNORE;IGNORE;<U21D4>
+-<U2200>	IGNORE;IGNORE;IGNORE;<U2200>
+-<U2202>	IGNORE;IGNORE;IGNORE;<U2202>
+-<U2203>	IGNORE;IGNORE;IGNORE;<U2203>
+-<U2205>	IGNORE;IGNORE;IGNORE;<U2205>
+-<U2206>	IGNORE;IGNORE;IGNORE;<U2206>
+-<U2207>	IGNORE;IGNORE;IGNORE;<U2207>
+-<U2208>	IGNORE;IGNORE;IGNORE;<U2208>
+-<U220B>	IGNORE;IGNORE;IGNORE;<U220B>
+-<U220F>	IGNORE;IGNORE;IGNORE;<U220F>
+-<U2211>	IGNORE;IGNORE;IGNORE;<U2211>
+-<U2212>	IGNORE;IGNORE;IGNORE;<U2212>
+-<U2213>	IGNORE;IGNORE;IGNORE;<U2213>
+-<U2214>	IGNORE;IGNORE;IGNORE;<U2214>
+-<U2044>	IGNORE;IGNORE;IGNORE;<U2044>
+-<U2217>	IGNORE;IGNORE;IGNORE;<U2217>
+-<U2218>	IGNORE;IGNORE;IGNORE;<U2218>
+-<U2022>	IGNORE;IGNORE;IGNORE;<U2022>
+-<U221A>	IGNORE;IGNORE;IGNORE;<U221A>
+-<U221D>	IGNORE;IGNORE;IGNORE;<U221D>
+-<U221E>	IGNORE;IGNORE;IGNORE;<U221E>
+-<U221F>	IGNORE;IGNORE;IGNORE;<U221F>
+-<U2220>	IGNORE;IGNORE;IGNORE;<U2220>
+-<U2225>	IGNORE;IGNORE;IGNORE;<U2225>
+-<U2227>	IGNORE;IGNORE;IGNORE;<U2227>
+-<U2228>	IGNORE;IGNORE;IGNORE;<U2228>
+-<U2229>	IGNORE;IGNORE;IGNORE;<U2229>
+-<U222A>	IGNORE;IGNORE;IGNORE;<U222A>
+-<U222B>	IGNORE;IGNORE;IGNORE;<U222B>
+-<U222C>	IGNORE;IGNORE;IGNORE;<U222C>
+-<U222E>	IGNORE;IGNORE;IGNORE;<U222E>
+-<U2234>	IGNORE;IGNORE;IGNORE;<U2234>
+-<U2235>	IGNORE;IGNORE;IGNORE;<U2235>
+-<U2236>	IGNORE;IGNORE;IGNORE;<U2236>
+-<U2237>	IGNORE;IGNORE;IGNORE;<U2237>
+-<U223C>	IGNORE;IGNORE;IGNORE;<U223C>
+-<U223E>	IGNORE;IGNORE;IGNORE;<U223E>
+-<U2243>	IGNORE;IGNORE;IGNORE;<U2243>
+-<U2245>	IGNORE;IGNORE;IGNORE;<U2245>
+-<U2248>	IGNORE;IGNORE;IGNORE;<U2248>
+-<U224C>	IGNORE;IGNORE;IGNORE;<U224C>
+-<U2253>	IGNORE;IGNORE;IGNORE;<U2253>
+-<U2261>	IGNORE;IGNORE;IGNORE;<U2261>
+-<U226A>	IGNORE;IGNORE;IGNORE;<U226A>
+-<U226B>	IGNORE;IGNORE;IGNORE;<U226B>
+-<U226E>	IGNORE;IGNORE;IGNORE;<U226E>
+-<U226F>	IGNORE;IGNORE;IGNORE;<U226F>
+-<U2282>	IGNORE;IGNORE;IGNORE;<U2282>
+-<U2283>	IGNORE;IGNORE;IGNORE;<U2283>
+-<U2286>	IGNORE;IGNORE;IGNORE;<U2286>
+-<U2287>	IGNORE;IGNORE;IGNORE;<U2287>
+-<U2299>	IGNORE;IGNORE;IGNORE;<U2299>
+-<U229A>	IGNORE;IGNORE;IGNORE;<U229A>
+-<U22A5>	IGNORE;IGNORE;IGNORE;<U22A5>
+-<U22C5>	IGNORE;IGNORE;IGNORE;<U22C5>
+-<U22EE>	IGNORE;IGNORE;IGNORE;<U22EE>
+-<U2302>	IGNORE;IGNORE;IGNORE;<U2302>
+-<U2308>	IGNORE;IGNORE;IGNORE;<U2308>
+-<U2309>	IGNORE;IGNORE;IGNORE;<U2309>
+-<U230A>	IGNORE;IGNORE;IGNORE;<U230A>
+-<U230B>	IGNORE;IGNORE;IGNORE;<U230B>
+-<U2310>	IGNORE;IGNORE;IGNORE;<U2310>
+-<U2312>	IGNORE;IGNORE;IGNORE;<U2312>
+-<U2315>	IGNORE;IGNORE;IGNORE;<U2315>
+-<U2320>	IGNORE;IGNORE;IGNORE;<U2320>
+-<U2321>	IGNORE;IGNORE;IGNORE;<U2321>
+-<U2423>	IGNORE;IGNORE;IGNORE;<U2423>
+-<U2440>	IGNORE;IGNORE;IGNORE;<U2440>
+-<U2441>	IGNORE;IGNORE;IGNORE;<U2441>
+-<U2442>	IGNORE;IGNORE;IGNORE;<U2442>
+-<U2443>	IGNORE;IGNORE;IGNORE;<U2443>
+-<U2446>	IGNORE;IGNORE;IGNORE;<U2446>
+-<U2447>	IGNORE;IGNORE;IGNORE;<U2447>
+-<U2448>	IGNORE;IGNORE;IGNORE;<U2448>
+-<U2449>	IGNORE;IGNORE;IGNORE;<U2449>
+-<U2460>	IGNORE;IGNORE;IGNORE;<U2460>
+-<U2461>	IGNORE;IGNORE;IGNORE;<U2461>
+-<U2462>	IGNORE;IGNORE;IGNORE;<U2462>
+-<U2463>	IGNORE;IGNORE;IGNORE;<U2463>
+-<U2464>	IGNORE;IGNORE;IGNORE;<U2464>
+-<U2465>	IGNORE;IGNORE;IGNORE;<U2465>
+-<U2466>	IGNORE;IGNORE;IGNORE;<U2466>
+-<U2467>	IGNORE;IGNORE;IGNORE;<U2467>
+-<U2468>	IGNORE;IGNORE;IGNORE;<U2468>
+-<U2469>	IGNORE;IGNORE;IGNORE;<U2469>
+-<U246A>	IGNORE;IGNORE;IGNORE;<U246A>
+-<U246B>	IGNORE;IGNORE;IGNORE;<U246B>
+-<U246C>	IGNORE;IGNORE;IGNORE;<U246C>
+-<U246D>	IGNORE;IGNORE;IGNORE;<U246D>
+-<U246E>	IGNORE;IGNORE;IGNORE;<U246E>
+-<U246F>	IGNORE;IGNORE;IGNORE;<U246F>
+-<U2470>	IGNORE;IGNORE;IGNORE;<U2470>
+-<U2471>	IGNORE;IGNORE;IGNORE;<U2471>
+-<U2472>	IGNORE;IGNORE;IGNORE;<U2472>
+-<U2473>	IGNORE;IGNORE;IGNORE;<U2473>
+-<U2474>	IGNORE;IGNORE;IGNORE;<U2474>
+-<U2475>	IGNORE;IGNORE;IGNORE;<U2475>
+-<U2476>	IGNORE;IGNORE;IGNORE;<U2476>
+-<U2477>	IGNORE;IGNORE;IGNORE;<U2477>
+-<U2478>	IGNORE;IGNORE;IGNORE;<U2478>
+-<U2479>	IGNORE;IGNORE;IGNORE;<U2479>
+-<U247A>	IGNORE;IGNORE;IGNORE;<U247A>
+-<U247B>	IGNORE;IGNORE;IGNORE;<U247B>
+-<U247C>	IGNORE;IGNORE;IGNORE;<U247C>
+-<U247D>	IGNORE;IGNORE;IGNORE;<U247D>
+-<U247E>	IGNORE;IGNORE;IGNORE;<U247E>
+-<U247F>	IGNORE;IGNORE;IGNORE;<U247F>
+-<U2480>	IGNORE;IGNORE;IGNORE;<U2480>
+-<U2481>	IGNORE;IGNORE;IGNORE;<U2481>
+-<U2482>	IGNORE;IGNORE;IGNORE;<U2482>
+-<U2483>	IGNORE;IGNORE;IGNORE;<U2483>
+-<U2484>	IGNORE;IGNORE;IGNORE;<U2484>
+-<U2485>	IGNORE;IGNORE;IGNORE;<U2485>
+-<U2486>	IGNORE;IGNORE;IGNORE;<U2486>
+-<U2487>	IGNORE;IGNORE;IGNORE;<U2487>
+-<U2488>	IGNORE;IGNORE;IGNORE;<U2488>
+-<U2489>	IGNORE;IGNORE;IGNORE;<U2489>
+-<U248A>	IGNORE;IGNORE;IGNORE;<U248A>
+-<U248B>	IGNORE;IGNORE;IGNORE;<U248B>
+-<U248C>	IGNORE;IGNORE;IGNORE;<U248C>
+-<U248D>	IGNORE;IGNORE;IGNORE;<U248D>
+-<U248E>	IGNORE;IGNORE;IGNORE;<U248E>
+-<U248F>	IGNORE;IGNORE;IGNORE;<U248F>
+-<U2490>	IGNORE;IGNORE;IGNORE;<U2490>
+-<U2491>	IGNORE;IGNORE;IGNORE;<U2491>
+-<U2492>	IGNORE;IGNORE;IGNORE;<U2492>
+-<U2493>	IGNORE;IGNORE;IGNORE;<U2493>
+-<U2494>	IGNORE;IGNORE;IGNORE;<U2494>
+-<U2495>	IGNORE;IGNORE;IGNORE;<U2495>
+-<U2496>	IGNORE;IGNORE;IGNORE;<U2496>
+-<U2497>	IGNORE;IGNORE;IGNORE;<U2497>
+-<U2498>	IGNORE;IGNORE;IGNORE;<U2498>
+-<U2499>	IGNORE;IGNORE;IGNORE;<U2499>
+-<U249A>	IGNORE;IGNORE;IGNORE;<U249A>
+-<U249B>	IGNORE;IGNORE;IGNORE;<U249B>
+-<U24EA>	IGNORE;IGNORE;IGNORE;<U24EA>
+-<U2500>	IGNORE;IGNORE;IGNORE;<U2500>
+-<U2550>	IGNORE;IGNORE;IGNORE;<U2550>
+-<U2502>	IGNORE;IGNORE;IGNORE;<U2502>
+-<U2551>	IGNORE;IGNORE;IGNORE;<U2551>
+-<U2504>	IGNORE;IGNORE;IGNORE;<U2504>
+-<U2505>	IGNORE;IGNORE;IGNORE;<U2505>
+-<U2506>	IGNORE;IGNORE;IGNORE;<U2506>
+-<U2507>	IGNORE;IGNORE;IGNORE;<U2507>
+-<U2508>	IGNORE;IGNORE;IGNORE;<U2508>
+-<U2509>	IGNORE;IGNORE;IGNORE;<U2509>
+-<U250A>	IGNORE;IGNORE;IGNORE;<U250A>
+-<U250B>	IGNORE;IGNORE;IGNORE;<U250B>
+-<U250C>	IGNORE;IGNORE;IGNORE;<U250C>
+-<U2552>	IGNORE;IGNORE;IGNORE;<U2552>
+-<U2553>	IGNORE;IGNORE;IGNORE;<U2553>
+-<U2554>	IGNORE;IGNORE;IGNORE;<U2554>
+-<U2510>	IGNORE;IGNORE;IGNORE;<U2510>
+-<U2555>	IGNORE;IGNORE;IGNORE;<U2555>
+-<U2556>	IGNORE;IGNORE;IGNORE;<U2556>
+-<U2557>	IGNORE;IGNORE;IGNORE;<U2557>
+-<U2514>	IGNORE;IGNORE;IGNORE;<U2514>
+-<U2558>	IGNORE;IGNORE;IGNORE;<U2558>
+-<U2559>	IGNORE;IGNORE;IGNORE;<U2559>
+-<U255A>	IGNORE;IGNORE;IGNORE;<U255A>
+-<U2518>	IGNORE;IGNORE;IGNORE;<U2518>
+-<U255B>	IGNORE;IGNORE;IGNORE;<U255B>
+-<U255C>	IGNORE;IGNORE;IGNORE;<U255C>
+-<U255D>	IGNORE;IGNORE;IGNORE;<U255D>
+-<U251C>	IGNORE;IGNORE;IGNORE;<U251C>
+-<U255E>	IGNORE;IGNORE;IGNORE;<U255E>
+-<U251E>	IGNORE;IGNORE;IGNORE;<U251E>
+-<U251F>	IGNORE;IGNORE;IGNORE;<U251F>
+-<U255F>	IGNORE;IGNORE;IGNORE;<U255F>
+-<U2521>	IGNORE;IGNORE;IGNORE;<U2521>
+-<U2522>	IGNORE;IGNORE;IGNORE;<U2522>
+-<U2560>	IGNORE;IGNORE;IGNORE;<U2560>
+-<U2524>	IGNORE;IGNORE;IGNORE;<U2524>
+-<U2561>	IGNORE;IGNORE;IGNORE;<U2561>
+-<U2526>	IGNORE;IGNORE;IGNORE;<U2526>
+-<U2527>	IGNORE;IGNORE;IGNORE;<U2527>
+-<U2562>	IGNORE;IGNORE;IGNORE;<U2562>
+-<U2529>	IGNORE;IGNORE;IGNORE;<U2529>
+-<U252A>	IGNORE;IGNORE;IGNORE;<U252A>
+-<U2563>	IGNORE;IGNORE;IGNORE;<U2563>
+-<U252C>	IGNORE;IGNORE;IGNORE;<U252C>
+-<U252D>	IGNORE;IGNORE;IGNORE;<U252D>
+-<U252E>	IGNORE;IGNORE;IGNORE;<U252E>
+-<U2564>	IGNORE;IGNORE;IGNORE;<U2564>
+-<U2565>	IGNORE;IGNORE;IGNORE;<U2565>
+-<U2531>	IGNORE;IGNORE;IGNORE;<U2531>
+-<U2532>	IGNORE;IGNORE;IGNORE;<U2532>
+-<U2566>	IGNORE;IGNORE;IGNORE;<U2566>
+-<U2534>	IGNORE;IGNORE;IGNORE;<U2534>
+-<U2535>	IGNORE;IGNORE;IGNORE;<U2535>
+-<U2536>	IGNORE;IGNORE;IGNORE;<U2536>
+-<U2567>	IGNORE;IGNORE;IGNORE;<U2567>
+-<U2568>	IGNORE;IGNORE;IGNORE;<U2568>
+-<U2539>	IGNORE;IGNORE;IGNORE;<U2539>
+-<U253A>	IGNORE;IGNORE;IGNORE;<U253A>
+-<U2569>	IGNORE;IGNORE;IGNORE;<U2569>
+-<U253C>	IGNORE;IGNORE;IGNORE;<U253C>
+-<U253D>	IGNORE;IGNORE;IGNORE;<U253D>
+-<U253E>	IGNORE;IGNORE;IGNORE;<U253E>
+-<U256A>	IGNORE;IGNORE;IGNORE;<U256A>
+-<U2540>	IGNORE;IGNORE;IGNORE;<U2540>
+-<U2541>	IGNORE;IGNORE;IGNORE;<U2541>
+-<U256B>	IGNORE;IGNORE;IGNORE;<U256B>
+-<U2543>	IGNORE;IGNORE;IGNORE;<U2543>
+-<U2544>	IGNORE;IGNORE;IGNORE;<U2544>
+-<U2545>	IGNORE;IGNORE;IGNORE;<U2545>
+-<U2546>	IGNORE;IGNORE;IGNORE;<U2546>
+-<U2547>	IGNORE;IGNORE;IGNORE;<U2547>
+-<U2548>	IGNORE;IGNORE;IGNORE;<U2548>
+-<U2549>	IGNORE;IGNORE;IGNORE;<U2549>
+-<U254A>	IGNORE;IGNORE;IGNORE;<U254A>
+-<U256C>	IGNORE;IGNORE;IGNORE;<U256C>
+-<U2571>	IGNORE;IGNORE;IGNORE;<U2571>
+-<U2572>	IGNORE;IGNORE;IGNORE;<U2572>
+-<U2580>	IGNORE;IGNORE;IGNORE;<U2580>
+-<U2584>	IGNORE;IGNORE;IGNORE;<U2584>
+-<U2588>	IGNORE;IGNORE;IGNORE;<U2588>
+-<U258C>	IGNORE;IGNORE;IGNORE;<U258C>
+-<U2590>	IGNORE;IGNORE;IGNORE;<U2590>
+-<U2591>	IGNORE;IGNORE;IGNORE;<U2591>
+-<U2592>	IGNORE;IGNORE;IGNORE;<U2592>
+-<U2593>	IGNORE;IGNORE;IGNORE;<U2593>
+-<U25A0>	IGNORE;IGNORE;IGNORE;<U25A0>
+-<U25A1>	IGNORE;IGNORE;IGNORE;<U25A1>
+-<U25A2>	IGNORE;IGNORE;IGNORE;<U25A2>
+-<U25A3>	IGNORE;IGNORE;IGNORE;<U25A3>
+-<U25A4>	IGNORE;IGNORE;IGNORE;<U25A4>
+-<U25A5>	IGNORE;IGNORE;IGNORE;<U25A5>
+-<U25A6>	IGNORE;IGNORE;IGNORE;<U25A6>
+-<U25A7>	IGNORE;IGNORE;IGNORE;<U25A7>
+-<U25A8>	IGNORE;IGNORE;IGNORE;<U25A8>
+-<U25A9>	IGNORE;IGNORE;IGNORE;<U25A9>
+-<U25AA>	IGNORE;IGNORE;IGNORE;<U25AA>
+-<U25AC>	IGNORE;IGNORE;IGNORE;<U25AC>
+-<U25AD>	IGNORE;IGNORE;IGNORE;<U25AD>
+-<U25B2>	IGNORE;IGNORE;IGNORE;<U25B2>
+-<U25B3>	IGNORE;IGNORE;IGNORE;<U25B3>
+-<U25B7>	IGNORE;IGNORE;IGNORE;<U25B7>
+-<U25BA>	IGNORE;IGNORE;IGNORE;<U25BA>
+-<U25BC>	IGNORE;IGNORE;IGNORE;<U25BC>
+-<U25BD>	IGNORE;IGNORE;IGNORE;<U25BD>
+-<U25C1>	IGNORE;IGNORE;IGNORE;<U25C1>
+-<U25C4>	IGNORE;IGNORE;IGNORE;<U25C4>
+-<U25C6>	IGNORE;IGNORE;IGNORE;<U25C6>
+-<U25C7>	IGNORE;IGNORE;IGNORE;<U25C7>
+-<U25CA>	IGNORE;IGNORE;IGNORE;<U25CA>
+-<U25CB>	IGNORE;IGNORE;IGNORE;<U25CB>
+-<U25CE>	IGNORE;IGNORE;IGNORE;<U25CE>
+-<U25CF>	IGNORE;IGNORE;IGNORE;<U25CF>
+-<U25D0>	IGNORE;IGNORE;IGNORE;<U25D0>
+-<U25D1>	IGNORE;IGNORE;IGNORE;<U25D1>
+-<U25D8>	IGNORE;IGNORE;IGNORE;<U25D8>
+-<U25D9>	IGNORE;IGNORE;IGNORE;<U25D9>
+-<U25E2>	IGNORE;IGNORE;IGNORE;<U25E2>
+-<U25E3>	IGNORE;IGNORE;IGNORE;<U25E3>
+-<U25EF>	IGNORE;IGNORE;IGNORE;<U25EF>
+-<U2605>	IGNORE;IGNORE;IGNORE;<U2605>
+-<U2606>	IGNORE;IGNORE;IGNORE;<U2606>
+-<U260E>	IGNORE;IGNORE;IGNORE;<U260E>
+-<U260F>	IGNORE;IGNORE;IGNORE;<U260F>
+-<U261C>	IGNORE;IGNORE;IGNORE;<U261C>
+-<U261E>	IGNORE;IGNORE;IGNORE;<U261E>
+-<U263A>	IGNORE;IGNORE;IGNORE;<U263A>
+-<U263B>	IGNORE;IGNORE;IGNORE;<U263B>
+-<U263C>	IGNORE;IGNORE;IGNORE;<U263C>
+-<U2640>	IGNORE;IGNORE;IGNORE;<U2640>
+-<U2642>	IGNORE;IGNORE;IGNORE;<U2642>
+-<U2660>	IGNORE;IGNORE;IGNORE;<U2660>
+-<U2661>	IGNORE;IGNORE;IGNORE;<U2661>
+-<U2662>	IGNORE;IGNORE;IGNORE;<U2662>
+-<U2663>	IGNORE;IGNORE;IGNORE;<U2663>
+-<U2664>	IGNORE;IGNORE;IGNORE;<U2664>
+-<U2665>	IGNORE;IGNORE;IGNORE;<U2665>
+-<U2666>	IGNORE;IGNORE;IGNORE;<U2666>
+-<U2667>	IGNORE;IGNORE;IGNORE;<U2667>
+-<U2669>	IGNORE;IGNORE;IGNORE;<U2669>
+-<U266A>	IGNORE;IGNORE;IGNORE;<U266A>
+-<U266B>	IGNORE;IGNORE;IGNORE;<U266B>
+-<U266C>	IGNORE;IGNORE;IGNORE;<U266C>
+-<U266D>	IGNORE;IGNORE;IGNORE;<U266D>
+-<U266E>	IGNORE;IGNORE;IGNORE;<U266E>
+-<U266F>	IGNORE;IGNORE;IGNORE;<U266F>
+-<U2713>	IGNORE;IGNORE;IGNORE;<U2713>
+-<U2717>	IGNORE;IGNORE;IGNORE;<U2717>
+-<U2720>	IGNORE;IGNORE;IGNORE;<U2720>
+-<U3000>	IGNORE;IGNORE;IGNORE;<U3000>
+-<U3001>	IGNORE;IGNORE;IGNORE;<U3001>
+-<U3002>	IGNORE;IGNORE;IGNORE;<U3002>
+-<U3003>	IGNORE;IGNORE;IGNORE;<U3003>
+-<U3004>	IGNORE;IGNORE;IGNORE;<U3004>
+-<U3005>	IGNORE;IGNORE;IGNORE;<U3005>
+-<U3006>	IGNORE;IGNORE;IGNORE;<U3006>
+-<U3007>	IGNORE;IGNORE;IGNORE;<U3007>
+-<U300A>	IGNORE;IGNORE;IGNORE;<U300A>
+-<U300B>	IGNORE;IGNORE;IGNORE;<U300B>
+-<U300C>	IGNORE;IGNORE;IGNORE;<U300C>
+-<U300D>	IGNORE;IGNORE;IGNORE;<U300D>
+-<U300E>	IGNORE;IGNORE;IGNORE;<U300E>
+-<U300F>	IGNORE;IGNORE;IGNORE;<U300F>
+-<U3010>	IGNORE;IGNORE;IGNORE;<U3010>
+-<U3011>	IGNORE;IGNORE;IGNORE;<U3011>
+-<U3012>	IGNORE;IGNORE;IGNORE;<U3012>
+-<U3013>	IGNORE;IGNORE;IGNORE;<U3013>
+-<U3014>	IGNORE;IGNORE;IGNORE;<U3014>
+-<U3015>	IGNORE;IGNORE;IGNORE;<U3015>
+-<U3016>	IGNORE;IGNORE;IGNORE;<U3016>
+-<U3017>	IGNORE;IGNORE;IGNORE;<U3017>
+-<U301C>	IGNORE;IGNORE;IGNORE;<U301C>
+-<U3020>	IGNORE;IGNORE;IGNORE;<U3020>
+-<U309B>	IGNORE;IGNORE;IGNORE;<U309B>
+-<U309C>	IGNORE;IGNORE;IGNORE;<U309C>
+-<U309D>	IGNORE;IGNORE;IGNORE;<U309D>
+-<U309E>	IGNORE;IGNORE;IGNORE;<U309E>
+-<U30FB>	IGNORE;IGNORE;IGNORE;<U30FB>
+-<U30FC>	IGNORE;IGNORE;IGNORE;<U30FC>
+-<U30FD>	IGNORE;IGNORE;IGNORE;<U30FD>
+-<U30FE>	IGNORE;IGNORE;IGNORE;<U30FE>
+-<U321C>	IGNORE;IGNORE;IGNORE;<U321C>
+-<U3220>	IGNORE;IGNORE;IGNORE;<U3220>
+-<U3221>	IGNORE;IGNORE;IGNORE;<U3221>
+-<U3222>	IGNORE;IGNORE;IGNORE;<U3222>
+-<U3223>	IGNORE;IGNORE;IGNORE;<U3223>
+-<U3224>	IGNORE;IGNORE;IGNORE;<U3224>
+-<U3225>	IGNORE;IGNORE;IGNORE;<U3225>
+-<U3226>	IGNORE;IGNORE;IGNORE;<U3226>
+-<U3227>	IGNORE;IGNORE;IGNORE;<U3227>
+-<U3228>	IGNORE;IGNORE;IGNORE;<U3228>
+-<U3229>	IGNORE;IGNORE;IGNORE;<U3229>
+-<U327F>	IGNORE;IGNORE;IGNORE;<U327F>
+-<U33C2>	IGNORE;IGNORE;IGNORE;<U33C2>
+-<U33D8>	IGNORE;IGNORE;IGNORE;<U33D8>
+-<U0000>	IGNORE;IGNORE;IGNORE;<U0000>
+-<U0001>	IGNORE;IGNORE;IGNORE;<U0001>
+-<U0002>	IGNORE;IGNORE;IGNORE;<U0002>
+-<U0003>	IGNORE;IGNORE;IGNORE;<U0003>
+-<U0004>	IGNORE;IGNORE;IGNORE;<U0004>
+-<U0005>	IGNORE;IGNORE;IGNORE;<U0005>
+-<U0006>	IGNORE;IGNORE;IGNORE;<U0006>
+-<U0007>	IGNORE;IGNORE;IGNORE;<U0007>
+-<U0008>	IGNORE;IGNORE;IGNORE;<U0008>
+-<U000E>	IGNORE;IGNORE;IGNORE;<U000E>
+-<U000F>	IGNORE;IGNORE;IGNORE;<U000F>
+-<U0010>	IGNORE;IGNORE;IGNORE;<U0010>
+-<U0011>	IGNORE;IGNORE;IGNORE;<U0011>
+-<U0012>	IGNORE;IGNORE;IGNORE;<U0012>
+-<U0013>	IGNORE;IGNORE;IGNORE;<U0013>
+-<U0014>	IGNORE;IGNORE;IGNORE;<U0014>
+-<U0015>	IGNORE;IGNORE;IGNORE;<U0015>
+-<U0016>	IGNORE;IGNORE;IGNORE;<U0016>
+-<U0017>	IGNORE;IGNORE;IGNORE;<U0017>
+-<U0018>	IGNORE;IGNORE;IGNORE;<U0018>
+-<U0019>	IGNORE;IGNORE;IGNORE;<U0019>
+-<U001A>	IGNORE;IGNORE;IGNORE;<U001A>
+-<U001B>	IGNORE;IGNORE;IGNORE;<U001B>
+-<U001C>	IGNORE;IGNORE;IGNORE;<U001C>
+-<U001D>	IGNORE;IGNORE;IGNORE;<U001D>
+-<U001E>	IGNORE;IGNORE;IGNORE;<U001E>
+-<U001F>	IGNORE;IGNORE;IGNORE;<U001F>
+-<U007F>	IGNORE;IGNORE;IGNORE;<U007F>
+-<U0080>	IGNORE;IGNORE;IGNORE;<U0080>
+-<U0081>	IGNORE;IGNORE;IGNORE;<U0081>
+-<U0082>	IGNORE;IGNORE;IGNORE;<U0082>
+-<U0083>	IGNORE;IGNORE;IGNORE;<U0083>
+-<U0084>	IGNORE;IGNORE;IGNORE;<U0084>
+-<U0085>	IGNORE;IGNORE;IGNORE;<U0085>
+-<U0086>	IGNORE;IGNORE;IGNORE;<U0086>
+-<U0087>	IGNORE;IGNORE;IGNORE;<U0087>
+-<U0088>	IGNORE;IGNORE;IGNORE;<U0088>
+-<U0089>	IGNORE;IGNORE;IGNORE;<U0089>
+-<U008A>	IGNORE;IGNORE;IGNORE;<U008A>
+-<U008B>	IGNORE;IGNORE;IGNORE;<U008B>
+-<U008C>	IGNORE;IGNORE;IGNORE;<U008C>
+-<U008D>	IGNORE;IGNORE;IGNORE;<U008D>
+-<U008E>	IGNORE;IGNORE;IGNORE;<U008E>
+-<U008F>	IGNORE;IGNORE;IGNORE;<U008F>
+-<U0090>	IGNORE;IGNORE;IGNORE;<U0090>
+-<U0091>	IGNORE;IGNORE;IGNORE;<U0091>
+-<U0092>	IGNORE;IGNORE;IGNORE;<U0092>
+-<U0093>	IGNORE;IGNORE;IGNORE;<U0093>
+-<U0094>	IGNORE;IGNORE;IGNORE;<U0094>
+-<U0095>	IGNORE;IGNORE;IGNORE;<U0095>
+-<U0096>	IGNORE;IGNORE;IGNORE;<U0096>
+-<U0097>	IGNORE;IGNORE;IGNORE;<U0097>
+-<U0098>	IGNORE;IGNORE;IGNORE;<U0098>
+-<U0099>	IGNORE;IGNORE;IGNORE;<U0099>
+-<U009A>	IGNORE;IGNORE;IGNORE;<U009A>
+-<U009B>	IGNORE;IGNORE;IGNORE;<U009B>
+-<U009C>	IGNORE;IGNORE;IGNORE;<U009C>
+-<U009D>	IGNORE;IGNORE;IGNORE;<U009D>
+-<U009E>	IGNORE;IGNORE;IGNORE;<U009E>
+-<U009F>	IGNORE;IGNORE;IGNORE;<U009F>
+-<UE000>	IGNORE;IGNORE;IGNORE;<UE000>
+-<UE001>	IGNORE;IGNORE;IGNORE;<UE001>
+-<UE002>	IGNORE;IGNORE;IGNORE;<UE002>
+-<U0301>	IGNORE;IGNORE;IGNORE;<U0301>
+-<UE004>	IGNORE;IGNORE;IGNORE;<UE004>
+-<UE005>	IGNORE;IGNORE;IGNORE;<UE005>
+-<UE006>	IGNORE;IGNORE;IGNORE;<UE006>
+-<UE007>	IGNORE;IGNORE;IGNORE;<UE007>
+-<UE008>	IGNORE;IGNORE;IGNORE;<UE008>
+-<UE009>	IGNORE;IGNORE;IGNORE;<UE009>
+-<UE00A>	IGNORE;IGNORE;IGNORE;<UE00A>
+-<UE00B>	IGNORE;IGNORE;IGNORE;<UE00B>
+-<UE00C>	IGNORE;IGNORE;IGNORE;<UE00C>
+-<UE00D>	IGNORE;IGNORE;IGNORE;<UE00D>
+-<UE00E>	IGNORE;IGNORE;IGNORE;<UE00E>
+-<UE00F>	IGNORE;IGNORE;IGNORE;<UE00F>
+-<"=>	IGNORE;IGNORE;IGNORE;<"=>
+-<UE011>	IGNORE;IGNORE;IGNORE;<UE011>
+-<UE012>	IGNORE;IGNORE;IGNORE;<UE012>
+-<UE013>	IGNORE;IGNORE;IGNORE;<UE013>
+-<UE014>	IGNORE;IGNORE;IGNORE;<UE014>
+-<UE015>	IGNORE;IGNORE;IGNORE;<UE015>
+-<UE017>	IGNORE;IGNORE;IGNORE;<UE017>
+-<UE018>	IGNORE;IGNORE;IGNORE;<UE018>
+-<UE019>	IGNORE;IGNORE;IGNORE;<UE019>
+-UNDEFINED	IGNORE;IGNORE;IGNORE
+-
+-<U0030>	<U0030>;<U0030>;IGNORE;IGNORE
+-<U2070>	<U0030>;<U2070>;IGNORE;IGNORE
+-<U215B>	<U0030>;<U215B>;IGNORE;IGNORE
+-<U00BC>	<U0030>;<U00BC>;IGNORE;IGNORE
+-<U215C>	<U0030>;<U215C>;IGNORE;IGNORE
+-<U00BD>	<U0030>;<U00BD>;IGNORE;IGNORE
+-<U215D>	<U0030>;<U215D>;IGNORE;IGNORE
+-<U00BE>	<U0030>;<U00BE>;IGNORE;IGNORE
+-<U215E>	<U0030>;<U215E>;IGNORE;IGNORE
+-<U0031>	<U0031>;<U0031>;IGNORE;IGNORE
+-<U0032>	<U0032>;<U0032>;IGNORE;IGNORE
+-<U0033>	<U0033>;<U0033>;IGNORE;IGNORE
+-<U0034>	<U0034>;<U0034>;IGNORE;IGNORE
+-<U0035>	<U0035>;<U0035>;IGNORE;IGNORE
+-<U0036>	<U0036>;<U0036>;IGNORE;IGNORE
+-<U0037>	<U0037>;<U0037>;IGNORE;IGNORE
+-<U0038>	<U0038>;<U0038>;IGNORE;IGNORE
+-<U0039>	<U0039>;<U0039>;IGNORE;IGNORE
+-<U00B9>	<U0031>;<U00B9>;IGNORE;IGNORE
+-<U00B2>	<U0032>;<U00B2>;IGNORE;IGNORE
+-<U00B3>	<U0033>;<U00B3>;IGNORE;IGNORE
+-<U2074>	<U0034>;<U2074>;IGNORE;IGNORE
+-<U2075>	<U0035>;<U2075>;IGNORE;IGNORE
+-<U2076>	<U0036>;<U2076>;IGNORE;IGNORE
+-<U2077>	<U0037>;<U2077>;IGNORE;IGNORE
+-<U2078>	<U0038>;<U2078>;IGNORE;IGNORE
+-<U2079>	<U0039>;<U2079>;IGNORE;IGNORE
+-<U0041>	<U0041>;<NONE>;<CAPITAL>;IGNORE
+-<U0061>	<U0041>;<NONE>;<SMALL>;IGNORE
+-<U00AA>	<U0041>;<NONE>;<U00AA>;IGNORE
+-<U00C1>	<U0041>;<ACUTE>;<CAPITAL>;IGNORE
+-<U00E1>	<U0041>;<ACUTE>;<SMALL>;IGNORE
+-<U00C0>	<U0041>;<GRAVE>;<CAPITAL>;IGNORE
+-<U00E0>	<U0041>;<GRAVE>;<SMALL>;IGNORE
+-<U0200>	<U0041>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
+-<U0201>	<U0041>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
+-<U0102>	<U0041>;<BREVE>;<CAPITAL>;IGNORE
+-<U0103>	<U0041>;<BREVE>;<SMALL>;IGNORE
+-<U1EAE>	<U0041>;<BREVE+ACUTE>;<CAPITAL>;IGNORE
+-<U1EAF>	<U0041>;<BREVE+ACUTE>;<SMALL>;IGNORE
+-<U1EB0>	<U0041>;<BREVE+GRAVE>;<CAPITAL>;IGNORE
+-<U1EB1>	<U0041>;<BREVE+GRAVE>;<SMALL>;IGNORE
+-<U1EB2>	<U0041>;<BREVE+HOOK>;<CAPITAL>;IGNORE
+-<U1EB3>	<U0041>;<BREVE+HOOK>;<SMALL>;IGNORE
+-<U1EB4>	<U0041>;<BREVE+TILDE>;<CAPITAL>;IGNORE
+-<U1EB5>	<U0041>;<BREVE+TILDE>;<SMALL>;IGNORE
+-<U1EB6>	<U0041>;<BREVE+DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1EB7>	<U0041>;<BREVE+DOT-BELOW>;<SMALL>;IGNORE
+-<U0202>	<U0041>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
+-<U0203>	<U0041>;<INVERTED-BREVE>;<SMALL>;IGNORE
+-<U00C2>	<U0041>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U00E2>	<U0041>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U1EA4>	<U0041>;<CIRCUMFLEX+ACUTE>;<CAPITAL>;IGNORE
+-<U1EA5>	<U0041>;<CIRCUMFLEX+ACUTE>;<SMALL>;IGNORE
+-<U1EA6>	<U0041>;<CIRCUMFLEX+GRAVE>;<CAPITAL>;IGNORE
+-<U1EA7>	<U0041>;<CIRCUMFLEX+GRAVE>;<SMALL>;IGNORE
+-<U1EA8>	<U0041>;<CIRCUMFLEX+HOOK>;<CAPITAL>;IGNORE
+-<U1EA9>	<U0041>;<CIRCUMFLEX+HOOK>;<SMALL>;IGNORE
+-<U1EAA>	<U0041>;<CIRCUMFLEX+TILDE>;<CAPITAL>;IGNORE
+-<U1EAB>	<U0041>;<CIRCUMFLEX+TILDE>;<SMALL>;IGNORE
+-<U1EAC>	<U0041>;<CIRCUMFLEX+DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1EAD>	<U0041>;<CIRCUMFLEX+DOT-BELOW>;<SMALL>;IGNORE
+-<U01CD>	<U0041>;<CARON>;<CAPITAL>;IGNORE
+-<U01CE>	<U0041>;<CARON>;<SMALL>;IGNORE
+-<U00C5>	<U0041>;<RING>;<CAPITAL>;IGNORE
+-<U00E5>	<U0041>;<RING>;<SMALL>;IGNORE
+-<U01FA>	<U0041>;<RING+ACUTE>;<CAPITAL>;IGNORE
+-<U01FB>	<U0041>;<RING+ACUTE>;<SMALL>;IGNORE
+-<U1E00>	<U0041>;<RING-BELOW>;<CAPITAL>;IGNORE
+-<U1E01>	<U0041>;<RING-BELOW>;<SMALL>;IGNORE
+-<U00C4>	<U0041>;<DIAERESIS>;<CAPITAL>;IGNORE
+-<U00E4>	<U0041>;<DIAERESIS>;<SMALL>;IGNORE
+-<U01DE>	<U0041>;<DIAERESIS+MACRON>;<CAPITAL>;IGNORE
+-<U01DF>	<U0041>;<DIAERESIS+MACRON>;<SMALL>;IGNORE
+-<U1EA2>	<U0041>;<HOOK>;<CAPITAL>;IGNORE
+-<U1EA3>	<U0041>;<HOOK>;<SMALL>;IGNORE
+-<U00C3>	<U0041>;<TILDE>;<CAPITAL>;IGNORE
+-<U00E3>	<U0041>;<TILDE>;<SMALL>;IGNORE
+-<U1EA0>	<U0041>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1EA1>	<U0041>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U0104>	<U0041>;<OGONEK>;<CAPITAL>;IGNORE
+-<U0105>	<U0041>;<OGONEK>;<SMALL>;IGNORE
+-<U0100>	<U0041>;<MACRON>;<CAPITAL>;IGNORE
+-<U0101>	<U0041>;<MACRON>;<SMALL>;IGNORE
+-<U01E0>	<U0041>;<MACRON+DOT>;<CAPITAL>;IGNORE
+-<U01E1>	<U0041>;<MACRON+DOT>;<SMALL>;IGNORE
+-<a8>
+-<U00C6>	"<U0041><U0045>";"<U00C6><U00C6>";"<CAPITAL><CAPITAL>";IGNORE
+-<U00E6>	"<U0041><U0045>";"<U00C6><U00C6>";"<SMALL><SMALL>";IGNORE
+-<U01FC>	"<U0041><U0045>";"<U01FC><U01FC>";"<CAPITAL><CAPITAL>";IGNORE
+-<U01FD>	"<U0041><U0045>";"<U01FC><U01FC>";"<SMALL><SMALL>";IGNORE
+-<U01E2>	"<U0041><U0045>";"<U01E2><U01E2>";"<CAPITAL><CAPITAL>";IGNORE
+-<U01E3>	"<U0041><U0045>";"<U01E2><U01E2>";"<SMALL><SMALL>";IGNORE
+-<U0042>	<U0042>;<NONE>;<CAPITAL>;IGNORE
+-<U0062>	<U0042>;<NONE>;<SMALL>;IGNORE
+-<U1E02>	<U0042>;<DOT>;<CAPITAL>;IGNORE
+-<U1E03>	<U0042>;<DOT>;<SMALL>;IGNORE
+-<U1E04>	<U0042>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E05>	<U0042>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U1E06>	<U0042>;<LINE-BELOW>;<CAPITAL>;IGNORE
+-<U1E07>	<U0042>;<LINE-BELOW>;<SMALL>;IGNORE
+-<b8>
+-<U0043>	<U0043>;<NONE>;<CAPITAL>;IGNORE
+-<U0063>	<U0043>;<NONE>;<SMALL>;IGNORE
+-<U0108>	<U0043>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U0109>	<U0043>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U0187>	<U0043>;<HOOK>;<CAPITAL>;IGNORE
+-<U0188>	<U0043>;<HOOK>;<SMALL>;IGNORE
+-<U010A>	<U0043>;<DOT>;<CAPITAL>;IGNORE
+-<U010B>	<U0043>;<DOT>;<SMALL>;IGNORE
+-<U00C7>	<U0043>;<CEDILLA>;<CAPITAL>;IGNORE
+-<U00E7>	<U0043>;<CEDILLA>;<SMALL>;IGNORE
+-<U1E08>	<U0043>;<CEDILLA+ACUTE>;<CAPITAL>;IGNORE
+-<U1E09>	<U0043>;<CEDILLA+ACUTE>;<SMALL>;IGNORE
+-<c8>
+-<U010C>	<U010C>;<NONE>;<CAPITAL>;IGNORE
+-<U010D>	<U010C>;<NONE>;<SMALL>;IGNORE
+-<U0044>	<U0044>;<NONE>;<CAPITAL>;IGNORE
+-<U0064>	<U0044>;<NONE>;<SMALL>;IGNORE
+-<U010E>	<U0044>;<CARON>;<CAPITAL>;IGNORE
+-<U010F>	<U0044>;<CARON>;<SMALL>;IGNORE
+-<U1E0A>	<U0044>;<DOT>;<CAPITAL>;IGNORE
+-<U1E0B>	<U0044>;<DOT>;<SMALL>;IGNORE
+-<U1E0C>	<U0044>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E0D>	<U0044>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U0110>	<U0044>;<STROKE>;<CAPITAL>;IGNORE
+-<U0111>	<U0044>;<STROKE>;<SMALL>;IGNORE
+-<U1E10>	<U0044>;<CEDILLA>;<CAPITAL>;IGNORE
+-<U1E11>	<U0044>;<CEDILLA>;<SMALL>;IGNORE
+-<U1E12>	<U0044>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U1E13>	<U0044>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
+-<U1E0E>	<U0044>;<LINE-BELOW>;<CAPITAL>;IGNORE
+-<U1E0F>	<U0044>;<LINE-BELOW>;<SMALL>;IGNORE
+-<d8>
+-<D-Z'>	<D-Z'>;<NONE>;<CAPITAL>;IGNORE
+-<D-z'>	<D-Z'>;<NONE>;<CAPITAL-SMALL>;IGNORE
+-<d-Z'>	<D-Z'>;<NONE>;<SMALL-CAPITAL>;IGNORE
+-<d-z'>	<D-Z'>;<NONE>;<SMALL>;IGNORE
+-<U0045>	<U0045>;<NONE>;<CAPITAL>;IGNORE
+-<U0065>	<U0045>;<NONE>;<SMALL>;IGNORE
+-<U00C9>	<U0045>;<ACUTE>;<CAPITAL>;IGNORE
+-<U00E9>	<U0045>;<ACUTE>;<SMALL>;IGNORE
+-<U00C8>	<U0045>;<GRAVE>;<CAPITAL>;IGNORE
+-<U00E8>	<U0045>;<GRAVE>;<SMALL>;IGNORE
+-<U0204>	<U0045>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
+-<U0205>	<U0045>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
+-<U0114>	<U0045>;<BREVE>;<CAPITAL>;IGNORE
+-<U0115>	<U0045>;<BREVE>;<SMALL>;IGNORE
+-<U0206>	<U0045>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
+-<U0207>	<U0045>;<INVERTED-BREVE>;<SMALL>;IGNORE
+-<U00CA>	<U0045>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U00EA>	<U0045>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U1EBE>	<U0045>;<CIRCUMFLEX+ACUTE>;<CAPITAL>;IGNORE
+-<U1EBF>	<U0045>;<CIRCUMFLEX+ACUTE>;<SMALL>;IGNORE
+-<U1EC0>	<U0045>;<CIRCUMFLEX+GRAVE>;<CAPITAL>;IGNORE
+-<U1EC1>	<U0045>;<CIRCUMFLEX+GRAVE>;<SMALL>;IGNORE
+-<U1EC2>	<U0045>;<CIRCUMFLEX+HOOK>;<CAPITAL>;IGNORE
+-<U1EC3>	<U0045>;<CIRCUMFLEX+HOOK>;<SMALL>;IGNORE
+-<U1EC4>	<U0045>;<CIRCUMFLEX+TILDE>;<CAPITAL>;IGNORE
+-<U1EC5>	<U0045>;<CIRCUMFLEX+TILDE>;<SMALL>;IGNORE
+-<U1EC6>	<U0045>;<CIRCUMFLEX+DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1EC7>	<U0045>;<CIRCUMFLEX+DOT-BELOW>;<SMALL>;IGNORE
+-<U00CB>	<U0045>;<DIAERESIS>;<CAPITAL>;IGNORE
+-<U00EB>	<U0045>;<DIAERESIS>;<SMALL>;IGNORE
+-<U1EBA>	<U0045>;<HOOK>;<CAPITAL>;IGNORE
+-<U1EBB>	<U0045>;<HOOK>;<SMALL>;IGNORE
+-<U1EBC>	<U0045>;<TILDE>;<CAPITAL>;IGNORE
+-<U1EBD>	<U0045>;<TILDE>;<SMALL>;IGNORE
+-<U1E1A>	<U0045>;<TILDE-BELOW>;<CAPITAL>;IGNORE
+-<U1E1B>	<U0045>;<TILDE-BELOW>;<SMALL>;IGNORE
+-<U0116>	<U0045>;<DOT>;<CAPITAL>;IGNORE
+-<U0117>	<U0045>;<DOT>;<SMALL>;IGNORE
+-<U1EB8>	<U0045>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1EB9>	<U0045>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U1E1C>	<U0045>;<CEDILLA+BREVE>;<CAPITAL>;IGNORE
+-<U1E1D>	<U0045>;<CEDILLA+BREVE>;<SMALL>;IGNORE
+-<U0118>	<U0045>;<OGONEK>;<CAPITAL>;IGNORE
+-<U0119>	<U0045>;<OGONEK>;<SMALL>;IGNORE
+-<U0112>	<U0045>;<MACRON>;<CAPITAL>;IGNORE
+-<U0113>	<U0045>;<MACRON>;<SMALL>;IGNORE
+-<U1E16>	<U0045>;<MACRON+ACUTE>;<CAPITAL>;IGNORE
+-<U1E17>	<U0045>;<MACRON+ACUTE>;<SMALL>;IGNORE
+-<U1E14>	<U0045>;<MACRON+GRAVE>;<CAPITAL>;IGNORE
+-<U1E15>	<U0045>;<MACRON+GRAVE>;<SMALL>;IGNORE
+-<U1E18>	<U0045>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U1E19>	<U0045>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
+-<e8>
+-<U011A>	<U011A>;<NONE>;<CAPITAL>;IGNORE
+-<U011B>	<U011A>;<NONE>;<SMALL>;IGNORE
+-<U0046>	<U0046>;<NONE>;<CAPITAL>;IGNORE
+-<U0066>	<U0046>;<NONE>;<SMALL>;IGNORE
+-<U0191>	<U0046>;<HOOK>;<CAPITAL>;IGNORE
+-<U0192>	<U0046>;<HOOK>;<SMALL>;IGNORE
+-<U1E1E>	<U0046>;<DOT>;<CAPITAL>;IGNORE
+-<U1E1F>	<U0046>;<DOT>;<SMALL>;IGNORE
+-<f8>
+-<UFB00>	"<U0046><U0046>";"<NONE><NONE>";"<UFB00><UFB00>";IGNORE
+-<UFB01>	"<U0046><U0049>";"<NONE><NONE>";"<UFB01><UFB01>";IGNORE
+-<UFB02>	"<U0046><U004C>";"<NONE><NONE>";"<UFB02><UFB02>";IGNORE
+-<UFB03>	"<U0046><U0046><U0049>";"<NONE><NONE><NONE>";"<UFB03><UFB03><UFB03>";IGNORE
+-<UFB04>	"<U0046><U0046><U004C>";"<NONE><NONE><NONE>";"<UFB04><UFB04><UFB04>";IGNORE
+-<U0047>	<U0047>;<NONE>;<CAPITAL>;IGNORE
+-<U0067>	<U0047>;<NONE>;<SMALL>;IGNORE
+-<U01F4>	<U0047>;<ACUTE>;<CAPITAL>;IGNORE
+-<U01F5>	<U0047>;<ACUTE>;<SMALL>;IGNORE
+-<U011E>	<U0047>;<BREVE>;<CAPITAL>;IGNORE
+-<U011F>	<U0047>;<BREVE>;<SMALL>;IGNORE
+-<U011C>	<U0047>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U011D>	<U0047>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U01E6>	<U0047>;<CARON>;<CAPITAL>;IGNORE
+-<U01E7>	<U0047>;<CARON>;<SMALL>;IGNORE
+-<U0120>	<U0047>;<DOT>;<CAPITAL>;IGNORE
+-<U0121>	<U0047>;<DOT>;<SMALL>;IGNORE
+-<U01E4>	<U0047>;<STROKE>;<CAPITAL>;IGNORE
+-<U01E5>	<U0047>;<STROKE>;<SMALL>;IGNORE
+-<U0122>	<U0047>;<CEDILLA>;<CAPITAL>;IGNORE
+-<U0123>	<U0047>;<CEDILLA>;<SMALL>;IGNORE
+-<U1E20>	<U0047>;<MACRON>;<CAPITAL>;IGNORE
+-<U1E21>	<U0047>;<MACRON>;<SMALL>;IGNORE
+-<g8>
+-<U0048>	<U0048>;<NONE>;<CAPITAL>;IGNORE
+-<U0068>	<U0048>;<NONE>;<SMALL>;IGNORE
+-<U1E2A>	<U0048>;<BREVE-BELOW>;<CAPITAL>;IGNORE
+-<U1E2B>	<U0048>;<BREVE-BELOW>;<SMALL>;IGNORE
+-<U0124>	<U0048>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U0125>	<U0048>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U1E26>	<U0048>;<DIAERESIS>;<CAPITAL>;IGNORE
+-<U1E27>	<U0048>;<DIAERESIS>;<SMALL>;IGNORE
+-<U1E22>	<U0048>;<DOT>;<CAPITAL>;IGNORE
+-<U1E23>	<U0048>;<DOT>;<SMALL>;IGNORE
+-<U1E24>	<U0048>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E25>	<U0048>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U0126>	<U0048>;<STROKE>;<CAPITAL>;IGNORE
+-<U0127>	<U0048>;<STROKE>;<SMALL>;IGNORE
+-<U1E28>	<U0048>;<CEDILLA>;<CAPITAL>;IGNORE
+-<U1E29>	<U0048>;<CEDILLA>;<SMALL>;IGNORE
+-<h8>
+-<C-H>	<C-H>;<NONE>;<CAPITAL>;IGNORE
+-<C-h>	<C-H>;<NONE>;<CAPITAL-SMALL>;IGNORE
+-<c-H>	<C-H>;<NONE>;<SMALL-CAPITAL>;IGNORE
+-<c-h>	<C-H>;<NONE>;<SMALL>;IGNORE
+-<U0049>	<U0049>;<NONE>;<CAPITAL>;IGNORE
+-<U0069>	<U0049>;<NONE>;<SMALL>;IGNORE
+-<U00CD>	<U0049>;<ACUTE>;<CAPITAL>;IGNORE
+-<U00ED>	<U0049>;<ACUTE>;<SMALL>;IGNORE
+-<U00CC>	<U0049>;<GRAVE>;<CAPITAL>;IGNORE
+-<U00EC>	<U0049>;<GRAVE>;<SMALL>;IGNORE
+-<U0208>	<U0049>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
+-<U0209>	<U0049>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
+-<U012C>	<U0049>;<BREVE>;<CAPITAL>;IGNORE
+-<U012D>	<U0049>;<BREVE>;<SMALL>;IGNORE
+-<U020A>	<U0049>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
+-<U020B>	<U0049>;<INVERTED-BREVE>;<SMALL>;IGNORE
+-<U00CE>	<U0049>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U00EE>	<U0049>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U01CF>	<U0049>;<CARON>;<CAPITAL>;IGNORE
+-<U01D0>	<U0049>;<CARON>;<SMALL>;IGNORE
+-<U00CF>	<U0049>;<DIAERESIS>;<CAPITAL>;IGNORE
+-<U00EF>	<U0049>;<DIAERESIS>;<SMALL>;IGNORE
+-<U1E2E>	<U0049>;<DIAERESIS+ACUTE>;<CAPITAL>;IGNORE
+-<U1E2F>	<U0049>;<DIAERESIS+ACUTE>;<SMALL>;IGNORE
+-<U1EC8>	<U0049>;<HOOK>;<CAPITAL>;IGNORE
+-<U1EC9>	<U0049>;<HOOK>;<SMALL>;IGNORE
+-<U0128>	<U0049>;<TILDE>;<CAPITAL>;IGNORE
+-<U0129>	<U0049>;<TILDE>;<SMALL>;IGNORE
+-<U1E2C>	<U0049>;<TILDE-BELOW>;<CAPITAL>;IGNORE
+-<U1E2D>	<U0049>;<TILDE-BELOW>;<SMALL>;IGNORE
+-<U0130>	<U0049>;<DOT>;<CAPITAL>;IGNORE
+-<U0131>	<U0049>;<DOT>;<SMALL>;IGNORE
+-<U1ECA>	<U0049>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1ECB>	<U0049>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U012E>	<U0049>;<OGONEK>;<CAPITAL>;IGNORE
+-<U012F>	<U0049>;<OGONEK>;<SMALL>;IGNORE
+-<U012A>	<U0049>;<MACRON>;<CAPITAL>;IGNORE
+-<U012B>	<U0049>;<MACRON>;<SMALL>;IGNORE
+-<i8>
+-<U0132>	"<U0049><U004A>";"<U0132><U0132>";"<CAPITAL><CAPITAL>";IGNORE
+-<U0133>	"<U0049><U004A>";"<U0132><U0132>";"<SMALL><SMALL>";IGNORE
+-<U004A>	<U004A>;<NONE>;<CAPITAL>;IGNORE
+-<U006A>	<U004A>;<NONE>;<SMALL>;IGNORE
+-<U0134>	<U004A>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U0135>	<U004A>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<j8>
+-<U004B>	<U004B>;<NONE>;<CAPITAL>;IGNORE
+-<U006B>	<U004B>;<NONE>;<SMALL>;IGNORE
+-<U1E30>	<U004B>;<ACUTE>;<CAPITAL>;IGNORE
+-<U1E31>	<U004B>;<ACUTE>;<SMALL>;IGNORE
+-<U01E8>	<U004B>;<CARON>;<CAPITAL>;IGNORE
+-<U01E9>	<U004B>;<CARON>;<SMALL>;IGNORE
+-<U0198>	<U004B>;<HOOK>;<CAPITAL>;IGNORE
+-<U0199>	<U004B>;<HOOK>;<SMALL>;IGNORE
+-<U1E32>	<U004B>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E33>	<U004B>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U0136>	<U004B>;<CEDILLA>;<CAPITAL>;IGNORE
+-<U0137>	<U004B>;<CEDILLA>;<SMALL>;IGNORE
+-<U1E34>	<U004B>;<LINE-BELOW>;<CAPITAL>;IGNORE
+-<U1E35>	<U004B>;<LINE-BELOW>;<SMALL>;IGNORE
+-<k8>
+-<U0138>	<U004B>;<U0138>;<SMALL>;IGNORE
+-<U0141>	<U0141>;<NONE>;<CAPITAL>;IGNORE
+-<U0142>	<U0141>;<NONE>;<SMALL>;IGNORE
+-<U004C>	<U004C>;<NONE>;<CAPITAL>;IGNORE
+-<U006C>	<U004C>;<NONE>;<SMALL>;IGNORE
+-<U0139>	<U004C>;<ACUTE>;<CAPITAL>;IGNORE
+-<U013A>	<U004C>;<ACUTE>;<SMALL>;IGNORE
+-<U013D>	<U004C>;<CARON>;<CAPITAL>;IGNORE
+-<U013E>	<U004C>;<CARON>;<SMALL>;IGNORE
+-<U013F>	<U004C>;<DOT>;<CAPITAL>;IGNORE
+-<U0140>	<U004C>;<DOT>;<SMALL>;IGNORE
+-<U1E36>	<U004C>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E37>	<U004C>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U013B>	<U004C>;<CEDILLA>;<CAPITAL>;IGNORE
+-<U013C>	<U004C>;<CEDILLA>;<SMALL>;IGNORE
+-<U1E38>	<U004C>;<MACRON+DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E39>	<U004C>;<MACRON+DOT-BELOW>;<SMALL>;IGNORE
+-<U1E3C>	<U004C>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U1E3D>	<U004C>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
+-<U1E3A>	<U004C>;<LINE-BELOW>;<CAPITAL>;IGNORE
+-<U1E3B>	<U004C>;<LINE-BELOW>;<SMALL>;IGNORE
+-<l8>
+-<U004D>	<U004D>;<NONE>;<CAPITAL>;IGNORE
+-<U006D>	<U004D>;<NONE>;<SMALL>;IGNORE
+-<U1E3E>	<U004D>;<ACUTE>;<CAPITAL>;IGNORE
+-<U1E3F>	<U004D>;<ACUTE>;<SMALL>;IGNORE
+-<U1E40>	<U004D>;<DOT>;<CAPITAL>;IGNORE
+-<U1E41>	<U004D>;<DOT>;<SMALL>;IGNORE
+-<U1E42>	<U004D>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E43>	<U004D>;<DOT-BELOW>;<SMALL>;IGNORE
+-<m8>
+-<U004E>	<U004E>;<NONE>;<CAPITAL>;IGNORE
+-<U006E>	<U004E>;<NONE>;<SMALL>;IGNORE
+-<U0147>	<U004E>;<CARON>;<CAPITAL>;IGNORE
+-<U0148>	<U004E>;<CARON>;<SMALL>;IGNORE
+-<U00D1>	<U004E>;<TILDE>;<CAPITAL>;IGNORE
+-<U00F1>	<U004E>;<TILDE>;<SMALL>;IGNORE
+-<U1E44>	<U004E>;<DOT>;<CAPITAL>;IGNORE
+-<U1E45>	<U004E>;<DOT>;<SMALL>;IGNORE
+-<U1E46>	<U004E>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E47>	<U004E>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U0145>	<U004E>;<CEDILLA>;<CAPITAL>;IGNORE
+-<U0146>	<U004E>;<CEDILLA>;<SMALL>;IGNORE
+-<U1E4A>	<U004E>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U1E4B>	<U004E>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
+-<U1E48>	<U004E>;<LINE-BELOW>;<CAPITAL>;IGNORE
+-<U1E49>	<U004E>;<LINE-BELOW>;<SMALL>;IGNORE
+-<U0149>	<U004E>;<PRECEDED-BY-APOSTROPHE>;<SMALL>;IGNORE
+-<n8>
+-<U0143>	<U0143>;<NONE>;<CAPITAL>;IGNORE
+-<U0144>	<U0143>;<NONE>;<SMALL>;IGNORE
+-<U014A>	"<U004E><U0047>";"<U014A><U014A>";"<CAPITAL><CAPITAL>";IGNORE
+-<U014B>	"<U004E><U0047>";"<U014A><U014A>";"<SMALL><SMALL>";IGNORE
+-<U004F>	<U004F>;<NONE>;<CAPITAL>;IGNORE
+-<U006F>	<U004F>;<NONE>;<SMALL>;IGNORE
+-<U00BA>	<U004F>;<NONE>;<U00BA>;IGNORE
+-<U00D3>	<U00D3>;<ACUTE>;<CAPITAL>;IGNORE
+-<U00F3>	<U00D3>;<ACUTE>;<SMALL>;IGNORE
+-<U00D2>	<U004F>;<GRAVE>;<CAPITAL>;IGNORE
+-<U00F2>	<U004F>;<GRAVE>;<SMALL>;IGNORE
+-<U020C>	<U004F>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
+-<U020D>	<U004F>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
+-<U014E>	<U004F>;<BREVE>;<CAPITAL>;IGNORE
+-<U014F>	<U004F>;<BREVE>;<SMALL>;IGNORE
+-<U020E>	<U004F>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
+-<U020F>	<U004F>;<INVERTED-BREVE>;<SMALL>;IGNORE
+-<U00D4>	<U004F>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U00F4>	<U004F>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U1ED0>	<U004F>;<CIRCUMFLEX+ACUTE>;<CAPITAL>;IGNORE
+-<U1ED1>	<U004F>;<CIRCUMFLEX+ACUTE>;<SMALL>;IGNORE
+-<U1ED2>	<U004F>;<CIRCUMFLEX+GRAVE>;<CAPITAL>;IGNORE
+-<U1ED3>	<U004F>;<CIRCUMFLEX+GRAVE>;<SMALL>;IGNORE
+-<U1ED4>	<U004F>;<CIRCUMFLEX+HOOK>;<CAPITAL>;IGNORE
+-<U1ED5>	<U004F>;<CIRCUMFLEX+HOOK>;<SMALL>;IGNORE
+-<U1ED6>	<U004F>;<CIRCUMFLEX+TILDE>;<CAPITAL>;IGNORE
+-<U1ED7>	<U004F>;<CIRCUMFLEX+TILDE>;<SMALL>;IGNORE
+-<U1ED8>	<U004F>;<CIRCUMFLEX+DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1ED9>	<U004F>;<CIRCUMFLEX+DOT-BELOW>;<SMALL>;IGNORE
+-<U01D1>	<U004F>;<CARON>;<CAPITAL>;IGNORE
+-<U01D2>	<U004F>;<CARON>;<SMALL>;IGNORE
+-<U00D6>	<U004F>;<DIAERESIS>;<CAPITAL>;IGNORE
+-<U00F6>	<U004F>;<DIAERESIS>;<SMALL>;IGNORE
+-<U0150>	<U004F>;<DOUBLE-ACUTE>;<CAPITAL>;IGNORE
+-<U0151>	<U004F>;<DOUBLE-ACUTE>;<SMALL>;IGNORE
+-<U1ECE>	<U004F>;<HOOK>;<CAPITAL>;IGNORE
+-<U1ECF>	<U004F>;<HOOK>;<SMALL>;IGNORE
+-<U00D5>	<U004F>;<TILDE>;<CAPITAL>;IGNORE
+-<U00F5>	<U004F>;<TILDE>;<SMALL>;IGNORE
+-<U1E4C>	<U004F>;<TILDE+ACUTE>;<CAPITAL>;IGNORE
+-<U1E4D>	<U004F>;<TILDE+ACUTE>;<SMALL>;IGNORE
+-<U1E4E>	<U004F>;<TILDE+DIAERESIS>;<CAPITAL>;IGNORE
+-<U1E4F>	<U004F>;<TILDE+DIAERESIS>;<SMALL>;IGNORE
+-<U1ECC>	<U004F>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1ECD>	<U004F>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U00D8>	<U004F>;<STROKE>;<CAPITAL>;IGNORE
+-<U00F8>	<U004F>;<STROKE>;<SMALL>;IGNORE
+-<U01FE>	<U004F>;<STROKE+ACUTE>;<CAPITAL>;IGNORE
+-<U01FF>	<U004F>;<STROKE+ACUTE>;<SMALL>;IGNORE
+-<U01EA>	<U004F>;<OGONEK>;<CAPITAL>;IGNORE
+-<U01EB>	<U004F>;<OGONEK>;<SMALL>;IGNORE
+-<U01EC>	<U004F>;<OGONEK+MACRON>;<CAPITAL>;IGNORE
+-<U01ED>	<U004F>;<OGONEK+MACRON>;<SMALL>;IGNORE
+-<U014C>	<U004F>;<MACRON>;<CAPITAL>;IGNORE
+-<U014D>	<U004F>;<MACRON>;<SMALL>;IGNORE
+-<U1E52>	<U004F>;<MACRON+ACUTE>;<CAPITAL>;IGNORE
+-<U1E53>	<U004F>;<MACRON+ACUTE>;<SMALL>;IGNORE
+-<U1E50>	<U004F>;<MACRON+GRAVE>;<CAPITAL>;IGNORE
+-<U1E51>	<U004F>;<MACRON+GRAVE>;<SMALL>;IGNORE
+-<U01A0>	<U004F>;<HORN>;<CAPITAL>;IGNORE
+-<U01A1>	<U004F>;<HORN>;<SMALL>;IGNORE
+-<U1EDA>	<U004F>;<HORN+ACUTE>;<CAPITAL>;IGNORE
+-<U1EDB>	<U004F>;<HORN+ACUTE>;<SMALL>;IGNORE
+-<U1EDC>	<U004F>;<HORN+GRAVE>;<CAPITAL>;IGNORE
+-<U1EDD>	<U004F>;<HORN+GRAVE>;<SMALL>;IGNORE
+-<U1EDE>	<U004F>;<HORN+HOOK>;<CAPITAL>;IGNORE
+-<U1EDF>	<U004F>;<HORN+HOOK>;<SMALL>;IGNORE
+-<U1EE0>	<U004F>;<HORN+TILDE>;<CAPITAL>;IGNORE
+-<U1EE1>	<U004F>;<HORN+TILDE>;<SMALL>;IGNORE
+-<U1EE2>	<U004F>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1EE3>	<U004F>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
+-<o8>
+-<U0152>	"<U004F><U0045>";"<U0152><U0152>";"<CAPITAL><CAPITAL>";IGNORE
+-<U0153>	"<U004F><U0045>";"<U0152><U0152>";"<SMALL><SMALL>";IGNORE
+-<U0050>	<U0050>;<NONE>;<CAPITAL>;IGNORE
+-<U0070>	<U0050>;<NONE>;<SMALL>;IGNORE
+-<U1E54>	<U0050>;<ACUTE>;<CAPITAL>;IGNORE
+-<U1E55>	<U0050>;<ACUTE>;<SMALL>;IGNORE
+-<U1E56>	<U0050>;<DOT>;<CAPITAL>;IGNORE
+-<U1E57>	<U0050>;<DOT>;<SMALL>;IGNORE
+-<p8>
+-<U0051>	<U0051>;<NONE>;<CAPITAL>;IGNORE
+-<U0071>	<U0051>;<NONE>;<SMALL>;IGNORE
+-<q8>
+-<U0052>	<U0052>;<NONE>;<CAPITAL>;IGNORE
+-<U0072>	<U0052>;<NONE>;<SMALL>;IGNORE
+-<U0154>	<U0052>;<ACUTE>;<CAPITAL>;IGNORE
+-<U0155>	<U0052>;<ACUTE>;<SMALL>;IGNORE
+-<U0210>	<U0052>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
+-<U0211>	<U0052>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
+-<U0212>	<U0052>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
+-<U0213>	<U0052>;<INVERTED-BREVE>;<SMALL>;IGNORE
+-<U1E58>	<U0052>;<DOT>;<CAPITAL>;IGNORE
+-<U1E59>	<U0052>;<DOT>;<SMALL>;IGNORE
+-<U1E5A>	<U0052>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E5B>	<U0052>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U0156>	<U0052>;<CEDILLA>;<CAPITAL>;IGNORE
+-<U0157>	<U0052>;<CEDILLA>;<SMALL>;IGNORE
+-<U1E5C>	<U0052>;<MACRON+DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E5D>	<U0052>;<MACRON+DOT-BELOW>;<SMALL>;IGNORE
+-<U1E5E>	<U0052>;<LINE-BELOW>;<CAPITAL>;IGNORE
+-<U1E5F>	<U0052>;<LINE-BELOW>;<SMALL>;IGNORE
+-<r8>
+-<U0158>	<U0158>;<NONE>;<CAPITAL>;IGNORE
+-<U0159>	<U0158>;<NONE>;<SMALL>;IGNORE
+-<U0053>	<U0053>;<NONE>;<CAPITAL>;IGNORE
+-<U0073>	<U0053>;<NONE>;<SMALL>;IGNORE
+-<UFB06>	"<U0053><U0054>";"<NONE><NONE>";"<UFB06><UFB06>";IGNORE
+-<U015A>	<U0053>;<ACUTE>;<CAPITAL>;IGNORE
+-<U015B>	<U0053>;<ACUTE>;<SMALL>;IGNORE
+-<U1E64>	<U0053>;<ACUTE+DOT>;<CAPITAL>;IGNORE
+-<U1E65>	<U0053>;<ACUTE+DOT>;<SMALL>;IGNORE
+-<U015C>	<U0053>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U015D>	<U0053>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U1E66>	<U0053>;<CARON+DOT>;<CAPITAL>;IGNORE
+-<U1E67>	<U0053>;<CARON+DOT>;<SMALL>;IGNORE
+-<U1E60>	<U0053>;<DOT>;<CAPITAL>;IGNORE
+-<U1E61>	<U0053>;<DOT>;<SMALL>;IGNORE
+-<U1E62>	<U0053>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E63>	<U0053>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U1E68>	<U0053>;<DOT+DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E69>	<U0053>;<DOT+DOT-BELOW>;<SMALL>;IGNORE
+-<U015E>	<U0053>;<CEDILLA>;<CAPITAL>;IGNORE
+-<U015F>	<U0053>;<CEDILLA>;<SMALL>;IGNORE
+-<s8>
+-<U0160>	<U0160>;<NONE>;<CAPITAL>;IGNORE
+-<U0161>	<U0160>;<NONE>;<SMALL>;IGNORE
+-<U017F>	<U0053>;<U017F>;<SMALL>;IGNORE
+-<U00DF>	"<U0053><U0053>";"<NONE><NONE>";"<SMALL><U00DF>";IGNORE
+-<UFB05>	"<U0053><U0054>";"<NONE><NONE>";"<UFB05><UFB05>";IGNORE
+-<U0054>	<U0054>;<NONE>;<CAPITAL>;IGNORE
+-<U0074>	<U0054>;<NONE>;<SMALL>;IGNORE
+-<U0164>	<U0054>;<CARON>;<CAPITAL>;IGNORE
+-<U0165>	<U0054>;<CARON>;<SMALL>;IGNORE
+-<U1E6A>	<U0054>;<DOT>;<CAPITAL>;IGNORE
+-<U1E6B>	<U0054>;<DOT>;<SMALL>;IGNORE
+-<U1E6C>	<U0054>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E6D>	<U0054>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U0166>	<U0054>;<STROKE>;<CAPITAL>;IGNORE
+-<U0167>	<U0054>;<STROKE>;<SMALL>;IGNORE
+-<U0162>	<U0054>;<CEDILLA>;<CAPITAL>;IGNORE
+-<U0163>	<U0054>;<CEDILLA>;<SMALL>;IGNORE
+-<U1E70>	<U0054>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U1E71>	<U0054>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
+-<U1E6E>	<U0054>;<LINE-BELOW>;<CAPITAL>;IGNORE
+-<U1E6F>	<U0054>;<LINE-BELOW>;<SMALL>;IGNORE
+-<t8>
+-<U0106>	<U0106>;<NONE>;<CAPITAL>;IGNORE
+-<U0107>	<U0106>;<NONE>;<SMALL>;IGNORE
+-<U00DE>	"<U0054><U0048>";"<U00DE><U00DE>";"<CAPITAL><CAPITAL>";IGNORE
+-<U00FE>	"<U0054><U0048>";"<U00DE><U00DE>";"<SMALL><SMALL>";IGNORE
+-<U0055>	<U0055>;<NONE>;<CAPITAL>;IGNORE
+-<U0075>	<U0055>;<NONE>;<SMALL>;IGNORE
+-<U00DA>	<U0055>;<ACUTE>;<CAPITAL>;IGNORE
+-<U00FA>	<U0055>;<ACUTE>;<SMALL>;IGNORE
+-<U00D9>	<U0055>;<GRAVE>;<CAPITAL>;IGNORE
+-<U00F9>	<U0055>;<GRAVE>;<SMALL>;IGNORE
+-<U0214>	<U0055>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
+-<U0215>	<U0055>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
+-<U016C>	<U0055>;<BREVE>;<CAPITAL>;IGNORE
+-<U016D>	<U0055>;<BREVE>;<SMALL>;IGNORE
+-<U0216>	<U0055>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
+-<U0217>	<U0055>;<INVERTED-BREVE>;<SMALL>;IGNORE
+-<U00DB>	<U0055>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U00FB>	<U0055>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U01D3>	<U0055>;<CARON>;<CAPITAL>;IGNORE
+-<U01D4>	<U0055>;<CARON>;<SMALL>;IGNORE
+-<U016E>	<U0055>;<RING>;<CAPITAL>;IGNORE
+-<U016F>	<U0055>;<RING>;<SMALL>;IGNORE
+-<U00DC>	<U0055>;<DIAERESIS>;<CAPITAL>;IGNORE
+-<U00FC>	<U0055>;<DIAERESIS>;<SMALL>;IGNORE
+-<U01D5>	<U0055>;<DIAERESIS+MACRON>;<CAPITAL>;IGNORE
+-<U01D6>	<U0055>;<DIAERESIS+MACRON>;<SMALL>;IGNORE
+-<U01D7>	<U0055>;<DIAERESIS+ACUTE>;<CAPITAL>;IGNORE
+-<U01D8>	<U0055>;<DIAERESIS+ACUTE>;<SMALL>;IGNORE
+-<U01DB>	<U0055>;<DIAERESIS+GRAVE>;<CAPITAL>;IGNORE
+-<U01DC>	<U0055>;<DIAERESIS+GRAVE>;<SMALL>;IGNORE
+-<U01D9>	<U0055>;<DIAERESIS+CARON>;<CAPITAL>;IGNORE
+-<U01DA>	<U0055>;<DIAERESIS+CARON>;<SMALL>;IGNORE
+-<U0170>	<U0055>;<DOUBLE-ACUTE>;<CAPITAL>;IGNORE
+-<U0171>	<U0055>;<DOUBLE-ACUTE>;<SMALL>;IGNORE
+-<U1EE6>	<U0055>;<HOOK>;<CAPITAL>;IGNORE
+-<U1EE7>	<U0055>;<HOOK>;<SMALL>;IGNORE
+-<U0168>	<U0055>;<TILDE>;<CAPITAL>;IGNORE
+-<U0169>	<U0055>;<TILDE>;<SMALL>;IGNORE
+-<U1E78>	<U0055>;<TILDE+ACUTE>;<CAPITAL>;IGNORE
+-<U1E79>	<U0055>;<TILDE+ACUTE>;<SMALL>;IGNORE
+-<U1E74>	<U0055>;<TILDE-BELOW>;<CAPITAL>;IGNORE
+-<U1E75>	<U0055>;<TILDE-BELOW>;<SMALL>;IGNORE
+-<U1EE4>	<U0055>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1EE5>	<U0055>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U0172>	<U0055>;<OGONEK>;<CAPITAL>;IGNORE
+-<U0173>	<U0055>;<OGONEK>;<SMALL>;IGNORE
+-<U016A>	<U0055>;<MACRON>;<CAPITAL>;IGNORE
+-<U016B>	<U0055>;<MACRON>;<SMALL>;IGNORE
+-<U1E7A>	<U0055>;<MACRON+DIAERESIS>;<CAPITAL>;IGNORE
+-<U1E7B>	<U0055>;<MACRON+DIAERESIS>;<SMALL>;IGNORE
+-<U1E72>	<U0055>;<MACRON+DIAERESIS-BELOW>;<CAPITAL>;IGNORE
+-<U1E73>	<U0055>;<MACRON+DIAERESIS-BELOW>;<SMALL>;IGNORE
+-<U1E76>	<U0055>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U1E77>	<U0055>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
+-<U01AF>	<U0055>;<HORN>;<CAPITAL>;IGNORE
+-<U01B0>	<U0055>;<HORN>;<SMALL>;IGNORE
+-<U1EE8>	<U0055>;<HORN+ACUTE>;<CAPITAL>;IGNORE
+-<U1EE9>	<U0055>;<HORN+ACUTE>;<SMALL>;IGNORE
+-<U1EEA>	<U0055>;<HORN+GRAVE>;<CAPITAL>;IGNORE
+-<U1EEB>	<U0055>;<HORN+GRAVE>;<SMALL>;IGNORE
+-<U1EEC>	<U0055>;<HORN+HOOK>;<CAPITAL>;IGNORE
+-<U1EED>	<U0055>;<HORN+HOOK>;<SMALL>;IGNORE
+-<U1EEE>	<U0055>;<HORN+TILDE>;<CAPITAL>;IGNORE
+-<U1EEF>	<U0055>;<HORN+TILDE>;<SMALL>;IGNORE
+-<U1EF0>	<U0055>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1EF1>	<U0055>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
+-<u8>
+-<U0056>	<U0056>;<NONE>;<CAPITAL>;IGNORE
+-<U0076>	<U0056>;<NONE>;<SMALL>;IGNORE
+-<U1E7C>	<U0056>;<TILDE>;<CAPITAL>;IGNORE
+-<U1E7D>	<U0056>;<TILDE>;<SMALL>;IGNORE
+-<U1E7E>	<U0056>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E7F>	<U0056>;<DOT-BELOW>;<SMALL>;IGNORE
+-<v8>
+-<U0057>	<U0057>;<NONE>;<CAPITAL>;IGNORE
+-<U0077>	<U0057>;<NONE>;<SMALL>;IGNORE
+-<U1E82>	<U0057>;<ACUTE>;<CAPITAL>;IGNORE
+-<U1E83>	<U0057>;<ACUTE>;<SMALL>;IGNORE
+-<U1E80>	<U0057>;<GRAVE>;<CAPITAL>;IGNORE
+-<U1E81>	<U0057>;<GRAVE>;<SMALL>;IGNORE
+-<U0174>	<U0057>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U0175>	<U0057>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U1E84>	<U0057>;<DIAERESIS>;<CAPITAL>;IGNORE
+-<U1E85>	<U0057>;<DIAERESIS>;<SMALL>;IGNORE
+-<U1E86>	<U0057>;<DOT>;<CAPITAL>;IGNORE
+-<U1E87>	<U0057>;<DOT>;<SMALL>;IGNORE
+-<U1E88>	<U0057>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E89>	<U0057>;<DOT-BELOW>;<SMALL>;IGNORE
+-<w8>
+-<U0058>	<U0058>;<NONE>;<CAPITAL>;IGNORE
+-<U0078>	<U0058>;<NONE>;<SMALL>;IGNORE
+-<U1E8C>	<U0058>;<DIAERESIS>;<CAPITAL>;IGNORE
+-<U1E8D>	<U0058>;<DIAERESIS>;<SMALL>;IGNORE
+-<U1E8A>	<U0058>;<DOT>;<CAPITAL>;IGNORE
+-<U1E8B>	<U0058>;<DOT>;<SMALL>;IGNORE
+-<x8>
+-<U0059>	<U0059>;<NONE>;<CAPITAL>;IGNORE
+-<U0079>	<U0059>;<NONE>;<SMALL>;IGNORE
+-<U00DD>	<U0059>;<ACUTE>;<CAPITAL>;IGNORE
+-<U00FD>	<U0059>;<ACUTE>;<SMALL>;IGNORE
+-<U1EF2>	<U0059>;<GRAVE>;<CAPITAL>;IGNORE
+-<U1EF3>	<U0059>;<GRAVE>;<SMALL>;IGNORE
+-<U0176>	<U0059>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U0177>	<U0059>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U0178>	<U0059>;<DIAERESIS>;<CAPITAL>;IGNORE
+-<U00FF>	<U0059>;<DIAERESIS>;<SMALL>;IGNORE
+-<U1EF6>	<U0059>;<HOOK>;<CAPITAL>;IGNORE
+-<U1EF7>	<U0059>;<HOOK>;<SMALL>;IGNORE
+-<U1EF8>	<U0059>;<TILDE>;<CAPITAL>;IGNORE
+-<U1EF9>	<U0059>;<TILDE>;<SMALL>;IGNORE
+-<U1E8E>	<U0059>;<DOT>;<CAPITAL>;IGNORE
+-<U1E8F>	<U0059>;<DOT>;<SMALL>;IGNORE
+-<U1EF4>	<U0059>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1EF5>	<U0059>;<DOT-BELOW>;<SMALL>;IGNORE
+-<y8>
+-<U005A>	<U005A>;<NONE>;<CAPITAL>;IGNORE
+-<U007A>	<U005A>;<NONE>;<SMALL>;IGNORE
+-<U0179>	<U005A>;<ACUTE>;<CAPITAL>;IGNORE
+-<U017A>	<U005A>;<ACUTE>;<SMALL>;IGNORE
+-<U1E90>	<U005A>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
+-<U1E91>	<U005A>;<CIRCUMFLEX>;<SMALL>;IGNORE
+-<U017B>	<U005A>;<DOT>;<CAPITAL>;IGNORE
+-<U017C>	<U005A>;<DOT>;<SMALL>;IGNORE
+-<U1E92>	<U005A>;<DOT-BELOW>;<CAPITAL>;IGNORE
+-<U1E93>	<U005A>;<DOT-BELOW>;<SMALL>;IGNORE
+-<U01B5>	<U005A>;<STROKE>;<CAPITAL>;IGNORE
+-<U01B6>	<U005A>;<STROKE>;<SMALL>;IGNORE
+-<U1E94>	<U005A>;<LINE-BELOW>;<CAPITAL>;IGNORE
+-<U1E95>	<U005A>;<LINE-BELOW>;<SMALL>;IGNORE
+-<z8>
+-<U017D>	<U017D>;<NONE>;<CAPITAL>;IGNORE
+-<U017E>	<U017D>;<NONE>;<SMALL>;IGNORE
+-<U0391>	<U0391>;<CAPITAL>;<GREEK>;IGNORE
+-<U0386>	<U0391>;<CAPITAL>;<TONOS>;IGNORE
+-<U03B1>	<U0391>;<SMALL>;<GREEK>;IGNORE
+-<U03AC>	<U0391>;<SMALL>;<TONOS>;IGNORE
+-<U0392>	<U0392>;<CAPITAL>;<GREEK>;IGNORE
+-<U03B2>	<U0392>;<SMALL>;<GREEK>;IGNORE
+-<U0393>	<U0393>;<CAPITAL>;<GREEK>;IGNORE
+-<U03B3>	<U0393>;<SMALL>;<GREEK>;IGNORE
+-<U0394>	<U0394>;<CAPITAL>;<GREEK>;IGNORE
+-<U03B4>	<U0394>;<SMALL>;<GREEK>;IGNORE
+-<U0395>	<U0395>;<CAPITAL>;<GREEK>;IGNORE
+-<U0388>	<U0395>;<CAPITAL>;<TONOS>;IGNORE
+-<U03B5>	<U0395>;<SMALL>;<GREEK>;IGNORE
+-<U03AD>	<U0395>;<SMALL>;<TONOS>;IGNORE
+-<U0396>	<U0396>;<CAPITAL>;<GREEK>;IGNORE
+-<U03B6>	<U0396>;<SMALL>;<GREEK>;IGNORE
+-<U0397>	<U0397>;<CAPITAL>;<GREEK>;IGNORE
+-<U0389>	<U0397>;<CAPITAL>;<TONOS>;IGNORE
+-<U03B7>	<U0397>;<SMALL>;<GREEK>;IGNORE
+-<U03AE>	<U0397>;<SMALL>;<TONOS>;IGNORE
+-<U0398>	<U0398>;<CAPITAL>;<GREEK>;IGNORE
+-<U03B8>	<U0398>;<SMALL>;<GREEK>;IGNORE
+-<U0399>	<U0399>;<CAPITAL>;<GREEK>;IGNORE
+-<U038A>	<U0399>;<CAPITAL>;<TONOS>;IGNORE
+-<U03AA>	<U0399>;<CAPITAL>;<DIALYTICA>;IGNORE
+-<U03B9>	<U0399>;<SMALL>;<GREEK>;IGNORE
+-<U03AF>	<U0399>;<SMALL>;<TONOS>;IGNORE
+-<U03CA>	<U0399>;<SMALL>;<DIALYTICA>;IGNORE
+-<U0390>	<U0399>;<SMALL>;<DIALYTICA+TONOS>;IGNORE
+-<U039A>	<U039A>;<CAPITAL>;<GREEK>;IGNORE
+-<U03BA>	<U039A>;<SMALL>;<GREEK>;IGNORE
+-<U039B>	<U039B>;<CAPITAL>;<GREEK>;IGNORE
+-<U03BB>	<U039B>;<SMALL>;<GREEK>;IGNORE
+-<U039C>	<U039C>;<CAPITAL>;<GREEK>;IGNORE
+-<U03BC>	<U039C>;<SMALL>;<GREEK>;IGNORE
+-<U039D>	<U039D>;<CAPITAL>;<GREEK>;IGNORE
+-<U03BD>	<U039D>;<SMALL>;<GREEK>;IGNORE
+-<U039E>	<U039E>;<CAPITAL>;<GREEK>;IGNORE
+-<U03BE>	<U039E>;<SMALL>;<GREEK>;IGNORE
+-<U039F>	<U039F>;<CAPITAL>;<GREEK>;IGNORE
+-<U038C>	<U039F>;<CAPITAL>;<TONOS>;IGNORE
+-<U03BF>	<U039F>;<SMALL>;<GREEK>;IGNORE
+-<U03CC>	<U039F>;<SMALL>;<TONOS>;IGNORE
+-<U03A0>	<U03A0>;<CAPITAL>;<GREEK>;IGNORE
+-<U03C0>	<U03A0>;<SMALL>;<GREEK>;IGNORE
+-<U03A1>	<U03A1>;<CAPITAL>;<GREEK>;IGNORE
+-<U03C1>	<U03A1>;<SMALL>;<GREEK>;IGNORE
+-<U03A3>	<U03A3>;<CAPITAL>;<GREEK>;IGNORE
+-<U03C3>	<U03A3>;<SMALL>;<GREEK>;IGNORE
+-<U03C2>	<U03A3>;<SMALL>;<U03C2>;IGNORE
+-<U03A4>	<U03A4>;<CAPITAL>;<GREEK>;IGNORE
+-<U03C4>	<U03A4>;<SMALL>;<GREEK>;IGNORE
+-<U03A5>	<U03A5>;<CAPITAL>;<GREEK>;IGNORE
+-<U038E>	<U03A5>;<CAPITAL>;<TONOS>;IGNORE
+-<U03AB>	<U03A5>;<CAPITAL>;<DIALYTICA>;IGNORE
+-<U03C5>	<U03A5>;<SMALL>;<GREEK>;IGNORE
+-<U03CD>	<U03A5>;<SMALL>;<TONOS>;IGNORE
+-<U03CB>	<U03A5>;<SMALL>;<DIALYTICA>;IGNORE
+-<U03B0>	<U03A5>;<SMALL>;<DIALYTICA+TONOS>;IGNORE
+-<U03A6>	<U03A6>;<CAPITAL>;<GREEK>;IGNORE
+-<U03C6>	<U03A6>;<SMALL>;<GREEK>;IGNORE
+-<U03A7>	<U03A7>;<CAPITAL>;<GREEK>;IGNORE
+-<U03C7>	<U03A7>;<SMALL>;<GREEK>;IGNORE
+-<U03A8>	<U03A8>;<CAPITAL>;<GREEK>;IGNORE
+-<U03C8>	<U03A8>;<SMALL>;<GREEK>;IGNORE
+-<U03A9>	<U03A9>;<CAPITAL>;<GREEK>;IGNORE
+-<U038F>	<U03A9>;<CAPITAL>;<TONOS>;IGNORE
+-<U03C9>	<U03A9>;<SMALL>;<GREEK>;IGNORE
+-<U03CE>	<U03A9>;<SMALL>;<TONOS>;IGNORE
+-<U0410>	<U0410>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0430>	<U0410>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0411>	<U0411>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0431>	<U0411>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0412>	<U0412>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0432>	<U0412>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0413>	<U0413>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0433>	<U0413>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0403>	<U0403>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0453>	<U0403>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0490>	<U0490>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0491>	<U0490>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0414>	<U0414>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0434>	<U0414>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0402>	<U0402>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0452>	<U0402>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0415>	<U0415>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0435>	<U0415>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0401>	<U0401>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0451>	<U0401>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0404>	<U0404>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0454>	<U0404>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0416>	<U0416>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0436>	<U0416>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0417>	<U0417>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0437>	<U0417>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0418>	<U0418>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0438>	<U0418>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0406>	<U0406>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0456>	<U0406>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0407>	<U0407>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0457>	<U0407>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0408>	<U0408>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0458>	<U0408>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0419>	<U0419>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0439>	<U0419>;<CYRILLIC>;<SMALL>;IGNORE
+-<U041A>	<U041A>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U043A>	<U041A>;<CYRILLIC>;<SMALL>;IGNORE
+-<U040C>	<U040C>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U045C>	<U040C>;<CYRILLIC>;<SMALL>;IGNORE
+-<U041B>	<U041B>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U043B>	<U041B>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0409>	<U0409>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0459>	<U0409>;<CYRILLIC>;<SMALL>;IGNORE
+-<U041C>	<U041C>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U043C>	<U041C>;<CYRILLIC>;<SMALL>;IGNORE
+-<U041D>	<U041D>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U043D>	<U041D>;<CYRILLIC>;<SMALL>;IGNORE
+-<U040A>	<U040A>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U045A>	<U040A>;<CYRILLIC>;<SMALL>;IGNORE
+-<U041E>	<U041E>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U043E>	<U041E>;<CYRILLIC>;<SMALL>;IGNORE
+-<U041F>	<U041F>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U043F>	<U041F>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0420>	<U0420>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0440>	<U0420>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0421>	<U0421>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0441>	<U0421>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0422>	<U0422>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0442>	<U0422>;<CYRILLIC>;<SMALL>;IGNORE
+-<U040B>	<U040B>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U045B>	<U040B>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0423>	<U0423>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0443>	<U0423>;<CYRILLIC>;<SMALL>;IGNORE
+-<U040E>	<U040E>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U045E>	<U040E>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0424>	<U0424>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0444>	<U0424>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0425>	<U0425>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0445>	<U0425>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0426>	<U0426>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0446>	<U0426>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0405>	<U0405>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0455>	<U0405>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0427>	<U0427>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0447>	<U0427>;<CYRILLIC>;<SMALL>;IGNORE
+-<U040F>	<U040F>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U045F>	<U040F>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0428>	<U0428>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0448>	<U0428>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0429>	<U0429>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0449>	<U0429>;<CYRILLIC>;<SMALL>;IGNORE
+-<U044A>	<U044A>;<CYRILLIC>;<SMALL>;IGNORE
+-<U042A>	<U044A>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U042B>	<U042B>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U044B>	<U042B>;<CYRILLIC>;<SMALL>;IGNORE
+-<U044C>	<U044C>;<CYRILLIC>;<SMALL>;IGNORE
+-<U042C>	<U044C>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U042D>	<U042D>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U044D>	<U042D>;<CYRILLIC>;<SMALL>;IGNORE
+-<U042E>	<U042E>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U044E>	<U042E>;<CYRILLIC>;<SMALL>;IGNORE
+-<U042F>	<U042F>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U044F>	<U042F>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0462>	<U0462>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0463>	<U0462>;<CYRILLIC>;<SMALL>;IGNORE
+-<U046A>	<U046A>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U046B>	<U046A>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0472>	<U0472>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0473>	<U0472>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0474>	<U0474>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0475>	<U0474>;<CYRILLIC>;<SMALL>;IGNORE
+-<U0480>	<U0480>;<CYRILLIC>;<CAPITAL>;IGNORE
+-<U0481>	<U0480>;<CYRILLIC>;<SMALL>;IGNORE
+-<U05D0>	<U05D0>;IGNORE;IGNORE;IGNORE
+-<U05D1>	<U05D1>;IGNORE;IGNORE;IGNORE
+-<U05D2>	<U05D2>;IGNORE;IGNORE;IGNORE
+-<U05D3>	<U05D3>;IGNORE;IGNORE;IGNORE
+-<U05D4>	<U05D4>;IGNORE;IGNORE;IGNORE
+-<U05D5>	<U05D5>;IGNORE;IGNORE;IGNORE
+-<U05D6>	<U05D6>;IGNORE;IGNORE;IGNORE
+-<U05D7>	<U05D7>;IGNORE;IGNORE;IGNORE
+-<U05D8>	<U05D8>;IGNORE;IGNORE;IGNORE
+-<U05D9>	<U05D9>;IGNORE;IGNORE;IGNORE
+-<U05DA>	<U05DA>;IGNORE;IGNORE;IGNORE
+-<U05DB>	<U05DB>;IGNORE;IGNORE;IGNORE
+-<U05DC>	<U05DC>;IGNORE;IGNORE;IGNORE
+-<U05DD>	<U05DD>;IGNORE;IGNORE;IGNORE
+-<U05DE>	<U05DE>;IGNORE;IGNORE;IGNORE
+-<U05DF>	<U05DF>;IGNORE;IGNORE;IGNORE
+-<U05E0>	<U05E0>;IGNORE;IGNORE;IGNORE
+-<U05E1>	<U05E1>;IGNORE;IGNORE;IGNORE
+-<U05E2>	<U05E2>;IGNORE;IGNORE;IGNORE
+-<U05E3>	<U05E3>;IGNORE;IGNORE;IGNORE
+-<U05E4>	<U05E4>;IGNORE;IGNORE;IGNORE
+-<U05E5>	<U05E5>;IGNORE;IGNORE;IGNORE
+-<U05E6>	<U05E6>;IGNORE;IGNORE;IGNORE
+-<U05E7>	<U05E7>;IGNORE;IGNORE;IGNORE
+-<U05E8>	<U05E8>;IGNORE;IGNORE;IGNORE
+-<U05E9>	<U05E9>;IGNORE;IGNORE;IGNORE
+-<U05EA>	<U05EA>;IGNORE;IGNORE;IGNORE
+-
+-% Arabic collating
+-
+-<U060C>	IGNORE;IGNORE;IGNORE;<U060C>
+-<U061B>	IGNORE;IGNORE;IGNORE;<U061B>
+-<U061F>	IGNORE;IGNORE;IGNORE;<U061F>
+-<U0640>	IGNORE;IGNORE;IGNORE;<U0640>
+-
+-<U0621>	<U0621>;<U0621>;IGNORE;IGNORE
+-<U0622>	<U0622>;<U0622>;IGNORE;IGNORE
+-<UFE82>	<U0622>;<UFE82>;IGNORE;IGNORE
+-<U0623>	<U0621>;<U0623>;IGNORE;IGNORE
+-<UFE84>	<U0621>;<UFE84>;IGNORE;IGNORE
+-<U0624>	<U0621>;<U0624>;IGNORE;IGNORE
+-<U0625>	<U0621>;<U0625>;IGNORE;IGNORE
+-<UFE88>	<U0621>;<UFE88>;IGNORE;IGNORE
+-<U0626>	<U0621>;<U0626>;IGNORE;IGNORE
+-<U0670>	<U0670>;<U0670>;IGNORE;IGNORE
+-<U0627>	<U0627>;<U0627>;IGNORE;IGNORE
+-<UFE8D>	<U0627>;<UFE8D>;IGNORE;IGNORE
+-<UFE8E>	<U0627>;<UFE8E>;IGNORE;IGNORE
+-<UE016>	<U0627>;<UE016>;IGNORE;IGNORE
+-<U0628>	<U0628>;<U0628>;IGNORE;IGNORE
+-<UFE8F>	<U0628>;<UFE8F>;IGNORE;IGNORE
+-<UFE90>	<U0628>;<UFE90>;IGNORE;IGNORE
+-<UFE91>	<U0628>;<UFE91>;IGNORE;IGNORE
+-<UFE92>	<U0628>;<UFE92>;IGNORE;IGNORE
+-<U067E>	<U067E>;<U067E>;IGNORE;IGNORE
+-<U06A4>	<U06A4>;<U06A4>;IGNORE;IGNORE
+-<U0629>	<U0629>;<U0629>;IGNORE;IGNORE
+-<UFE93>	<U0629>;<UFE93>;IGNORE;IGNORE
+-<UFE94>	<U0629>;<UFE94>;IGNORE;IGNORE
+-<U062A>	<U0629>;<U062A>;IGNORE;IGNORE
+-<UFE95>	<U0629>;<UFE95>;IGNORE;IGNORE
+-<UFE96>	<U0629>;<UFE96>;IGNORE;IGNORE
+-<UFE97>	<U0629>;<UFE97>;IGNORE;IGNORE
+-<UFE98>	<U0629>;<UFE98>;IGNORE;IGNORE
+-<U062B>	<U062B>;<U062B>;IGNORE;IGNORE
+-<UFE99>	<U062B>;<UFE99>;IGNORE;IGNORE
+-<UFE9A>	<U062B>;<UFE9A>;IGNORE;IGNORE
+-<UFE9B>	<U062B>;<UFE9B>;IGNORE;IGNORE
+-<UFE9C>	<U062B>;<UFE9C>;IGNORE;IGNORE
+-<U062C>	<U062C>;<U062C>;IGNORE;IGNORE
+-<UFE9D>	<U062C>;<UFE9D>;IGNORE;IGNORE
+-<UFE9E>	<U062C>;<UFE9E>;IGNORE;IGNORE
+-<UFE9F>	<U062C>;<UFE9F>;IGNORE;IGNORE
+-<UFEA0>	<U062C>;<UFEA0>;IGNORE;IGNORE
+-<U062D>	<U062D>;<U062D>;IGNORE;IGNORE
+-<UFEA1>	<U062D>;<UFEA1>;IGNORE;IGNORE
+-<UFEA2>	<U062D>;<UFEA2>;IGNORE;IGNORE
+-<UFEA3>	<U062D>;<UFEA3>;IGNORE;IGNORE
+-<UFEA4>	<U062D>;<UFEA4>;IGNORE;IGNORE
+-<U062E>	<U062E>;<U062E>;IGNORE;IGNORE
+-<UFEA5>	<U062E>;<UFEA5>;IGNORE;IGNORE
+-<UFEA6>	<U062E>;<UFEA6>;IGNORE;IGNORE
+-<UFEA7>	<U062E>;<UFEA7>;IGNORE;IGNORE
+-<UFEA8>	<U062E>;<UFEA8>;IGNORE;IGNORE
+-<U062F>	<U062F>;<U062F>;IGNORE;IGNORE
+-<UFEA9>	<U062F>;<UFEA9>;IGNORE;IGNORE
+-<UFEAA>	<U062F>;<UFEAA>;IGNORE;IGNORE
+-<U0630>	<U0630>;<U0630>;IGNORE;IGNORE
+-<UFEAB>	<U0630>;<UFEAB>;IGNORE;IGNORE
+-<UFEAC>	<U0630>;<UFEAC>;IGNORE;IGNORE
+-<U0631>	<U0631>;<U0631>;IGNORE;IGNORE
+-<UFEAD>	<U0631>;<UFEAD>;IGNORE;IGNORE
+-<UFEAE>	<U0631>;<UFEAE>;IGNORE;IGNORE
+-<U0632>	<U0632>;<U0632>;IGNORE;IGNORE
+-<UFEAF>	<U0632>;<UFEAF>;IGNORE;IGNORE
+-<UFEB0>	<U0632>;<UFEB0>;IGNORE;IGNORE
+-<U0633>	<U0633>;<U0633>;IGNORE;IGNORE
+-<UFEB1>	<U0633>;<UFEB1>;IGNORE;IGNORE
+-<UFEB2>	<U0633>;<UFEB2>;IGNORE;IGNORE
+-<UFEB3>	<U0633>;<UFEB3>;IGNORE;IGNORE
+-<UFEB4>	<U0633>;<UFEB4>;IGNORE;IGNORE
+-<U0634>	<U0634>;<U0634>;IGNORE;IGNORE
+-<UFEB5>	<U0634>;<UFEB5>;IGNORE;IGNORE
+-<UFEB6>	<U0634>;<UFEB6>;IGNORE;IGNORE
+-<UFEB7>	<U0634>;<UFEB7>;IGNORE;IGNORE
+-<UFEB8>	<U0634>;<UFEB8>;IGNORE;IGNORE
+-<U0635>	<U0635>;<U0635>;IGNORE;IGNORE
+-<UFEB9>	<U0635>;<UFEB9>;IGNORE;IGNORE
+-<UFEBA>	<U0635>;<UFEBA>;IGNORE;IGNORE
+-<UFEBB>	<U0635>;<UFEBB>;IGNORE;IGNORE
+-<UFEBC>	<U0635>;<UFEBC>;IGNORE;IGNORE
+-<U0636>	<U0636>;<U0636>;IGNORE;IGNORE
+-<UFEBD>	<U0636>;<UFEBD>;IGNORE;IGNORE
+-<UFEBE>	<U0636>;<UFEBE>;IGNORE;IGNORE
+-<UFEBF>	<U0636>;<UFEBF>;IGNORE;IGNORE
+-<UFEC0>	<U0636>;<UFEC0>;IGNORE;IGNORE
+-<U0637>	<U0637>;<U0637>;IGNORE;IGNORE
+-<UFEC1>	<U0637>;<UFEC1>;IGNORE;IGNORE
+-<UFEC2>	<U0637>;<UFEC2>;IGNORE;IGNORE
+-<UFEC3>	<U0637>;<UFEC3>;IGNORE;IGNORE
+-<UFEC4>	<U0637>;<UFEC4>;IGNORE;IGNORE
+-<U0638>	<U0638>;<U0638>;IGNORE;IGNORE
+-<UFEC5>	<U0638>;<UFEC5>;IGNORE;IGNORE
+-<UFEC6>	<U0638>;<UFEC6>;IGNORE;IGNORE
+-<UFEC7>	<U0638>;<UFEC7>;IGNORE;IGNORE
+-<UFEC8>	<U0638>;<UFEC8>;IGNORE;IGNORE
+-<U0639>	<U0639>;<U0639>;IGNORE;IGNORE
+-<UFEC9>	<U0639>;<UFEC9>;IGNORE;IGNORE
+-<UFECA>	<U0639>;<UFECA>;IGNORE;IGNORE
+-<UFECB>	<U0639>;<UFECB>;IGNORE;IGNORE
+-<UFECC>	<U0639>;<UFECC>;IGNORE;IGNORE
+-<U063A>	<U063A>;<U063A>;IGNORE;IGNORE
+-<UFECD>	<U063A>;<UFECD>;IGNORE;IGNORE
+-<UFECE>	<U063A>;<UFECE>;IGNORE;IGNORE
+-<UFECF>	<U063A>;<UFECF>;IGNORE;IGNORE
+-<UFED0>	<U063A>;<UFED0>;IGNORE;IGNORE
+-<U0641>	<U0641>;<U0641>;IGNORE;IGNORE
+-<UFED1>	<U0641>;<UFED1>;IGNORE;IGNORE
+-<UFED2>	<U0641>;<UFED2>;IGNORE;IGNORE
+-<UFED3>	<U0641>;<UFED3>;IGNORE;IGNORE
+-<UFED4>	<U0641>;<UFED4>;IGNORE;IGNORE
+-<U0642>	<U0642>;<U0642>;IGNORE;IGNORE
+-<UFED5>	<U0642>;<UFED5>;IGNORE;IGNORE
+-<UFED6>	<U0642>;<UFED6>;IGNORE;IGNORE
+-<UFED7>	<U0642>;<UFED7>;IGNORE;IGNORE
+-<UFED8>	<U0642>;<UFED8>;IGNORE;IGNORE
+-<U0643>	<U0643>;<U0643>;IGNORE;IGNORE
+-<UFED9>	<U0643>;<UFED9>;IGNORE;IGNORE
+-<UFEDA>	<U0643>;<UFEDA>;IGNORE;IGNORE
+-<UFEDB>	<U0643>;<UFEDB>;IGNORE;IGNORE
+-<UFEDC>	<U0643>;<UFEDC>;IGNORE;IGNORE
+-<U0644>	<U0644>;<U0644>;IGNORE;IGNORE
+-<UFEDD>	<U0644>;<UFEDD>;IGNORE;IGNORE
+-<UFEDE>	<U0644>;<UFEDE>;IGNORE;IGNORE
+-<UFEDF>	<U0644>;<UFEDF>;IGNORE;IGNORE
+-<UFEE0>	<U0644>;<UFEE0>;IGNORE;IGNORE
+-<U0645>	<U0645>;<U0645>;IGNORE;IGNORE
+-<UFEE1>	<U0645>;<UFEE1>;IGNORE;IGNORE
+-<UFEE2>	<U0645>;<UFEE2>;IGNORE;IGNORE
+-<UFEE3>	<U0645>;<UFEE3>;IGNORE;IGNORE
+-<UFEE4>	<U0645>;<UFEE4>;IGNORE;IGNORE
+-<U0646>	<U0646>;<U0646>;IGNORE;IGNORE
+-<UFEE5>	<U0646>;<UFEE5>;IGNORE;IGNORE
+-<UFEE6>	<U0646>;<UFEE6>;IGNORE;IGNORE
+-<UFEE7>	<U0646>;<UFEE7>;IGNORE;IGNORE
+-<UFEE8>	<U0646>;<UFEE8>;IGNORE;IGNORE
+-<U0647>	<U0647>;<U0647>;IGNORE;IGNORE
+-<UFEE9>	<U0647>;<UFEE9>;IGNORE;IGNORE
+-<UFEEA>	<U0647>;<UFEEA>;IGNORE;IGNORE
+-<UFEEB>	<U0647>;<UFEEB>;IGNORE;IGNORE
+-<UFEEC>	<U0647>;<UFEEC>;IGNORE;IGNORE
+-<U0648>	<U0648>;<U0648>;IGNORE;IGNORE
+-<UFEED>	<U0648>;<UFEED>;IGNORE;IGNORE
+-<UFEEE>	<U0648>;<UFEEE>;IGNORE;IGNORE
+-<U0649>	<U0649>;<U0649>;IGNORE;IGNORE
+-<UFEEF>	<U0649>;<UFEEF>;IGNORE;IGNORE
+-<UFEF0>	<U0649>;<UFEF0>;IGNORE;IGNORE
+-<U064A>	<U064A>;<U064A>;IGNORE;IGNORE
+-<UFEF1>	<U064A>;<UFEF1>;IGNORE;IGNORE
+-<UFEF2>	<U064A>;<UFEF2>;IGNORE;IGNORE
+-<UFEF3>	<U064A>;<UFEF3>;IGNORE;IGNORE
+-<UFEF4>	<U064A>;<UFEF4>;IGNORE;IGNORE
+-
+-<U064B>	IGNORE;IGNORE;<U064B>;IGNORE
+-<U064C>	IGNORE;IGNORE;<U064C>;IGNORE
+-<U064D>	IGNORE;IGNORE;<U064D>;IGNORE
+-<U064E>	IGNORE;IGNORE;<U064E>;IGNORE
+-<U064F>	IGNORE;IGNORE;<U064F>;IGNORE
+-<U0650>	IGNORE;IGNORE;<U0650>;IGNORE
+-<U0651>	IGNORE;IGNORE;<U0651>;IGNORE
+-<UFE7D>	IGNORE;IGNORE;<UFE7D>;IGNORE
+-<U0652>	IGNORE;IGNORE;<U0652>;IGNORE
+-
+-<U0660>	<U0030>;<U0660>;IGNORE;IGNORE
+-<U0661>	<U0031>;<U0661>;IGNORE;IGNORE
+-<U0662>	<U0032>;<U0662>;IGNORE;IGNORE
+-<U0663>	<U0033>;<U0663>;IGNORE;IGNORE
+-<U0664>	<U0034>;<U0664>;IGNORE;IGNORE
+-<U0665>	<U0035>;<U0665>;IGNORE;IGNORE
+-<U0666>	<U0036>;<U0666>;IGNORE;IGNORE
+-<U0667>	<U0037>;<U0667>;IGNORE;IGNORE
+-<U0668>	<U0038>;<U0668>;IGNORE;IGNORE
+-<U0669>	<U0039>;<U0669>;IGNORE;IGNORE
+-
+-<UFEF5>	"<U0644><U0622>";"<U0644><U0622>";"<UFEF5><UFEF5>";IGNORE
+-<UFEF6>	"<U0644><U0622>";"<U0644><UFE82>";"<UFEF6><UFEF6>";IGNORE
+-<UFEF7>	"<U0644><U0623>";"<U0644><U0623>";"<UFEF7><UFEF7>";IGNORE
+-<UFEF8>	"<U0644><U0623>";"<U0644><UFE84>";"<UFEF8><UFEF8>";IGNORE
+-<UFEF9>	"<U0644><U0625>";"<U0644><U0625>";"<UFEF9><UFEF9>";IGNORE
+-<UFEFA>	"<U0644><U0625>";"<U0644><UFE88>";"<UFEFA><UFEFA>";IGNORE
+-<UFEFB>	"<U0644><U0627>";"<U0644><UFE8D>";"<UFEFB><UFEFB>";IGNORE
+-<UFEFC>	"<U0644><U0627>";"<U0644><UFE8E>";"<UFEFC><UFEFC>";IGNORE
+-
+-% katakana/hiragana sorting
+-% base is katakana, as this is present in most charsets
+-% normal before voiced before semi-voiced
+-% small vocals before normal vocals
+-% katakana before hiragana
+-
+-<U30A1>	<U30A1>;<U30A1>;IGNORE;IGNORE
+-<U3041>	<U30A1>;<U3041>;IGNORE;IGNORE
+-<U30A2>	<U30A1>;<U30A2>;IGNORE;IGNORE
+-<U3042>	<U30A1>;<U3042>;IGNORE;IGNORE
+-<U30A3>	<U30A3>;<U30A3>;IGNORE;IGNORE
+-<U3043>	<U30A3>;<U3043>;IGNORE;IGNORE
+-<U30A4>	<U30A3>;<U30A4>;IGNORE;IGNORE
+-<U3044>	<U30A3>;<U3044>;IGNORE;IGNORE
+-<U30A5>	<U30A5>;<U30A5>;IGNORE;IGNORE
+-<U3045>	<U30A5>;<U3045>;IGNORE;IGNORE
+-<U30A6>	<U30A5>;<U30A6>;IGNORE;IGNORE
+-<U3046>	<U30A5>;<U3046>;IGNORE;IGNORE
+-<U30F4>	<U30A5>;<U30F4>;IGNORE;IGNORE
+-<U30A7>	<U30A7>;<U30A7>;IGNORE;IGNORE
+-<U3047>	<U30A7>;<U3047>;IGNORE;IGNORE
+-<U30A8>	<U30A7>;<U30A8>;IGNORE;IGNORE
+-<U3048>	<U30A7>;<U3048>;IGNORE;IGNORE
+-<U30A9>	<U30A9>;<U30A9>;IGNORE;IGNORE
+-<U3049>	<U30A9>;<U3049>;IGNORE;IGNORE
+-<U30AA>	<U30A9>;<U30AA>;IGNORE;IGNORE
+-<U304A>	<U30A9>;<U304A>;IGNORE;IGNORE
+-<U30F5>	<U30F5>;<U30F5>;IGNORE;IGNORE
+-<U30AB>	<U30F5>;<U30AB>;IGNORE;IGNORE
+-<U304B>	<U30F5>;<U304B>;IGNORE;IGNORE
+-<U30AC>	<U30F5>;<U30AC>;IGNORE;IGNORE
+-<U304C>	<U30F5>;<U304C>;IGNORE;IGNORE
+-<U30AD>	<U30AD>;<U30AD>;IGNORE;IGNORE
+-<U304D>	<U30AD>;<U304D>;IGNORE;IGNORE
+-<U30AE>	<U30AD>;<U30AE>;IGNORE;IGNORE
+-<U304E>	<U30AD>;<U304E>;IGNORE;IGNORE
+-<U30AF>	<U30AF>;<U30AF>;IGNORE;IGNORE
+-<U304F>	<U30AF>;<U304F>;IGNORE;IGNORE
+-<U30B0>	<U30AF>;<U30B0>;IGNORE;IGNORE
+-<U3050>	<U30AF>;<U3050>;IGNORE;IGNORE
+-<U30F6>	<U30F6>;<U30F6>;IGNORE;IGNORE
+-<U30B1>	<U30F6>;<U30B1>;IGNORE;IGNORE
+-<U3051>	<U30F6>;<U3051>;IGNORE;IGNORE
+-<U30B2>	<U30F6>;<U30B2>;IGNORE;IGNORE
+-<U3052>	<U30F6>;<U3052>;IGNORE;IGNORE
+-<U30B3>	<U30B3>;<U30B3>;IGNORE;IGNORE
+-<U3053>	<U30B3>;<U3053>;IGNORE;IGNORE
+-<U30B4>	<U30B3>;<U30B4>;IGNORE;IGNORE
+-<U3054>	<U30B3>;<U3054>;IGNORE;IGNORE
+-<U30B5>	<U30B5>;<U30B5>;IGNORE;IGNORE
+-<U3055>	<U30B5>;<U3055>;IGNORE;IGNORE
+-<U30B6>	<U30B5>;<U30B6>;IGNORE;IGNORE
+-<U3056>	<U30B5>;<U3056>;IGNORE;IGNORE
+-<U30B7>	<U30B7>;<U30B7>;IGNORE;IGNORE
+-<U3057>	<U30B7>;<U3057>;IGNORE;IGNORE
+-<U30B8>	<U30B7>;<U30B8>;IGNORE;IGNORE
+-<U3058>	<U30B7>;<U3058>;IGNORE;IGNORE
+-<U30B9>	<U30B9>;<U30B9>;IGNORE;IGNORE
+-<U3059>	<U30B9>;<U3059>;IGNORE;IGNORE
+-<U30BA>	<U30B9>;<U30BA>;IGNORE;IGNORE
+-<U305A>	<U30B9>;<U305A>;IGNORE;IGNORE
+-<U30BB>	<U30BB>;<U30BB>;IGNORE;IGNORE
+-<U305B>	<U30BB>;<U305B>;IGNORE;IGNORE
+-<U30BC>	<U30BB>;<U30BC>;IGNORE;IGNORE
+-<U305C>	<U30BB>;<U305C>;IGNORE;IGNORE
+-<U30BD>	<U30BD>;<U30BD>;IGNORE;IGNORE
+-<U305D>	<U30BD>;<U305D>;IGNORE;IGNORE
+-<U30BE>	<U30BD>;<U30BE>;IGNORE;IGNORE
+-<U305E>	<U30BD>;<U305E>;IGNORE;IGNORE
+-<U30BF>	<U30BF>;<U30BF>;IGNORE;IGNORE
+-<U305F>	<U30BF>;<U305F>;IGNORE;IGNORE
+-<U30C0>	<U30BF>;<U30C0>;IGNORE;IGNORE
+-<U3060>	<U30BF>;<U3060>;IGNORE;IGNORE
+-<U30C1>	<U30C1>;<U30C1>;IGNORE;IGNORE
+-<U3061>	<U30C1>;<U3061>;IGNORE;IGNORE
+-<U30C2>	<U30C1>;<U30C2>;IGNORE;IGNORE
+-<U3062>	<U30C1>;<U3062>;IGNORE;IGNORE
+-<U30C3>	<U30C3>;<U30C3>;IGNORE;IGNORE
+-<U3063>	<U30C3>;<U3063>;IGNORE;IGNORE
+-<U30C4>	<U30C3>;<U30C4>;IGNORE;IGNORE
+-<U3064>	<U30C3>;<U3064>;IGNORE;IGNORE
+-<U30C5>	<U30C3>;<U30C5>;IGNORE;IGNORE
+-<U3065>	<U30C3>;<U3065>;IGNORE;IGNORE
+-<U30C6>	<U30C6>;<U30C6>;IGNORE;IGNORE
+-<U3066>	<U30C6>;<U3066>;IGNORE;IGNORE
+-<U30C7>	<U30C6>;<U30C7>;IGNORE;IGNORE
+-<U3067>	<U30C6>;<U3067>;IGNORE;IGNORE
+-<U30C8>	<U30C8>;<U30C8>;IGNORE;IGNORE
+-<U3068>	<U30C8>;<U3068>;IGNORE;IGNORE
+-<U30C9>	<U30C8>;<U30C9>;IGNORE;IGNORE
+-<U3069>	<U30C8>;<U3069>;IGNORE;IGNORE
+-<U30CA>	<U30CA>;<U30CA>;IGNORE;IGNORE
+-<U306A>	<U30CA>;<U306A>;IGNORE;IGNORE
+-<U30CB>	<U30CB>;<U30CB>;IGNORE;IGNORE
+-<U306B>	<U30CB>;<U306B>;IGNORE;IGNORE
+-<U30CC>	<U30CC>;<U30CC>;IGNORE;IGNORE
+-<U306C>	<U30CC>;<U306C>;IGNORE;IGNORE
+-<U30CD>	<U30CD>;<U30CD>;IGNORE;IGNORE
+-<U306D>	<U30CD>;<U306D>;IGNORE;IGNORE
+-<U30CE>	<U30CE>;<U30CE>;IGNORE;IGNORE
+-<U306E>	<U30CE>;<U306E>;IGNORE;IGNORE
+-<U30CF>	<U30CF>;<U30CF>;IGNORE;IGNORE
+-<U306F>	<U30CF>;<U306F>;IGNORE;IGNORE
+-<U30D0>	<U30CF>;<U30D0>;IGNORE;IGNORE
+-<U3070>	<U30CF>;<U3070>;IGNORE;IGNORE
+-<U30D1>	<U30CF>;<U30D1>;IGNORE;IGNORE
+-<U3071>	<U30CF>;<U3071>;IGNORE;IGNORE
+-<U30D2>	<U30D2>;<U30D2>;IGNORE;IGNORE
+-<U3072>	<U30D2>;<U3072>;IGNORE;IGNORE
+-<U30D3>	<U30D2>;<U30D3>;IGNORE;IGNORE
+-<U3073>	<U30D2>;<U3073>;IGNORE;IGNORE
+-<U30D4>	<U30D2>;<U30D4>;IGNORE;IGNORE
+-<U3074>	<U30D2>;<U3074>;IGNORE;IGNORE
+-<U30D5>	<U30D5>;<U30D5>;IGNORE;IGNORE
+-<U3075>	<U30D5>;<U3075>;IGNORE;IGNORE
+-<U30D6>	<U30D5>;<U30D6>;IGNORE;IGNORE
+-<U3076>	<U30D5>;<U3076>;IGNORE;IGNORE
+-<U30D7>	<U30D5>;<U30D7>;IGNORE;IGNORE
+-<U3077>	<U30D5>;<U3077>;IGNORE;IGNORE
+-<U30D8>	<U30D8>;<U30D8>;IGNORE;IGNORE
+-<U3078>	<U30D8>;<U3078>;IGNORE;IGNORE
+-<U30D9>	<U30D8>;<U30D9>;IGNORE;IGNORE
+-<U3079>	<U30D8>;<U3079>;IGNORE;IGNORE
+-<U30DA>	<U30D8>;<U30DA>;IGNORE;IGNORE
+-<U307A>	<U30D8>;<U307A>;IGNORE;IGNORE
+-<U30DB>	<U30DB>;<U30DB>;IGNORE;IGNORE
+-<U307B>	<U30DB>;<U307B>;IGNORE;IGNORE
+-<U30DC>	<U30DB>;<U30DC>;IGNORE;IGNORE
+-<U307C>	<U30DB>;<U307C>;IGNORE;IGNORE
+-<U30DD>	<U30DB>;<U30DD>;IGNORE;IGNORE
+-<U307D>	<U30DB>;<U307D>;IGNORE;IGNORE
+-<U30DE>	<U30DE>;<U30DE>;IGNORE;IGNORE
+-<U307E>	<U30DE>;<U307E>;IGNORE;IGNORE
+-<U30DF>	<U30DF>;<U30DF>;IGNORE;IGNORE
+-<U307F>	<U30DF>;<U307F>;IGNORE;IGNORE
+-<U30E0>	<U30E0>;<U30E0>;IGNORE;IGNORE
+-<U3080>	<U30E0>;<U3080>;IGNORE;IGNORE
+-<U30E1>	<U30E1>;<U30E1>;IGNORE;IGNORE
+-<U3081>	<U30E1>;<U3081>;IGNORE;IGNORE
+-<U30E2>	<U30E2>;<U30E2>;IGNORE;IGNORE
+-<U3082>	<U30E2>;<U3082>;IGNORE;IGNORE
+-<U30E3>	<U30E3>;<U30E3>;IGNORE;IGNORE
+-<U3083>	<U30E3>;<U3083>;IGNORE;IGNORE
+-<U30E4>	<U30E3>;<U30E4>;IGNORE;IGNORE
+-<U3084>	<U30E3>;<U3084>;IGNORE;IGNORE
+-<U30E5>	<U30E5>;<U30E5>;IGNORE;IGNORE
+-<U3085>	<U30E5>;<U3085>;IGNORE;IGNORE
+-<U30E6>	<U30E5>;<U30E6>;IGNORE;IGNORE
+-<U3086>	<U30E5>;<U3086>;IGNORE;IGNORE
+-<U30E7>	<U30E7>;<U30E7>;IGNORE;IGNORE
+-<U3087>	<U30E7>;<U3087>;IGNORE;IGNORE
+-<U30E8>	<U30E7>;<U30E8>;IGNORE;IGNORE
+-<U3088>	<U30E7>;<U3088>;IGNORE;IGNORE
+-<U30E9>	<U30E9>;<U30E9>;IGNORE;IGNORE
+-<U3089>	<U30E9>;<U3089>;IGNORE;IGNORE
+-<U30EA>	<U30EA>;<U30EA>;IGNORE;IGNORE
+-<U308A>	<U30EA>;<U308A>;IGNORE;IGNORE
+-<U30EB>	<U30EB>;<U30EB>;IGNORE;IGNORE
+-<U308B>	<U30EB>;<U308B>;IGNORE;IGNORE
+-<U30EC>	<U30EC>;<U30EC>;IGNORE;IGNORE
+-<U308C>	<U30EC>;<U308C>;IGNORE;IGNORE
+-<U30ED>	<U30ED>;<U30ED>;IGNORE;IGNORE
+-<U308D>	<U30ED>;<U308D>;IGNORE;IGNORE
+-<U30EE>	<U30EE>;<U30EE>;IGNORE;IGNORE
+-<U308E>	<U30EE>;<U308E>;IGNORE;IGNORE
+-<U30EF>	<U30EE>;<U30EF>;IGNORE;IGNORE
+-<U308F>	<U30EE>;<U308F>;IGNORE;IGNORE
+-<U30F0>	<U30F0>;<U30F0>;IGNORE;IGNORE
+-<U3090>	<U30F0>;<U3090>;IGNORE;IGNORE
+-<U30F1>	<U30F1>;<U30F1>;IGNORE;IGNORE
+-<U3091>	<U30F1>;<U3091>;IGNORE;IGNORE
+-<U30F2>	<U30F2>;<U30F2>;IGNORE;IGNORE
+-<U3092>	<U30F2>;<U3092>;IGNORE;IGNORE
+-<U30F3>	<U30F3>;<U30F3>;IGNORE;IGNORE
+-<U3093>	<U30F3>;<U3093>;IGNORE;IGNORE
+-
+-order_end
++reorder-end
+ 
+ END LC_COLLATE
+ 
+-LC_CTYPE
+-copy "i18n"
+-END LC_CTYPE
+-
+ LC_MESSAGES
+ yesexpr "<U005E><U005B><U0068><U0048><U0079><U0059><U005D><U002E><U002A>"
+ noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"

Modified: glibc-package/trunk/debian/patches/localedata/tailor-iso14651_t1.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/tailor-iso14651_t1.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/localedata/tailor-iso14651_t1.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -2,7 +2,7 @@
 # DP: Description: Rewrite collation rules to include iso14651_t1
 # DP:  es_ES: BZ664, by Pablo Saratxaga
 # DP:  da_DK fi_FI nb_NO: BZ672, by Denis Barbier
-# DP:  ar_SA cs_CZ et_EE hr_HR hsb_DE lt_LT pl_PL sl_SI tr_TR: not
+# DP:  ar_SA cs_CZ et_EE hr_HR lt_LT pl_PL sl_SI tr_TR: not
 # DP:    submitted yet.
 # DP: Related bugs: BZ664 BZ672
 # DP: Dpatch author: Denis Barbier
@@ -4734,2217 +4734,6 @@
  
  END LC_COLLATE
  
---- a/localedata/locales/hsb_DE
-+++ b/localedata/locales/hsb_DE
-@@ -34,7 +34,14 @@
- 
- END LC_IDENTIFICATION
- 
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
- LC_COLLATE
-+% Copy the template from ISO/IEC 14651
-+copy "iso14651_t1"
-+
- collating-element <D-Z'> from "<U0044><U0179>"
- collating-element <D-z'> from "<U0044><U017A>"
- collating-element <d-Z'> from "<U0064><U0179>"
-@@ -44,2081 +51,122 @@
- collating-element <c-H> from "<U0063><U0048>"
- collating-element <c-h> from "<U0063><U0068>"
- 
--% Base collation scheme: 1994-03-22
-+collating-symbol <ccaron>
-+collating-symbol <d-z-sh>
-+collating-symbol <ecaron>
-+collating-symbol <ch>
-+collating-symbol <lstroke>
-+collating-symbol <nacute>
-+collating-symbol <oacute>
-+collating-symbol <rcaron>
-+collating-symbol <scaron>
-+collating-symbol <cacute>
-+collating-symbol <zcaron>
-+
-+collating-symbol <CAP-MIN>
-+collating-symbol <MIN-CAP>
-+
-+reorder-after <MIN>
-+<MIN-CAP>
-+<CAP-MIN>
-+
-+reorder-after <c>
-+<ccaron>
-+
-+reorder-after <d>
-+<d-z-sh>
-+
-+reorder-after <e>
-+<ecaron>
-+
-+reorder-after <h>
-+<ch>
-+
-+reorder-after <k>
-+<lstroke>
-+
-+reorder-after <n>
-+<nacute>
-+
-+%  Is oacute really used?
-+reorder-after <o>
-+<oacute>
-+
-+reorder-after <r>
-+<rcaron>
-+
-+reorder-after <s>
-+<scaron>
-+
-+reorder-after <t>
-+<cacute>
-+
-+reorder-after <z>
-+<zcaron>
-+
-+reorder-after <U010B>
-+<U010D> <ccaron>;<PCT>;<MIN>;IGNORE
-+reorder-after <U010A>
-+<U010C> <ccaron>;<PCT>;<CAP>;IGNORE
-+
-+reorder-after <U0111>
-+<d-z'> <d-z-sh>;<BAS>;<MIN>;IGNORE
-+<d-Z'> <d-z-sh>;<BAS>;<MIN-CAP>;IGNORE
-+reorder-after <U0110>
-+<D-z'> <d-z-sh>;<BAS>;<CAP-MIN>;IGNORE
-+<D-Z'> <d-z-sh>;<BAS>;<CAP>;IGNORE
-+
-+reorder-after <U0113>
-+<U011B> <ecaron>;<BAS>;<MIN>;IGNORE
-+reorder-after <U0112>
-+<U011A> <ecaron>;<BAS>;<CAP>;IGNORE
-+
-+reorder-after <U0127>
-+<c-h>  <ch>;<BAS>;<MIN>;IGNORE
-+<c-H>  <ch>;<BAS>;<MIN-CAP>;IGNORE
-+reorder-after <U0126>
-+<C-h>  <ch>;<BAS>;<CAP-MIN>;IGNORE
-+<C-H>  <ch>;<BAS>;<CAP>;IGNORE
-+
-+reorder-after <U0137>
-+<U0142> <lstroke>;<BAS>;<MIN>;IGNORE
-+reorder-after <U0136>
-+<U0141> <lstroke>;<BAS>;<CAP>;IGNORE
-+
-+reorder-after <U0146>
-+<U0144> <nacute>;<BAS>;<MIN>;IGNORE
-+reorder-after <U0145>
-+<U0143> <nacute>;<BAS>;<CAP>;IGNORE
-+
-+reorder-after <U006F>
-+<U00F3> <oacute>;<BAS>;<MIN>;IGNORE
-+reorder-after <U004F>
-+<U00D3> <oacute>;<BAS>;<CAP>;IGNORE
-+
-+reorder-after <U0157>
-+<U0159> <rcaron>;<BAS>;<MIN>;IGNORE
-+reorder-after <U0156>
-+<U0158> <rcaron>;<BAS>;<CAP>;IGNORE
-+
-+reorder-after <U015F>
-+<U0161> <scaron>;<BAS>;<MIN>;IGNORE
-+reorder-after <U015E>
-+<U0160> <scaron>;<BAS>;<CAP>;IGNORE
-+
-+reorder-after <U0163>
-+<U0107> <cacute>;<BAS>;<MIN>;IGNORE
-+reorder-after <U0162>
-+<U0106> <cacute>;<BAS>;<CAP>;IGNORE
-+
-+reorder-after <U017C>
-+<U017E> <zcaron>;<BAS>;<MIN>;IGNORE
-+reorder-after <U017B>
-+<U017D> <zcaron>;<BAS>;<CAP>;IGNORE
- 
--% Ordering algorithm:
--%  1. Spaces and hyphen (but not soft
--%     hyphen) before punctuation
--%     characters, punctuation characters
--%     before numbers,
--%     numbers before letters.
--%  2. Letters with diacritical marks are
--%     members of equivalence classes
--%  3. A distinction is made with regards
--%     to case as noted below.
--%  4. Special characters are ignored
--%     when comparing letters, but then
--%     they are considered
--%  5. The alphabets are sorted in order
--%     of first appearance in ISO 10646:
--%     Latin, Greek, Cyrillic, etc.
--%
--% According to Greek specifications,
--% the steps 2. and 3. above are reversed
--% for the Greek script
--
--% collating symbols
--
--% The collating symbol naming is
--% mostly taken from ISO 10646-1,
--% for example the case and accent
--% names are from this standard.
--
--collating-symbol <CAPITAL>
--collating-symbol <CAPITAL-SMALL>
--collating-symbol <SMALL-CAPITAL>
--collating-symbol <SMALL>
--
--% <CAPITAL-SMALL> and <SMALL-CAPITAL>
--% are for cases like Danish <U0041><U0061>
--% and Spanish <U0043><U0068> being treated
--% as one letter.
--
--% The <a8> ...... <z8> collating
--% symbols have defined weights as
--% the last character in a group of
--% Latin letters. They are used
--% to specify deltas by locales using
--% a locale as the default ordering
--% and by "replace-after" statements
--% specifying the changed placement
--% in an ordering of a character.
--
--collating-symbol <a8>
--collating-symbol <b8>
--collating-symbol <c8>
--collating-symbol <d8>
--collating-symbol <e8>
--collating-symbol <f8>
--collating-symbol <g8>
--collating-symbol <h8>
--collating-symbol <i8>
--collating-symbol <j8>
--collating-symbol <k8>
--collating-symbol <l8>
--collating-symbol <m8>
--collating-symbol <n8>
--collating-symbol <o8>
--collating-symbol <p8>
--collating-symbol <q8>
--collating-symbol <r8>
--collating-symbol <s8>
--collating-symbol <t8>
--collating-symbol <u8>
--collating-symbol <v8>
--collating-symbol <w8>
--collating-symbol <x8>
--collating-symbol <y8>
--collating-symbol <z8>
--
--collating-symbol <NONE>
--collating-symbol <ACUTE>
--collating-symbol <ACUTE+DOT>
--collating-symbol <GRAVE>
--collating-symbol <DOUBLE-GRAVE>
--collating-symbol <BREVE>
--collating-symbol <BREVE+ACUTE>
--collating-symbol <BREVE+GRAVE>
--collating-symbol <BREVE+MACRON>
--collating-symbol <BREVE+HOOK>
--collating-symbol <BREVE+TILDE>
--collating-symbol <BREVE+DOT-BELOW>
--collating-symbol <BREVE-BELOW>
--collating-symbol <INVERTED-BREVE>
--collating-symbol <CIRCUMFLEX>
--collating-symbol <CIRCUMFLEX+ACUTE>
--collating-symbol <CIRCUMFLEX+GRAVE>
--collating-symbol <CIRCUMFLEX+HOOK>
--collating-symbol <CIRCUMFLEX+TILDE>
--collating-symbol <CIRCUMFLEX+DOT-BELOW>
--collating-symbol <CARON>
--collating-symbol <CARON+DIAERESIS>
--collating-symbol <CARON+DOT>
--collating-symbol <RING>
--collating-symbol <RING+ACUTE>
--collating-symbol <RING-BELOW>
--collating-symbol <DIAERESIS>
--collating-symbol <DIAERESIS+MACRON>
--collating-symbol <DIAERESIS+ACUTE>
--collating-symbol <DIAERESIS+GRAVE>
--collating-symbol <DIAERESIS+CARON>
--collating-symbol <DOUBLE-ACUTE>
--collating-symbol <HOOK>
--collating-symbol <TILDE>
--collating-symbol <TILDE+ACUTE>
--collating-symbol <TILDE+DIAERESIS>
--collating-symbol <TILDE-BELOW>
--collating-symbol <DOT>
--collating-symbol <DOT-BELOW>
--collating-symbol <DOT+DOT-BELOW>
--collating-symbol <STROKE>
--collating-symbol <STROKE+ACUTE>
--collating-symbol <CEDILLA>
--collating-symbol <CEDILLA+ACUTE>
--collating-symbol <CEDILLA+GRAVE>
--collating-symbol <CEDILLA+BREVE>
--collating-symbol <OGONEK>
--collating-symbol <OGONEK+MACRON>
--collating-symbol <MACRON>
--collating-symbol <MACRON+ACUTE>
--collating-symbol <MACRON+GRAVE>
--collating-symbol <MACRON+DIAERESIS>
--collating-symbol <MACRON+DIAERESIS-BELOW>
--collating-symbol <MACRON+DOT>
--collating-symbol <MACRON+DOT-BELOW>
--collating-symbol <MACRON+CIRCUMFLEX>
--collating-symbol <LINE-BELOW>
--collating-symbol <HORN>
--collating-symbol <HORN+ACUTE>
--collating-symbol <HORN+GRAVE>
--collating-symbol <HORN+HOOK>
--collating-symbol <HORN+TILDE>
--collating-symbol <HORN+DOT-BELOW>
--collating-symbol <PRECEDED-BY-APOSTROPHE>
--collating-symbol <GREEK>
--collating-symbol <TONOS>
--collating-symbol <DIALYTICA>
--collating-symbol <DIALYTICA+TONOS>
--collating-symbol <CYRILLIC>
--collating-symbol <HIRAGANA>
--collating-symbol <KATAKANA>
--collating-symbol <SPECIAL>
--
--% letter;accent;case;specials
--
--order_start forward;backward/
--            ;forward;position
--
--% <CAPITAL> or <SMALL> letters first:
--
--<SMALL>
--<SMALL-CAPITAL>
--<CAPITAL-SMALL>
--<CAPITAL>
--
--% Accents:
--
--<NONE>
--<ACUTE>
--<ACUTE+DOT>
--<GRAVE>
--<DOUBLE-GRAVE>
--<BREVE>
--<BREVE+ACUTE>
--<BREVE+GRAVE>
--<BREVE+MACRON>
--<BREVE+HOOK>
--<BREVE+TILDE>
--<BREVE+DOT-BELOW>
--<BREVE-BELOW>
--<INVERTED-BREVE>
--<CIRCUMFLEX>
--<CIRCUMFLEX+ACUTE>
--<CIRCUMFLEX+GRAVE>
--<CIRCUMFLEX+HOOK>
--<CIRCUMFLEX+TILDE>
--<CIRCUMFLEX+DOT-BELOW>
--<CARON>
--<CARON+DIAERESIS>
--<CARON+DOT>
--<RING>
--<RING+ACUTE>
--<RING-BELOW>
--<DIAERESIS>
--<DIAERESIS+MACRON>
--<DIAERESIS+ACUTE>
--<DIAERESIS+GRAVE>
--<DIAERESIS+CARON>
--<DOUBLE-ACUTE>
--<HOOK>
--<TILDE>
--<TILDE+ACUTE>
--<TILDE+DIAERESIS>
--<TILDE-BELOW>
--<DOT>
--<DOT-BELOW>
--<DOT+DOT-BELOW>
--<STROKE>
--<STROKE+ACUTE>
--<CEDILLA>
--<CEDILLA+ACUTE>
--<CEDILLA+GRAVE>
--<CEDILLA+BREVE>
--<OGONEK>
--<OGONEK+MACRON>
--<MACRON>
--<MACRON+ACUTE>
--<MACRON+GRAVE>
--<MACRON+DIAERESIS>
--<MACRON+DIAERESIS-BELOW>
--<MACRON+DOT>
--<MACRON+DOT-BELOW>
--<MACRON+CIRCUMFLEX>
--<LINE-BELOW>
--<HORN>
--<HORN+ACUTE>
--<HORN+GRAVE>
--<HORN+HOOK>
--<HORN+TILDE>
--<HORN+DOT-BELOW>
--<PRECEDED-BY-APOSTROPHE>
--<GREEK>
--<TONOS>
--<DIALYTICA>
--<DIALYTICA+TONOS>
--<CYRILLIC>
--<HIRAGANA>
--<KATAKANA>
--<SPECIAL>
--
--<U00A0>	<U00A0>;<U00A0>;<U00A0>;IGNORE
--<U0020>	IGNORE;IGNORE;IGNORE;<U0020>
--<U0009>	IGNORE;IGNORE;IGNORE;<U0009>
--<U000B>	IGNORE;IGNORE;IGNORE;<U000B>
--<U000D>	IGNORE;IGNORE;IGNORE;<U000D>
--<U000A>	IGNORE;IGNORE;IGNORE;<U000A>
--<U000C>	IGNORE;IGNORE;IGNORE;<U000C>
--<U005F>	IGNORE;IGNORE;IGNORE;<U005F>
--<U00AF>	IGNORE;IGNORE;IGNORE;<U00AF>
--<U00AD>	IGNORE;IGNORE;IGNORE;<U00AD>
--<U002D>	IGNORE;IGNORE;IGNORE;<U002D>
--<U002C>	IGNORE;IGNORE;IGNORE;<U002C>
--<U003B>	IGNORE;IGNORE;IGNORE;<U003B>
--<U003A>	IGNORE;IGNORE;IGNORE;<U003A>
--<U0021>	IGNORE;IGNORE;IGNORE;<U0021>
--<U00A1>	IGNORE;IGNORE;IGNORE;<U00A1>
--<U003F>	IGNORE;IGNORE;IGNORE;<U003F>
--<U00BF>	IGNORE;IGNORE;IGNORE;<U00BF>
--<U002F>	IGNORE;IGNORE;IGNORE;<U002F>
--<U002E>	IGNORE;IGNORE;IGNORE;<U002E>
--<U00B4>	IGNORE;IGNORE;IGNORE;<U00B4>
--<U0060>	IGNORE;IGNORE;IGNORE;<U0060>
--<U005E>	IGNORE;IGNORE;IGNORE;<U005E>
--<U00A8>	IGNORE;IGNORE;IGNORE;<U00A8>
--<U007E>	IGNORE;IGNORE;IGNORE;<U007E>
--<U00B7>	IGNORE;IGNORE;IGNORE;<U00B7>
--<U00B8>	IGNORE;IGNORE;IGNORE;<U00B8>
--<U0027>	IGNORE;IGNORE;IGNORE;<U0027>
--<U2018>	IGNORE;IGNORE;IGNORE;<U2018>
--<U2019>	IGNORE;IGNORE;IGNORE;<U2019>
--<U0022>	IGNORE;IGNORE;IGNORE;<U0022>
--<U201C>	IGNORE;IGNORE;IGNORE;<U201C>
--<U201D>	IGNORE;IGNORE;IGNORE;<U201D>
--<U00AB>	IGNORE;IGNORE;IGNORE;<U00AB>
--<U00BB>	IGNORE;IGNORE;IGNORE;<U00BB>
--<U0028>	IGNORE;IGNORE;IGNORE;<U0028>
--<U207D>	IGNORE;IGNORE;IGNORE;<U207D>
--<U0029>	IGNORE;IGNORE;IGNORE;<U0029>
--<U207E>	IGNORE;IGNORE;IGNORE;<U207E>
--<U005B>	IGNORE;IGNORE;IGNORE;<U005B>
--<U005D>	IGNORE;IGNORE;IGNORE;<U005D>
--<U007B>	IGNORE;IGNORE;IGNORE;<U007B>
--<U007D>	IGNORE;IGNORE;IGNORE;<U007D>
--<U00A7>	IGNORE;IGNORE;IGNORE;<U00A7>
--<U00B6>	IGNORE;IGNORE;IGNORE;<U00B6>
--<U00A9>	IGNORE;IGNORE;IGNORE;<U00A9>
--<U00AE>	IGNORE;IGNORE;IGNORE;<U00AE>
--<U0040>	IGNORE;IGNORE;IGNORE;<U0040>
--<U00A4>	IGNORE;IGNORE;IGNORE;<U00A4>
--<U00A2>	IGNORE;IGNORE;IGNORE;<U00A2>
--<U0024>	IGNORE;IGNORE;IGNORE;<U0024>
--<U00A3>	IGNORE;IGNORE;IGNORE;<U00A3>
--<U00A5>	IGNORE;IGNORE;IGNORE;<U00A5>
--<U002A>	IGNORE;IGNORE;IGNORE;<U002A>
--<U005C>	IGNORE;IGNORE;IGNORE;<U005C>
--<U0026>	IGNORE;IGNORE;IGNORE;<U0026>
--<U0023>	IGNORE;IGNORE;IGNORE;<U0023>
--<U0025>	IGNORE;IGNORE;IGNORE;<U0025>
--<U207B>	IGNORE;IGNORE;IGNORE;<U207B>
--<U002B>	IGNORE;IGNORE;IGNORE;<U002B>
--<U207A>	IGNORE;IGNORE;IGNORE;<U207A>
--<U00B1>	IGNORE;IGNORE;IGNORE;<U00B1>
--<U00F7>	IGNORE;IGNORE;IGNORE;<U00F7>
--<U00D7>	IGNORE;IGNORE;IGNORE;<U00D7>
--<U2260>	IGNORE;IGNORE;IGNORE;<U2260>
--<U003C>	IGNORE;IGNORE;IGNORE;<U003C>
--<U2264>	IGNORE;IGNORE;IGNORE;<U2264>
--<U003D>	IGNORE;IGNORE;IGNORE;<U003D>
--<U2265>	IGNORE;IGNORE;IGNORE;<U2265>
--<U003E>	IGNORE;IGNORE;IGNORE;<U003E>
--<U00AC>	IGNORE;IGNORE;IGNORE;<U00AC>
--<U007C>	IGNORE;IGNORE;IGNORE;<U007C>
--<U00A6>	IGNORE;IGNORE;IGNORE;<U00A6>
--<U00B0>	IGNORE;IGNORE;IGNORE;<U00B0>
--<U00B5>	IGNORE;IGNORE;IGNORE;<U00B5>
--<U02C7>	IGNORE;IGNORE;IGNORE;<U02C7>
--<U02D8>	IGNORE;IGNORE;IGNORE;<U02D8>
--<U02D9>	IGNORE;IGNORE;IGNORE;<U02D9>
--<U02DA>	IGNORE;IGNORE;IGNORE;<U02DA>
--<U02DB>	IGNORE;IGNORE;IGNORE;<U02DB>
--<U02DC>	IGNORE;IGNORE;IGNORE;<U02DC>
--<U02DD>	IGNORE;IGNORE;IGNORE;<U02DD>
--<U0374>	IGNORE;IGNORE;IGNORE;<U0374>
--<U0375>	IGNORE;IGNORE;IGNORE;<U0375>
--<U037A>	IGNORE;IGNORE;IGNORE;<U037A>
--<U037E>	IGNORE;IGNORE;IGNORE;<U037E>
--<U0384>	IGNORE;IGNORE;IGNORE;<U0384>
--<U0385>	IGNORE;IGNORE;IGNORE;<U0385>
--<U0387>	IGNORE;IGNORE;IGNORE;<U0387>
--<U03D0>	IGNORE;IGNORE;IGNORE;<U03D0>
--<U1FBF>	IGNORE;IGNORE;IGNORE;<U1FBF>
--<U1FC0>	IGNORE;IGNORE;IGNORE;<U1FC0>
--<U1FC1>	IGNORE;IGNORE;IGNORE;<U1FC1>
--<U1FCD>	IGNORE;IGNORE;IGNORE;<U1FCD>
--<U1FCE>	IGNORE;IGNORE;IGNORE;<U1FCE>
--<U1FCF>	IGNORE;IGNORE;IGNORE;<U1FCF>
--<U1FDD>	IGNORE;IGNORE;IGNORE;<U1FDD>
--<U1FDE>	IGNORE;IGNORE;IGNORE;<U1FDE>
--<U1FDF>	IGNORE;IGNORE;IGNORE;<U1FDF>
--<U1FED>	IGNORE;IGNORE;IGNORE;<U1FED>
--<U1FEF>	IGNORE;IGNORE;IGNORE;<U1FEF>
--<U1FFE>	IGNORE;IGNORE;IGNORE;<U1FFE>
--<U2002>	IGNORE;IGNORE;IGNORE;<U2002>
--<U2003>	IGNORE;IGNORE;IGNORE;<U2003>
--<U2004>	IGNORE;IGNORE;IGNORE;<U2004>
--<U2005>	IGNORE;IGNORE;IGNORE;<U2005>
--<U2006>	IGNORE;IGNORE;IGNORE;<U2006>
--<U200E>	IGNORE;IGNORE;IGNORE;<U200E>
--<U200F>	IGNORE;IGNORE;IGNORE;<U200F>
--<U2009>	IGNORE;IGNORE;IGNORE;<U2009>
--<U200A>	IGNORE;IGNORE;IGNORE;<U200A>
--<U2010>	IGNORE;IGNORE;IGNORE;<U2010>
--<U2013>	IGNORE;IGNORE;IGNORE;<U2013>
--<U2014>	IGNORE;IGNORE;IGNORE;<U2014>
--<U2015>	IGNORE;IGNORE;IGNORE;<U2015>
--<U2016>	IGNORE;IGNORE;IGNORE;<U2016>
--<U2017>	IGNORE;IGNORE;IGNORE;<U2017>
--<U201A>	IGNORE;IGNORE;IGNORE;<U201A>
--<U201B>	IGNORE;IGNORE;IGNORE;<U201B>
--<U201E>	IGNORE;IGNORE;IGNORE;<U201E>
--<U201F>	IGNORE;IGNORE;IGNORE;<U201F>
--<U2020>	IGNORE;IGNORE;IGNORE;<U2020>
--<U2021>	IGNORE;IGNORE;IGNORE;<U2021>
--<U2219>	IGNORE;IGNORE;IGNORE;<U2219>
--<U2025>	IGNORE;IGNORE;IGNORE;<U2025>
--<U2026>	IGNORE;IGNORE;IGNORE;<U2026>
--<U2030>	IGNORE;IGNORE;IGNORE;<U2030>
--<U2032>	IGNORE;IGNORE;IGNORE;<U2032>
--<U2033>	IGNORE;IGNORE;IGNORE;<U2033>
--<U2034>	IGNORE;IGNORE;IGNORE;<U2034>
--<U2035>	IGNORE;IGNORE;IGNORE;<U2035>
--<U2036>	IGNORE;IGNORE;IGNORE;<U2036>
--<U2037>	IGNORE;IGNORE;IGNORE;<U2037>
--<U2038>	IGNORE;IGNORE;IGNORE;<U2038>
--<U2039>	IGNORE;IGNORE;IGNORE;<U2039>
--<U203A>	IGNORE;IGNORE;IGNORE;<U203A>
--<U203B>	IGNORE;IGNORE;IGNORE;<U203B>
--<U203C>	IGNORE;IGNORE;IGNORE;<U203C>
--<U203E>	IGNORE;IGNORE;IGNORE;<U203E>
--<U207C>	IGNORE;IGNORE;IGNORE;<U207C>
--<U2080>	IGNORE;IGNORE;IGNORE;<U2080>
--<U2081>	IGNORE;IGNORE;IGNORE;<U2081>
--<U2082>	IGNORE;IGNORE;IGNORE;<U2082>
--<U2083>	IGNORE;IGNORE;IGNORE;<U2083>
--<U2084>	IGNORE;IGNORE;IGNORE;<U2084>
--<U2085>	IGNORE;IGNORE;IGNORE;<U2085>
--<U2086>	IGNORE;IGNORE;IGNORE;<U2086>
--<U2087>	IGNORE;IGNORE;IGNORE;<U2087>
--<U2088>	IGNORE;IGNORE;IGNORE;<U2088>
--<U2089>	IGNORE;IGNORE;IGNORE;<U2089>
--<U208A>	IGNORE;IGNORE;IGNORE;<U208A>
--<U208B>	IGNORE;IGNORE;IGNORE;<U208B>
--<U208C>	IGNORE;IGNORE;IGNORE;<U208C>
--<U208D>	IGNORE;IGNORE;IGNORE;<U208D>
--<U208E>	IGNORE;IGNORE;IGNORE;<U208E>
--<U20A3>	IGNORE;IGNORE;IGNORE;<U20A3>
--<U20A4>	IGNORE;IGNORE;IGNORE;<U20A4>
--<U20A7>	IGNORE;IGNORE;IGNORE;<U20A7>
--<U20A9>	IGNORE;IGNORE;IGNORE;<U20A9>
--<U2103>	IGNORE;IGNORE;IGNORE;<U2103>
--<U2105>	IGNORE;IGNORE;IGNORE;<U2105>
--<U2109>	IGNORE;IGNORE;IGNORE;<U2109>
--<U2116>	IGNORE;IGNORE;IGNORE;<U2116>
--<U2117>	IGNORE;IGNORE;IGNORE;<U2117>
--<U211E>	IGNORE;IGNORE;IGNORE;<U211E>
--<U2120>	IGNORE;IGNORE;IGNORE;<U2120>
--<U2122>	IGNORE;IGNORE;IGNORE;<U2122>
--<U2126>	IGNORE;IGNORE;IGNORE;<U2126>
--<U212B>	IGNORE;IGNORE;IGNORE;<U212B>
--<U2153>	IGNORE;IGNORE;IGNORE;<U2153>
--<U2154>	IGNORE;IGNORE;IGNORE;<U2154>
--<U2155>	IGNORE;IGNORE;IGNORE;<U2155>
--<U2156>	IGNORE;IGNORE;IGNORE;<U2156>
--<U2157>	IGNORE;IGNORE;IGNORE;<U2157>
--<U2158>	IGNORE;IGNORE;IGNORE;<U2158>
--<U2159>	IGNORE;IGNORE;IGNORE;<U2159>
--<U215A>	IGNORE;IGNORE;IGNORE;<U215A>
--<U2160>	IGNORE;IGNORE;IGNORE;<U2160>
--<U2161>	IGNORE;IGNORE;IGNORE;<U2161>
--<U2162>	IGNORE;IGNORE;IGNORE;<U2162>
--<U2163>	IGNORE;IGNORE;IGNORE;<U2163>
--<U2164>	IGNORE;IGNORE;IGNORE;<U2164>
--<U2165>	IGNORE;IGNORE;IGNORE;<U2165>
--<U2166>	IGNORE;IGNORE;IGNORE;<U2166>
--<U2167>	IGNORE;IGNORE;IGNORE;<U2167>
--<U2168>	IGNORE;IGNORE;IGNORE;<U2168>
--<U2169>	IGNORE;IGNORE;IGNORE;<U2169>
--<U216A>	IGNORE;IGNORE;IGNORE;<U216A>
--<U216B>	IGNORE;IGNORE;IGNORE;<U216B>
--<U216C>	IGNORE;IGNORE;IGNORE;<U216C>
--<U216D>	IGNORE;IGNORE;IGNORE;<U216D>
--<U216E>	IGNORE;IGNORE;IGNORE;<U216E>
--<U216F>	IGNORE;IGNORE;IGNORE;<U216F>
--<U2170>	IGNORE;IGNORE;IGNORE;<U2170>
--<U2171>	IGNORE;IGNORE;IGNORE;<U2171>
--<U2172>	IGNORE;IGNORE;IGNORE;<U2172>
--<U2173>	IGNORE;IGNORE;IGNORE;<U2173>
--<U2174>	IGNORE;IGNORE;IGNORE;<U2174>
--<U2175>	IGNORE;IGNORE;IGNORE;<U2175>
--<U2176>	IGNORE;IGNORE;IGNORE;<U2176>
--<U2177>	IGNORE;IGNORE;IGNORE;<U2177>
--<U2178>	IGNORE;IGNORE;IGNORE;<U2178>
--<U2179>	IGNORE;IGNORE;IGNORE;<U2179>
--<U217A>	IGNORE;IGNORE;IGNORE;<U217A>
--<U217B>	IGNORE;IGNORE;IGNORE;<U217B>
--<U217C>	IGNORE;IGNORE;IGNORE;<U217C>
--<U217D>	IGNORE;IGNORE;IGNORE;<U217D>
--<U217E>	IGNORE;IGNORE;IGNORE;<U217E>
--<U217F>	IGNORE;IGNORE;IGNORE;<U217F>
--<U2180>	IGNORE;IGNORE;IGNORE;<U2180>
--<U2181>	IGNORE;IGNORE;IGNORE;<U2181>
--<U2182>	IGNORE;IGNORE;IGNORE;<U2182>
--<U2191>	IGNORE;IGNORE;IGNORE;<U2191>
--<U2193>	IGNORE;IGNORE;IGNORE;<U2193>
--<U2194>	IGNORE;IGNORE;IGNORE;<U2194>
--<U2195>	IGNORE;IGNORE;IGNORE;<U2195>
--<U2196>	IGNORE;IGNORE;IGNORE;<U2196>
--<U2197>	IGNORE;IGNORE;IGNORE;<U2197>
--<U2198>	IGNORE;IGNORE;IGNORE;<U2198>
--<U2199>	IGNORE;IGNORE;IGNORE;<U2199>
--<U21A8>	IGNORE;IGNORE;IGNORE;<U21A8>
--<U21C0>	IGNORE;IGNORE;IGNORE;<U21C0>
--<U21D0>	IGNORE;IGNORE;IGNORE;<U21D0>
--<U21D2>	IGNORE;IGNORE;IGNORE;<U21D2>
--<U21D4>	IGNORE;IGNORE;IGNORE;<U21D4>
--<U2200>	IGNORE;IGNORE;IGNORE;<U2200>
--<U2202>	IGNORE;IGNORE;IGNORE;<U2202>
--<U2203>	IGNORE;IGNORE;IGNORE;<U2203>
--<U2205>	IGNORE;IGNORE;IGNORE;<U2205>
--<U2206>	IGNORE;IGNORE;IGNORE;<U2206>
--<U2207>	IGNORE;IGNORE;IGNORE;<U2207>
--<U2208>	IGNORE;IGNORE;IGNORE;<U2208>
--<U220B>	IGNORE;IGNORE;IGNORE;<U220B>
--<U220F>	IGNORE;IGNORE;IGNORE;<U220F>
--<U2211>	IGNORE;IGNORE;IGNORE;<U2211>
--<U2212>	IGNORE;IGNORE;IGNORE;<U2212>
--<U2213>	IGNORE;IGNORE;IGNORE;<U2213>
--<U2214>	IGNORE;IGNORE;IGNORE;<U2214>
--<U2044>	IGNORE;IGNORE;IGNORE;<U2044>
--<U2217>	IGNORE;IGNORE;IGNORE;<U2217>
--<U2218>	IGNORE;IGNORE;IGNORE;<U2218>
--<U2022>	IGNORE;IGNORE;IGNORE;<U2022>
--<U221A>	IGNORE;IGNORE;IGNORE;<U221A>
--<U221D>	IGNORE;IGNORE;IGNORE;<U221D>
--<U221E>	IGNORE;IGNORE;IGNORE;<U221E>
--<U221F>	IGNORE;IGNORE;IGNORE;<U221F>
--<U2220>	IGNORE;IGNORE;IGNORE;<U2220>
--<U2225>	IGNORE;IGNORE;IGNORE;<U2225>
--<U2227>	IGNORE;IGNORE;IGNORE;<U2227>
--<U2228>	IGNORE;IGNORE;IGNORE;<U2228>
--<U2229>	IGNORE;IGNORE;IGNORE;<U2229>
--<U222A>	IGNORE;IGNORE;IGNORE;<U222A>
--<U222B>	IGNORE;IGNORE;IGNORE;<U222B>
--<U222C>	IGNORE;IGNORE;IGNORE;<U222C>
--<U222E>	IGNORE;IGNORE;IGNORE;<U222E>
--<U2234>	IGNORE;IGNORE;IGNORE;<U2234>
--<U2235>	IGNORE;IGNORE;IGNORE;<U2235>
--<U2236>	IGNORE;IGNORE;IGNORE;<U2236>
--<U2237>	IGNORE;IGNORE;IGNORE;<U2237>
--<U223C>	IGNORE;IGNORE;IGNORE;<U223C>
--<U223E>	IGNORE;IGNORE;IGNORE;<U223E>
--<U2243>	IGNORE;IGNORE;IGNORE;<U2243>
--<U2245>	IGNORE;IGNORE;IGNORE;<U2245>
--<U2248>	IGNORE;IGNORE;IGNORE;<U2248>
--<U224C>	IGNORE;IGNORE;IGNORE;<U224C>
--<U2253>	IGNORE;IGNORE;IGNORE;<U2253>
--<U2261>	IGNORE;IGNORE;IGNORE;<U2261>
--<U226A>	IGNORE;IGNORE;IGNORE;<U226A>
--<U226B>	IGNORE;IGNORE;IGNORE;<U226B>
--<U226E>	IGNORE;IGNORE;IGNORE;<U226E>
--<U226F>	IGNORE;IGNORE;IGNORE;<U226F>
--<U2282>	IGNORE;IGNORE;IGNORE;<U2282>
--<U2283>	IGNORE;IGNORE;IGNORE;<U2283>
--<U2286>	IGNORE;IGNORE;IGNORE;<U2286>
--<U2287>	IGNORE;IGNORE;IGNORE;<U2287>
--<U2299>	IGNORE;IGNORE;IGNORE;<U2299>
--<U229A>	IGNORE;IGNORE;IGNORE;<U229A>
--<U22A5>	IGNORE;IGNORE;IGNORE;<U22A5>
--<U22C5>	IGNORE;IGNORE;IGNORE;<U22C5>
--<U22EE>	IGNORE;IGNORE;IGNORE;<U22EE>
--<U2302>	IGNORE;IGNORE;IGNORE;<U2302>
--<U2308>	IGNORE;IGNORE;IGNORE;<U2308>
--<U2309>	IGNORE;IGNORE;IGNORE;<U2309>
--<U230A>	IGNORE;IGNORE;IGNORE;<U230A>
--<U230B>	IGNORE;IGNORE;IGNORE;<U230B>
--<U2310>	IGNORE;IGNORE;IGNORE;<U2310>
--<U2312>	IGNORE;IGNORE;IGNORE;<U2312>
--<U2315>	IGNORE;IGNORE;IGNORE;<U2315>
--<U2320>	IGNORE;IGNORE;IGNORE;<U2320>
--<U2321>	IGNORE;IGNORE;IGNORE;<U2321>
--<U2423>	IGNORE;IGNORE;IGNORE;<U2423>
--<U2440>	IGNORE;IGNORE;IGNORE;<U2440>
--<U2441>	IGNORE;IGNORE;IGNORE;<U2441>
--<U2442>	IGNORE;IGNORE;IGNORE;<U2442>
--<U2443>	IGNORE;IGNORE;IGNORE;<U2443>
--<U2446>	IGNORE;IGNORE;IGNORE;<U2446>
--<U2447>	IGNORE;IGNORE;IGNORE;<U2447>
--<U2448>	IGNORE;IGNORE;IGNORE;<U2448>
--<U2449>	IGNORE;IGNORE;IGNORE;<U2449>
--<U2460>	IGNORE;IGNORE;IGNORE;<U2460>
--<U2461>	IGNORE;IGNORE;IGNORE;<U2461>
--<U2462>	IGNORE;IGNORE;IGNORE;<U2462>
--<U2463>	IGNORE;IGNORE;IGNORE;<U2463>
--<U2464>	IGNORE;IGNORE;IGNORE;<U2464>
--<U2465>	IGNORE;IGNORE;IGNORE;<U2465>
--<U2466>	IGNORE;IGNORE;IGNORE;<U2466>
--<U2467>	IGNORE;IGNORE;IGNORE;<U2467>
--<U2468>	IGNORE;IGNORE;IGNORE;<U2468>
--<U2469>	IGNORE;IGNORE;IGNORE;<U2469>
--<U246A>	IGNORE;IGNORE;IGNORE;<U246A>
--<U246B>	IGNORE;IGNORE;IGNORE;<U246B>
--<U246C>	IGNORE;IGNORE;IGNORE;<U246C>
--<U246D>	IGNORE;IGNORE;IGNORE;<U246D>
--<U246E>	IGNORE;IGNORE;IGNORE;<U246E>
--<U246F>	IGNORE;IGNORE;IGNORE;<U246F>
--<U2470>	IGNORE;IGNORE;IGNORE;<U2470>
--<U2471>	IGNORE;IGNORE;IGNORE;<U2471>
--<U2472>	IGNORE;IGNORE;IGNORE;<U2472>
--<U2473>	IGNORE;IGNORE;IGNORE;<U2473>
--<U2474>	IGNORE;IGNORE;IGNORE;<U2474>
--<U2475>	IGNORE;IGNORE;IGNORE;<U2475>
--<U2476>	IGNORE;IGNORE;IGNORE;<U2476>
--<U2477>	IGNORE;IGNORE;IGNORE;<U2477>
--<U2478>	IGNORE;IGNORE;IGNORE;<U2478>
--<U2479>	IGNORE;IGNORE;IGNORE;<U2479>
--<U247A>	IGNORE;IGNORE;IGNORE;<U247A>
--<U247B>	IGNORE;IGNORE;IGNORE;<U247B>
--<U247C>	IGNORE;IGNORE;IGNORE;<U247C>
--<U247D>	IGNORE;IGNORE;IGNORE;<U247D>
--<U247E>	IGNORE;IGNORE;IGNORE;<U247E>
--<U247F>	IGNORE;IGNORE;IGNORE;<U247F>
--<U2480>	IGNORE;IGNORE;IGNORE;<U2480>
--<U2481>	IGNORE;IGNORE;IGNORE;<U2481>
--<U2482>	IGNORE;IGNORE;IGNORE;<U2482>
--<U2483>	IGNORE;IGNORE;IGNORE;<U2483>
--<U2484>	IGNORE;IGNORE;IGNORE;<U2484>
--<U2485>	IGNORE;IGNORE;IGNORE;<U2485>
--<U2486>	IGNORE;IGNORE;IGNORE;<U2486>
--<U2487>	IGNORE;IGNORE;IGNORE;<U2487>
--<U2488>	IGNORE;IGNORE;IGNORE;<U2488>
--<U2489>	IGNORE;IGNORE;IGNORE;<U2489>
--<U248A>	IGNORE;IGNORE;IGNORE;<U248A>
--<U248B>	IGNORE;IGNORE;IGNORE;<U248B>
--<U248C>	IGNORE;IGNORE;IGNORE;<U248C>
--<U248D>	IGNORE;IGNORE;IGNORE;<U248D>
--<U248E>	IGNORE;IGNORE;IGNORE;<U248E>
--<U248F>	IGNORE;IGNORE;IGNORE;<U248F>
--<U2490>	IGNORE;IGNORE;IGNORE;<U2490>
--<U2491>	IGNORE;IGNORE;IGNORE;<U2491>
--<U2492>	IGNORE;IGNORE;IGNORE;<U2492>
--<U2493>	IGNORE;IGNORE;IGNORE;<U2493>
--<U2494>	IGNORE;IGNORE;IGNORE;<U2494>
--<U2495>	IGNORE;IGNORE;IGNORE;<U2495>
--<U2496>	IGNORE;IGNORE;IGNORE;<U2496>
--<U2497>	IGNORE;IGNORE;IGNORE;<U2497>
--<U2498>	IGNORE;IGNORE;IGNORE;<U2498>
--<U2499>	IGNORE;IGNORE;IGNORE;<U2499>
--<U249A>	IGNORE;IGNORE;IGNORE;<U249A>
--<U249B>	IGNORE;IGNORE;IGNORE;<U249B>
--<U24EA>	IGNORE;IGNORE;IGNORE;<U24EA>
--<U2500>	IGNORE;IGNORE;IGNORE;<U2500>
--<U2550>	IGNORE;IGNORE;IGNORE;<U2550>
--<U2502>	IGNORE;IGNORE;IGNORE;<U2502>
--<U2551>	IGNORE;IGNORE;IGNORE;<U2551>
--<U2504>	IGNORE;IGNORE;IGNORE;<U2504>
--<U2505>	IGNORE;IGNORE;IGNORE;<U2505>
--<U2506>	IGNORE;IGNORE;IGNORE;<U2506>
--<U2507>	IGNORE;IGNORE;IGNORE;<U2507>
--<U2508>	IGNORE;IGNORE;IGNORE;<U2508>
--<U2509>	IGNORE;IGNORE;IGNORE;<U2509>
--<U250A>	IGNORE;IGNORE;IGNORE;<U250A>
--<U250B>	IGNORE;IGNORE;IGNORE;<U250B>
--<U250C>	IGNORE;IGNORE;IGNORE;<U250C>
--<U2552>	IGNORE;IGNORE;IGNORE;<U2552>
--<U2553>	IGNORE;IGNORE;IGNORE;<U2553>
--<U2554>	IGNORE;IGNORE;IGNORE;<U2554>
--<U2510>	IGNORE;IGNORE;IGNORE;<U2510>
--<U2555>	IGNORE;IGNORE;IGNORE;<U2555>
--<U2556>	IGNORE;IGNORE;IGNORE;<U2556>
--<U2557>	IGNORE;IGNORE;IGNORE;<U2557>
--<U2514>	IGNORE;IGNORE;IGNORE;<U2514>
--<U2558>	IGNORE;IGNORE;IGNORE;<U2558>
--<U2559>	IGNORE;IGNORE;IGNORE;<U2559>
--<U255A>	IGNORE;IGNORE;IGNORE;<U255A>
--<U2518>	IGNORE;IGNORE;IGNORE;<U2518>
--<U255B>	IGNORE;IGNORE;IGNORE;<U255B>
--<U255C>	IGNORE;IGNORE;IGNORE;<U255C>
--<U255D>	IGNORE;IGNORE;IGNORE;<U255D>
--<U251C>	IGNORE;IGNORE;IGNORE;<U251C>
--<U255E>	IGNORE;IGNORE;IGNORE;<U255E>
--<U251E>	IGNORE;IGNORE;IGNORE;<U251E>
--<U251F>	IGNORE;IGNORE;IGNORE;<U251F>
--<U255F>	IGNORE;IGNORE;IGNORE;<U255F>
--<U2521>	IGNORE;IGNORE;IGNORE;<U2521>
--<U2522>	IGNORE;IGNORE;IGNORE;<U2522>
--<U2560>	IGNORE;IGNORE;IGNORE;<U2560>
--<U2524>	IGNORE;IGNORE;IGNORE;<U2524>
--<U2561>	IGNORE;IGNORE;IGNORE;<U2561>
--<U2526>	IGNORE;IGNORE;IGNORE;<U2526>
--<U2527>	IGNORE;IGNORE;IGNORE;<U2527>
--<U2562>	IGNORE;IGNORE;IGNORE;<U2562>
--<U2529>	IGNORE;IGNORE;IGNORE;<U2529>
--<U252A>	IGNORE;IGNORE;IGNORE;<U252A>
--<U2563>	IGNORE;IGNORE;IGNORE;<U2563>
--<U252C>	IGNORE;IGNORE;IGNORE;<U252C>
--<U252D>	IGNORE;IGNORE;IGNORE;<U252D>
--<U252E>	IGNORE;IGNORE;IGNORE;<U252E>
--<U2564>	IGNORE;IGNORE;IGNORE;<U2564>
--<U2565>	IGNORE;IGNORE;IGNORE;<U2565>
--<U2531>	IGNORE;IGNORE;IGNORE;<U2531>
--<U2532>	IGNORE;IGNORE;IGNORE;<U2532>
--<U2566>	IGNORE;IGNORE;IGNORE;<U2566>
--<U2534>	IGNORE;IGNORE;IGNORE;<U2534>
--<U2535>	IGNORE;IGNORE;IGNORE;<U2535>
--<U2536>	IGNORE;IGNORE;IGNORE;<U2536>
--<U2567>	IGNORE;IGNORE;IGNORE;<U2567>
--<U2568>	IGNORE;IGNORE;IGNORE;<U2568>
--<U2539>	IGNORE;IGNORE;IGNORE;<U2539>
--<U253A>	IGNORE;IGNORE;IGNORE;<U253A>
--<U2569>	IGNORE;IGNORE;IGNORE;<U2569>
--<U253C>	IGNORE;IGNORE;IGNORE;<U253C>
--<U253D>	IGNORE;IGNORE;IGNORE;<U253D>
--<U253E>	IGNORE;IGNORE;IGNORE;<U253E>
--<U256A>	IGNORE;IGNORE;IGNORE;<U256A>
--<U2540>	IGNORE;IGNORE;IGNORE;<U2540>
--<U2541>	IGNORE;IGNORE;IGNORE;<U2541>
--<U256B>	IGNORE;IGNORE;IGNORE;<U256B>
--<U2543>	IGNORE;IGNORE;IGNORE;<U2543>
--<U2544>	IGNORE;IGNORE;IGNORE;<U2544>
--<U2545>	IGNORE;IGNORE;IGNORE;<U2545>
--<U2546>	IGNORE;IGNORE;IGNORE;<U2546>
--<U2547>	IGNORE;IGNORE;IGNORE;<U2547>
--<U2548>	IGNORE;IGNORE;IGNORE;<U2548>
--<U2549>	IGNORE;IGNORE;IGNORE;<U2549>
--<U254A>	IGNORE;IGNORE;IGNORE;<U254A>
--<U256C>	IGNORE;IGNORE;IGNORE;<U256C>
--<U2571>	IGNORE;IGNORE;IGNORE;<U2571>
--<U2572>	IGNORE;IGNORE;IGNORE;<U2572>
--<U2580>	IGNORE;IGNORE;IGNORE;<U2580>
--<U2584>	IGNORE;IGNORE;IGNORE;<U2584>
--<U2588>	IGNORE;IGNORE;IGNORE;<U2588>
--<U258C>	IGNORE;IGNORE;IGNORE;<U258C>
--<U2590>	IGNORE;IGNORE;IGNORE;<U2590>
--<U2591>	IGNORE;IGNORE;IGNORE;<U2591>
--<U2592>	IGNORE;IGNORE;IGNORE;<U2592>
--<U2593>	IGNORE;IGNORE;IGNORE;<U2593>
--<U25A0>	IGNORE;IGNORE;IGNORE;<U25A0>
--<U25A1>	IGNORE;IGNORE;IGNORE;<U25A1>
--<U25A2>	IGNORE;IGNORE;IGNORE;<U25A2>
--<U25A3>	IGNORE;IGNORE;IGNORE;<U25A3>
--<U25A4>	IGNORE;IGNORE;IGNORE;<U25A4>
--<U25A5>	IGNORE;IGNORE;IGNORE;<U25A5>
--<U25A6>	IGNORE;IGNORE;IGNORE;<U25A6>
--<U25A7>	IGNORE;IGNORE;IGNORE;<U25A7>
--<U25A8>	IGNORE;IGNORE;IGNORE;<U25A8>
--<U25A9>	IGNORE;IGNORE;IGNORE;<U25A9>
--<U25AA>	IGNORE;IGNORE;IGNORE;<U25AA>
--<U25AC>	IGNORE;IGNORE;IGNORE;<U25AC>
--<U25AD>	IGNORE;IGNORE;IGNORE;<U25AD>
--<U25B2>	IGNORE;IGNORE;IGNORE;<U25B2>
--<U25B3>	IGNORE;IGNORE;IGNORE;<U25B3>
--<U25B7>	IGNORE;IGNORE;IGNORE;<U25B7>
--<U25BA>	IGNORE;IGNORE;IGNORE;<U25BA>
--<U25BC>	IGNORE;IGNORE;IGNORE;<U25BC>
--<U25BD>	IGNORE;IGNORE;IGNORE;<U25BD>
--<U25C1>	IGNORE;IGNORE;IGNORE;<U25C1>
--<U25C4>	IGNORE;IGNORE;IGNORE;<U25C4>
--<U25C6>	IGNORE;IGNORE;IGNORE;<U25C6>
--<U25C7>	IGNORE;IGNORE;IGNORE;<U25C7>
--<U25CA>	IGNORE;IGNORE;IGNORE;<U25CA>
--<U25CB>	IGNORE;IGNORE;IGNORE;<U25CB>
--<U25CE>	IGNORE;IGNORE;IGNORE;<U25CE>
--<U25CF>	IGNORE;IGNORE;IGNORE;<U25CF>
--<U25D0>	IGNORE;IGNORE;IGNORE;<U25D0>
--<U25D1>	IGNORE;IGNORE;IGNORE;<U25D1>
--<U25D8>	IGNORE;IGNORE;IGNORE;<U25D8>
--<U25D9>	IGNORE;IGNORE;IGNORE;<U25D9>
--<U25E2>	IGNORE;IGNORE;IGNORE;<U25E2>
--<U25E3>	IGNORE;IGNORE;IGNORE;<U25E3>
--<U25EF>	IGNORE;IGNORE;IGNORE;<U25EF>
--<U2605>	IGNORE;IGNORE;IGNORE;<U2605>
--<U2606>	IGNORE;IGNORE;IGNORE;<U2606>
--<U260E>	IGNORE;IGNORE;IGNORE;<U260E>
--<U260F>	IGNORE;IGNORE;IGNORE;<U260F>
--<U261C>	IGNORE;IGNORE;IGNORE;<U261C>
--<U261E>	IGNORE;IGNORE;IGNORE;<U261E>
--<U263A>	IGNORE;IGNORE;IGNORE;<U263A>
--<U263B>	IGNORE;IGNORE;IGNORE;<U263B>
--<U263C>	IGNORE;IGNORE;IGNORE;<U263C>
--<U2640>	IGNORE;IGNORE;IGNORE;<U2640>
--<U2642>	IGNORE;IGNORE;IGNORE;<U2642>
--<U2660>	IGNORE;IGNORE;IGNORE;<U2660>
--<U2661>	IGNORE;IGNORE;IGNORE;<U2661>
--<U2662>	IGNORE;IGNORE;IGNORE;<U2662>
--<U2663>	IGNORE;IGNORE;IGNORE;<U2663>
--<U2664>	IGNORE;IGNORE;IGNORE;<U2664>
--<U2665>	IGNORE;IGNORE;IGNORE;<U2665>
--<U2666>	IGNORE;IGNORE;IGNORE;<U2666>
--<U2667>	IGNORE;IGNORE;IGNORE;<U2667>
--<U2669>	IGNORE;IGNORE;IGNORE;<U2669>
--<U266A>	IGNORE;IGNORE;IGNORE;<U266A>
--<U266B>	IGNORE;IGNORE;IGNORE;<U266B>
--<U266C>	IGNORE;IGNORE;IGNORE;<U266C>
--<U266D>	IGNORE;IGNORE;IGNORE;<U266D>
--<U266E>	IGNORE;IGNORE;IGNORE;<U266E>
--<U266F>	IGNORE;IGNORE;IGNORE;<U266F>
--<U2713>	IGNORE;IGNORE;IGNORE;<U2713>
--<U2717>	IGNORE;IGNORE;IGNORE;<U2717>
--<U2720>	IGNORE;IGNORE;IGNORE;<U2720>
--<U3000>	IGNORE;IGNORE;IGNORE;<U3000>
--<U3001>	IGNORE;IGNORE;IGNORE;<U3001>
--<U3002>	IGNORE;IGNORE;IGNORE;<U3002>
--<U3003>	IGNORE;IGNORE;IGNORE;<U3003>
--<U3004>	IGNORE;IGNORE;IGNORE;<U3004>
--<U3005>	IGNORE;IGNORE;IGNORE;<U3005>
--<U3006>	IGNORE;IGNORE;IGNORE;<U3006>
--<U3007>	IGNORE;IGNORE;IGNORE;<U3007>
--<U300A>	IGNORE;IGNORE;IGNORE;<U300A>
--<U300B>	IGNORE;IGNORE;IGNORE;<U300B>
--<U300C>	IGNORE;IGNORE;IGNORE;<U300C>
--<U300D>	IGNORE;IGNORE;IGNORE;<U300D>
--<U300E>	IGNORE;IGNORE;IGNORE;<U300E>
--<U300F>	IGNORE;IGNORE;IGNORE;<U300F>
--<U3010>	IGNORE;IGNORE;IGNORE;<U3010>
--<U3011>	IGNORE;IGNORE;IGNORE;<U3011>
--<U3012>	IGNORE;IGNORE;IGNORE;<U3012>
--<U3013>	IGNORE;IGNORE;IGNORE;<U3013>
--<U3014>	IGNORE;IGNORE;IGNORE;<U3014>
--<U3015>	IGNORE;IGNORE;IGNORE;<U3015>
--<U3016>	IGNORE;IGNORE;IGNORE;<U3016>
--<U3017>	IGNORE;IGNORE;IGNORE;<U3017>
--<U301C>	IGNORE;IGNORE;IGNORE;<U301C>
--<U3020>	IGNORE;IGNORE;IGNORE;<U3020>
--<U309B>	IGNORE;IGNORE;IGNORE;<U309B>
--<U309C>	IGNORE;IGNORE;IGNORE;<U309C>
--<U309D>	IGNORE;IGNORE;IGNORE;<U309D>
--<U309E>	IGNORE;IGNORE;IGNORE;<U309E>
--<U30FB>	IGNORE;IGNORE;IGNORE;<U30FB>
--<U30FC>	IGNORE;IGNORE;IGNORE;<U30FC>
--<U30FD>	IGNORE;IGNORE;IGNORE;<U30FD>
--<U30FE>	IGNORE;IGNORE;IGNORE;<U30FE>
--<U321C>	IGNORE;IGNORE;IGNORE;<U321C>
--<U3220>	IGNORE;IGNORE;IGNORE;<U3220>
--<U3221>	IGNORE;IGNORE;IGNORE;<U3221>
--<U3222>	IGNORE;IGNORE;IGNORE;<U3222>
--<U3223>	IGNORE;IGNORE;IGNORE;<U3223>
--<U3224>	IGNORE;IGNORE;IGNORE;<U3224>
--<U3225>	IGNORE;IGNORE;IGNORE;<U3225>
--<U3226>	IGNORE;IGNORE;IGNORE;<U3226>
--<U3227>	IGNORE;IGNORE;IGNORE;<U3227>
--<U3228>	IGNORE;IGNORE;IGNORE;<U3228>
--<U3229>	IGNORE;IGNORE;IGNORE;<U3229>
--<U327F>	IGNORE;IGNORE;IGNORE;<U327F>
--<U33C2>	IGNORE;IGNORE;IGNORE;<U33C2>
--<U33D8>	IGNORE;IGNORE;IGNORE;<U33D8>
--<U0000>	IGNORE;IGNORE;IGNORE;<U0000>
--<U0001>	IGNORE;IGNORE;IGNORE;<U0001>
--<U0002>	IGNORE;IGNORE;IGNORE;<U0002>
--<U0003>	IGNORE;IGNORE;IGNORE;<U0003>
--<U0004>	IGNORE;IGNORE;IGNORE;<U0004>
--<U0005>	IGNORE;IGNORE;IGNORE;<U0005>
--<U0006>	IGNORE;IGNORE;IGNORE;<U0006>
--<U0007>	IGNORE;IGNORE;IGNORE;<U0007>
--<U0008>	IGNORE;IGNORE;IGNORE;<U0008>
--<U000E>	IGNORE;IGNORE;IGNORE;<U000E>
--<U000F>	IGNORE;IGNORE;IGNORE;<U000F>
--<U0010>	IGNORE;IGNORE;IGNORE;<U0010>
--<U0011>	IGNORE;IGNORE;IGNORE;<U0011>
--<U0012>	IGNORE;IGNORE;IGNORE;<U0012>
--<U0013>	IGNORE;IGNORE;IGNORE;<U0013>
--<U0014>	IGNORE;IGNORE;IGNORE;<U0014>
--<U0015>	IGNORE;IGNORE;IGNORE;<U0015>
--<U0016>	IGNORE;IGNORE;IGNORE;<U0016>
--<U0017>	IGNORE;IGNORE;IGNORE;<U0017>
--<U0018>	IGNORE;IGNORE;IGNORE;<U0018>
--<U0019>	IGNORE;IGNORE;IGNORE;<U0019>
--<U001A>	IGNORE;IGNORE;IGNORE;<U001A>
--<U001B>	IGNORE;IGNORE;IGNORE;<U001B>
--<U001C>	IGNORE;IGNORE;IGNORE;<U001C>
--<U001D>	IGNORE;IGNORE;IGNORE;<U001D>
--<U001E>	IGNORE;IGNORE;IGNORE;<U001E>
--<U001F>	IGNORE;IGNORE;IGNORE;<U001F>
--<U007F>	IGNORE;IGNORE;IGNORE;<U007F>
--<U0080>	IGNORE;IGNORE;IGNORE;<U0080>
--<U0081>	IGNORE;IGNORE;IGNORE;<U0081>
--<U0082>	IGNORE;IGNORE;IGNORE;<U0082>
--<U0083>	IGNORE;IGNORE;IGNORE;<U0083>
--<U0084>	IGNORE;IGNORE;IGNORE;<U0084>
--<U0085>	IGNORE;IGNORE;IGNORE;<U0085>
--<U0086>	IGNORE;IGNORE;IGNORE;<U0086>
--<U0087>	IGNORE;IGNORE;IGNORE;<U0087>
--<U0088>	IGNORE;IGNORE;IGNORE;<U0088>
--<U0089>	IGNORE;IGNORE;IGNORE;<U0089>
--<U008A>	IGNORE;IGNORE;IGNORE;<U008A>
--<U008B>	IGNORE;IGNORE;IGNORE;<U008B>
--<U008C>	IGNORE;IGNORE;IGNORE;<U008C>
--<U008D>	IGNORE;IGNORE;IGNORE;<U008D>
--<U008E>	IGNORE;IGNORE;IGNORE;<U008E>
--<U008F>	IGNORE;IGNORE;IGNORE;<U008F>
--<U0090>	IGNORE;IGNORE;IGNORE;<U0090>
--<U0091>	IGNORE;IGNORE;IGNORE;<U0091>
--<U0092>	IGNORE;IGNORE;IGNORE;<U0092>
--<U0093>	IGNORE;IGNORE;IGNORE;<U0093>
--<U0094>	IGNORE;IGNORE;IGNORE;<U0094>
--<U0095>	IGNORE;IGNORE;IGNORE;<U0095>
--<U0096>	IGNORE;IGNORE;IGNORE;<U0096>
--<U0097>	IGNORE;IGNORE;IGNORE;<U0097>
--<U0098>	IGNORE;IGNORE;IGNORE;<U0098>
--<U0099>	IGNORE;IGNORE;IGNORE;<U0099>
--<U009A>	IGNORE;IGNORE;IGNORE;<U009A>
--<U009B>	IGNORE;IGNORE;IGNORE;<U009B>
--<U009C>	IGNORE;IGNORE;IGNORE;<U009C>
--<U009D>	IGNORE;IGNORE;IGNORE;<U009D>
--<U009E>	IGNORE;IGNORE;IGNORE;<U009E>
--<U009F>	IGNORE;IGNORE;IGNORE;<U009F>
--<UE000>	IGNORE;IGNORE;IGNORE;<UE000>
--<UE001>	IGNORE;IGNORE;IGNORE;<UE001>
--<UE002>	IGNORE;IGNORE;IGNORE;<UE002>
--<U0301>	IGNORE;IGNORE;IGNORE;<U0301>
--<UE004>	IGNORE;IGNORE;IGNORE;<UE004>
--<UE005>	IGNORE;IGNORE;IGNORE;<UE005>
--<UE006>	IGNORE;IGNORE;IGNORE;<UE006>
--<UE007>	IGNORE;IGNORE;IGNORE;<UE007>
--<UE008>	IGNORE;IGNORE;IGNORE;<UE008>
--<UE009>	IGNORE;IGNORE;IGNORE;<UE009>
--<UE00A>	IGNORE;IGNORE;IGNORE;<UE00A>
--<UE00B>	IGNORE;IGNORE;IGNORE;<UE00B>
--<UE00C>	IGNORE;IGNORE;IGNORE;<UE00C>
--<UE00D>	IGNORE;IGNORE;IGNORE;<UE00D>
--<UE00E>	IGNORE;IGNORE;IGNORE;<UE00E>
--<UE00F>	IGNORE;IGNORE;IGNORE;<UE00F>
--<"=>	IGNORE;IGNORE;IGNORE;<"=>
--<UE011>	IGNORE;IGNORE;IGNORE;<UE011>
--<UE012>	IGNORE;IGNORE;IGNORE;<UE012>
--<UE013>	IGNORE;IGNORE;IGNORE;<UE013>
--<UE014>	IGNORE;IGNORE;IGNORE;<UE014>
--<UE015>	IGNORE;IGNORE;IGNORE;<UE015>
--<UE017>	IGNORE;IGNORE;IGNORE;<UE017>
--<UE018>	IGNORE;IGNORE;IGNORE;<UE018>
--<UE019>	IGNORE;IGNORE;IGNORE;<UE019>
--UNDEFINED	IGNORE;IGNORE;IGNORE
--
--<U0030>	<U0030>;<U0030>;IGNORE;IGNORE
--<U2070>	<U0030>;<U2070>;IGNORE;IGNORE
--<U215B>	<U0030>;<U215B>;IGNORE;IGNORE
--<U00BC>	<U0030>;<U00BC>;IGNORE;IGNORE
--<U215C>	<U0030>;<U215C>;IGNORE;IGNORE
--<U00BD>	<U0030>;<U00BD>;IGNORE;IGNORE
--<U215D>	<U0030>;<U215D>;IGNORE;IGNORE
--<U00BE>	<U0030>;<U00BE>;IGNORE;IGNORE
--<U215E>	<U0030>;<U215E>;IGNORE;IGNORE
--<U0031>	<U0031>;<U0031>;IGNORE;IGNORE
--<U0032>	<U0032>;<U0032>;IGNORE;IGNORE
--<U0033>	<U0033>;<U0033>;IGNORE;IGNORE
--<U0034>	<U0034>;<U0034>;IGNORE;IGNORE
--<U0035>	<U0035>;<U0035>;IGNORE;IGNORE
--<U0036>	<U0036>;<U0036>;IGNORE;IGNORE
--<U0037>	<U0037>;<U0037>;IGNORE;IGNORE
--<U0038>	<U0038>;<U0038>;IGNORE;IGNORE
--<U0039>	<U0039>;<U0039>;IGNORE;IGNORE
--<U00B9>	<U0031>;<U00B9>;IGNORE;IGNORE
--<U00B2>	<U0032>;<U00B2>;IGNORE;IGNORE
--<U00B3>	<U0033>;<U00B3>;IGNORE;IGNORE
--<U2074>	<U0034>;<U2074>;IGNORE;IGNORE
--<U2075>	<U0035>;<U2075>;IGNORE;IGNORE
--<U2076>	<U0036>;<U2076>;IGNORE;IGNORE
--<U2077>	<U0037>;<U2077>;IGNORE;IGNORE
--<U2078>	<U0038>;<U2078>;IGNORE;IGNORE
--<U2079>	<U0039>;<U2079>;IGNORE;IGNORE
--<U0041>	<U0041>;<NONE>;<CAPITAL>;IGNORE
--<U0061>	<U0041>;<NONE>;<SMALL>;IGNORE
--<U00AA>	<U0041>;<NONE>;<U00AA>;IGNORE
--<U00C1>	<U0041>;<ACUTE>;<CAPITAL>;IGNORE
--<U00E1>	<U0041>;<ACUTE>;<SMALL>;IGNORE
--<U00C0>	<U0041>;<GRAVE>;<CAPITAL>;IGNORE
--<U00E0>	<U0041>;<GRAVE>;<SMALL>;IGNORE
--<U0200>	<U0041>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
--<U0201>	<U0041>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
--<U0102>	<U0041>;<BREVE>;<CAPITAL>;IGNORE
--<U0103>	<U0041>;<BREVE>;<SMALL>;IGNORE
--<U1EAE>	<U0041>;<BREVE+ACUTE>;<CAPITAL>;IGNORE
--<U1EAF>	<U0041>;<BREVE+ACUTE>;<SMALL>;IGNORE
--<U1EB0>	<U0041>;<BREVE+GRAVE>;<CAPITAL>;IGNORE
--<U1EB1>	<U0041>;<BREVE+GRAVE>;<SMALL>;IGNORE
--<U1EB2>	<U0041>;<BREVE+HOOK>;<CAPITAL>;IGNORE
--<U1EB3>	<U0041>;<BREVE+HOOK>;<SMALL>;IGNORE
--<U1EB4>	<U0041>;<BREVE+TILDE>;<CAPITAL>;IGNORE
--<U1EB5>	<U0041>;<BREVE+TILDE>;<SMALL>;IGNORE
--<U1EB6>	<U0041>;<BREVE+DOT-BELOW>;<CAPITAL>;IGNORE
--<U1EB7>	<U0041>;<BREVE+DOT-BELOW>;<SMALL>;IGNORE
--<U0202>	<U0041>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
--<U0203>	<U0041>;<INVERTED-BREVE>;<SMALL>;IGNORE
--<U00C2>	<U0041>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U00E2>	<U0041>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U1EA4>	<U0041>;<CIRCUMFLEX+ACUTE>;<CAPITAL>;IGNORE
--<U1EA5>	<U0041>;<CIRCUMFLEX+ACUTE>;<SMALL>;IGNORE
--<U1EA6>	<U0041>;<CIRCUMFLEX+GRAVE>;<CAPITAL>;IGNORE
--<U1EA7>	<U0041>;<CIRCUMFLEX+GRAVE>;<SMALL>;IGNORE
--<U1EA8>	<U0041>;<CIRCUMFLEX+HOOK>;<CAPITAL>;IGNORE
--<U1EA9>	<U0041>;<CIRCUMFLEX+HOOK>;<SMALL>;IGNORE
--<U1EAA>	<U0041>;<CIRCUMFLEX+TILDE>;<CAPITAL>;IGNORE
--<U1EAB>	<U0041>;<CIRCUMFLEX+TILDE>;<SMALL>;IGNORE
--<U1EAC>	<U0041>;<CIRCUMFLEX+DOT-BELOW>;<CAPITAL>;IGNORE
--<U1EAD>	<U0041>;<CIRCUMFLEX+DOT-BELOW>;<SMALL>;IGNORE
--<U01CD>	<U0041>;<CARON>;<CAPITAL>;IGNORE
--<U01CE>	<U0041>;<CARON>;<SMALL>;IGNORE
--<U00C5>	<U0041>;<RING>;<CAPITAL>;IGNORE
--<U00E5>	<U0041>;<RING>;<SMALL>;IGNORE
--<U01FA>	<U0041>;<RING+ACUTE>;<CAPITAL>;IGNORE
--<U01FB>	<U0041>;<RING+ACUTE>;<SMALL>;IGNORE
--<U1E00>	<U0041>;<RING-BELOW>;<CAPITAL>;IGNORE
--<U1E01>	<U0041>;<RING-BELOW>;<SMALL>;IGNORE
--<U00C4>	<U0041>;<DIAERESIS>;<CAPITAL>;IGNORE
--<U00E4>	<U0041>;<DIAERESIS>;<SMALL>;IGNORE
--<U01DE>	<U0041>;<DIAERESIS+MACRON>;<CAPITAL>;IGNORE
--<U01DF>	<U0041>;<DIAERESIS+MACRON>;<SMALL>;IGNORE
--<U1EA2>	<U0041>;<HOOK>;<CAPITAL>;IGNORE
--<U1EA3>	<U0041>;<HOOK>;<SMALL>;IGNORE
--<U00C3>	<U0041>;<TILDE>;<CAPITAL>;IGNORE
--<U00E3>	<U0041>;<TILDE>;<SMALL>;IGNORE
--<U1EA0>	<U0041>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1EA1>	<U0041>;<DOT-BELOW>;<SMALL>;IGNORE
--<U0104>	<U0041>;<OGONEK>;<CAPITAL>;IGNORE
--<U0105>	<U0041>;<OGONEK>;<SMALL>;IGNORE
--<U0100>	<U0041>;<MACRON>;<CAPITAL>;IGNORE
--<U0101>	<U0041>;<MACRON>;<SMALL>;IGNORE
--<U01E0>	<U0041>;<MACRON+DOT>;<CAPITAL>;IGNORE
--<U01E1>	<U0041>;<MACRON+DOT>;<SMALL>;IGNORE
--<a8>
--<U00C6>	"<U0041><U0045>";"<U00C6><U00C6>";"<CAPITAL><CAPITAL>";IGNORE
--<U00E6>	"<U0041><U0045>";"<U00C6><U00C6>";"<SMALL><SMALL>";IGNORE
--<U01FC>	"<U0041><U0045>";"<U01FC><U01FC>";"<CAPITAL><CAPITAL>";IGNORE
--<U01FD>	"<U0041><U0045>";"<U01FC><U01FC>";"<SMALL><SMALL>";IGNORE
--<U01E2>	"<U0041><U0045>";"<U01E2><U01E2>";"<CAPITAL><CAPITAL>";IGNORE
--<U01E3>	"<U0041><U0045>";"<U01E2><U01E2>";"<SMALL><SMALL>";IGNORE
--<U0042>	<U0042>;<NONE>;<CAPITAL>;IGNORE
--<U0062>	<U0042>;<NONE>;<SMALL>;IGNORE
--<U1E02>	<U0042>;<DOT>;<CAPITAL>;IGNORE
--<U1E03>	<U0042>;<DOT>;<SMALL>;IGNORE
--<U1E04>	<U0042>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E05>	<U0042>;<DOT-BELOW>;<SMALL>;IGNORE
--<U1E06>	<U0042>;<LINE-BELOW>;<CAPITAL>;IGNORE
--<U1E07>	<U0042>;<LINE-BELOW>;<SMALL>;IGNORE
--<b8>
--<U0043>	<U0043>;<NONE>;<CAPITAL>;IGNORE
--<U0063>	<U0043>;<NONE>;<SMALL>;IGNORE
--<U0108>	<U0043>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U0109>	<U0043>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U0187>	<U0043>;<HOOK>;<CAPITAL>;IGNORE
--<U0188>	<U0043>;<HOOK>;<SMALL>;IGNORE
--<U010A>	<U0043>;<DOT>;<CAPITAL>;IGNORE
--<U010B>	<U0043>;<DOT>;<SMALL>;IGNORE
--<U00C7>	<U0043>;<CEDILLA>;<CAPITAL>;IGNORE
--<U00E7>	<U0043>;<CEDILLA>;<SMALL>;IGNORE
--<U1E08>	<U0043>;<CEDILLA+ACUTE>;<CAPITAL>;IGNORE
--<U1E09>	<U0043>;<CEDILLA+ACUTE>;<SMALL>;IGNORE
--<c8>
--<U010C>	<U010C>;<NONE>;<CAPITAL>;IGNORE
--<U010D>	<U010C>;<NONE>;<SMALL>;IGNORE
--<U0044>	<U0044>;<NONE>;<CAPITAL>;IGNORE
--<U0064>	<U0044>;<NONE>;<SMALL>;IGNORE
--<U010E>	<U0044>;<CARON>;<CAPITAL>;IGNORE
--<U010F>	<U0044>;<CARON>;<SMALL>;IGNORE
--<U1E0A>	<U0044>;<DOT>;<CAPITAL>;IGNORE
--<U1E0B>	<U0044>;<DOT>;<SMALL>;IGNORE
--<U1E0C>	<U0044>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E0D>	<U0044>;<DOT-BELOW>;<SMALL>;IGNORE
--<U0110>	<U0044>;<STROKE>;<CAPITAL>;IGNORE
--<U0111>	<U0044>;<STROKE>;<SMALL>;IGNORE
--<U1E10>	<U0044>;<CEDILLA>;<CAPITAL>;IGNORE
--<U1E11>	<U0044>;<CEDILLA>;<SMALL>;IGNORE
--<U1E12>	<U0044>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U1E13>	<U0044>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
--<U1E0E>	<U0044>;<LINE-BELOW>;<CAPITAL>;IGNORE
--<U1E0F>	<U0044>;<LINE-BELOW>;<SMALL>;IGNORE
--<d8>
--<D-Z'>	<D-Z'>;<NONE>;<CAPITAL>;IGNORE
--<D-z'>	<D-Z'>;<NONE>;<CAPITAL-SMALL>;IGNORE
--<d-Z'>	<D-Z'>;<NONE>;<SMALL-CAPITAL>;IGNORE
--<d-z'>	<D-Z'>;<NONE>;<SMALL>;IGNORE
--<U0045>	<U0045>;<NONE>;<CAPITAL>;IGNORE
--<U0065>	<U0045>;<NONE>;<SMALL>;IGNORE
--<U00C9>	<U0045>;<ACUTE>;<CAPITAL>;IGNORE
--<U00E9>	<U0045>;<ACUTE>;<SMALL>;IGNORE
--<U00C8>	<U0045>;<GRAVE>;<CAPITAL>;IGNORE
--<U00E8>	<U0045>;<GRAVE>;<SMALL>;IGNORE
--<U0204>	<U0045>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
--<U0205>	<U0045>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
--<U0114>	<U0045>;<BREVE>;<CAPITAL>;IGNORE
--<U0115>	<U0045>;<BREVE>;<SMALL>;IGNORE
--<U0206>	<U0045>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
--<U0207>	<U0045>;<INVERTED-BREVE>;<SMALL>;IGNORE
--<U00CA>	<U0045>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U00EA>	<U0045>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U1EBE>	<U0045>;<CIRCUMFLEX+ACUTE>;<CAPITAL>;IGNORE
--<U1EBF>	<U0045>;<CIRCUMFLEX+ACUTE>;<SMALL>;IGNORE
--<U1EC0>	<U0045>;<CIRCUMFLEX+GRAVE>;<CAPITAL>;IGNORE
--<U1EC1>	<U0045>;<CIRCUMFLEX+GRAVE>;<SMALL>;IGNORE
--<U1EC2>	<U0045>;<CIRCUMFLEX+HOOK>;<CAPITAL>;IGNORE
--<U1EC3>	<U0045>;<CIRCUMFLEX+HOOK>;<SMALL>;IGNORE
--<U1EC4>	<U0045>;<CIRCUMFLEX+TILDE>;<CAPITAL>;IGNORE
--<U1EC5>	<U0045>;<CIRCUMFLEX+TILDE>;<SMALL>;IGNORE
--<U1EC6>	<U0045>;<CIRCUMFLEX+DOT-BELOW>;<CAPITAL>;IGNORE
--<U1EC7>	<U0045>;<CIRCUMFLEX+DOT-BELOW>;<SMALL>;IGNORE
--<U00CB>	<U0045>;<DIAERESIS>;<CAPITAL>;IGNORE
--<U00EB>	<U0045>;<DIAERESIS>;<SMALL>;IGNORE
--<U1EBA>	<U0045>;<HOOK>;<CAPITAL>;IGNORE
--<U1EBB>	<U0045>;<HOOK>;<SMALL>;IGNORE
--<U1EBC>	<U0045>;<TILDE>;<CAPITAL>;IGNORE
--<U1EBD>	<U0045>;<TILDE>;<SMALL>;IGNORE
--<U1E1A>	<U0045>;<TILDE-BELOW>;<CAPITAL>;IGNORE
--<U1E1B>	<U0045>;<TILDE-BELOW>;<SMALL>;IGNORE
--<U0116>	<U0045>;<DOT>;<CAPITAL>;IGNORE
--<U0117>	<U0045>;<DOT>;<SMALL>;IGNORE
--<U1EB8>	<U0045>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1EB9>	<U0045>;<DOT-BELOW>;<SMALL>;IGNORE
--<U1E1C>	<U0045>;<CEDILLA+BREVE>;<CAPITAL>;IGNORE
--<U1E1D>	<U0045>;<CEDILLA+BREVE>;<SMALL>;IGNORE
--<U0118>	<U0045>;<OGONEK>;<CAPITAL>;IGNORE
--<U0119>	<U0045>;<OGONEK>;<SMALL>;IGNORE
--<U0112>	<U0045>;<MACRON>;<CAPITAL>;IGNORE
--<U0113>	<U0045>;<MACRON>;<SMALL>;IGNORE
--<U1E16>	<U0045>;<MACRON+ACUTE>;<CAPITAL>;IGNORE
--<U1E17>	<U0045>;<MACRON+ACUTE>;<SMALL>;IGNORE
--<U1E14>	<U0045>;<MACRON+GRAVE>;<CAPITAL>;IGNORE
--<U1E15>	<U0045>;<MACRON+GRAVE>;<SMALL>;IGNORE
--<U1E18>	<U0045>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U1E19>	<U0045>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
--<e8>
--<U011A>	<U011A>;<NONE>;<CAPITAL>;IGNORE
--<U011B>	<U011A>;<NONE>;<SMALL>;IGNORE
--<U0046>	<U0046>;<NONE>;<CAPITAL>;IGNORE
--<U0066>	<U0046>;<NONE>;<SMALL>;IGNORE
--<U0191>	<U0046>;<HOOK>;<CAPITAL>;IGNORE
--<U0192>	<U0046>;<HOOK>;<SMALL>;IGNORE
--<U1E1E>	<U0046>;<DOT>;<CAPITAL>;IGNORE
--<U1E1F>	<U0046>;<DOT>;<SMALL>;IGNORE
--<f8>
--<UFB00>	"<U0046><U0046>";"<NONE><NONE>";"<UFB00><UFB00>";IGNORE
--<UFB01>	"<U0046><U0049>";"<NONE><NONE>";"<UFB01><UFB01>";IGNORE
--<UFB02>	"<U0046><U004C>";"<NONE><NONE>";"<UFB02><UFB02>";IGNORE
--<UFB03>	"<U0046><U0046><U0049>";"<NONE><NONE><NONE>";"<UFB03><UFB03><UFB03>";IGNORE
--<UFB04>	"<U0046><U0046><U004C>";"<NONE><NONE><NONE>";"<UFB04><UFB04><UFB04>";IGNORE
--<U0047>	<U0047>;<NONE>;<CAPITAL>;IGNORE
--<U0067>	<U0047>;<NONE>;<SMALL>;IGNORE
--<U01F4>	<U0047>;<ACUTE>;<CAPITAL>;IGNORE
--<U01F5>	<U0047>;<ACUTE>;<SMALL>;IGNORE
--<U011E>	<U0047>;<BREVE>;<CAPITAL>;IGNORE
--<U011F>	<U0047>;<BREVE>;<SMALL>;IGNORE
--<U011C>	<U0047>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U011D>	<U0047>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U01E6>	<U0047>;<CARON>;<CAPITAL>;IGNORE
--<U01E7>	<U0047>;<CARON>;<SMALL>;IGNORE
--<U0120>	<U0047>;<DOT>;<CAPITAL>;IGNORE
--<U0121>	<U0047>;<DOT>;<SMALL>;IGNORE
--<U01E4>	<U0047>;<STROKE>;<CAPITAL>;IGNORE
--<U01E5>	<U0047>;<STROKE>;<SMALL>;IGNORE
--<U0122>	<U0047>;<CEDILLA>;<CAPITAL>;IGNORE
--<U0123>	<U0047>;<CEDILLA>;<SMALL>;IGNORE
--<U1E20>	<U0047>;<MACRON>;<CAPITAL>;IGNORE
--<U1E21>	<U0047>;<MACRON>;<SMALL>;IGNORE
--<g8>
--<U0048>	<U0048>;<NONE>;<CAPITAL>;IGNORE
--<U0068>	<U0048>;<NONE>;<SMALL>;IGNORE
--<U1E2A>	<U0048>;<BREVE-BELOW>;<CAPITAL>;IGNORE
--<U1E2B>	<U0048>;<BREVE-BELOW>;<SMALL>;IGNORE
--<U0124>	<U0048>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U0125>	<U0048>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U1E26>	<U0048>;<DIAERESIS>;<CAPITAL>;IGNORE
--<U1E27>	<U0048>;<DIAERESIS>;<SMALL>;IGNORE
--<U1E22>	<U0048>;<DOT>;<CAPITAL>;IGNORE
--<U1E23>	<U0048>;<DOT>;<SMALL>;IGNORE
--<U1E24>	<U0048>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E25>	<U0048>;<DOT-BELOW>;<SMALL>;IGNORE
--<U0126>	<U0048>;<STROKE>;<CAPITAL>;IGNORE
--<U0127>	<U0048>;<STROKE>;<SMALL>;IGNORE
--<U1E28>	<U0048>;<CEDILLA>;<CAPITAL>;IGNORE
--<U1E29>	<U0048>;<CEDILLA>;<SMALL>;IGNORE
--<h8>
--<C-H>	<C-H>;<NONE>;<CAPITAL>;IGNORE
--<C-h>	<C-H>;<NONE>;<CAPITAL-SMALL>;IGNORE
--<c-H>	<C-H>;<NONE>;<SMALL-CAPITAL>;IGNORE
--<c-h>	<C-H>;<NONE>;<SMALL>;IGNORE
--<U0049>	<U0049>;<NONE>;<CAPITAL>;IGNORE
--<U0069>	<U0049>;<NONE>;<SMALL>;IGNORE
--<U00CD>	<U0049>;<ACUTE>;<CAPITAL>;IGNORE
--<U00ED>	<U0049>;<ACUTE>;<SMALL>;IGNORE
--<U00CC>	<U0049>;<GRAVE>;<CAPITAL>;IGNORE
--<U00EC>	<U0049>;<GRAVE>;<SMALL>;IGNORE
--<U0208>	<U0049>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
--<U0209>	<U0049>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
--<U012C>	<U0049>;<BREVE>;<CAPITAL>;IGNORE
--<U012D>	<U0049>;<BREVE>;<SMALL>;IGNORE
--<U020A>	<U0049>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
--<U020B>	<U0049>;<INVERTED-BREVE>;<SMALL>;IGNORE
--<U00CE>	<U0049>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U00EE>	<U0049>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U01CF>	<U0049>;<CARON>;<CAPITAL>;IGNORE
--<U01D0>	<U0049>;<CARON>;<SMALL>;IGNORE
--<U00CF>	<U0049>;<DIAERESIS>;<CAPITAL>;IGNORE
--<U00EF>	<U0049>;<DIAERESIS>;<SMALL>;IGNORE
--<U1E2E>	<U0049>;<DIAERESIS+ACUTE>;<CAPITAL>;IGNORE
--<U1E2F>	<U0049>;<DIAERESIS+ACUTE>;<SMALL>;IGNORE
--<U1EC8>	<U0049>;<HOOK>;<CAPITAL>;IGNORE
--<U1EC9>	<U0049>;<HOOK>;<SMALL>;IGNORE
--<U0128>	<U0049>;<TILDE>;<CAPITAL>;IGNORE
--<U0129>	<U0049>;<TILDE>;<SMALL>;IGNORE
--<U1E2C>	<U0049>;<TILDE-BELOW>;<CAPITAL>;IGNORE
--<U1E2D>	<U0049>;<TILDE-BELOW>;<SMALL>;IGNORE
--<U0130>	<U0049>;<DOT>;<CAPITAL>;IGNORE
--<U0131>	<U0049>;<DOT>;<SMALL>;IGNORE
--<U1ECA>	<U0049>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1ECB>	<U0049>;<DOT-BELOW>;<SMALL>;IGNORE
--<U012E>	<U0049>;<OGONEK>;<CAPITAL>;IGNORE
--<U012F>	<U0049>;<OGONEK>;<SMALL>;IGNORE
--<U012A>	<U0049>;<MACRON>;<CAPITAL>;IGNORE
--<U012B>	<U0049>;<MACRON>;<SMALL>;IGNORE
--<i8>
--<U0132>	"<U0049><U004A>";"<U0132><U0132>";"<CAPITAL><CAPITAL>";IGNORE
--<U0133>	"<U0049><U004A>";"<U0132><U0132>";"<SMALL><SMALL>";IGNORE
--<U004A>	<U004A>;<NONE>;<CAPITAL>;IGNORE
--<U006A>	<U004A>;<NONE>;<SMALL>;IGNORE
--<U0134>	<U004A>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U0135>	<U004A>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<j8>
--<U004B>	<U004B>;<NONE>;<CAPITAL>;IGNORE
--<U006B>	<U004B>;<NONE>;<SMALL>;IGNORE
--<U1E30>	<U004B>;<ACUTE>;<CAPITAL>;IGNORE
--<U1E31>	<U004B>;<ACUTE>;<SMALL>;IGNORE
--<U01E8>	<U004B>;<CARON>;<CAPITAL>;IGNORE
--<U01E9>	<U004B>;<CARON>;<SMALL>;IGNORE
--<U0198>	<U004B>;<HOOK>;<CAPITAL>;IGNORE
--<U0199>	<U004B>;<HOOK>;<SMALL>;IGNORE
--<U1E32>	<U004B>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E33>	<U004B>;<DOT-BELOW>;<SMALL>;IGNORE
--<U0136>	<U004B>;<CEDILLA>;<CAPITAL>;IGNORE
--<U0137>	<U004B>;<CEDILLA>;<SMALL>;IGNORE
--<U1E34>	<U004B>;<LINE-BELOW>;<CAPITAL>;IGNORE
--<U1E35>	<U004B>;<LINE-BELOW>;<SMALL>;IGNORE
--<k8>
--<U0138>	<U004B>;<U0138>;<SMALL>;IGNORE
--<U0141>	<U0141>;<NONE>;<CAPITAL>;IGNORE
--<U0142>	<U0141>;<NONE>;<SMALL>;IGNORE
--<U004C>	<U004C>;<NONE>;<CAPITAL>;IGNORE
--<U006C>	<U004C>;<NONE>;<SMALL>;IGNORE
--<U0139>	<U004C>;<ACUTE>;<CAPITAL>;IGNORE
--<U013A>	<U004C>;<ACUTE>;<SMALL>;IGNORE
--<U013D>	<U004C>;<CARON>;<CAPITAL>;IGNORE
--<U013E>	<U004C>;<CARON>;<SMALL>;IGNORE
--<U013F>	<U004C>;<DOT>;<CAPITAL>;IGNORE
--<U0140>	<U004C>;<DOT>;<SMALL>;IGNORE
--<U1E36>	<U004C>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E37>	<U004C>;<DOT-BELOW>;<SMALL>;IGNORE
--<U013B>	<U004C>;<CEDILLA>;<CAPITAL>;IGNORE
--<U013C>	<U004C>;<CEDILLA>;<SMALL>;IGNORE
--<U1E38>	<U004C>;<MACRON+DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E39>	<U004C>;<MACRON+DOT-BELOW>;<SMALL>;IGNORE
--<U1E3C>	<U004C>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U1E3D>	<U004C>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
--<U1E3A>	<U004C>;<LINE-BELOW>;<CAPITAL>;IGNORE
--<U1E3B>	<U004C>;<LINE-BELOW>;<SMALL>;IGNORE
--<l8>
--<U004D>	<U004D>;<NONE>;<CAPITAL>;IGNORE
--<U006D>	<U004D>;<NONE>;<SMALL>;IGNORE
--<U1E3E>	<U004D>;<ACUTE>;<CAPITAL>;IGNORE
--<U1E3F>	<U004D>;<ACUTE>;<SMALL>;IGNORE
--<U1E40>	<U004D>;<DOT>;<CAPITAL>;IGNORE
--<U1E41>	<U004D>;<DOT>;<SMALL>;IGNORE
--<U1E42>	<U004D>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E43>	<U004D>;<DOT-BELOW>;<SMALL>;IGNORE
--<m8>
--<U004E>	<U004E>;<NONE>;<CAPITAL>;IGNORE
--<U006E>	<U004E>;<NONE>;<SMALL>;IGNORE
--<U0147>	<U004E>;<CARON>;<CAPITAL>;IGNORE
--<U0148>	<U004E>;<CARON>;<SMALL>;IGNORE
--<U00D1>	<U004E>;<TILDE>;<CAPITAL>;IGNORE
--<U00F1>	<U004E>;<TILDE>;<SMALL>;IGNORE
--<U1E44>	<U004E>;<DOT>;<CAPITAL>;IGNORE
--<U1E45>	<U004E>;<DOT>;<SMALL>;IGNORE
--<U1E46>	<U004E>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E47>	<U004E>;<DOT-BELOW>;<SMALL>;IGNORE
--<U0145>	<U004E>;<CEDILLA>;<CAPITAL>;IGNORE
--<U0146>	<U004E>;<CEDILLA>;<SMALL>;IGNORE
--<U1E4A>	<U004E>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U1E4B>	<U004E>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
--<U1E48>	<U004E>;<LINE-BELOW>;<CAPITAL>;IGNORE
--<U1E49>	<U004E>;<LINE-BELOW>;<SMALL>;IGNORE
--<U0149>	<U004E>;<PRECEDED-BY-APOSTROPHE>;<SMALL>;IGNORE
--<n8>
--<U0143>	<U0143>;<NONE>;<CAPITAL>;IGNORE
--<U0144>	<U0143>;<NONE>;<SMALL>;IGNORE
--<U014A>	"<U004E><U0047>";"<U014A><U014A>";"<CAPITAL><CAPITAL>";IGNORE
--<U014B>	"<U004E><U0047>";"<U014A><U014A>";"<SMALL><SMALL>";IGNORE
--<U004F>	<U004F>;<NONE>;<CAPITAL>;IGNORE
--<U006F>	<U004F>;<NONE>;<SMALL>;IGNORE
--<U00BA>	<U004F>;<NONE>;<U00BA>;IGNORE
--<U00D3>	<U00D3>;<ACUTE>;<CAPITAL>;IGNORE
--<U00F3>	<U00D3>;<ACUTE>;<SMALL>;IGNORE
--<U00D2>	<U004F>;<GRAVE>;<CAPITAL>;IGNORE
--<U00F2>	<U004F>;<GRAVE>;<SMALL>;IGNORE
--<U020C>	<U004F>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
--<U020D>	<U004F>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
--<U014E>	<U004F>;<BREVE>;<CAPITAL>;IGNORE
--<U014F>	<U004F>;<BREVE>;<SMALL>;IGNORE
--<U020E>	<U004F>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
--<U020F>	<U004F>;<INVERTED-BREVE>;<SMALL>;IGNORE
--<U00D4>	<U004F>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U00F4>	<U004F>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U1ED0>	<U004F>;<CIRCUMFLEX+ACUTE>;<CAPITAL>;IGNORE
--<U1ED1>	<U004F>;<CIRCUMFLEX+ACUTE>;<SMALL>;IGNORE
--<U1ED2>	<U004F>;<CIRCUMFLEX+GRAVE>;<CAPITAL>;IGNORE
--<U1ED3>	<U004F>;<CIRCUMFLEX+GRAVE>;<SMALL>;IGNORE
--<U1ED4>	<U004F>;<CIRCUMFLEX+HOOK>;<CAPITAL>;IGNORE
--<U1ED5>	<U004F>;<CIRCUMFLEX+HOOK>;<SMALL>;IGNORE
--<U1ED6>	<U004F>;<CIRCUMFLEX+TILDE>;<CAPITAL>;IGNORE
--<U1ED7>	<U004F>;<CIRCUMFLEX+TILDE>;<SMALL>;IGNORE
--<U1ED8>	<U004F>;<CIRCUMFLEX+DOT-BELOW>;<CAPITAL>;IGNORE
--<U1ED9>	<U004F>;<CIRCUMFLEX+DOT-BELOW>;<SMALL>;IGNORE
--<U01D1>	<U004F>;<CARON>;<CAPITAL>;IGNORE
--<U01D2>	<U004F>;<CARON>;<SMALL>;IGNORE
--<U00D6>	<U004F>;<DIAERESIS>;<CAPITAL>;IGNORE
--<U00F6>	<U004F>;<DIAERESIS>;<SMALL>;IGNORE
--<U0150>	<U004F>;<DOUBLE-ACUTE>;<CAPITAL>;IGNORE
--<U0151>	<U004F>;<DOUBLE-ACUTE>;<SMALL>;IGNORE
--<U1ECE>	<U004F>;<HOOK>;<CAPITAL>;IGNORE
--<U1ECF>	<U004F>;<HOOK>;<SMALL>;IGNORE
--<U00D5>	<U004F>;<TILDE>;<CAPITAL>;IGNORE
--<U00F5>	<U004F>;<TILDE>;<SMALL>;IGNORE
--<U1E4C>	<U004F>;<TILDE+ACUTE>;<CAPITAL>;IGNORE
--<U1E4D>	<U004F>;<TILDE+ACUTE>;<SMALL>;IGNORE
--<U1E4E>	<U004F>;<TILDE+DIAERESIS>;<CAPITAL>;IGNORE
--<U1E4F>	<U004F>;<TILDE+DIAERESIS>;<SMALL>;IGNORE
--<U1ECC>	<U004F>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1ECD>	<U004F>;<DOT-BELOW>;<SMALL>;IGNORE
--<U00D8>	<U004F>;<STROKE>;<CAPITAL>;IGNORE
--<U00F8>	<U004F>;<STROKE>;<SMALL>;IGNORE
--<U01FE>	<U004F>;<STROKE+ACUTE>;<CAPITAL>;IGNORE
--<U01FF>	<U004F>;<STROKE+ACUTE>;<SMALL>;IGNORE
--<U01EA>	<U004F>;<OGONEK>;<CAPITAL>;IGNORE
--<U01EB>	<U004F>;<OGONEK>;<SMALL>;IGNORE
--<U01EC>	<U004F>;<OGONEK+MACRON>;<CAPITAL>;IGNORE
--<U01ED>	<U004F>;<OGONEK+MACRON>;<SMALL>;IGNORE
--<U014C>	<U004F>;<MACRON>;<CAPITAL>;IGNORE
--<U014D>	<U004F>;<MACRON>;<SMALL>;IGNORE
--<U1E52>	<U004F>;<MACRON+ACUTE>;<CAPITAL>;IGNORE
--<U1E53>	<U004F>;<MACRON+ACUTE>;<SMALL>;IGNORE
--<U1E50>	<U004F>;<MACRON+GRAVE>;<CAPITAL>;IGNORE
--<U1E51>	<U004F>;<MACRON+GRAVE>;<SMALL>;IGNORE
--<U01A0>	<U004F>;<HORN>;<CAPITAL>;IGNORE
--<U01A1>	<U004F>;<HORN>;<SMALL>;IGNORE
--<U1EDA>	<U004F>;<HORN+ACUTE>;<CAPITAL>;IGNORE
--<U1EDB>	<U004F>;<HORN+ACUTE>;<SMALL>;IGNORE
--<U1EDC>	<U004F>;<HORN+GRAVE>;<CAPITAL>;IGNORE
--<U1EDD>	<U004F>;<HORN+GRAVE>;<SMALL>;IGNORE
--<U1EDE>	<U004F>;<HORN+HOOK>;<CAPITAL>;IGNORE
--<U1EDF>	<U004F>;<HORN+HOOK>;<SMALL>;IGNORE
--<U1EE0>	<U004F>;<HORN+TILDE>;<CAPITAL>;IGNORE
--<U1EE1>	<U004F>;<HORN+TILDE>;<SMALL>;IGNORE
--<U1EE2>	<U004F>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
--<U1EE3>	<U004F>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
--<o8>
--<U0152>	"<U004F><U0045>";"<U0152><U0152>";"<CAPITAL><CAPITAL>";IGNORE
--<U0153>	"<U004F><U0045>";"<U0152><U0152>";"<SMALL><SMALL>";IGNORE
--<U0050>	<U0050>;<NONE>;<CAPITAL>;IGNORE
--<U0070>	<U0050>;<NONE>;<SMALL>;IGNORE
--<U1E54>	<U0050>;<ACUTE>;<CAPITAL>;IGNORE
--<U1E55>	<U0050>;<ACUTE>;<SMALL>;IGNORE
--<U1E56>	<U0050>;<DOT>;<CAPITAL>;IGNORE
--<U1E57>	<U0050>;<DOT>;<SMALL>;IGNORE
--<p8>
--<U0051>	<U0051>;<NONE>;<CAPITAL>;IGNORE
--<U0071>	<U0051>;<NONE>;<SMALL>;IGNORE
--<q8>
--<U0052>	<U0052>;<NONE>;<CAPITAL>;IGNORE
--<U0072>	<U0052>;<NONE>;<SMALL>;IGNORE
--<U0154>	<U0052>;<ACUTE>;<CAPITAL>;IGNORE
--<U0155>	<U0052>;<ACUTE>;<SMALL>;IGNORE
--<U0210>	<U0052>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
--<U0211>	<U0052>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
--<U0212>	<U0052>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
--<U0213>	<U0052>;<INVERTED-BREVE>;<SMALL>;IGNORE
--<U1E58>	<U0052>;<DOT>;<CAPITAL>;IGNORE
--<U1E59>	<U0052>;<DOT>;<SMALL>;IGNORE
--<U1E5A>	<U0052>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E5B>	<U0052>;<DOT-BELOW>;<SMALL>;IGNORE
--<U0156>	<U0052>;<CEDILLA>;<CAPITAL>;IGNORE
--<U0157>	<U0052>;<CEDILLA>;<SMALL>;IGNORE
--<U1E5C>	<U0052>;<MACRON+DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E5D>	<U0052>;<MACRON+DOT-BELOW>;<SMALL>;IGNORE
--<U1E5E>	<U0052>;<LINE-BELOW>;<CAPITAL>;IGNORE
--<U1E5F>	<U0052>;<LINE-BELOW>;<SMALL>;IGNORE
--<r8>
--<U0158>	<U0158>;<NONE>;<CAPITAL>;IGNORE
--<U0159>	<U0158>;<NONE>;<SMALL>;IGNORE
--<U0053>	<U0053>;<NONE>;<CAPITAL>;IGNORE
--<U0073>	<U0053>;<NONE>;<SMALL>;IGNORE
--<UFB06>	"<U0053><U0054>";"<NONE><NONE>";"<UFB06><UFB06>";IGNORE
--<U015A>	<U0053>;<ACUTE>;<CAPITAL>;IGNORE
--<U015B>	<U0053>;<ACUTE>;<SMALL>;IGNORE
--<U1E64>	<U0053>;<ACUTE+DOT>;<CAPITAL>;IGNORE
--<U1E65>	<U0053>;<ACUTE+DOT>;<SMALL>;IGNORE
--<U015C>	<U0053>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U015D>	<U0053>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U1E66>	<U0053>;<CARON+DOT>;<CAPITAL>;IGNORE
--<U1E67>	<U0053>;<CARON+DOT>;<SMALL>;IGNORE
--<U1E60>	<U0053>;<DOT>;<CAPITAL>;IGNORE
--<U1E61>	<U0053>;<DOT>;<SMALL>;IGNORE
--<U1E62>	<U0053>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E63>	<U0053>;<DOT-BELOW>;<SMALL>;IGNORE
--<U1E68>	<U0053>;<DOT+DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E69>	<U0053>;<DOT+DOT-BELOW>;<SMALL>;IGNORE
--<U015E>	<U0053>;<CEDILLA>;<CAPITAL>;IGNORE
--<U015F>	<U0053>;<CEDILLA>;<SMALL>;IGNORE
--<s8>
--<U0160>	<U0160>;<NONE>;<CAPITAL>;IGNORE
--<U0161>	<U0160>;<NONE>;<SMALL>;IGNORE
--<U017F>	<U0053>;<U017F>;<SMALL>;IGNORE
--<U00DF>	"<U0053><U0053>";"<NONE><NONE>";"<SMALL><U00DF>";IGNORE
--<UFB05>	"<U0053><U0054>";"<NONE><NONE>";"<UFB05><UFB05>";IGNORE
--<U0054>	<U0054>;<NONE>;<CAPITAL>;IGNORE
--<U0074>	<U0054>;<NONE>;<SMALL>;IGNORE
--<U0164>	<U0054>;<CARON>;<CAPITAL>;IGNORE
--<U0165>	<U0054>;<CARON>;<SMALL>;IGNORE
--<U1E6A>	<U0054>;<DOT>;<CAPITAL>;IGNORE
--<U1E6B>	<U0054>;<DOT>;<SMALL>;IGNORE
--<U1E6C>	<U0054>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E6D>	<U0054>;<DOT-BELOW>;<SMALL>;IGNORE
--<U0166>	<U0054>;<STROKE>;<CAPITAL>;IGNORE
--<U0167>	<U0054>;<STROKE>;<SMALL>;IGNORE
--<U0162>	<U0054>;<CEDILLA>;<CAPITAL>;IGNORE
--<U0163>	<U0054>;<CEDILLA>;<SMALL>;IGNORE
--<U1E70>	<U0054>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U1E71>	<U0054>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
--<U1E6E>	<U0054>;<LINE-BELOW>;<CAPITAL>;IGNORE
--<U1E6F>	<U0054>;<LINE-BELOW>;<SMALL>;IGNORE
--<t8>
--<U0106>	<U0106>;<NONE>;<CAPITAL>;IGNORE
--<U0107>	<U0106>;<NONE>;<SMALL>;IGNORE
--<U00DE>	"<U0054><U0048>";"<U00DE><U00DE>";"<CAPITAL><CAPITAL>";IGNORE
--<U00FE>	"<U0054><U0048>";"<U00DE><U00DE>";"<SMALL><SMALL>";IGNORE
--<U0055>	<U0055>;<NONE>;<CAPITAL>;IGNORE
--<U0075>	<U0055>;<NONE>;<SMALL>;IGNORE
--<U00DA>	<U0055>;<ACUTE>;<CAPITAL>;IGNORE
--<U00FA>	<U0055>;<ACUTE>;<SMALL>;IGNORE
--<U00D9>	<U0055>;<GRAVE>;<CAPITAL>;IGNORE
--<U00F9>	<U0055>;<GRAVE>;<SMALL>;IGNORE
--<U0214>	<U0055>;<DOUBLE-GRAVE>;<CAPITAL>;IGNORE
--<U0215>	<U0055>;<DOUBLE-GRAVE>;<SMALL>;IGNORE
--<U016C>	<U0055>;<BREVE>;<CAPITAL>;IGNORE
--<U016D>	<U0055>;<BREVE>;<SMALL>;IGNORE
--<U0216>	<U0055>;<INVERTED-BREVE>;<CAPITAL>;IGNORE
--<U0217>	<U0055>;<INVERTED-BREVE>;<SMALL>;IGNORE
--<U00DB>	<U0055>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U00FB>	<U0055>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U01D3>	<U0055>;<CARON>;<CAPITAL>;IGNORE
--<U01D4>	<U0055>;<CARON>;<SMALL>;IGNORE
--<U016E>	<U0055>;<RING>;<CAPITAL>;IGNORE
--<U016F>	<U0055>;<RING>;<SMALL>;IGNORE
--<U00DC>	<U0055>;<DIAERESIS>;<CAPITAL>;IGNORE
--<U00FC>	<U0055>;<DIAERESIS>;<SMALL>;IGNORE
--<U01D5>	<U0055>;<DIAERESIS+MACRON>;<CAPITAL>;IGNORE
--<U01D6>	<U0055>;<DIAERESIS+MACRON>;<SMALL>;IGNORE
--<U01D7>	<U0055>;<DIAERESIS+ACUTE>;<CAPITAL>;IGNORE
--<U01D8>	<U0055>;<DIAERESIS+ACUTE>;<SMALL>;IGNORE
--<U01DB>	<U0055>;<DIAERESIS+GRAVE>;<CAPITAL>;IGNORE
--<U01DC>	<U0055>;<DIAERESIS+GRAVE>;<SMALL>;IGNORE
--<U01D9>	<U0055>;<DIAERESIS+CARON>;<CAPITAL>;IGNORE
--<U01DA>	<U0055>;<DIAERESIS+CARON>;<SMALL>;IGNORE
--<U0170>	<U0055>;<DOUBLE-ACUTE>;<CAPITAL>;IGNORE
--<U0171>	<U0055>;<DOUBLE-ACUTE>;<SMALL>;IGNORE
--<U1EE6>	<U0055>;<HOOK>;<CAPITAL>;IGNORE
--<U1EE7>	<U0055>;<HOOK>;<SMALL>;IGNORE
--<U0168>	<U0055>;<TILDE>;<CAPITAL>;IGNORE
--<U0169>	<U0055>;<TILDE>;<SMALL>;IGNORE
--<U1E78>	<U0055>;<TILDE+ACUTE>;<CAPITAL>;IGNORE
--<U1E79>	<U0055>;<TILDE+ACUTE>;<SMALL>;IGNORE
--<U1E74>	<U0055>;<TILDE-BELOW>;<CAPITAL>;IGNORE
--<U1E75>	<U0055>;<TILDE-BELOW>;<SMALL>;IGNORE
--<U1EE4>	<U0055>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1EE5>	<U0055>;<DOT-BELOW>;<SMALL>;IGNORE
--<U0172>	<U0055>;<OGONEK>;<CAPITAL>;IGNORE
--<U0173>	<U0055>;<OGONEK>;<SMALL>;IGNORE
--<U016A>	<U0055>;<MACRON>;<CAPITAL>;IGNORE
--<U016B>	<U0055>;<MACRON>;<SMALL>;IGNORE
--<U1E7A>	<U0055>;<MACRON+DIAERESIS>;<CAPITAL>;IGNORE
--<U1E7B>	<U0055>;<MACRON+DIAERESIS>;<SMALL>;IGNORE
--<U1E72>	<U0055>;<MACRON+DIAERESIS-BELOW>;<CAPITAL>;IGNORE
--<U1E73>	<U0055>;<MACRON+DIAERESIS-BELOW>;<SMALL>;IGNORE
--<U1E76>	<U0055>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U1E77>	<U0055>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
--<U01AF>	<U0055>;<HORN>;<CAPITAL>;IGNORE
--<U01B0>	<U0055>;<HORN>;<SMALL>;IGNORE
--<U1EE8>	<U0055>;<HORN+ACUTE>;<CAPITAL>;IGNORE
--<U1EE9>	<U0055>;<HORN+ACUTE>;<SMALL>;IGNORE
--<U1EEA>	<U0055>;<HORN+GRAVE>;<CAPITAL>;IGNORE
--<U1EEB>	<U0055>;<HORN+GRAVE>;<SMALL>;IGNORE
--<U1EEC>	<U0055>;<HORN+HOOK>;<CAPITAL>;IGNORE
--<U1EED>	<U0055>;<HORN+HOOK>;<SMALL>;IGNORE
--<U1EEE>	<U0055>;<HORN+TILDE>;<CAPITAL>;IGNORE
--<U1EEF>	<U0055>;<HORN+TILDE>;<SMALL>;IGNORE
--<U1EF0>	<U0055>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
--<U1EF1>	<U0055>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
--<u8>
--<U0056>	<U0056>;<NONE>;<CAPITAL>;IGNORE
--<U0076>	<U0056>;<NONE>;<SMALL>;IGNORE
--<U1E7C>	<U0056>;<TILDE>;<CAPITAL>;IGNORE
--<U1E7D>	<U0056>;<TILDE>;<SMALL>;IGNORE
--<U1E7E>	<U0056>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E7F>	<U0056>;<DOT-BELOW>;<SMALL>;IGNORE
--<v8>
--<U0057>	<U0057>;<NONE>;<CAPITAL>;IGNORE
--<U0077>	<U0057>;<NONE>;<SMALL>;IGNORE
--<U1E82>	<U0057>;<ACUTE>;<CAPITAL>;IGNORE
--<U1E83>	<U0057>;<ACUTE>;<SMALL>;IGNORE
--<U1E80>	<U0057>;<GRAVE>;<CAPITAL>;IGNORE
--<U1E81>	<U0057>;<GRAVE>;<SMALL>;IGNORE
--<U0174>	<U0057>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U0175>	<U0057>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U1E84>	<U0057>;<DIAERESIS>;<CAPITAL>;IGNORE
--<U1E85>	<U0057>;<DIAERESIS>;<SMALL>;IGNORE
--<U1E86>	<U0057>;<DOT>;<CAPITAL>;IGNORE
--<U1E87>	<U0057>;<DOT>;<SMALL>;IGNORE
--<U1E88>	<U0057>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E89>	<U0057>;<DOT-BELOW>;<SMALL>;IGNORE
--<w8>
--<U0058>	<U0058>;<NONE>;<CAPITAL>;IGNORE
--<U0078>	<U0058>;<NONE>;<SMALL>;IGNORE
--<U1E8C>	<U0058>;<DIAERESIS>;<CAPITAL>;IGNORE
--<U1E8D>	<U0058>;<DIAERESIS>;<SMALL>;IGNORE
--<U1E8A>	<U0058>;<DOT>;<CAPITAL>;IGNORE
--<U1E8B>	<U0058>;<DOT>;<SMALL>;IGNORE
--<x8>
--<U0059>	<U0059>;<NONE>;<CAPITAL>;IGNORE
--<U0079>	<U0059>;<NONE>;<SMALL>;IGNORE
--<U00DD>	<U0059>;<ACUTE>;<CAPITAL>;IGNORE
--<U00FD>	<U0059>;<ACUTE>;<SMALL>;IGNORE
--<U1EF2>	<U0059>;<GRAVE>;<CAPITAL>;IGNORE
--<U1EF3>	<U0059>;<GRAVE>;<SMALL>;IGNORE
--<U0176>	<U0059>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U0177>	<U0059>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U0178>	<U0059>;<DIAERESIS>;<CAPITAL>;IGNORE
--<U00FF>	<U0059>;<DIAERESIS>;<SMALL>;IGNORE
--<U1EF6>	<U0059>;<HOOK>;<CAPITAL>;IGNORE
--<U1EF7>	<U0059>;<HOOK>;<SMALL>;IGNORE
--<U1EF8>	<U0059>;<TILDE>;<CAPITAL>;IGNORE
--<U1EF9>	<U0059>;<TILDE>;<SMALL>;IGNORE
--<U1E8E>	<U0059>;<DOT>;<CAPITAL>;IGNORE
--<U1E8F>	<U0059>;<DOT>;<SMALL>;IGNORE
--<U1EF4>	<U0059>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1EF5>	<U0059>;<DOT-BELOW>;<SMALL>;IGNORE
--<y8>
--<U005A>	<U005A>;<NONE>;<CAPITAL>;IGNORE
--<U007A>	<U005A>;<NONE>;<SMALL>;IGNORE
--<U0179>	<U005A>;<ACUTE>;<CAPITAL>;IGNORE
--<U017A>	<U005A>;<ACUTE>;<SMALL>;IGNORE
--<U1E90>	<U005A>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
--<U1E91>	<U005A>;<CIRCUMFLEX>;<SMALL>;IGNORE
--<U017B>	<U005A>;<DOT>;<CAPITAL>;IGNORE
--<U017C>	<U005A>;<DOT>;<SMALL>;IGNORE
--<U1E92>	<U005A>;<DOT-BELOW>;<CAPITAL>;IGNORE
--<U1E93>	<U005A>;<DOT-BELOW>;<SMALL>;IGNORE
--<U01B5>	<U005A>;<STROKE>;<CAPITAL>;IGNORE
--<U01B6>	<U005A>;<STROKE>;<SMALL>;IGNORE
--<U1E94>	<U005A>;<LINE-BELOW>;<CAPITAL>;IGNORE
--<U1E95>	<U005A>;<LINE-BELOW>;<SMALL>;IGNORE
--<z8>
--<U017D>	<U017D>;<NONE>;<CAPITAL>;IGNORE
--<U017E>	<U017D>;<NONE>;<SMALL>;IGNORE
--<U0391>	<U0391>;<CAPITAL>;<GREEK>;IGNORE
--<U0386>	<U0391>;<CAPITAL>;<TONOS>;IGNORE
--<U03B1>	<U0391>;<SMALL>;<GREEK>;IGNORE
--<U03AC>	<U0391>;<SMALL>;<TONOS>;IGNORE
--<U0392>	<U0392>;<CAPITAL>;<GREEK>;IGNORE
--<U03B2>	<U0392>;<SMALL>;<GREEK>;IGNORE
--<U0393>	<U0393>;<CAPITAL>;<GREEK>;IGNORE
--<U03B3>	<U0393>;<SMALL>;<GREEK>;IGNORE
--<U0394>	<U0394>;<CAPITAL>;<GREEK>;IGNORE
--<U03B4>	<U0394>;<SMALL>;<GREEK>;IGNORE
--<U0395>	<U0395>;<CAPITAL>;<GREEK>;IGNORE
--<U0388>	<U0395>;<CAPITAL>;<TONOS>;IGNORE
--<U03B5>	<U0395>;<SMALL>;<GREEK>;IGNORE
--<U03AD>	<U0395>;<SMALL>;<TONOS>;IGNORE
--<U0396>	<U0396>;<CAPITAL>;<GREEK>;IGNORE
--<U03B6>	<U0396>;<SMALL>;<GREEK>;IGNORE
--<U0397>	<U0397>;<CAPITAL>;<GREEK>;IGNORE
--<U0389>	<U0397>;<CAPITAL>;<TONOS>;IGNORE
--<U03B7>	<U0397>;<SMALL>;<GREEK>;IGNORE
--<U03AE>	<U0397>;<SMALL>;<TONOS>;IGNORE
--<U0398>	<U0398>;<CAPITAL>;<GREEK>;IGNORE
--<U03B8>	<U0398>;<SMALL>;<GREEK>;IGNORE
--<U0399>	<U0399>;<CAPITAL>;<GREEK>;IGNORE
--<U038A>	<U0399>;<CAPITAL>;<TONOS>;IGNORE
--<U03AA>	<U0399>;<CAPITAL>;<DIALYTICA>;IGNORE
--<U03B9>	<U0399>;<SMALL>;<GREEK>;IGNORE
--<U03AF>	<U0399>;<SMALL>;<TONOS>;IGNORE
--<U03CA>	<U0399>;<SMALL>;<DIALYTICA>;IGNORE
--<U0390>	<U0399>;<SMALL>;<DIALYTICA+TONOS>;IGNORE
--<U039A>	<U039A>;<CAPITAL>;<GREEK>;IGNORE
--<U03BA>	<U039A>;<SMALL>;<GREEK>;IGNORE
--<U039B>	<U039B>;<CAPITAL>;<GREEK>;IGNORE
--<U03BB>	<U039B>;<SMALL>;<GREEK>;IGNORE
--<U039C>	<U039C>;<CAPITAL>;<GREEK>;IGNORE
--<U03BC>	<U039C>;<SMALL>;<GREEK>;IGNORE
--<U039D>	<U039D>;<CAPITAL>;<GREEK>;IGNORE
--<U03BD>	<U039D>;<SMALL>;<GREEK>;IGNORE
--<U039E>	<U039E>;<CAPITAL>;<GREEK>;IGNORE
--<U03BE>	<U039E>;<SMALL>;<GREEK>;IGNORE
--<U039F>	<U039F>;<CAPITAL>;<GREEK>;IGNORE
--<U038C>	<U039F>;<CAPITAL>;<TONOS>;IGNORE
--<U03BF>	<U039F>;<SMALL>;<GREEK>;IGNORE
--<U03CC>	<U039F>;<SMALL>;<TONOS>;IGNORE
--<U03A0>	<U03A0>;<CAPITAL>;<GREEK>;IGNORE
--<U03C0>	<U03A0>;<SMALL>;<GREEK>;IGNORE
--<U03A1>	<U03A1>;<CAPITAL>;<GREEK>;IGNORE
--<U03C1>	<U03A1>;<SMALL>;<GREEK>;IGNORE
--<U03A3>	<U03A3>;<CAPITAL>;<GREEK>;IGNORE
--<U03C3>	<U03A3>;<SMALL>;<GREEK>;IGNORE
--<U03C2>	<U03A3>;<SMALL>;<U03C2>;IGNORE
--<U03A4>	<U03A4>;<CAPITAL>;<GREEK>;IGNORE
--<U03C4>	<U03A4>;<SMALL>;<GREEK>;IGNORE
--<U03A5>	<U03A5>;<CAPITAL>;<GREEK>;IGNORE
--<U038E>	<U03A5>;<CAPITAL>;<TONOS>;IGNORE
--<U03AB>	<U03A5>;<CAPITAL>;<DIALYTICA>;IGNORE
--<U03C5>	<U03A5>;<SMALL>;<GREEK>;IGNORE
--<U03CD>	<U03A5>;<SMALL>;<TONOS>;IGNORE
--<U03CB>	<U03A5>;<SMALL>;<DIALYTICA>;IGNORE
--<U03B0>	<U03A5>;<SMALL>;<DIALYTICA+TONOS>;IGNORE
--<U03A6>	<U03A6>;<CAPITAL>;<GREEK>;IGNORE
--<U03C6>	<U03A6>;<SMALL>;<GREEK>;IGNORE
--<U03A7>	<U03A7>;<CAPITAL>;<GREEK>;IGNORE
--<U03C7>	<U03A7>;<SMALL>;<GREEK>;IGNORE
--<U03A8>	<U03A8>;<CAPITAL>;<GREEK>;IGNORE
--<U03C8>	<U03A8>;<SMALL>;<GREEK>;IGNORE
--<U03A9>	<U03A9>;<CAPITAL>;<GREEK>;IGNORE
--<U038F>	<U03A9>;<CAPITAL>;<TONOS>;IGNORE
--<U03C9>	<U03A9>;<SMALL>;<GREEK>;IGNORE
--<U03CE>	<U03A9>;<SMALL>;<TONOS>;IGNORE
--<U0410>	<U0410>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0430>	<U0410>;<CYRILLIC>;<SMALL>;IGNORE
--<U0411>	<U0411>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0431>	<U0411>;<CYRILLIC>;<SMALL>;IGNORE
--<U0412>	<U0412>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0432>	<U0412>;<CYRILLIC>;<SMALL>;IGNORE
--<U0413>	<U0413>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0433>	<U0413>;<CYRILLIC>;<SMALL>;IGNORE
--<U0403>	<U0403>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0453>	<U0403>;<CYRILLIC>;<SMALL>;IGNORE
--<U0490>	<U0490>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0491>	<U0490>;<CYRILLIC>;<SMALL>;IGNORE
--<U0414>	<U0414>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0434>	<U0414>;<CYRILLIC>;<SMALL>;IGNORE
--<U0402>	<U0402>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0452>	<U0402>;<CYRILLIC>;<SMALL>;IGNORE
--<U0415>	<U0415>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0435>	<U0415>;<CYRILLIC>;<SMALL>;IGNORE
--<U0401>	<U0401>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0451>	<U0401>;<CYRILLIC>;<SMALL>;IGNORE
--<U0404>	<U0404>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0454>	<U0404>;<CYRILLIC>;<SMALL>;IGNORE
--<U0416>	<U0416>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0436>	<U0416>;<CYRILLIC>;<SMALL>;IGNORE
--<U0417>	<U0417>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0437>	<U0417>;<CYRILLIC>;<SMALL>;IGNORE
--<U0418>	<U0418>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0438>	<U0418>;<CYRILLIC>;<SMALL>;IGNORE
--<U0406>	<U0406>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0456>	<U0406>;<CYRILLIC>;<SMALL>;IGNORE
--<U0407>	<U0407>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0457>	<U0407>;<CYRILLIC>;<SMALL>;IGNORE
--<U0408>	<U0408>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0458>	<U0408>;<CYRILLIC>;<SMALL>;IGNORE
--<U0419>	<U0419>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0439>	<U0419>;<CYRILLIC>;<SMALL>;IGNORE
--<U041A>	<U041A>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U043A>	<U041A>;<CYRILLIC>;<SMALL>;IGNORE
--<U040C>	<U040C>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U045C>	<U040C>;<CYRILLIC>;<SMALL>;IGNORE
--<U041B>	<U041B>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U043B>	<U041B>;<CYRILLIC>;<SMALL>;IGNORE
--<U0409>	<U0409>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0459>	<U0409>;<CYRILLIC>;<SMALL>;IGNORE
--<U041C>	<U041C>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U043C>	<U041C>;<CYRILLIC>;<SMALL>;IGNORE
--<U041D>	<U041D>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U043D>	<U041D>;<CYRILLIC>;<SMALL>;IGNORE
--<U040A>	<U040A>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U045A>	<U040A>;<CYRILLIC>;<SMALL>;IGNORE
--<U041E>	<U041E>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U043E>	<U041E>;<CYRILLIC>;<SMALL>;IGNORE
--<U041F>	<U041F>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U043F>	<U041F>;<CYRILLIC>;<SMALL>;IGNORE
--<U0420>	<U0420>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0440>	<U0420>;<CYRILLIC>;<SMALL>;IGNORE
--<U0421>	<U0421>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0441>	<U0421>;<CYRILLIC>;<SMALL>;IGNORE
--<U0422>	<U0422>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0442>	<U0422>;<CYRILLIC>;<SMALL>;IGNORE
--<U040B>	<U040B>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U045B>	<U040B>;<CYRILLIC>;<SMALL>;IGNORE
--<U0423>	<U0423>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0443>	<U0423>;<CYRILLIC>;<SMALL>;IGNORE
--<U040E>	<U040E>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U045E>	<U040E>;<CYRILLIC>;<SMALL>;IGNORE
--<U0424>	<U0424>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0444>	<U0424>;<CYRILLIC>;<SMALL>;IGNORE
--<U0425>	<U0425>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0445>	<U0425>;<CYRILLIC>;<SMALL>;IGNORE
--<U0426>	<U0426>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0446>	<U0426>;<CYRILLIC>;<SMALL>;IGNORE
--<U0405>	<U0405>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0455>	<U0405>;<CYRILLIC>;<SMALL>;IGNORE
--<U0427>	<U0427>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0447>	<U0427>;<CYRILLIC>;<SMALL>;IGNORE
--<U040F>	<U040F>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U045F>	<U040F>;<CYRILLIC>;<SMALL>;IGNORE
--<U0428>	<U0428>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0448>	<U0428>;<CYRILLIC>;<SMALL>;IGNORE
--<U0429>	<U0429>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0449>	<U0429>;<CYRILLIC>;<SMALL>;IGNORE
--<U044A>	<U044A>;<CYRILLIC>;<SMALL>;IGNORE
--<U042A>	<U044A>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U042B>	<U042B>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U044B>	<U042B>;<CYRILLIC>;<SMALL>;IGNORE
--<U044C>	<U044C>;<CYRILLIC>;<SMALL>;IGNORE
--<U042C>	<U044C>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U042D>	<U042D>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U044D>	<U042D>;<CYRILLIC>;<SMALL>;IGNORE
--<U042E>	<U042E>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U044E>	<U042E>;<CYRILLIC>;<SMALL>;IGNORE
--<U042F>	<U042F>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U044F>	<U042F>;<CYRILLIC>;<SMALL>;IGNORE
--<U0462>	<U0462>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0463>	<U0462>;<CYRILLIC>;<SMALL>;IGNORE
--<U046A>	<U046A>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U046B>	<U046A>;<CYRILLIC>;<SMALL>;IGNORE
--<U0472>	<U0472>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0473>	<U0472>;<CYRILLIC>;<SMALL>;IGNORE
--<U0474>	<U0474>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0475>	<U0474>;<CYRILLIC>;<SMALL>;IGNORE
--<U0480>	<U0480>;<CYRILLIC>;<CAPITAL>;IGNORE
--<U0481>	<U0480>;<CYRILLIC>;<SMALL>;IGNORE
--<U05D0>	<U05D0>;IGNORE;IGNORE;IGNORE
--<U05D1>	<U05D1>;IGNORE;IGNORE;IGNORE
--<U05D2>	<U05D2>;IGNORE;IGNORE;IGNORE
--<U05D3>	<U05D3>;IGNORE;IGNORE;IGNORE
--<U05D4>	<U05D4>;IGNORE;IGNORE;IGNORE
--<U05D5>	<U05D5>;IGNORE;IGNORE;IGNORE
--<U05D6>	<U05D6>;IGNORE;IGNORE;IGNORE
--<U05D7>	<U05D7>;IGNORE;IGNORE;IGNORE
--<U05D8>	<U05D8>;IGNORE;IGNORE;IGNORE
--<U05D9>	<U05D9>;IGNORE;IGNORE;IGNORE
--<U05DA>	<U05DA>;IGNORE;IGNORE;IGNORE
--<U05DB>	<U05DB>;IGNORE;IGNORE;IGNORE
--<U05DC>	<U05DC>;IGNORE;IGNORE;IGNORE
--<U05DD>	<U05DD>;IGNORE;IGNORE;IGNORE
--<U05DE>	<U05DE>;IGNORE;IGNORE;IGNORE
--<U05DF>	<U05DF>;IGNORE;IGNORE;IGNORE
--<U05E0>	<U05E0>;IGNORE;IGNORE;IGNORE
--<U05E1>	<U05E1>;IGNORE;IGNORE;IGNORE
--<U05E2>	<U05E2>;IGNORE;IGNORE;IGNORE
--<U05E3>	<U05E3>;IGNORE;IGNORE;IGNORE
--<U05E4>	<U05E4>;IGNORE;IGNORE;IGNORE
--<U05E5>	<U05E5>;IGNORE;IGNORE;IGNORE
--<U05E6>	<U05E6>;IGNORE;IGNORE;IGNORE
--<U05E7>	<U05E7>;IGNORE;IGNORE;IGNORE
--<U05E8>	<U05E8>;IGNORE;IGNORE;IGNORE
--<U05E9>	<U05E9>;IGNORE;IGNORE;IGNORE
--<U05EA>	<U05EA>;IGNORE;IGNORE;IGNORE
--
--% Arabic collating
--
--<U060C>	IGNORE;IGNORE;IGNORE;<U060C>
--<U061B>	IGNORE;IGNORE;IGNORE;<U061B>
--<U061F>	IGNORE;IGNORE;IGNORE;<U061F>
--<U0640>	IGNORE;IGNORE;IGNORE;<U0640>
--
--<U0621>	<U0621>;<U0621>;IGNORE;IGNORE
--<U0622>	<U0622>;<U0622>;IGNORE;IGNORE
--<UFE82>	<U0622>;<UFE82>;IGNORE;IGNORE
--<U0623>	<U0621>;<U0623>;IGNORE;IGNORE
--<UFE84>	<U0621>;<UFE84>;IGNORE;IGNORE
--<U0624>	<U0621>;<U0624>;IGNORE;IGNORE
--<U0625>	<U0621>;<U0625>;IGNORE;IGNORE
--<UFE88>	<U0621>;<UFE88>;IGNORE;IGNORE
--<U0626>	<U0621>;<U0626>;IGNORE;IGNORE
--<U0670>	<U0670>;<U0670>;IGNORE;IGNORE
--<U0627>	<U0627>;<U0627>;IGNORE;IGNORE
--<UFE8D>	<U0627>;<UFE8D>;IGNORE;IGNORE
--<UFE8E>	<U0627>;<UFE8E>;IGNORE;IGNORE
--<UE016>	<U0627>;<UE016>;IGNORE;IGNORE
--<U0628>	<U0628>;<U0628>;IGNORE;IGNORE
--<UFE8F>	<U0628>;<UFE8F>;IGNORE;IGNORE
--<UFE90>	<U0628>;<UFE90>;IGNORE;IGNORE
--<UFE91>	<U0628>;<UFE91>;IGNORE;IGNORE
--<UFE92>	<U0628>;<UFE92>;IGNORE;IGNORE
--<U067E>	<U067E>;<U067E>;IGNORE;IGNORE
--<U06A4>	<U06A4>;<U06A4>;IGNORE;IGNORE
--<U0629>	<U0629>;<U0629>;IGNORE;IGNORE
--<UFE93>	<U0629>;<UFE93>;IGNORE;IGNORE
--<UFE94>	<U0629>;<UFE94>;IGNORE;IGNORE
--<U062A>	<U0629>;<U062A>;IGNORE;IGNORE
--<UFE95>	<U0629>;<UFE95>;IGNORE;IGNORE
--<UFE96>	<U0629>;<UFE96>;IGNORE;IGNORE
--<UFE97>	<U0629>;<UFE97>;IGNORE;IGNORE
--<UFE98>	<U0629>;<UFE98>;IGNORE;IGNORE
--<U062B>	<U062B>;<U062B>;IGNORE;IGNORE
--<UFE99>	<U062B>;<UFE99>;IGNORE;IGNORE
--<UFE9A>	<U062B>;<UFE9A>;IGNORE;IGNORE
--<UFE9B>	<U062B>;<UFE9B>;IGNORE;IGNORE
--<UFE9C>	<U062B>;<UFE9C>;IGNORE;IGNORE
--<U062C>	<U062C>;<U062C>;IGNORE;IGNORE
--<UFE9D>	<U062C>;<UFE9D>;IGNORE;IGNORE
--<UFE9E>	<U062C>;<UFE9E>;IGNORE;IGNORE
--<UFE9F>	<U062C>;<UFE9F>;IGNORE;IGNORE
--<UFEA0>	<U062C>;<UFEA0>;IGNORE;IGNORE
--<U062D>	<U062D>;<U062D>;IGNORE;IGNORE
--<UFEA1>	<U062D>;<UFEA1>;IGNORE;IGNORE
--<UFEA2>	<U062D>;<UFEA2>;IGNORE;IGNORE
--<UFEA3>	<U062D>;<UFEA3>;IGNORE;IGNORE
--<UFEA4>	<U062D>;<UFEA4>;IGNORE;IGNORE
--<U062E>	<U062E>;<U062E>;IGNORE;IGNORE
--<UFEA5>	<U062E>;<UFEA5>;IGNORE;IGNORE
--<UFEA6>	<U062E>;<UFEA6>;IGNORE;IGNORE
--<UFEA7>	<U062E>;<UFEA7>;IGNORE;IGNORE
--<UFEA8>	<U062E>;<UFEA8>;IGNORE;IGNORE
--<U062F>	<U062F>;<U062F>;IGNORE;IGNORE
--<UFEA9>	<U062F>;<UFEA9>;IGNORE;IGNORE
--<UFEAA>	<U062F>;<UFEAA>;IGNORE;IGNORE
--<U0630>	<U0630>;<U0630>;IGNORE;IGNORE
--<UFEAB>	<U0630>;<UFEAB>;IGNORE;IGNORE
--<UFEAC>	<U0630>;<UFEAC>;IGNORE;IGNORE
--<U0631>	<U0631>;<U0631>;IGNORE;IGNORE
--<UFEAD>	<U0631>;<UFEAD>;IGNORE;IGNORE
--<UFEAE>	<U0631>;<UFEAE>;IGNORE;IGNORE
--<U0632>	<U0632>;<U0632>;IGNORE;IGNORE
--<UFEAF>	<U0632>;<UFEAF>;IGNORE;IGNORE
--<UFEB0>	<U0632>;<UFEB0>;IGNORE;IGNORE
--<U0633>	<U0633>;<U0633>;IGNORE;IGNORE
--<UFEB1>	<U0633>;<UFEB1>;IGNORE;IGNORE
--<UFEB2>	<U0633>;<UFEB2>;IGNORE;IGNORE
--<UFEB3>	<U0633>;<UFEB3>;IGNORE;IGNORE
--<UFEB4>	<U0633>;<UFEB4>;IGNORE;IGNORE
--<U0634>	<U0634>;<U0634>;IGNORE;IGNORE
--<UFEB5>	<U0634>;<UFEB5>;IGNORE;IGNORE
--<UFEB6>	<U0634>;<UFEB6>;IGNORE;IGNORE
--<UFEB7>	<U0634>;<UFEB7>;IGNORE;IGNORE
--<UFEB8>	<U0634>;<UFEB8>;IGNORE;IGNORE
--<U0635>	<U0635>;<U0635>;IGNORE;IGNORE
--<UFEB9>	<U0635>;<UFEB9>;IGNORE;IGNORE
--<UFEBA>	<U0635>;<UFEBA>;IGNORE;IGNORE
--<UFEBB>	<U0635>;<UFEBB>;IGNORE;IGNORE
--<UFEBC>	<U0635>;<UFEBC>;IGNORE;IGNORE
--<U0636>	<U0636>;<U0636>;IGNORE;IGNORE
--<UFEBD>	<U0636>;<UFEBD>;IGNORE;IGNORE
--<UFEBE>	<U0636>;<UFEBE>;IGNORE;IGNORE
--<UFEBF>	<U0636>;<UFEBF>;IGNORE;IGNORE
--<UFEC0>	<U0636>;<UFEC0>;IGNORE;IGNORE
--<U0637>	<U0637>;<U0637>;IGNORE;IGNORE
--<UFEC1>	<U0637>;<UFEC1>;IGNORE;IGNORE
--<UFEC2>	<U0637>;<UFEC2>;IGNORE;IGNORE
--<UFEC3>	<U0637>;<UFEC3>;IGNORE;IGNORE
--<UFEC4>	<U0637>;<UFEC4>;IGNORE;IGNORE
--<U0638>	<U0638>;<U0638>;IGNORE;IGNORE
--<UFEC5>	<U0638>;<UFEC5>;IGNORE;IGNORE
--<UFEC6>	<U0638>;<UFEC6>;IGNORE;IGNORE
--<UFEC7>	<U0638>;<UFEC7>;IGNORE;IGNORE
--<UFEC8>	<U0638>;<UFEC8>;IGNORE;IGNORE
--<U0639>	<U0639>;<U0639>;IGNORE;IGNORE
--<UFEC9>	<U0639>;<UFEC9>;IGNORE;IGNORE
--<UFECA>	<U0639>;<UFECA>;IGNORE;IGNORE
--<UFECB>	<U0639>;<UFECB>;IGNORE;IGNORE
--<UFECC>	<U0639>;<UFECC>;IGNORE;IGNORE
--<U063A>	<U063A>;<U063A>;IGNORE;IGNORE
--<UFECD>	<U063A>;<UFECD>;IGNORE;IGNORE
--<UFECE>	<U063A>;<UFECE>;IGNORE;IGNORE
--<UFECF>	<U063A>;<UFECF>;IGNORE;IGNORE
--<UFED0>	<U063A>;<UFED0>;IGNORE;IGNORE
--<U0641>	<U0641>;<U0641>;IGNORE;IGNORE
--<UFED1>	<U0641>;<UFED1>;IGNORE;IGNORE
--<UFED2>	<U0641>;<UFED2>;IGNORE;IGNORE
--<UFED3>	<U0641>;<UFED3>;IGNORE;IGNORE
--<UFED4>	<U0641>;<UFED4>;IGNORE;IGNORE
--<U0642>	<U0642>;<U0642>;IGNORE;IGNORE
--<UFED5>	<U0642>;<UFED5>;IGNORE;IGNORE
--<UFED6>	<U0642>;<UFED6>;IGNORE;IGNORE
--<UFED7>	<U0642>;<UFED7>;IGNORE;IGNORE
--<UFED8>	<U0642>;<UFED8>;IGNORE;IGNORE
--<U0643>	<U0643>;<U0643>;IGNORE;IGNORE
--<UFED9>	<U0643>;<UFED9>;IGNORE;IGNORE
--<UFEDA>	<U0643>;<UFEDA>;IGNORE;IGNORE
--<UFEDB>	<U0643>;<UFEDB>;IGNORE;IGNORE
--<UFEDC>	<U0643>;<UFEDC>;IGNORE;IGNORE
--<U0644>	<U0644>;<U0644>;IGNORE;IGNORE
--<UFEDD>	<U0644>;<UFEDD>;IGNORE;IGNORE
--<UFEDE>	<U0644>;<UFEDE>;IGNORE;IGNORE
--<UFEDF>	<U0644>;<UFEDF>;IGNORE;IGNORE
--<UFEE0>	<U0644>;<UFEE0>;IGNORE;IGNORE
--<U0645>	<U0645>;<U0645>;IGNORE;IGNORE
--<UFEE1>	<U0645>;<UFEE1>;IGNORE;IGNORE
--<UFEE2>	<U0645>;<UFEE2>;IGNORE;IGNORE
--<UFEE3>	<U0645>;<UFEE3>;IGNORE;IGNORE
--<UFEE4>	<U0645>;<UFEE4>;IGNORE;IGNORE
--<U0646>	<U0646>;<U0646>;IGNORE;IGNORE
--<UFEE5>	<U0646>;<UFEE5>;IGNORE;IGNORE
--<UFEE6>	<U0646>;<UFEE6>;IGNORE;IGNORE
--<UFEE7>	<U0646>;<UFEE7>;IGNORE;IGNORE
--<UFEE8>	<U0646>;<UFEE8>;IGNORE;IGNORE
--<U0647>	<U0647>;<U0647>;IGNORE;IGNORE
--<UFEE9>	<U0647>;<UFEE9>;IGNORE;IGNORE
--<UFEEA>	<U0647>;<UFEEA>;IGNORE;IGNORE
--<UFEEB>	<U0647>;<UFEEB>;IGNORE;IGNORE
--<UFEEC>	<U0647>;<UFEEC>;IGNORE;IGNORE
--<U0648>	<U0648>;<U0648>;IGNORE;IGNORE
--<UFEED>	<U0648>;<UFEED>;IGNORE;IGNORE
--<UFEEE>	<U0648>;<UFEEE>;IGNORE;IGNORE
--<U0649>	<U0649>;<U0649>;IGNORE;IGNORE
--<UFEEF>	<U0649>;<UFEEF>;IGNORE;IGNORE
--<UFEF0>	<U0649>;<UFEF0>;IGNORE;IGNORE
--<U064A>	<U064A>;<U064A>;IGNORE;IGNORE
--<UFEF1>	<U064A>;<UFEF1>;IGNORE;IGNORE
--<UFEF2>	<U064A>;<UFEF2>;IGNORE;IGNORE
--<UFEF3>	<U064A>;<UFEF3>;IGNORE;IGNORE
--<UFEF4>	<U064A>;<UFEF4>;IGNORE;IGNORE
--
--<U064B>	IGNORE;IGNORE;<U064B>;IGNORE
--<U064C>	IGNORE;IGNORE;<U064C>;IGNORE
--<U064D>	IGNORE;IGNORE;<U064D>;IGNORE
--<U064E>	IGNORE;IGNORE;<U064E>;IGNORE
--<U064F>	IGNORE;IGNORE;<U064F>;IGNORE
--<U0650>	IGNORE;IGNORE;<U0650>;IGNORE
--<U0651>	IGNORE;IGNORE;<U0651>;IGNORE
--<UFE7D>	IGNORE;IGNORE;<UFE7D>;IGNORE
--<U0652>	IGNORE;IGNORE;<U0652>;IGNORE
--
--<U0660>	<U0030>;<U0660>;IGNORE;IGNORE
--<U0661>	<U0031>;<U0661>;IGNORE;IGNORE
--<U0662>	<U0032>;<U0662>;IGNORE;IGNORE
--<U0663>	<U0033>;<U0663>;IGNORE;IGNORE
--<U0664>	<U0034>;<U0664>;IGNORE;IGNORE
--<U0665>	<U0035>;<U0665>;IGNORE;IGNORE
--<U0666>	<U0036>;<U0666>;IGNORE;IGNORE
--<U0667>	<U0037>;<U0667>;IGNORE;IGNORE
--<U0668>	<U0038>;<U0668>;IGNORE;IGNORE
--<U0669>	<U0039>;<U0669>;IGNORE;IGNORE
--
--<UFEF5>	"<U0644><U0622>";"<U0644><U0622>";"<UFEF5><UFEF5>";IGNORE
--<UFEF6>	"<U0644><U0622>";"<U0644><UFE82>";"<UFEF6><UFEF6>";IGNORE
--<UFEF7>	"<U0644><U0623>";"<U0644><U0623>";"<UFEF7><UFEF7>";IGNORE
--<UFEF8>	"<U0644><U0623>";"<U0644><UFE84>";"<UFEF8><UFEF8>";IGNORE
--<UFEF9>	"<U0644><U0625>";"<U0644><U0625>";"<UFEF9><UFEF9>";IGNORE
--<UFEFA>	"<U0644><U0625>";"<U0644><UFE88>";"<UFEFA><UFEFA>";IGNORE
--<UFEFB>	"<U0644><U0627>";"<U0644><UFE8D>";"<UFEFB><UFEFB>";IGNORE
--<UFEFC>	"<U0644><U0627>";"<U0644><UFE8E>";"<UFEFC><UFEFC>";IGNORE
--
--% katakana/hiragana sorting
--% base is katakana, as this is present in most charsets
--% normal before voiced before semi-voiced
--% small vocals before normal vocals
--% katakana before hiragana
--
--<U30A1>	<U30A1>;<U30A1>;IGNORE;IGNORE
--<U3041>	<U30A1>;<U3041>;IGNORE;IGNORE
--<U30A2>	<U30A1>;<U30A2>;IGNORE;IGNORE
--<U3042>	<U30A1>;<U3042>;IGNORE;IGNORE
--<U30A3>	<U30A3>;<U30A3>;IGNORE;IGNORE
--<U3043>	<U30A3>;<U3043>;IGNORE;IGNORE
--<U30A4>	<U30A3>;<U30A4>;IGNORE;IGNORE
--<U3044>	<U30A3>;<U3044>;IGNORE;IGNORE
--<U30A5>	<U30A5>;<U30A5>;IGNORE;IGNORE
--<U3045>	<U30A5>;<U3045>;IGNORE;IGNORE
--<U30A6>	<U30A5>;<U30A6>;IGNORE;IGNORE
--<U3046>	<U30A5>;<U3046>;IGNORE;IGNORE
--<U30F4>	<U30A5>;<U30F4>;IGNORE;IGNORE
--<U30A7>	<U30A7>;<U30A7>;IGNORE;IGNORE
--<U3047>	<U30A7>;<U3047>;IGNORE;IGNORE
--<U30A8>	<U30A7>;<U30A8>;IGNORE;IGNORE
--<U3048>	<U30A7>;<U3048>;IGNORE;IGNORE
--<U30A9>	<U30A9>;<U30A9>;IGNORE;IGNORE
--<U3049>	<U30A9>;<U3049>;IGNORE;IGNORE
--<U30AA>	<U30A9>;<U30AA>;IGNORE;IGNORE
--<U304A>	<U30A9>;<U304A>;IGNORE;IGNORE
--<U30F5>	<U30F5>;<U30F5>;IGNORE;IGNORE
--<U30AB>	<U30F5>;<U30AB>;IGNORE;IGNORE
--<U304B>	<U30F5>;<U304B>;IGNORE;IGNORE
--<U30AC>	<U30F5>;<U30AC>;IGNORE;IGNORE
--<U304C>	<U30F5>;<U304C>;IGNORE;IGNORE
--<U30AD>	<U30AD>;<U30AD>;IGNORE;IGNORE
--<U304D>	<U30AD>;<U304D>;IGNORE;IGNORE
--<U30AE>	<U30AD>;<U30AE>;IGNORE;IGNORE
--<U304E>	<U30AD>;<U304E>;IGNORE;IGNORE
--<U30AF>	<U30AF>;<U30AF>;IGNORE;IGNORE
--<U304F>	<U30AF>;<U304F>;IGNORE;IGNORE
--<U30B0>	<U30AF>;<U30B0>;IGNORE;IGNORE
--<U3050>	<U30AF>;<U3050>;IGNORE;IGNORE
--<U30F6>	<U30F6>;<U30F6>;IGNORE;IGNORE
--<U30B1>	<U30F6>;<U30B1>;IGNORE;IGNORE
--<U3051>	<U30F6>;<U3051>;IGNORE;IGNORE
--<U30B2>	<U30F6>;<U30B2>;IGNORE;IGNORE
--<U3052>	<U30F6>;<U3052>;IGNORE;IGNORE
--<U30B3>	<U30B3>;<U30B3>;IGNORE;IGNORE
--<U3053>	<U30B3>;<U3053>;IGNORE;IGNORE
--<U30B4>	<U30B3>;<U30B4>;IGNORE;IGNORE
--<U3054>	<U30B3>;<U3054>;IGNORE;IGNORE
--<U30B5>	<U30B5>;<U30B5>;IGNORE;IGNORE
--<U3055>	<U30B5>;<U3055>;IGNORE;IGNORE
--<U30B6>	<U30B5>;<U30B6>;IGNORE;IGNORE
--<U3056>	<U30B5>;<U3056>;IGNORE;IGNORE
--<U30B7>	<U30B7>;<U30B7>;IGNORE;IGNORE
--<U3057>	<U30B7>;<U3057>;IGNORE;IGNORE
--<U30B8>	<U30B7>;<U30B8>;IGNORE;IGNORE
--<U3058>	<U30B7>;<U3058>;IGNORE;IGNORE
--<U30B9>	<U30B9>;<U30B9>;IGNORE;IGNORE
--<U3059>	<U30B9>;<U3059>;IGNORE;IGNORE
--<U30BA>	<U30B9>;<U30BA>;IGNORE;IGNORE
--<U305A>	<U30B9>;<U305A>;IGNORE;IGNORE
--<U30BB>	<U30BB>;<U30BB>;IGNORE;IGNORE
--<U305B>	<U30BB>;<U305B>;IGNORE;IGNORE
--<U30BC>	<U30BB>;<U30BC>;IGNORE;IGNORE
--<U305C>	<U30BB>;<U305C>;IGNORE;IGNORE
--<U30BD>	<U30BD>;<U30BD>;IGNORE;IGNORE
--<U305D>	<U30BD>;<U305D>;IGNORE;IGNORE
--<U30BE>	<U30BD>;<U30BE>;IGNORE;IGNORE
--<U305E>	<U30BD>;<U305E>;IGNORE;IGNORE
--<U30BF>	<U30BF>;<U30BF>;IGNORE;IGNORE
--<U305F>	<U30BF>;<U305F>;IGNORE;IGNORE
--<U30C0>	<U30BF>;<U30C0>;IGNORE;IGNORE
--<U3060>	<U30BF>;<U3060>;IGNORE;IGNORE
--<U30C1>	<U30C1>;<U30C1>;IGNORE;IGNORE
--<U3061>	<U30C1>;<U3061>;IGNORE;IGNORE
--<U30C2>	<U30C1>;<U30C2>;IGNORE;IGNORE
--<U3062>	<U30C1>;<U3062>;IGNORE;IGNORE
--<U30C3>	<U30C3>;<U30C3>;IGNORE;IGNORE
--<U3063>	<U30C3>;<U3063>;IGNORE;IGNORE
--<U30C4>	<U30C3>;<U30C4>;IGNORE;IGNORE
--<U3064>	<U30C3>;<U3064>;IGNORE;IGNORE
--<U30C5>	<U30C3>;<U30C5>;IGNORE;IGNORE
--<U3065>	<U30C3>;<U3065>;IGNORE;IGNORE
--<U30C6>	<U30C6>;<U30C6>;IGNORE;IGNORE
--<U3066>	<U30C6>;<U3066>;IGNORE;IGNORE
--<U30C7>	<U30C6>;<U30C7>;IGNORE;IGNORE
--<U3067>	<U30C6>;<U3067>;IGNORE;IGNORE
--<U30C8>	<U30C8>;<U30C8>;IGNORE;IGNORE
--<U3068>	<U30C8>;<U3068>;IGNORE;IGNORE
--<U30C9>	<U30C8>;<U30C9>;IGNORE;IGNORE
--<U3069>	<U30C8>;<U3069>;IGNORE;IGNORE
--<U30CA>	<U30CA>;<U30CA>;IGNORE;IGNORE
--<U306A>	<U30CA>;<U306A>;IGNORE;IGNORE
--<U30CB>	<U30CB>;<U30CB>;IGNORE;IGNORE
--<U306B>	<U30CB>;<U306B>;IGNORE;IGNORE
--<U30CC>	<U30CC>;<U30CC>;IGNORE;IGNORE
--<U306C>	<U30CC>;<U306C>;IGNORE;IGNORE
--<U30CD>	<U30CD>;<U30CD>;IGNORE;IGNORE
--<U306D>	<U30CD>;<U306D>;IGNORE;IGNORE
--<U30CE>	<U30CE>;<U30CE>;IGNORE;IGNORE
--<U306E>	<U30CE>;<U306E>;IGNORE;IGNORE
--<U30CF>	<U30CF>;<U30CF>;IGNORE;IGNORE
--<U306F>	<U30CF>;<U306F>;IGNORE;IGNORE
--<U30D0>	<U30CF>;<U30D0>;IGNORE;IGNORE
--<U3070>	<U30CF>;<U3070>;IGNORE;IGNORE
--<U30D1>	<U30CF>;<U30D1>;IGNORE;IGNORE
--<U3071>	<U30CF>;<U3071>;IGNORE;IGNORE
--<U30D2>	<U30D2>;<U30D2>;IGNORE;IGNORE
--<U3072>	<U30D2>;<U3072>;IGNORE;IGNORE
--<U30D3>	<U30D2>;<U30D3>;IGNORE;IGNORE
--<U3073>	<U30D2>;<U3073>;IGNORE;IGNORE
--<U30D4>	<U30D2>;<U30D4>;IGNORE;IGNORE
--<U3074>	<U30D2>;<U3074>;IGNORE;IGNORE
--<U30D5>	<U30D5>;<U30D5>;IGNORE;IGNORE
--<U3075>	<U30D5>;<U3075>;IGNORE;IGNORE
--<U30D6>	<U30D5>;<U30D6>;IGNORE;IGNORE
--<U3076>	<U30D5>;<U3076>;IGNORE;IGNORE
--<U30D7>	<U30D5>;<U30D7>;IGNORE;IGNORE
--<U3077>	<U30D5>;<U3077>;IGNORE;IGNORE
--<U30D8>	<U30D8>;<U30D8>;IGNORE;IGNORE
--<U3078>	<U30D8>;<U3078>;IGNORE;IGNORE
--<U30D9>	<U30D8>;<U30D9>;IGNORE;IGNORE
--<U3079>	<U30D8>;<U3079>;IGNORE;IGNORE
--<U30DA>	<U30D8>;<U30DA>;IGNORE;IGNORE
--<U307A>	<U30D8>;<U307A>;IGNORE;IGNORE
--<U30DB>	<U30DB>;<U30DB>;IGNORE;IGNORE
--<U307B>	<U30DB>;<U307B>;IGNORE;IGNORE
--<U30DC>	<U30DB>;<U30DC>;IGNORE;IGNORE
--<U307C>	<U30DB>;<U307C>;IGNORE;IGNORE
--<U30DD>	<U30DB>;<U30DD>;IGNORE;IGNORE
--<U307D>	<U30DB>;<U307D>;IGNORE;IGNORE
--<U30DE>	<U30DE>;<U30DE>;IGNORE;IGNORE
--<U307E>	<U30DE>;<U307E>;IGNORE;IGNORE
--<U30DF>	<U30DF>;<U30DF>;IGNORE;IGNORE
--<U307F>	<U30DF>;<U307F>;IGNORE;IGNORE
--<U30E0>	<U30E0>;<U30E0>;IGNORE;IGNORE
--<U3080>	<U30E0>;<U3080>;IGNORE;IGNORE
--<U30E1>	<U30E1>;<U30E1>;IGNORE;IGNORE
--<U3081>	<U30E1>;<U3081>;IGNORE;IGNORE
--<U30E2>	<U30E2>;<U30E2>;IGNORE;IGNORE
--<U3082>	<U30E2>;<U3082>;IGNORE;IGNORE
--<U30E3>	<U30E3>;<U30E3>;IGNORE;IGNORE
--<U3083>	<U30E3>;<U3083>;IGNORE;IGNORE
--<U30E4>	<U30E3>;<U30E4>;IGNORE;IGNORE
--<U3084>	<U30E3>;<U3084>;IGNORE;IGNORE
--<U30E5>	<U30E5>;<U30E5>;IGNORE;IGNORE
--<U3085>	<U30E5>;<U3085>;IGNORE;IGNORE
--<U30E6>	<U30E5>;<U30E6>;IGNORE;IGNORE
--<U3086>	<U30E5>;<U3086>;IGNORE;IGNORE
--<U30E7>	<U30E7>;<U30E7>;IGNORE;IGNORE
--<U3087>	<U30E7>;<U3087>;IGNORE;IGNORE
--<U30E8>	<U30E7>;<U30E8>;IGNORE;IGNORE
--<U3088>	<U30E7>;<U3088>;IGNORE;IGNORE
--<U30E9>	<U30E9>;<U30E9>;IGNORE;IGNORE
--<U3089>	<U30E9>;<U3089>;IGNORE;IGNORE
--<U30EA>	<U30EA>;<U30EA>;IGNORE;IGNORE
--<U308A>	<U30EA>;<U308A>;IGNORE;IGNORE
--<U30EB>	<U30EB>;<U30EB>;IGNORE;IGNORE
--<U308B>	<U30EB>;<U308B>;IGNORE;IGNORE
--<U30EC>	<U30EC>;<U30EC>;IGNORE;IGNORE
--<U308C>	<U30EC>;<U308C>;IGNORE;IGNORE
--<U30ED>	<U30ED>;<U30ED>;IGNORE;IGNORE
--<U308D>	<U30ED>;<U308D>;IGNORE;IGNORE
--<U30EE>	<U30EE>;<U30EE>;IGNORE;IGNORE
--<U308E>	<U30EE>;<U308E>;IGNORE;IGNORE
--<U30EF>	<U30EE>;<U30EF>;IGNORE;IGNORE
--<U308F>	<U30EE>;<U308F>;IGNORE;IGNORE
--<U30F0>	<U30F0>;<U30F0>;IGNORE;IGNORE
--<U3090>	<U30F0>;<U3090>;IGNORE;IGNORE
--<U30F1>	<U30F1>;<U30F1>;IGNORE;IGNORE
--<U3091>	<U30F1>;<U3091>;IGNORE;IGNORE
--<U30F2>	<U30F2>;<U30F2>;IGNORE;IGNORE
--<U3092>	<U30F2>;<U3092>;IGNORE;IGNORE
--<U30F3>	<U30F3>;<U30F3>;IGNORE;IGNORE
--<U3093>	<U30F3>;<U3093>;IGNORE;IGNORE
--
--order_end
-+reorder-end
- 
- END LC_COLLATE
- 
--LC_CTYPE
--copy "i18n"
--END LC_CTYPE
--
- LC_MESSAGES
- yesexpr "<U005E><U005B><U0068><U0048><U0079><U0059><U005D><U002E><U002A>"
- noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
 --- a/localedata/locales/lt_LT
 +++ b/localedata/locales/lt_LT
 @@ -58,2067 +58,13 @@

Deleted: glibc-package/trunk/debian/patches/mips/local-lazy-eval.diff
===================================================================
--- glibc-package/trunk/debian/patches/mips/local-lazy-eval.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/mips/local-lazy-eval.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,38 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Workaround invalid resolving of lazy evaluation stubs
-# DP: Related bugs: #265678
-# DP: Dpatch author: Thiemo Seufer <ths@debian.org>
-# DP: Patch author: Thiemo Seufer <ths@debian.org>
-# DP: Upstream status: Debian-Specific
-# DP: Status Details: The correct fix will be done to modify toolchains in etch.
-# DP: Date: 2005-04-11, 2005-04-16 updated by gotom
-
-2005-04-16  GOTO Masanori  <gotom@debian.org>
-
-	* sysdeps/mips/dl-machine.h: Drop due to _dl_lookup_versioned_symbol
-	and _dl_lookup_symbol are changed into _dl_lookup_symbol_x.
-
-2005-04-11  Thiemo Seufer <ths@debian.org>
-
-	* first version.
-
----
- elf/do-lookup.h |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/elf/do-lookup.h
-+++ b/elf/do-lookup.h
-@@ -248,6 +248,13 @@
- 		}
- 	      /* FALLTHROUGH */
- 	    case STB_GLOBAL:
-+#ifdef __mips__
-+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
-+		 symbols, we skip them. */
-+	      if (sym->st_shndx == SHN_UNDEF)
-+		break;
-+#endif
-+
- 	      /* Global definition.  Just what we need.  */
- 	      result->s = sym;
- 	      result->m = (struct link_map *) map;

Added: glibc-package/trunk/debian/patches/mips/local-lowlevellock.diff
===================================================================
--- glibc-package/trunk/debian/patches/mips/local-lowlevellock.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/mips/local-lowlevellock.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,15 @@
+2010-02-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h: remove
+	useless include.
+
+--- a/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
++++ b/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
+@@ -24,7 +24,6 @@
+ #include <sys/param.h>
+ #include <bits/pthreadtypes.h>
+ #include <atomic.h>
+-#include <sysdep.h>
+ #include <kernel-features.h>
+ 
+ #define FUTEX_WAIT		0

Added: glibc-package/trunk/debian/patches/s390/cvs-makecontext.diff
===================================================================
--- glibc-package/trunk/debian/patches/s390/cvs-makecontext.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/s390/cvs-makecontext.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,224 @@
+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.
+
+diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c b/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c
+index 94760e0..0e309c3 100644
+--- 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 @@ void
+ __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 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
+   *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)
+diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c b/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c
+index b08f1b4..40ff3ee 100644
+--- 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 @@ void
+ __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 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
+   *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)

Deleted: glibc-package/trunk/debian/patches/s390/submitted-siginfo.diff
===================================================================
--- glibc-package/trunk/debian/patches/s390/submitted-siginfo.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/s390/submitted-siginfo.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,22 +0,0 @@
-2009-07-25  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/s390/bits/siginfo.h (struct sigevent):
-	Add _tid slot to maintain consistency with kernel.
-
----
- sysdeps/unix/sysv/linux/s390/bits/siginfo.h |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
-+++ b/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
-@@ -282,6 +282,10 @@
-       {
- 	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.	 */

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/series	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,4 +1,4 @@
-svn-updates.diff
+#svn-updates.diff
 
 locale/check-unknown-symbols.diff
 locale/fix-LC_COLLATE-rules.diff
@@ -6,7 +6,6 @@
 locale/preprocessor-collate.diff  # should not be needed anymore, but keep it anyways.
 locale/locale-print-LANGUAGE.diff
 locale/LC_IDENTIFICATION-optional-fields.diff
-locale/cvs-C-first_weekday.diff
 locale/LC_COLLATE-keywords-ordering.diff
 localedata/local-all-no-archive.diff
 localedata/sort-UTF8-first.diff
@@ -27,6 +26,7 @@
 localedata/locale-zh_TW.diff
 localedata/locale-se_NO.diff
 localedata/tailor-iso14651_t1.diff
+localedata/locale-hsb_DE.diff
 localedata/tailor-iso14651_t1-common.diff
 localedata/fix-lang.diff
 localedata/fr_BE-first_weekday.diff
@@ -48,36 +48,38 @@
 alpha/submitted-dl-support.diff
 alpha/submitted-fdatasync.diff
 alpha/submitted-fpu-round.diff
-alpha/submitted-getsysstats.diff
-alpha/submitted-includes.diff
-alpha/submitted-lowlevellock.diff
 alpha/submitted-PTR_MANGLE.diff
-alpha/submitted-procfs_h.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
 
 amd64/local-biarch.diff
 amd64/local-clone.diff
 amd64/local-linuxthreads-gscope.diff
+amd64/submitted-tst-audit6-avx.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/cvs-setjmp-longjmp-fpu.diff
 
-hppa/submitted-sock_nonblock.diff
 hppa/local-inlining.diff
 hppa/local-linuxthreads.diff
 hppa/local-linuxthreads-gscope.diff
 hppa/submitted-fadvise64_64.diff
 hppa/submitted-lt.diff
 hppa/submitted-nptl-carlos.diff
-hppa/submitted-pie.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
 
 hurd-i386/local-dl-dynamic-weak.diff
 hurd-i386/local-enable-ldconfig.diff
@@ -109,20 +111,18 @@
 hurd-i386/submitted-sbrk.diff
 hurd-i386/local-thread-cancel.diff
 hurd-i386/submitted-readlinkat.diff
-hurd-i386/cvs-termios-IXANY.patch
 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/submitted-getnprocs.diff
 hurd-i386/local-locarchive.diff
+hurd-i386/submitted-regex_internal.diff
 
 ia64/submitted-sysconf.diff
 ia64/submitted-libm.diff
-ia64/submitted-siginfo.diff
-ia64/cvs-memchr.diff
-ia64/submitted-memchr.diff
 
 i386/local-biarch.diff
 i386/local-clone.diff
@@ -138,15 +138,16 @@
 m68k/local-pthread_lock.diff
 m68k/submitted-gcc34-seccomment.diff
 
-mips/local-lazy-eval.diff
+mips/local-lowlevellock.diff
 mips/local-r10k.diff
 mips/submitted-rld_map.diff
 
+s390/cvs-makecontext.diff
 s390/submitted-nexttowardf.diff
-s390/submitted-siginfo.diff
 
 sh4/local-fpscr_values.diff
 sh4/submitted-set_fpscr.diff
+sh4/cvs-register_dump.diff
 
 sparc/local-fork.diff
 sparc/local-sparcv9-target.diff
@@ -197,7 +198,6 @@
 any/local-tcsetaddr.diff
 any/local-disable-test-tgmath2.diff
 any/local-tst-mktime2.diff
-any/local-dynamic-resolvconf.diff
 any/submitted-nis-netgrp.diff
 any/submitted-clock-settime.diff
 any/submitted-longdouble.diff
@@ -212,36 +212,24 @@
 #any/local-disable-gethostbyname4.diff
 any/submitted-getaddrinfo-lo.diff
 any/local-getaddrinfo-interface.diff
-any/cvs-broken-dns.diff
 any/submitted-autotools.diff
-any/cvs-nptl-init.diff
 any/submitted-accept4-hidden.diff
-any/submitted-getent-gshadow.diff
-any/submitted-missing-etc-hosts.diff
 any/submitted-etc-resolv.conf.diff
 any/submitted-localedef-mmap.diff
-any/submitted-confname.h.diff
-any/cvs-getutmpx-compat.diff
-any/cvs-ksm.diff
+any/submitted-missing-etc-hosts.diff
 any/submitted-bits-fcntl_h-at.diff
-any/cvs-sched_h.diff
-any/cvs-nis-not-configured.diff
-any/submitted-getaddrinfo-nodata.diff
-any/submitted-gethostbyname3.diff
 any/local-ntp-update.diff
-any/cvs-malloc_info-output.diff
 #any/cvs-futimens.diff
-any/cvs-resolv-init.diff
-any/cvs-resolv-uninitialized.diff
 any/cvs-resolv-bindv6only.diff
-any/cvs-resolv-edns0.diff
-any/cvs-resolv-v6mapped.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/submitted-stat-issock.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

Modified: glibc-package/trunk/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/trunk/debian/patches/series.kfreebsd-amd64	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/series.kfreebsd-amd64	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,6 +1,7 @@
 kfreebsd/local-config_h_in.patch
 kfreebsd/local-ftw.diff
 kfreebsd/local-linuxthreads29.diff
+kfreebsd/local-nosavesse.diff
 kfreebsd/local-memusage_no_mremap.diff
 kfreebsd/local-pthread_at_fork.diff
 kfreebsd/local-readdir_r.diff
@@ -8,3 +9,4 @@
 kfreebsd/local-sys_queue_h.diff
 kfreebsd/local-sysdeps.diff
 kfreebsd/local-undef-glibc.diff
+kfreebsd/local-syscalls_2.11.patch

Modified: glibc-package/trunk/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.kfreebsd-i386	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/series.kfreebsd-i386	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,6 +1,7 @@
 kfreebsd/local-config_h_in.patch
 kfreebsd/local-ftw.diff
 kfreebsd/local-linuxthreads29.diff
+kfreebsd/local-nosavesse.diff
 kfreebsd/local-memusage_no_mremap.diff
 kfreebsd/local-pthread_at_fork.diff
 kfreebsd/local-readdir_r.diff
@@ -8,3 +9,4 @@
 kfreebsd/local-sys_queue_h.diff
 kfreebsd/local-sysdeps.diff
 kfreebsd/local-undef-glibc.diff
+kfreebsd/local-syscalls_2.11.patch

Added: glibc-package/trunk/debian/patches/sh4/cvs-register_dump.diff
===================================================================
--- glibc-package/trunk/debian/patches/sh4/cvs-register_dump.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/sh4/cvs-register_dump.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -0,0 +1,22 @@
+2010-05-26  Takashi Yoshii  <takashi.yoshii.zj@renesas.com>
+
+	* sysdeps/unix/sysv/linux/sh/sh4/register-dump.h: Fix iov[] size.
+
+--- a/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
++++ b/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
+@@ -1,5 +1,5 @@
+ /* Dump registers.
+-   Copyright (C) 1999, 2000, 2009 Free Software Foundation, Inc.
++   Copyright (C) 1999, 2000, 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
+@@ -58,7 +58,7 @@ register_dump (int fd, struct sigcontext *ctx)
+ {
+   char regs[22][8];
+   char fpregs[34][8];
+-  struct iovec iov[112];
++  struct iovec iov[22 * 2 + 34 * 2 + 2];
+   size_t nr = 0;
+ 
+ #define ADD_STRING(str) \

Deleted: glibc-package/trunk/debian/patches/svn-updates.diff
===================================================================
--- glibc-package/trunk/debian/patches/svn-updates.diff	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/patches/svn-updates.diff	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,191 +0,0 @@
-SVN update of svn://svn.eglibc.org/branches/eglibc-2_10 from revision 9295
-
---- a/ChangeLog	(révision 9295)
-+++ b/ChangeLog	(révision 9588)
-@@ -1,3 +1,8 @@
-+2009-11-01  Ulrich Drepper  <drepper@redhat.com>
-+
-+	* malloc/hooks.c (free_check): Restore locking and call _int_free
-+	appropriately.
-+
- 2009-10-28  Roland McGrath  <roland@redhat.com>
- 
- 	* Makefile (dist-prepare): New target.
---- a/malloc/hooks.c	(révision 9295)
-+++ b/malloc/hooks.c	(révision 9588)
-@@ -162,8 +162,8 @@
- 	 ((char*)p + sz)>=(mp_.sbrk_base+main_arena.system_mem) )) ||
-        sz<MINSIZE || sz&MALLOC_ALIGN_MASK || !inuse(p) ||
-        ( !prev_inuse(p) && (p->prev_size&MALLOC_ALIGN_MASK ||
--                            (contig && (char*)prev_chunk(p)<mp_.sbrk_base) ||
--                            next_chunk(prev_chunk(p))!=p) ))
-+			    (contig && (char*)prev_chunk(p)<mp_.sbrk_base) ||
-+			    next_chunk(prev_chunk(p))!=p) ))
-       return NULL;
-     magic = MAGICBYTE(p);
-     for(sz += SIZE_SZ-1; (c = ((unsigned char*)p)[sz]) != magic; sz -= c) {
-@@ -177,9 +177,9 @@
-        first. */
-     offset = (unsigned long)mem & page_mask;
-     if((offset!=MALLOC_ALIGNMENT && offset!=0 && offset!=0x10 &&
--        offset!=0x20 && offset!=0x40 && offset!=0x80 && offset!=0x100 &&
--        offset!=0x200 && offset!=0x400 && offset!=0x800 && offset!=0x1000 &&
--        offset<0x2000) ||
-+	offset!=0x20 && offset!=0x40 && offset!=0x80 && offset!=0x100 &&
-+	offset!=0x200 && offset!=0x400 && offset!=0x800 && offset!=0x1000 &&
-+	offset<0x2000) ||
-        !chunk_is_mmapped(p) || (p->size & PREV_INUSE) ||
-        ( (((unsigned long)p - p->prev_size) & page_mask) != 0 ) ||
-        ( (sz = chunksize(p)), ((p->prev_size + sz) & page_mask) != 0 ) )
-@@ -276,13 +276,17 @@
-   mchunkptr p;
- 
-   if(!mem) return;
-+  (void)mutex_lock(&main_arena.mutex);
-   p = mem2chunk_check(mem, NULL);
-   if(!p) {
-+    (void)mutex_unlock(&main_arena.mutex);
-+
-     malloc_printerr(check_action, "free(): invalid pointer", mem);
-     return;
-   }
- #if HAVE_MMAP
-   if (chunk_is_mmapped(p)) {
-+    (void)mutex_unlock(&main_arena.mutex);
-     munmap_chunk(p);
-     return;
-   }
-@@ -291,12 +295,11 @@
-   memset(mem, 0, chunksize(p) - (SIZE_SZ+1));
- #endif
- #ifdef ATOMIC_FASTBINS
--  _int_free(&main_arena, p, 0);
-+  _int_free(&main_arena, p, 1);
- #else
--  (void)mutex_lock(&main_arena.mutex);
-   _int_free(&main_arena, p);
-+#endif
-   (void)mutex_unlock(&main_arena.mutex);
--#endif
- }
- 
- static Void_t*
-@@ -345,13 +348,13 @@
-       if(oldsize - SIZE_SZ >= nb)
- 	newmem = oldmem; /* do nothing */
-       else {
--        /* Must alloc, copy, free. */
--        if (top_check() >= 0)
-+	/* Must alloc, copy, free. */
-+	if (top_check() >= 0)
- 	  newmem = _int_malloc(&main_arena, bytes+1);
--        if (newmem) {
--          MALLOC_COPY(BOUNDED_N(newmem, bytes+1), oldmem, oldsize - 2*SIZE_SZ);
--          munmap_chunk(oldp);
--        }
-+	if (newmem) {
-+	  MALLOC_COPY(BOUNDED_N(newmem, bytes+1), oldmem, oldsize - 2*SIZE_SZ);
-+	  munmap_chunk(oldp);
-+	}
-       }
-     }
-   } else {
-@@ -367,7 +370,7 @@
-     nb = chunksize(newp);
-     if(oldp<newp || oldp>=chunk_at_offset(newp, nb)) {
-       memset((char*)oldmem + 2*sizeof(mbinptr), 0,
--             oldsize - (2*sizeof(mbinptr)+2*SIZE_SZ+1));
-+	     oldsize - (2*sizeof(mbinptr)+2*SIZE_SZ+1));
-     } else if(nb > oldsize+SIZE_SZ) {
-       memset((char*)BOUNDED_N(chunk2mem(newp), bytes) + oldsize,
- 	     0, nb - (oldsize+SIZE_SZ));
-@@ -626,7 +629,7 @@
- 	mark_bin(&main_arena, i);
-       } else {
- 	/* Oops, index computation from chunksize must have changed.
--           Link the whole list into unsorted_chunks.  */
-+	   Link the whole list into unsorted_chunks.  */
- 	first(b) = last(b) = b;
- 	b = unsorted_chunks(&main_arena);
- 	ms->av[2*i+2]->bk = b;
-@@ -667,7 +670,7 @@
-     /* Check whether it is safe to enable malloc checking, or whether
-        it is necessary to disable it.  */
-     if (ms->using_malloc_checking && !using_malloc_checking &&
--        !disallow_malloc_check)
-+	!disallow_malloc_check)
-       __malloc_check_init ();
-     else if (!ms->using_malloc_checking && using_malloc_checking) {
-       __malloc_hook = NULL;
---- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c	(révision 0)
-+++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c	(révision 9588)
-@@ -0,0 +1,38 @@
-+/* Copyright (C) 2003, 2004, 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.  */
-+
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sysdep.h>
-+
-+/* Advice the system about the expected behaviour of the application with
-+   respect to the file associated with FD.  */
-+
-+int
-+posix_fadvise (int fd, off_t offset, off_t len, int advise)
-+{
-+#ifdef __NR_fadvise64
-+  INTERNAL_SYSCALL_DECL (err);
-+  int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+#else
-+  return ENOSYS;
-+#endif
-+}
---- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list	(révision 9295)
-+++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list	(révision 9588)
-@@ -2,6 +2,5 @@
- 
- readahead	-	readahead	i:iii	__readahead	readahead
- sync_file_range	-	sync_file_range	i:iiii	sync_file_range
--posix_fadvise	-	fadvise64	i:iiii	posix_fadvise
- ftruncate	-	ftruncate	i:ii	__ftruncate	ftruncate ftruncate64 __ftruncate64
- truncate	-	truncate	i:si	truncate	truncate64
---- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c	(révision 0)
-+++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c	(révision 9588)
-@@ -0,0 +1 @@
-+#include <sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c>
---- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c	(révision 0)
-+++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c	(révision 9588)
-@@ -0,0 +1 @@
-+/* posix_fadvise64 is in posix_fadvise.c */
---- a/ports/ChangeLog.mips	(révision 9295)
-+++ b/ports/ChangeLog.mips	(révision 9588)
-@@ -1,3 +1,11 @@
-+2009-12-01  Joseph Myers  <joseph@codesourcery.com>
-+
-+	* sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list
-+	(posix_fadvise): Remove.
-+	* sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c,
-+	sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c,
-+	sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c: New.
-+
- 2009-11-06  Joseph Myers  <joseph@codesourcery.com>
- 
- 	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h (fallocate): Fix types

Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/rules.d/build.mk	2010-05-28 22:51:08 UTC (rev 4294)
@@ -105,8 +105,6 @@
 	  echo "Flavour cross-compiled, tests have been skipped." | tee $(log_results) ; \
 	elif ! $(call kernel_check,$(call xx,MIN_KERNEL_SUPPORTED)); then \
 	  echo "Kernel too old, tests have been skipped." | tee $(log_results) ; \
-	elif hostname | grep -q -E 'ball|mayr|mayer|rem' ; then \
-	  echo "Buggy build daemon detected, tests have been skipped." | tee $(log_results) ; \
 	elif [ $(call xx,RUN_TESTSUITE) != "yes" ]; then \
 	  echo "Testsuite disabled for $(curpass), skipping tests."; \
 	  echo "Tests have been disabled." > $(log_results) ; \

Modified: glibc-package/trunk/debian/shlibver
===================================================================
--- glibc-package/trunk/debian/shlibver	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/shlibver	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1 +1 @@
-shlib_dep_ver = 2.10
+shlib_dep_ver = 2.11

Modified: glibc-package/trunk/debian/symbols.wildcards
===================================================================
--- glibc-package/trunk/debian/symbols.wildcards	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/symbols.wildcards	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,4 +1,4 @@
-| #PACKAGE# (>> 2.10), #PACKAGE# (<< 2.11)
+| #PACKAGE# (>> 2.11), #PACKAGE# (<< 2.12)
  *@GLIBC_PRIVATE 0 1
  *@GLIBC_2.0 2.0
  *@GLIBC_2.1 2.1
@@ -25,4 +25,5 @@
  *@GLIBC_2.8 2.8
  *@GLIBC_2.9 2.9
  *@GLIBC_2.10 2.10
+ *@GLIBC_2.11 2.11
  *@GCC_3.0 2.3.6

Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,4 +1,5 @@
 libc_rtlddir = /lib64
+extra_config_options = --enable-multi-arch
 
 # /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302.
 define libc6_extra_pkg_install

Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/sysdeps/i386.mk	2010-05-28 22:51:08 UTC (rev 4294)
@@ -1,6 +1,8 @@
 CC = gcc-4.3
 CXX = g++-4.3
 
+extra_config_options = --enable-multi-arch
+
 # We use -march=i686 and glibc's i686 routines use cmov, so require it.
 # A Debian-local glibc patch adds cmov to the search path.
 # The optimized libraries also use NPTL!

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-alpha-linux-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-alpha-linux-gnu-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-alpha-linux-gnu-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -10,6 +10,7 @@
 tst-cleanupx2.out, Error 1
 tst-cpuclock2.out, Error 1
 tst-eintr1.out, Error 1
+tst-longjmp_chk.out, Error 1
 tst-mutexpi4.out, Error 1
 tst-mutexpi5a.out, Error 1
 tst-mutexpi5.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-alphaev67-linux-gnu-alphaev67
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-alphaev67-linux-gnu-alphaev67	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-alphaev67-linux-gnu-alphaev67	2010-05-28 22:51:08 UTC (rev 4294)
@@ -10,6 +10,7 @@
 tst-cleanupx2.out, Error 1
 tst-cpuclock2.out, Error 1
 tst-eintr1.out, Error 1
+tst-longjmp_chk.out, Error 1
 tst-mutexpi4.out, Error 1
 tst-mutexpi5a.out, Error 1
 tst-mutexpi5.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-arm-linux-gnueabi-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-arm-linux-gnueabi-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-arm-linux-gnueabi-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -12,7 +12,5 @@
 test-fenv.out, Error 1
 test-float.out, Error 1
 test-fpucw.out, Error 132
-test-idouble.out, Error 1
-test-ifloat.out, Error 1
 test-misc.out, Error 1
 tst-timer.out, Error 139

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -4,20 +4,29 @@
 # Format: <Failed test>, Error <Make error code> [(ignored)]
 #
 annexc.out, Error 1 (ignored)
+check-execstack.out, Error 1
 check-localplt.out, Error 1
 check-textrel.out, Error 1
 tst-addr1.out, Error 1
 tst-audit2.out, Error 139
+tst-backtrace2.out, Error 1
 tst-cancelx20.out, Error 1
 tst-cancelx21.out, Error 1
 tst-cancelx4.out, Error 1
 tst-cancelx5.out, Error 1
 tst-cleanupx4.out, Error 1
 tst-cpuclock2.out, Error 1
-tst-getcpu.out, Error 1
 tst-cputimer1.out, Error 1
 tst-cputimer2.out, Error 1
 tst-cputimer3.out, Error 1
+tst-getcpu.out, Error 1
+tst-longjmp_chk.out, Error 1
 tst-mqueue3.out, Error 1
 tst-timer4.out, Error 1
 tst-timer5.out, Error 1
+
+# Should be removed when bug #582787 is fixed
+tstdiomisc.out, Error 1
+
+# Should be removed when bug #561203 is fixed
+tst-fork1.out, Error 139

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -19,6 +19,8 @@
 annexc.out, Error 1 (ignored)
 bug-glob2.out, Error 1
 bug-ulimit1.out, Error 1
+check-execstack.out, Error 1
+check-textrel.out, Error 1
 check-local-headers.out, Error 1
 check-localplt.out, Error 1
 mtrace-tst-loading, Error 1
@@ -26,7 +28,9 @@
 test-assert-perr.out, Error 1
 test-assert.out, Error 1
 test-fenv.out, Error 1
+test-idouble.out, Error 139
 test-ifaddrs.out, Error 1
+test-ifloat.out, Error 139
 test-lfs.out, Error 1
 test-memmem, Error 1
 tst-aio10.out, Error 1
@@ -56,6 +60,7 @@
 tst-lfschk4.out, Error 1
 tst-lfschk5.out, Error 1
 tst-lfschk6.out, Error 1
+tst-longjmp_chk2.out, Error 1
 tst-mknodat.out, Error 1
 tst-renameat.out, Error 1
 tst-sprofil.out, Error 136

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-i486-kfreebsd-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-i486-kfreebsd-gnu-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-i486-kfreebsd-gnu-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -8,6 +8,7 @@
 tst-aio10.out, Error 1
 tst-aio4.out, Error 1
 tst-aio9.out, Error 1
+tst-longjmp_chk.out, Error 1
 tst-mknodat.out, Error 1
 tst-cputimer2.out, Error 1
 tst-pselect.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-i686-kfreebsd-gnu-i386
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-i686-kfreebsd-gnu-i386	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-i686-kfreebsd-gnu-i386	2010-05-28 22:51:08 UTC (rev 4294)
@@ -11,6 +11,7 @@
 tst-aio4.out, Error 1
 tst-aio9.out, Error 1
 tst-cputimer2.out, Error 1
+tst-longjmp_chk.out, Error 1
 tst-mknodat.out, Error 1
 tst-pselect.out, Error 1
 tst-timer4.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-i686-kfreebsd-gnu-i686
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-i686-kfreebsd-gnu-i686	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-i686-kfreebsd-gnu-i686	2010-05-28 22:51:08 UTC (rev 4294)
@@ -8,6 +8,7 @@
 tst-aio10.out, Error 1
 tst-aio4.out, Error 1
 tst-aio9.out, Error 1
+tst-longjmp_chk.out, Error 1
 tst-mknodat.out, Error 1
 tst-cputimer2.out, Error 1
 tst-pselect.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -7,19 +7,4 @@
 check-localplt.out, Error 1
 tst-cpuclock2.out, Error 1
 tst-getcpu.out, Error 1
-tst-mutexpi4.out, Error 1
-tst-mutexpi5.out, Error 1
-tst-mutexpi5a.out, Error 1
-tst-mutexpi6.out, Error 1
-tst-mutexpi9.out, Error 1
-tst-oddstacklimit.out, Error 139
-tst-robustpi1.out, Error 1
-tst-robustpi2.out, Error 1
-tst-robustpi3.out, Error 1
-tst-robustpi4.out, Error 1
-tst-robustpi5.out, Error 1
-tst-robustpi6.out, Error 1
-tst-robustpi7.out, Error 1
-tst-robustpi8.out, Error 1
-tst-robustpi9.out, Error 1
-tst-timer.out, Error 139
+tst-longjmp_chk2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mips-linux-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-mips-linux-gnu-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-mips-linux-gnu-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -4,9 +4,11 @@
 # Format: <Failed test>, Error <Make error code> [(ignored)]
 #
 annexc.out, Error 1 (ignored)
+check-execstack.out, Error 1
 check-localplt.out, Error 1
 tst-audit1.out, Error 127
 tst-audit2.out, Error 127
+tst-backtrace2.out, Error 1
 tst-cancelx4.out, Error 1
 tst-cancelx5.out, Error 1
 tst-cpuclock2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-mips32-linux-gnu-mipsn32	2010-05-28 22:51:08 UTC (rev 4294)
@@ -6,10 +6,12 @@
 annexc.out, Error 1 (ignored)
 bug-nextafter.out, Error 8
 bug-nexttoward.out, Error 8
+check-execstack.out, Error 1
 check-localplt.out, Error 1
 test-misc.out, Error 1
 tst-audit1.out, Error 127
 tst-audit2.out, Error 127
+tst-backtrace2.out, Error 1
 tst-cancelx4.out, Error 1
 tst-cancelx5.out, Error 1
 tst-cpuclock2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32	2010-05-28 22:51:08 UTC (rev 4294)
@@ -6,10 +6,12 @@
 annexc.out, Error 1 (ignored)
 bug-nextafter.out, Error 8
 bug-nexttoward.out, Error 8
+check-execstack.out, Error 1
 check-localplt.out, Error 1
 test-misc.out, Error 1
 tst-audit1.out, Error 127
 tst-audit2.out, Error 127
+tst-backtrace2.out, Error 1
 tst-cancelx4.out, Error 1
 tst-cancelx5.out, Error 1
 tst-cpuclock2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-mips64-linux-gnu-mips64	2010-05-28 22:51:08 UTC (rev 4294)
@@ -6,10 +6,12 @@
 annexc.out, Error 1 (ignored)
 bug-nextafter.out, Error 8
 bug-nexttoward.out, Error 8
+check-execstack.out, Error 1
 check-localplt.out, Error 1
 test-misc.out, Error 1
 tst-audit1.out, Error 127
 tst-audit2.out, Error 127
+tst-backtrace2.out, Error 1
 tst-cancelx4.out, Error 1
 tst-cancelx5.out, Error 1
 tst-cpuclock2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64	2010-05-28 22:51:08 UTC (rev 4294)
@@ -6,10 +6,12 @@
 annexc.out, Error 1 (ignored)
 bug-nextafter.out, Error 8
 bug-nexttoward.out, Error 8
+check-execstack.out, Error 1
 check-localplt.out, Error 1
 test-misc.out, Error 1
 tst-audit1.out, Error 127
 tst-audit2.out, Error 127
+tst-backtrace2.out, Error 1
 tst-cancelx4.out, Error 1
 tst-cancelx5.out, Error 1
 tst-cpuclock2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -4,9 +4,11 @@
 # Format: <Failed test>, Error <Make error code> [(ignored)]
 #
 annexc.out, Error 1 (ignored)
+check-execstack.out, Error 1
 check-localplt.out, Error 1
 tst-audit1.out, Error 127
 tst-audit2.out, Error 127
+tst-backtrace2.out, Error 1
 tst-cancelx4.out, Error 1
 tst-cancelx5.out, Error 1
 tst-cpuclock2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-sparc-linux-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-sparc-linux-gnu-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-sparc-linux-gnu-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -5,10 +5,6 @@
 #
 annexc.out, Error 1 (ignored)
 check-localplt.out, Error 1
-tst-cancel20.out, Error 1
-tst-cancelx20.out, Error 1
-tst-cancelx4.out, Error 1
-tst-cancelx5.out, Error 1
+tst-backtrace2.out, Error 1
 tst-cpuclock2.out, Error 1
-tst-eintr1.out, Error 1
-tst-timer.out, Error 139
+tst-longjmp_chk2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64-linux-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64-linux-gnu-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64-linux-gnu-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -5,8 +5,10 @@
 #
 annexc.out, Error 1 (ignored)
 check-localplt.out, Error 1
+tst-backtrace2.out, Error 1
 tst-cancelx21.out, Error 1
 tst-cancelx4.out, Error 1
 tst-cancelx5.out, Error 1
 tst-cpuclock2.out, Error 1
 tst-timer.out, Error 139
+tst-longjmp_chk2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64-linux-gnu-sparc64
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64-linux-gnu-sparc64	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64-linux-gnu-sparc64	2010-05-28 22:51:08 UTC (rev 4294)
@@ -5,10 +5,12 @@
 #
 annexc.out, Error 1 (ignored)
 check-localplt.out, Error 1
+tst-backtrace2.out, Error 1
 tst-cancelx21.out, Error 1
 tst-chk3.out, Error 1
 tst-chk6.out, Error 1
+tst-cpuclock2.out, Error 1
 tst-lfschk3.out, Error 1
 tst-lfschk6.out, Error 1
-tst-cpuclock2.out, Error 1
+tst-longjmp_chk2.out, Error 1
 tst-timer.out, Error 139

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64b-linux-gnu-sparcv9b
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64b-linux-gnu-sparcv9b	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-sparc64b-linux-gnu-sparcv9b	2010-05-28 22:51:08 UTC (rev 4294)
@@ -5,10 +5,9 @@
 #
 annexc.out, Error 1 (ignored)
 check-localplt.out, Error 1
+tst-backtrace2.out, Error 1
 tst-cancelx21.out, Error 1
 tst-cancelx4.out, Error 1
 tst-cancelx5.out, Error 1
 tst-cpuclock2.out, Error 1
-tst-execstack-needed.out, Error 1
-tst-execstack-prog.out, Error 1
-tst-execstack.out, Error 1
+tst-longjmp_chk2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-sparcv9b-linux-gnu-sparcv9b
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-sparcv9b-linux-gnu-sparcv9b	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-sparcv9b-linux-gnu-sparcv9b	2010-05-28 22:51:08 UTC (rev 4294)
@@ -4,12 +4,7 @@
 # Format: <Failed test>, Error <Make error code> [(ignored)]
 #
 annexc.out, Error 1 (ignored)
-bug22.out, Error 1
 check-localplt.out, Error 1
-tst-cancel20.out, Error 1
-tst-cancelx20.out, Error 1
-tst-cancelx4.out, Error 1
-tst-cancelx5.out, Error 1
+tst-backtrace2.out, Error 1
 tst-cpuclock2.out, Error 1
-tst-eintr1.out, Error 1
-tst-timer.out, Error 139
+tst-longjmp_chk2.out, Error 1

Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-x86_64-kfreebsd-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-x86_64-kfreebsd-gnu-libc	2010-05-26 18:28:45 UTC (rev 4293)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-x86_64-kfreebsd-gnu-libc	2010-05-28 22:51:08 UTC (rev 4294)
@@ -8,6 +8,7 @@
 tst-aio10.out, Error 1
 tst-aio4.out, Error 1
 tst-aio9.out, Error 1
+tst-longjmp_chk.out, Error 1
 tst-mknodat.out, Error 1
 tst-cputimer2.out, Error 1
 tst-pselect.out, Error 1