diff options
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/sparc')
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h | 4 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h index 0f4691025e..e948ca10a8 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h +++ b/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h @@ -1,5 +1,5 @@ /* Machine-specific pthread type layouts. SPARC version. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. @@ -80,7 +80,7 @@ typedef union __pthread_mutex_u # define __PTHREAD_MUTEX_HAVE_PREV 1 #else unsigned int __nusers; - union + __extension__ union { int __spins; union __pthread_mutex_u *__next; diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h index d8c65aeffd..d69623c145 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. @@ -40,7 +40,11 @@ __##syscall_name##_nocancel: \ nop; \ .size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \ .subsection 2; \ + cfi_startproc; \ 1: save %sp, -192, %sp; \ + cfi_def_cfa_register (%fp); \ + cfi_window_save; \ + cfi_register (%o7, %i7); \ CENABLE; \ nop; \ mov %o0, %l0; \ @@ -53,6 +57,7 @@ __##syscall_name##_nocancel: \ mov %l0, %o0; \ jmpl %i7 + 8, %g0; \ restore %g0, %l1, %o0; \ + cfi_endproc; \ .previous; \ SYSCALL_ERROR_HANDLER \ SYSCALL_ERROR_HANDLER2 |