diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-10-06 09:25:03 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-10-06 09:25:03 +0000 |
| commit | 8802619dd44c1323b9c6d42ed73af7c5b77f33fb (patch) | |
| tree | 56c1e4ab1d3e50b30b58feb65499e7af4d02a917 /nptl | |
| parent | 8d5be89424e466635b8294b37226878c1a9fe1eb (diff) | |
| download | glibc-8802619dd44c1323b9c6d42ed73af7c5b77f33fb.tar glibc-8802619dd44c1323b9c6d42ed73af7c5b77f33fb.tar.gz glibc-8802619dd44c1323b9c6d42ed73af7c5b77f33fb.tar.bz2 glibc-8802619dd44c1323b9c6d42ed73af7c5b77f33fb.zip | |
* sysdeps/unix/sysv/linux/jmp-unwind.c: Include pthreadP.h instead
of pthread-functions.h and pthreaddef.h.
* sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/jmp-unwind.c | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index f48085822c..5d488cd1a5 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,9 @@ 2004-10-06 Jakub Jelinek <jakub@redhat.com> + * sysdeps/unix/sysv/linux/jmp-unwind.c: Include pthreadP.h instead + of pthread-functions.h and pthreaddef.h. + * sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise. + * sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h. (JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from CFA. diff --git a/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c b/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c index 67350c2151..c435eff307 100644 --- a/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c +++ b/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c @@ -19,8 +19,7 @@ #include <setjmp.h> #include <stddef.h> -#include <pthread-functions.h> -#include <pthreaddef.h> +#include <pthreadP.h> extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); #pragma weak __pthread_cleanup_upto diff --git a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c index f7d88f20e6..36886f58a4 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c @@ -1,5 +1,5 @@ /* Clean up stack frames unwound by longjmp. Linux/s390 version. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 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 @@ -19,8 +19,7 @@ #include <setjmp.h> #include <stddef.h> -#include <pthread-functions.h> -#include <pthreaddef.h> +#include <pthreadP.h> extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); #pragma weak __pthread_cleanup_upto |