diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2007-09-06 12:38:52 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2007-09-06 12:38:52 (GMT) |
| commit | 0bee99ed389b8ffbdf5d9903daece3d491659f25 (patch) | |
| tree | 4a76e32aae8a8db858a210e446263ad3363672f7 | |
| parent | 1cf24eb2a4396142048f1a5d0ee8eb0a19ea82d1 (diff) | |
Add a patch to enqable NPTL build on ARM OABI with glibc-2.6.1.
Fix a comment.
| -rw-r--r-- | patches/glibc/ports-2.6.1/100-ARM-NPTL.patch | 13 | ||||
| -rw-r--r-- | scripts/functions | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/patches/glibc/ports-2.6.1/100-ARM-NPTL.patch b/patches/glibc/ports-2.6.1/100-ARM-NPTL.patch new file mode 100644 index 0000000..7cb14de --- /dev/null +++ b/patches/glibc/ports-2.6.1/100-ARM-NPTL.patch @@ -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 --git a/scripts/functions b/scripts/functions index b7211a4..eebe886 100644 --- a/scripts/functions +++ b/scripts/functions @@ -435,7 +435,7 @@ CT_ExtractAndPatch() { 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 |