diff options
Diffstat (limited to 'linuxthreads')
-rw-r--r-- | linuxthreads/ChangeLog | 6 | ||||
-rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h | 21 |
2 files changed, 26 insertions, 1 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index ca061a943f..45a76743ad 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +2004-07-14 Kaz Kojima <kkojima@rr.iij4u.or.jp> + + * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h + (__local_multiple_threads): Define for librt. + (SINGLE_THREAD_P): Likewise. + 2004-07-07 Jakub Jelinek <jakub@redhat.com> * sysdeps/pthread/getcpuclockid.c (pthread_getcpuclockid): Allow diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h index 9fac494a9f..03c6fedbfe 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h @@ -99,6 +99,7 @@ # else # define __local_enable_asynccancel __librt_enable_asynccancel # define __local_disable_asynccancel __librt_disable_asynccancel +# define __local_multiple_threads __librt_multiple_threads # endif # if defined IS_IN_librt && defined PIC @@ -183,7 +184,8 @@ extern int __local_multiple_threads attribute_hidden; 1: # else -# define SINGLE_THREAD_P \ +# if !defined NOT_IN_libc || defined IS_IN_libpthread +# define SINGLE_THREAD_P \ mov r12,r2; \ mov.l 0f,r12; \ mova 0f,r0; \ @@ -197,6 +199,23 @@ extern int __local_multiple_threads attribute_hidden; 0: .long _GLOBAL_OFFSET_TABLE_; \ 1: .long __local_multiple_threads@GOTOFF; \ 2: +# else +# define SINGLE_THREAD_P \ + mov r12,r2; \ + mov.l 0f,r12; \ + mova 0f,r0; \ + add r0,r12; \ + mov.l 1f,r0; \ + mov.l @(r0,r12),r0; \ + mov.l @r0,r0; \ + mov r2,r12; \ + bra 2f; \ + tst r0,r0; \ + .align 2; \ + 0: .long _GLOBAL_OFFSET_TABLE_; \ + 1: .long __local_multiple_threads@GOT; \ + 2: +# endif # endif # endif |