This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
| Other format: | [Raw text] | |
Hi,
The attached patch is the SH variant of the cancellation handling
patch. The change of pt-initfini.c is needed to avoid the build
failure when using the newer gcc. It passed linuxthreads testsuite
on sh4.
Regards,
kaz
--
2003-01-05 Kaz Kojima <kkojima@rr.iij4u.or.jp>
[ChangeLog]
* sysdeps/unix/sysv/linux/sh/clone.S (__clone): Use
SYSCALL_ERROR_HANDLER.
* sysdeps/unix/sysv/linux/sh/pipe.S (__libc_pipe): Likewise.
* sysdeps/unix/sysv/linux/sh/socket.S (__socket): Likewise.
Add support for cancellation handling.
* sysdeps/unix/sysv/linux/sh/syscall.S (__syscall): Use
SYSCALL_ERROR_HANDLER.
* sysdeps/unix/sysv/linux/sh/vfork.S (__vfork): Likewise.
* sysdeps/unix/sysv/linux/sh/sysdep.h (PSEUDO): Likewise.
Add support for cancellation handling.
(SYSCALL_ERROR_HANDLER): Define PIC variants.
[linuxthreads/ChangLog]
* sysdeps/sh/tls.h: Include dl-sysdep.h and stdint.h.
(tcbhead_t): Add multiple_threads member.
(TLS_INIT_TP_EXPENSIVE): Define.
* sysdeps/unix/sysv/linux/sh/pt-initfini.c: Don't use multi-line
strings. Remove unused code.
* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: New file.
diff -urN ORIG/libc/linuxthreads/sysdeps/sh/tls.h LOCAL/libc/linuxthreads/sysdeps/sh/tls.h
--- ORIG/libc/linuxthreads/sysdeps/sh/tls.h Thu Oct 3 19:42:29 2002
+++ LOCAL/libc/linuxthreads/sysdeps/sh/tls.h Sat Jan 4 09:08:41 2003
@@ -1,5 +1,5 @@
/* Definition for thread-local data handling. linuxthreads/SH version.
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003 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
@@ -20,10 +20,12 @@
#ifndef _TLS_H
#define _TLS_H
-#ifndef __ASSEMBLER__
-#include <stddef.h>
+# include <dl-sysdep.h>
+# include <pt-machine.h>
-#include <pt-machine.h>
+#ifndef __ASSEMBLER__
+# include <stddef.h>
+# include <stdint.h>
/* Type for the dtv. */
typedef union dtv
@@ -39,18 +41,24 @@
thread descriptor used by libpthread. */
dtv_t *dtv;
void *self; /* Pointer to the thread descriptor. */
+ int multiple_threads;
} tcbhead_t;
+#else /* __ASSEMBLER__ */
+# include <tcb-offsets.h>
+#endif /* __ASSEMBLER__ */
/* We can support TLS only if the floating-stack support is available. */
-#if defined FLOATING_STACKS && defined HAVE_TLS_SUPPORT
-
-/* Get system call information. */
-# include <sysdep.h>
+#if defined HAVE_TLS_SUPPORT \
+ && (defined FLOATING_STACKS || !defined IS_IN_libpthread)
/* Signal that TLS support is available. */
# define USE_TLS 1
+#ifndef __ASSEMBLER__
+
+/* Get system call information. */
+# include <sysdep.h>
/* Get the thread descriptor definition. */
# include <linuxthreads/descr.h>
@@ -103,13 +111,17 @@
0; \
})
+/* Indicate that dynamic linker shouldn't try to initialize TLS even
+ when no PT_TLS segments are found in the program and libraries
+ it is linked against. */
+# define TLS_INIT_TP_EXPENSIVE 1
/* Return the address of the dtv for the current thread. */
# define THREAD_DTV() \
({ struct _pthread_descr_struct *__descr; \
THREAD_GETMEM (__descr, p_header.data.dtvp); })
-#endif /* FLOATING_STACKS && HAVE_TLS_SUPPORT */
+# endif /* HAVE_TLS_SUPPORT && (FLOATING_STACKS || !IS_IN_libpthread) */
#endif /* __ASSEMBLER__ */
#endif /* tls.h */
diff -urN ORIG/libc/linuxthreads/sysdeps/unix/sysv/linux/sh/pt-initfini.c LOCAL/libc/linuxthreads/sysdeps/unix/sysv/linux/sh/pt-initfini.c
--- ORIG/libc/linuxthreads/sysdeps/unix/sysv/linux/sh/pt-initfini.c Tue Aug 27 07:07:50 2002
+++ LOCAL/libc/linuxthreads/sysdeps/unix/sysv/linux/sh/pt-initfini.c Sat Jan 4 13:49:23 2003
@@ -36,134 +36,114 @@
* crtn.s puts the corresponding function epilogues
in the .init and .fini sections. */
-__asm__ ("
-
-#include \"defs.h\"
-#define SHARED
-
-/*@HEADER_ENDS*/
-
-/*@TESTS_BEGIN*/
-
-/*@TESTS_END*/
-
-/*@_init_PROLOG_BEGINS*/
- .section .init
- .align 5
- .global _init
- .type _init,@function
-_init:
- mov.l r12,@-r15
- mov.l r14,@-r15
- sts.l pr,@-r15
-#ifdef SHARED
- mova .L22,r0
- mov.l .L22,r12
- add r0,r12
- mova .L24,r0
- mov.l .L24,r1
- add r0,r1
- jsr @r1
- nop
- mova .L23,r0
- mov.l .L23,r1
- add r0,r1
-#else
- mov.l .L24,r1
- jsr @r1
- nop
- mov.l .L23,r1
-#endif
- jsr @r1
- mov r15,r14
- bra 1f
- nop
- .align 2
-#ifdef SHARED
-.L22:
- .long _GLOBAL_OFFSET_TABLE_
-.L23:
- .long __gmon_start__@PLT
-.L24:
- .long __pthread_initialize_minimal@PLT
-#else
-.L23:
- .long __gmon_start__
-.L24:
- .long __pthread_initialize_minimal
-#endif
- .data
- .global __fpscr_values
-__fpscr_values:
- .long 0
- .long 0x80000
- .previous
-1:
- ALIGN
- END_INIT
-
-
-/*@_init_PROLOG_ENDS*/
-
-/*@_init_EPILOG_BEGINS*/
- .section .init
- mov r14,r15
- lds.l @r15+,pr
- mov.l @r15+,r14
- rts
- mov.l @r15+,r12
- END_INIT
- .section .text
- .align 5
- .weak __gmon_start__
- .type __gmon_start__,@function
-__gmon_start__:
- mov.l r14,@-r15
- mov r15,r14
- mov r14,r15
- rts
- mov.l @r15+,r14
-
-/*@_init_EPILOG_ENDS*/
-
-/*@_fini_PROLOG_BEGINS*/
- .section .fini
- .align 5
- .global _fini
- .type _fini,@function
-_fini:
- mov.l r12,@-r15
- mov.l r14,@-r15
- sts.l pr,@-r15
-#ifdef SHARED
- mova .L27,r0
- mov.l .L27,r12
- add r0,r12
-#endif
- mov r15,r14
- ALIGN
- END_FINI
-#ifdef SHARED
- bra 1f
- nop
- .align 2
-.L27:
- .long _GLOBAL_OFFSET_TABLE_
-#endif
-1:
-/*@_fini_PROLOG_ENDS*/
-
-/*@_fini_EPILOG_BEGINS*/
- .section .fini
- mov r14,r15
- lds.l @r15+,pr
- mov.l @r15+,r14
- rts
- mov.l @r15+,r12
-
- END_FINI
-
-/*@_fini_EPILOG_ENDS*/
-
-/*@TRAILER_BEGINS*/
+__asm__ ("\n\
+\n\
+#include \"defs.h\"\n\
+\n\
+/*@HEADER_ENDS*/\n\
+\n\
+/*@TESTS_BEGIN*/\n\
+\n\
+/*@TESTS_END*/\n\
+\n\
+/*@_init_PROLOG_BEGINS*/\n\
+ .section .init\n\
+ .align 5\n\
+ .global _init\n\
+ .type _init,@function\n\
+_init:\n\
+ mov.l r12,@-r15\n\
+ mov.l r14,@-r15\n\
+ sts.l pr,@-r15\n\
+ mova .L22,r0\n\
+ mov.l .L22,r12\n\
+ add r0,r12\n\
+ mova .L24,r0\n\
+ mov.l .L24,r1\n\
+ add r0,r1\n\
+ jsr @r1\n\
+ nop\n\
+ mova .L23,r0\n\
+ mov.l .L23,r1\n\
+ add r0,r1\n\
+ jsr @r1\n\
+ mov r15,r14\n\
+ bra 1f\n\
+ nop\n\
+ .align 2\n\
+.L22:\n\
+ .long _GLOBAL_OFFSET_TABLE_\n\
+.L23:\n\
+ .long __gmon_start__@PLT\n\
+.L24:\n\
+ .long __pthread_initialize_minimal@PLT\n\
+ .data\n\
+ .global __fpscr_values\n\
+__fpscr_values:\n\
+ .long 0\n\
+ .long 0x80000\n\
+ .previous\n\
+1:\n\
+ ALIGN\n\
+ END_INIT\n\
+\n\
+/*@_init_PROLOG_ENDS*/\n\
+\n\
+/*@_init_EPILOG_BEGINS*/\n\
+ .section .init\n\
+ mov r14,r15\n\
+ lds.l @r15+,pr\n\
+ mov.l @r15+,r14\n\
+ rts \n\
+ mov.l @r15+,r12\n\
+ END_INIT\n\
+ .section .text\n\
+ .align 5\n\
+ .weak __gmon_start__\n\
+ .type __gmon_start__,@function\n\
+__gmon_start__:\n\
+ mov.l r14,@-r15\n\
+ mov r15,r14\n\
+ mov r14,r15\n\
+ rts \n\
+ mov.l @r15+,r14\n\
+ \n\
+/*@_init_EPILOG_ENDS*/\n\
+\n\
+/*@_fini_PROLOG_BEGINS*/\n\
+ .section .fini\n\
+ .align 5\n\
+ .global _fini\n\
+ .type _fini,@function\n\
+_fini:\n\
+ mov.l r12,@-r15\n\
+ mov.l r14,@-r15\n\
+ sts.l pr,@-r15\n\
+ mova .L27,r0\n\
+ mov.l .L27,r12\n\
+ add r0,r12\n\
+ mov r15,r14\n\
+ ALIGN\n\
+ END_FINI\n\
+ bra 1f\n\
+ nop\n\
+ .align 2\n\
+.L27:\n\
+ .long _GLOBAL_OFFSET_TABLE_\n\
+1:\n\
+/*@_fini_PROLOG_ENDS*/\n\
+\n\
+/*@_fini_EPILOG_BEGINS*/\n\
+ .section .fini\n\
+ mov r14,r15\n\
+ lds.l @r15+,pr\n\
+ mov.l @r15+,r14\n\
+ rts \n\
+ mov.l @r15+,r12\n\
+\n\
+ END_FINI\n\
+ \n\
+/*@_fini_EPILOG_ENDS*/\n\
+\n\
+/*@TRAILER_BEGINS*/\n\
");
diff -urN ORIG/libc/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h LOCAL/libc/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
--- ORIG/libc/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h Thu Jan 1 09:00:00 1970
+++ LOCAL/libc/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h Sun Jan 5 18:07:13 2003
@@ -0,0 +1,163 @@
+/* Copyright (C) 2003 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <sysdep.h>
+#include <tls.h>
+#include <pt-machine.h>
+#ifndef __ASSEMBLER__
+# include <linuxthreads/internals.h>
+#endif
+
+#if !defined NOT_IN_libc || defined IS_IN_libpthread
+
+# define _IMM12 #-12
+# define _IMM16 #-16
+# define _IMP16 #16
+# undef PSEUDO
+# define PSEUDO(name, syscall_name, args) \
+ .text; \
+ ENTRY (name); \
+ SINGLE_THREAD_P; \
+ bf .Lpseudo_cancel; \
+ DO_CALL (syscall_name, args); \
+ mov r0,r1; \
+ mov _IMM12,r2; \
+ shad r2,r1; \
+ not r1,r1; \
+ tst r1,r1; \
+ bt .Lsyscall_error; \
+ bra .Lpseudo_end; \
+ nop; \
+ .Lpseudo_cancel: \
+ sts.l pr,@-r15; \
+ add _IMM16,r15; \
+ SAVE_ARGS_##args; \
+ CENABLE; \
+ LOAD_ARGS_##args; \
+ add _IMP16,r15; \
+ lds.l @r15+,pr; \
+ DO_CALL(syscall_name, args); \
+ sts.l pr,@-r15; \
+ mov.l r0,@-r15; \
+ CDISABLE; \
+ mov.l @r15+,r0; \
+ lds.l @r15+,pr; \
+ mov r0,r1; \
+ mov _IMM12,r2; \
+ shad r2,r1; \
+ not r1,r1; \
+ tst r1,r1; \
+ bf .Lpseudo_end; \
+ .Lsyscall_error: \
+ SYSCALL_ERROR_HANDLER; \
+ .Lpseudo_end:
+
+# undef PSEUDO_END
+# define PSEUDO_END(sym) \
+ END (sym)
+
+# define SAVE_ARGS_0 /* Nothing. */
+# define SAVE_ARGS_1 SAVE_ARGS_0; mov.l r4,@(0,r15)
+# define SAVE_ARGS_2 SAVE_ARGS_1; mov.l r5,@(4,r15)
+# define SAVE_ARGS_3 SAVE_ARGS_2; mov.l r6,@(8,r15)
+# define SAVE_ARGS_4 SAVE_ARGS_3; mov.l r7,@(12,r15)
+# define SAVE_ARGS_5 SAVE_ARGS_4
+# define SAVE_ARGS_6 SAVE_ARGS_5
+
+# define LOAD_ARGS_0 /* Nothing. */
+# define LOAD_ARGS_1 LOAD_ARGS_0; mov.l @(0,r15),r4
+# define LOAD_ARGS_2 LOAD_ARGS_1; mov.l @(4,r15),r5
+# define LOAD_ARGS_3 LOAD_ARGS_2; mov.l @(8,r15),r6
+# define LOAD_ARGS_4 LOAD_ARGS_3; mov.l @(12,r15),r7
+# define LOAD_ARGS_5 LOAD_ARGS_4
+# define LOAD_ARGS_6 LOAD_ARGS_5
+
+# ifdef IS_IN_libpthread
+# define __local_enable_asynccancel __pthread_enable_asynccancel
+# define __local_disable_asynccancel __pthread_disable_asynccancel
+# define __local_multiple_threads __pthread_multiple_threads
+# else
+# define __local_enable_asynccancel __libc_enable_asynccancel
+# define __local_disable_asynccancel __libc_disable_asynccancel
+# define __local_multiple_threads __libc_multiple_threads
+# endif
+
+# define CENABLE \
+ mov.l 1f,r0; \
+ bsrf r0; \
+ nop; \
+ 0: bra 2f; \
+ nop; \
+ .align 2; \
+ 1: .long __local_enable_asynccancel - 0b; \
+ 2:
+# define CDISABLE \
+ mov.l 1f,r0; \
+ bsrf r0; \
+ nop; \
+ 0: bra 2f; \
+ nop; \
+ .align 2; \
+ 1: .long __local_disable_asynccancel - 0b; \
+ 2:
+
+# ifndef __ASSEMBLER__
+# if defined FLOATING_STACKS && USE___THREAD && defined PIC
+# define SINGLE_THREAD_P \
+ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
+ p_header.data.multiple_threads) == 0, 1)
+# else
+extern int __local_multiple_threads attribute_hidden;
+# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
+# endif
+# else
+# if !defined PIC
+# define SINGLE_THREAD_P \
+ mov.l 1f,r0; \
+ bra 2f; \
+ tst r0,r0; \
+ .align 2; \
+ 1: .long __local_multiple_threads; \
+ 2:
+# elif defined FLOATING_STACKS && USE___THREAD
+# define SINGLE_THREAD_P \
+ mov.l @(MULTIPLE_THREADS_OFFSET,gbr),r0; tst r0,r0
+# 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 r2,r12; \
+ bra 2f; \
+ tst r0,r0; \
+ .align 2; \
+ 0: .long _GLOBAL_OFFSET_TABLE_; \
+ 1: .long __local_multiple_threads@GOTOFF; \
+ 2:
+# endif
+# endif
+
+#elif !defined __ASSEMBLER__
+
+/* This code should never be used but we define it anyhow. */
+# define SINGLE_THREAD_P (1)
+
+#endif
diff -urN ORIG/libc/sysdeps/unix/sysv/linux/sh/clone.S LOCAL/libc/sysdeps/unix/sysv/linux/sh/clone.S
--- ORIG/libc/sysdeps/unix/sysv/linux/sh/clone.S Fri Jul 6 13:56:20 2001
+++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/clone.S Sun Jan 5 16:12:34 2003
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2003 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
@@ -32,27 +32,9 @@
bf/s 1f
tst r5, r5
bf/s 1f
- mov.l .L1, r1
-#ifdef SHARED
- mov.l r12, @-r15
- sts.l pr, @-r15
- mov.l .LG, r12
- mova .LG, r0
- add r0, r12
- mova .L1, r0
- add r0, r1
- jsr @r1
- mov #-EINVAL, r4
- lds.l @r15+, pr
- rts
- mov.l @r15+, r12
-#else
- jmp @r1
- mov #-EINVAL, r4
-#endif
- .align 2
-.L1:
- .long PLTJMP(C_SYMBOL_NAME(__syscall_error))
+ mov #-EINVAL,r0
+ bra .Lsyscall_error
+ nop
1:
/* insert the args onto the new stack */
mov.l r7, @-r5
@@ -68,36 +50,16 @@
shad r2, r1
not r1, r1 // r1=0 means r0 = -1 to -4095
tst r1, r1 // i.e. error in linux
- bf 2f
- mov.l .L2, r1
-#ifdef SHARED
- mov r0, r4
- mov.l r12, @-r15
- sts.l pr, @-r15
- mov.l .LG, r12
- mova .LG, r0
- add r0, r12
- mova .L2, r0
- add r0, r1
- jsr @r1
- nop
- lds.l @r15+, pr
- rts
- mov.l @r15+, r12
-#else
- jmp @r1
- mov r0, r4
-#endif
- .align 2
-.L2:
- .long PLTJMP(C_SYMBOL_NAME(__syscall_error))
-
-2:
+ bf .Lclone_end
+.Lsyscall_error:
+ SYSCALL_ERROR_HANDLER
+.Lclone_end:
tst r0, r0
- bt 3f
+ bt 2f
+.Lpseudo_end:
rts
nop
-3:
+2:
/* thread starts */
mov.l @r15, r1
jsr @r1
diff -urN ORIG/libc/sysdeps/unix/sysv/linux/sh/pipe.S LOCAL/libc/sysdeps/unix/sysv/linux/sh/pipe.S
--- ORIG/libc/sysdeps/unix/sysv/linux/sh/pipe.S Mon Aug 26 17:33:16 2002
+++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/pipe.S Sun Jan 5 16:06:41 2003
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2002, 2003 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
@@ -26,37 +26,16 @@
shad r2, r3
not r3, r3 // r1=0 means r0 = -1 to -4095
tst r3, r3 // i.e. error in linux
- bf 1f
- mov.l .L2, r1
-#ifdef SHARED
- mov r0, r4
- mov.l r12, @-r15
- sts.l pr, @-r15
- mov.l 0f, r12
- mova 0f, r0
- add r0, r12
- mova .L2, r0
- add r0, r1
- jsr @r1
- nop
- lds.l @r15+, pr
- rts
- mov.l @r15+, r12
- .align 2
-0:
- .long _GLOBAL_OFFSET_TABLE_
-#else
- jmp @r1
- mov r0, r4
-#endif
-1:
+ bt 1f
mov.l r0, @r4
mov.l r1, @(4, r4)
rts
mov #0, r0
- .align 2
-.L2:
- .long PLTJMP(C_SYMBOL_NAME(__syscall_error))
+1:
+ SYSCALL_ERROR_HANDLER
+.Lpseudo_end:
+ rts
+ nop
PSEUDO_END (__libc_pipe)
weak_alias (__libc_pipe, __pipe)
diff -urN ORIG/libc/sysdeps/unix/sysv/linux/sh/socket.S LOCAL/libc/sysdeps/unix/sysv/linux/sh/socket.S
--- ORIG/libc/sysdeps/unix/sysv/linux/sh/socket.S Fri Jul 6 13:56:20 2001
+++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/socket.S Sun Jan 5 10:02:21 2003
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2003 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
@@ -16,8 +16,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <sysdep.h>
+#include <sysdep-cancel.h>
#include <socketcall.h>
+#include <tls.h>
#define P(a, b) P2(a, b)
#define P2(a, b) a##b
@@ -63,7 +64,12 @@
/* Push args onto the stack. */
P(PUSHARGS_,NARGS)
- /* Do the system call trap. */
+#if defined NEED_CANCELLATION && defined CENABLE
+ SINGLE_THREAD_P
+ bf .Lsocket_cancel
+#endif
+
+ /* Do the system call trap. */
mov #+P(SOCKOP_,socket), r4
mov r15, r5
mov.l .L1,r3
@@ -77,39 +83,44 @@
shad r2, r1
not r1, r1 // r1=0 means r0 = -1 to -4095
tst r1, r1 // i.e. error in linux
- bf 1f
-
- mov.l .L2, r1
-#ifdef SHARED
- mov r0, r4
- mov.l r12, @-r15
- sts.l pr, @-r15
- mov.l 0f, r12
- mova 0f, r0
- add r0, r12
- mova .L2, r0
- add r0, r1
- jsr @r1
- nop
- lds.l @r15+, pr
- rts
- mov.l @r15+, r12
- .align 2
-0:
- .long _GLOBAL_OFFSET_TABLE_
-#else
- jmp @r1
- mov r0, r4
-#endif
-1:
+ bf .Lpseudo_end
+.Lsyscall_error:
+ SYSCALL_ERROR_HANDLER
+.Lpseudo_end:
/* Successful; return the syscall's value. */
rts
nop
+
+#if defined NEED_CANCELLATION && defined CENABLE
+.Lsocket_cancel:
+ /* Enable asynchronous cancellation. */
+ CENABLE
+
+ /* Do the system call trap. */
+ mov #+P(SOCKOP_,socket), r4
+ mov r15, r5
+ mov.l .L1,r3
+ trapa #0x12
+
+ mov.l r0,@-r15
+ CDISABLE
+ mov.l @r15+,r0
+
+ /* Pop args off the stack */
+ P(POPARGS_,NARGS)
+
+ mov r0, r1
+ mov #-12, r2
+ shad r2, r1
+ not r1, r1 // r1=0 means r0 = -1 to -4095
+ tst r1, r1 // i.e. error in linux
+ bf .Lpseudo_end
+ bra .Lsyscall_error
+ nop
+#endif
.align 2
.L1:
.long SYS_ify(socketcall)
-.L2:
- .long PLTJMP(C_SYMBOL_NAME(__syscall_error))
PSEUDO_END (__socket)
diff -urN ORIG/libc/sysdeps/unix/sysv/linux/sh/syscall.S LOCAL/libc/sysdeps/unix/sysv/linux/sh/syscall.S
--- ORIG/libc/sysdeps/unix/sysv/linux/sh/syscall.S Fri Jul 6 13:56:20 2001
+++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/syscall.S Sun Jan 5 16:14:24 2003
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2003 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
@@ -33,36 +33,12 @@
shad r2, r1
not r1, r1 // r1=0 means r0 = -1 to -4095
tst r1, r1 // i.e. error in linux
- bf 1f
- mov.l .L2, r1
-#ifdef SHARED
- mov r0, r4
- mov.l r12, @-r15
- sts.l pr, @-r15
- mov.l 0f, r12
- mova 0f, r0
- add r0, r12
- mova .L2, r0
- add r0, r1
- jsr @r1
- nop
- lds.l @r15+, pr
- rts
- mov.l @r15+, r12
- .align 2
-0:
- .long _GLOBAL_OFFSET_TABLE_
-#else
- jmp @r1
- mov r0, r4
-#endif
-1:
+ bf .Lpseudo_end
+ SYSCALL_ERROR_HANDLER
+.Lpseudo_end:
rts
nop
- .align 2
-.L2:
- .long PLTJMP(C_SYMBOL_NAME(__syscall_error))
PSEUDO_END (__syscall)
weak_alias (__syscall, syscall)
diff -urN ORIG/libc/sysdeps/unix/sysv/linux/sh/sysdep.h LOCAL/libc/sysdeps/unix/sysv/linux/sh/sysdep.h
--- ORIG/libc/sysdeps/unix/sysv/linux/sh/sysdep.h Tue Aug 27 07:08:04 2002
+++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/sysdep.h Sun Jan 5 16:41:21 2003
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,93,95-99,2000,02 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>, August 1995.
Changed by Kaz Kojima, <kkojima@rr.iij4u.or.jp>.
@@ -45,9 +45,9 @@
returns a value in -1 .. -4095 as a valid result so we can savely
test with -4095. */
+#define _IMM1 #-1
#define _IMM12 #-12
#undef PSEUDO
-#ifdef SHARED
#define PSEUDO(name, syscall_name, args) \
.text; \
ENTRY (name); \
@@ -57,50 +57,99 @@
shad r2,r1; \
not r1,r1; \
tst r1,r1; \
- bf 1f; \
- mov r0,r4; \
- mov.l r12,@-r15; \
- sts.l pr,@-r15; \
- mov.l 0f,r12; \
- mova 0f,r0; \
- add r0,r12; \
- mov.l 2f,r1; \
- mova 2f,r0; \
- add r0,r1; \
- jsr @r1; \
- nop; \
- lds.l @r15+,pr; \
- rts; \
- mov.l @r15+,r12; \
- .align 2; \
- 2: .long PLTJMP(C_SYMBOL_NAME(__syscall_error)); \
- 0: .long _GLOBAL_OFFSET_TABLE_; \
- 1:
-#else
-#define PSEUDO(name, syscall_name, args) \
- .text; \
- ENTRY (name); \
- DO_CALL (syscall_name, args); \
- mov r0,r1; \
- mov _IMM12,r2; \
- shad r2,r1; \
- not r1,r1; \
- tst r1,r1; \
- bf 1f; \
- mov.l 2f,r1; \
- jmp @r1; \
- mov r0, r4; \
- .align 2; \
- 2: .long PLTJMP(C_SYMBOL_NAME(__syscall_error)); \
- 1:
-#endif
+ bf .Lpseudo_end; \
+ SYSCALL_ERROR_HANDLER; \
+ .Lpseudo_end:
#undef PSEUDO_END
#define PSEUDO_END(name) \
- SYSCALL_ERROR_HANDLER \
END (name)
-#define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
+#ifndef PIC
+# define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
+#else
+# if RTLD_PRIVATE_ERRNO
+# define SYSCALL_ERROR_HANDLER \
+ neg r0,r1; \
+ mov.l 0f,r12; \
+ mova 0f,r0; \
+ add r0,r12; \
+ mov.l 1f,r0; \
+ mov.l r1,@(r0,r12)
+ bra .Lpseudo_end; \
+ mov _IMM1,r0; \
+ .align 2; \
+ 0: .long _GLOBAL_OFFSET_TABLE_; \
+ 1: .long errno@GOTOFF
+
+# elif defined _LIBC_REENTRANT
+
+# if USE___THREAD
+# ifndef NOT_IN_libc
+# define SYSCALL_ERROR_ERRNO __libc_errno
+# else
+# define SYSCALL_ERROR_ERRNO errno
+# endif
+# define SYSCALL_ERROR_HANDLER \
+ neg r0,r1; \
+ mov r12,r2; \
+ mov.l 0f,r12; \
+ mova 0f,r0; \
+ add r0,r12; \
+ mov.l 1f,r0; \
+ stc gbr, r4; \
+ mov.l @(r0,r12),r0; \
+ mov r2,r12; \
+ add r4,r0; \
+ mov.l r1,@r0; \
+ bra .Lpseudo_end; \
+ mov _IMM1,r0; \
+ .align 2; \
+ 0: .long _GLOBAL_OFFSET_TABLE_; \
+ 1: .long SYSCALL_ERROR_ERRNO@GOTTPOFF
+# else
+# define SYSCALL_ERROR_HANDLER \
+ neg r0,r1; \
+ mov.l r12,@-r15; \
+ mov.l r1,@-r15; \
+ mov.l 0f,r12; \
+ mova 0f,r0; \
+ add r0,r12; \
+ sts.l pr,@-r15; \
+ mov.l 1f,r1; \
+ bsrf r1; \
+ nop; \
+ 2: lds.l @r15+,pr; \
+ mov.l @r15+,r1; \
+ mov.l r1,@r0; \
+ mov.l @r15+,r12; \
+ bra .Lpseudo_end; \
+ mov _IMM1,r0; \
+ .align 2; \
+ 0: .long _GLOBAL_OFFSET_TABLE_; \
+ 1: .long PLTJMP(C_SYMBOL_NAME(__errno_location))-(2b+2-.)
+/* A quick note: it is assumed that the call to `__errno_location' does
+ not modify the stack! */
+# endif
+# else
+/* Store (-r0) into errno through the GOT. */
+# define SYSCALL_ERROR_HANDLER \
+ neg r0,r1; \
+ mov r12,r2; \
+ mov.l 0f,r12; \
+ mova 0f,r0; \
+ add r0,r12; \
+ mov.l 1f,r0; \
+ mov.l @(r0,r12),r0; \
+ mov r2,r12; \
+ mov.l r1,@r0; \
+ bra .Lpseudo_end; \
+ mov _IMM1,r0; \
+ .align 2; \
+ 0: .long _GLOBAL_OFFSET_TABLE_; \
+ 1: .long errno@GOT
+# endif /* _LIBC_REENTRANT */
+#endif /* PIC */
#define SYSCALL_INST0 trapa #0x10
#define SYSCALL_INST1 trapa #0x11
diff -urN ORIG/libc/sysdeps/unix/sysv/linux/sh/vfork.S LOCAL/libc/sysdeps/unix/sysv/linux/sh/vfork.S
--- ORIG/libc/sysdeps/unix/sysv/linux/sh/vfork.S Sat Jan 4 08:26:40 2003
+++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/vfork.S Sun Jan 5 16:21:48 2003
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2002, 2003 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
@@ -39,28 +39,8 @@
mov.w .L1, r1
cmp/eq r1, r0
bt 2f
- mov.l .L2, r1
-#ifdef SHARED
- mov r0, r4
- mov.l r12, @-r15
- sts.l pr, @-r15
- mov.l 0f, r12
- mova 0f, r0
- add r0, r12
- mova .L2, r0
- add r0, r1
- jsr @r1
+ bra .Lsyscall_error
nop
- lds.l @r15+, pr
- rts
- mov.l @r15+, r12
- .align 2
-0:
- .long _GLOBAL_OFFSET_TABLE_
-#else
- jmp @r1
- mov r0, r4
-#endif
.L1:
.word -ENOSYS
.L3: .word __NR_vfork
@@ -78,33 +58,10 @@
shad r2, r1
not r1, r1 // r1=0 means r0 = -1 to -4095
tst r1, r1 // i.e. error in linux
- bf 1f
- mov.l .L2, r1
-#ifdef SHARED
- mov r0, r4
- mov.l r12, @-r15
- sts.l pr, @-r15
- mov.l 0f, r12
- mova 0f, r0
- add r0, r12
- mova .L2, r0
- add r0, r1
- jsr @r1
- nop
- lds.l @r15+, pr
- rts
- mov.l @r15+, r12
- .align 2
-0:
- .long _GLOBAL_OFFSET_TABLE_
-#else
- jmp @r1
- mov r0, r4
-#endif
- .align 2
-.L2:
- .long PLTJMP(C_SYMBOL_NAME(__syscall_error))
-1:
+ bf .Lpseudo_end
+.Lsyscall_error:
+ SYSCALL_ERROR_HANDLER
+.Lpseudo_end:
rts
nop
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |