diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-07-14 23:05:23 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-07-14 23:05:23 +0000 |
| commit | 75540d8ad415cd04f981d81fe7c9effda5f88af5 (patch) | |
| tree | 58e1879e6335497338f468366c3a08fced8d092f | |
| parent | 255476a9e58ce60e5e03dc2641fdde20f4fbc321 (diff) | |
| download | glibc-75540d8ad415cd04f981d81fe7c9effda5f88af5.tar.gz glibc-75540d8ad415cd04f981d81fe7c9effda5f88af5.tar.xz glibc-75540d8ad415cd04f981d81fe7c9effda5f88af5.zip | |
Update.
2003-07-14 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Fix typo in test for compilation in libc.
| -rw-r--r-- | linuxthreads/ChangeLog | 5 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h | 2 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h | 10 |
4 files changed, 18 insertions, 4 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 557aa1868d..9cd3e94866 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2003-07-14 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Fix typo + in test for compilation in libc. + 2003-07-04 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (PSEUDO): Use diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h index 87f7367dd0..3fcd108d67 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h @@ -68,7 +68,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \ # ifdef IS_IN_libpthread # define CENABLE call __pthread_enable_asynccancel # define CDISABLE call __pthread_disable_asynccancel -# elif defined !NOT_IN_libc +# elif !defined NOT_IN_libc # define CENABLE call __libc_enable_asynccancel # define CDISABLE call __libc_disable_asynccancel # else diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 56a38b28fa..8839bf8c76 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2003-07-15 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h (PSEUDO): + Add cfi directives. + 2003-07-12 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/tcb-offsets.sym: Add RESULT, TID, CANCELHANDLING and diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h index 35adb1f39d..3f9edb24ae 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h @@ -30,30 +30,34 @@ # define PSEUDO(name, syscall_name, args) \ .section ".text"; \ ENTRY (name) \ + cfi_startproc; \ SINGLE_THREAD_P; \ bne- .Lpseudo_cancel; \ DO_CALL (SYS_ify (syscall_name)); \ PSEUDO_RET; \ .Lpseudo_cancel: \ stdu 1,-128(1); \ + cfi_adjust_cfa_offset (128); \ mflr 9; \ std 9,128+16(1); \ + cfi_offset (lr, 16); \ DOCARGS_##args; /* save syscall args around CENABLE. */ \ CENABLE; \ std 3,72(1); /* store CENABLE return value (MASK). */ \ UNDOCARGS_##args; /* restore syscall args. */ \ DO_CALL (SYS_ify (syscall_name)); \ mfcr 0; /* save CR/R3 around CDISABLE. */ \ - std 3,64(1); \ + std 3,64(1); \ std 0,8(1); \ ld 3,72(1); /* pass MASK to CDISABLE. */ \ CDISABLE; \ ld 9,128+16(1); \ ld 0,8(1); /* restore CR/R3. */ \ - ld 3,64(1); \ + ld 3,64(1); \ mtlr 9; \ mtcr 0; \ - addi 1,1,128; + addi 1,1,128; \ + cfi_endproc; # define DOCARGS_0 # define UNDOCARGS_0 |