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.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 557aa1868df19b9a1ce362905b02b31e681a5a69..9cd3e94866df6ebb6b8cc8aec1697edfb406591b 100644 (file)
--- 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 87f7367dd0a8572e79ad3e62d0e10c454264c56e..3fcd108d678ac29e3a4811175254b75cf578f975 100644 (file)
--- 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 56a38b28fa1ea61872e47ab9eb693343a4056377..8839bf8c768bd1b2355169d034fd30aa0ceb7b21 100644 (file)
--- 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 35adb1f39daa4b13f1b6ea944aace98f1d423bf5..3f9edb24ae58c509b1826ca121c69afd7acfc2d4 100644 (file)
--- 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