diff options
| author | Roland McGrath <roland@gnu.org> | 2004-09-22 21:27:23 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-09-22 21:27:23 +0000 |
| commit | 59ae4124b7029b712c0cc513f570be0bf10dcd06 (patch) | |
| tree | 05261955ad494d835d3963687fb4419996b7c45f /fedora/glibc-nptl-check.patch | |
| parent | ee414d57cfe8222f920662d5288c295a503e9970 (diff) | |
Patches migrated from cvs.devel.redhat.com:/cvs/devel/glibc
Diffstat (limited to 'fedora/glibc-nptl-check.patch')
| -rw-r--r-- | fedora/glibc-nptl-check.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/fedora/glibc-nptl-check.patch b/fedora/glibc-nptl-check.patch new file mode 100644 index 0000000000..48951ea5e8 --- /dev/null +++ b/fedora/glibc-nptl-check.patch @@ -0,0 +1,48 @@ +--- libc/sysdeps/unix/sysv/linux/dl-osinfo.h.jj 2002-12-10 09:09:24.000000000 -0500 ++++ libc/sysdeps/unix/sysv/linux/dl-osinfo.h 2003-05-20 17:05:37.000000000 -0400 +@@ -22,6 +22,7 @@ + #include <sys/sysctl.h> + #include <sys/utsname.h> + #include "kernel-features.h" ++#include <sysdep.h> + + #ifndef MIN + # define MIN(a,b) (((a)<(b))?(a):(b)) +@@ -37,8 +38,29 @@ dl_fatal (const char *str) + _dl_dprintf (2, str); + _exit (1); + } +-#endif + ++static inline void ++__attribute__ ((always_inline)) ++dl_redhat_nptl_check (const char *cp) ++{ ++ cp = strchr (cp, 'n'); ++ if (__builtin_expect (cp == NULL || cp[1] != 'p' ++ || cp[2] != 't' || cp[3] != 'l', 0) ++ && GLRO(dl_osversion) < 0x20545 ++ && GLRO(dl_osversion) > 0x20413) ++ { ++#ifdef __NR_set_tid_address ++ INTERNAL_SYSCALL_DECL (err); ++ int ret; ++ ret = INTERNAL_SYSCALL (set_tid_address, err, 1, NULL); ++ if (INTERNAL_SYSCALL_ERROR_P (ret, err)) ++#endif ++ GLRO(dl_osversion) = 0x20413; ++ } ++} ++#else ++#define dl_redhat_nptl_check(cp) ++#endif + + #define DL_SYSDEP_OSCHECK(FATAL) \ + do { \ +@@ -105,5 +127,6 @@ dl_fatal (const char *str) + FATAL ("FATAL: kernel too old\n"); \ + \ + GLRO(dl_osversion) = version; \ ++ dl_redhat_nptl_check (cp); \ + } \ + } while (0) |