diff options
| author | Roland McGrath <roland@gnu.org> | 2003-03-03 08:44:46 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-03-03 08:44:46 +0000 |
| commit | ea6a015bd78d1bc15c02f64d5e5423cbcdc86b2e (patch) | |
| tree | aa51f8c6fbea5e7ef556644f34553b6fde4be133 /nptl | |
| parent | 83f2fcbe7b26ac53dc237c37f52b699207bd9d19 (diff) | |
| download | glibc-ea6a015bd78d1bc15c02f64d5e5423cbcdc86b2e.tar.gz glibc-ea6a015bd78d1bc15c02f64d5e5423cbcdc86b2e.tar.xz glibc-ea6a015bd78d1bc15c02f64d5e5423cbcdc86b2e.zip | |
* sysdeps/ia64/dl-fptr.c (__ia64_make_fptr): Add const to MAP arg.
* sysdeps/ia64/dl-machine.h: Update decl.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 8 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread-functions.h | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/jmp-unwind.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index ba075bb943..d6ca84806c 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,11 @@ +2003-03-03 Roland McGrath <roland@redhat.com> + + * forward.c: Fix typo in __pthread_attr_init_2_0 compat_symbol decl. + + * sysdeps/pthread/pthread-functions.h (struct pthread_functions): + Argument to ptr___pthread_cleanup_upto is __jmp_buf, not jmp_buf. + * sysdeps/unix/sysv/linux/jmp-unwind.c: Likewise. + 2003-03-02 Ulrich Drepper <drepper@redhat.com> * sysdeps/pthread/timer_create.c (timer_create): Return correct diff --git a/nptl/sysdeps/pthread/pthread-functions.h b/nptl/sysdeps/pthread/pthread-functions.h index f6922a0d6c..9f38e34053 100644 --- a/nptl/sysdeps/pthread/pthread-functions.h +++ b/nptl/sysdeps/pthread/pthread-functions.h @@ -71,7 +71,7 @@ struct pthread_functions pthread_t (*ptr_pthread_self) (void); int (*ptr_pthread_setcancelstate) (int, int *); int (*ptr_pthread_setcanceltype) (int, int *); - void (*ptr___pthread_cleanup_upto) (jmp_buf, char *); + void (*ptr___pthread_cleanup_upto) (__jmp_buf, char *); int (*ptr___pthread_once) (pthread_once_t *, void (*) (void)); int (*ptr___pthread_rwlock_rdlock) (pthread_rwlock_t *); int (*ptr___pthread_rwlock_wrlock) (pthread_rwlock_t *); diff --git a/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c b/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c index f0a290ae4b..d6fbcc39eb 100644 --- a/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c +++ b/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c @@ -21,7 +21,7 @@ #include <stddef.h> #include <pthread-functions.h> -extern void __pthread_cleanup_upto (jmp_buf env, char *targetframe); +extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); #pragma weak __pthread_cleanup_upto @@ -35,5 +35,5 @@ _longjmp_unwind (jmp_buf env, int val) #endif if (fptr != NULL) - fptr (env, __builtin_frame_address (0)); + fptr (env->__jmpbuf, __builtin_frame_address (0)); } |