# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1189082332 0
# Node ID ba634892cc18a059e491967272ecf71dff42f0ea
# Parent  3dd2af7100bf60954943f62f7757eb5d354512ce
Add a patch to enqable NPTL build on ARM OABI with glibc-2.6.1.
Fix a comment.

diff -r 3dd2af7100bf -r ba634892cc18 patches/glibc/ports-2.6.1/100-ARM-NPTL.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/glibc/ports-2.6.1/100-ARM-NPTL.patch	Thu Sep 06 12:38:52 2007 +0000
@@ -0,0 +1,13 @@
+diff -durN glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
+--- glibc-ports-2.6.1.orig/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h	2005-11-16 20:22:59.000000000 +0100
++++ glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h	2007-09-06 13:53:16.000000000 +0200
+@@ -126,3 +126,9 @@
+ # define NO_CANCELLATION 1
+ 
+ #endif
++
++#ifndef __ASSEMBLER__
++# define RTLD_SINGLE_THREAD_P \
++  __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
++                   header.multiple_threads) == 0, 1)
++#endif
diff -r 3dd2af7100bf -r ba634892cc18 scripts/functions
--- a/scripts/functions	Thu Sep 06 10:49:05 2007 +0000
+++ b/scripts/functions	Thu Sep 06 12:38:52 2007 +0000
@@ -435,7 +435,7 @@
     if [ "${libc_addon}" = "y" ]; then
         # Some addons tarball directly contian the correct addon directory,
         # while others have the addon directory named ofter the tarball.
-        # Fix that bu always using the short name (eg: linuxthreads, ports, etc...)
+        # Fix that by always using the short name (eg: linuxthreads, ports, etc...)
         addon_short_name=`echo "${file}" |sed -r -e 's/^[^-]+-//; s/-[^-]+$//;'`
         [ -d "${addon_short_name}" ] || ln -s "${file}" "${addon_short_name}"
         # If libc addon, we're already in the correct place