From ea1533e08df4c63e680438ac1dc243cdc37d205a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 17 Jan 2007 08:37:26 +0000 Subject: * sysdeps/unix/sysv/linux/libc_pthread_init.c: Don't just copy the function table, mangle the pointers. * sysdeps/pthread/pthread-functions.h: Define PTHFCT_CALL. * forward.c: Use PTHFCT_CALL and __libc_pthread_functions_init. * sysdeps/pthread/bits/libc-lock.h: When using __libc_pthread_functions demangle pointers before use. * sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Use PTHFCT_CALL to demangle pointer. * sysdeps/unix/sysv/linux/jmp-unwind.c: Likewise. * sysdeps/pthread/setxid.h: Likewise. --- sysdeps/unix/sysv/linux/fatal-prepare.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'sysdeps/unix/sysv/linux/fatal-prepare.h') diff --git a/sysdeps/unix/sysv/linux/fatal-prepare.h b/sysdeps/unix/sysv/linux/fatal-prepare.h index d48ae62..81f38b0 100644 --- a/sysdeps/unix/sysv/linux/fatal-prepare.h +++ b/sysdeps/unix/sysv/linux/fatal-prepare.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -24,10 +24,9 @@ # include # define FATAL_PREPARE \ { \ - int (*fp) (int, int *); \ - fp = __libc_pthread_functions.ptr_pthread_setcancelstate; \ - if (fp != NULL) \ - fp (PTHREAD_CANCEL_DISABLE, NULL); \ + if (__libc_pthread_functions_init) \ + PTHFCT_CALL (ptr_pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, \ + NULL)); \ } #else # pragma weak pthread_setcancelstate -- cgit v1.1