mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 10:22:41 +08:00
Update.
2003-01-04 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Mark __syscall_pread64 and __syscall_pwrite64 cancelable. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h (INTERNAL_SYSCALL): New macro. (LOADARGS_0, LOADARGS_1): Fix. 2003-01-05 Ulrich Drepper <drepper@redhat.com> * Makerules (build-shlip-helper): Unless told otherwise, add -Wl,-z,defs to linker command line. * rt/Makefile (librt.so): Link with ld.so. * dlfcn/Makefile (libdl.so): Likewise.
This commit is contained in:
Ulrich Drepper
parent
73e9ae887f
commit
bdee30cfe4
15
ChangeLog
15
ChangeLog
@ -1,3 +1,18 @@
|
||||
2003-01-04 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Mark
|
||||
__syscall_pread64 and __syscall_pwrite64 cancelable.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
|
||||
(INTERNAL_SYSCALL): New macro.
|
||||
(LOADARGS_0, LOADARGS_1): Fix.
|
||||
|
||||
2003-01-05 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* Makerules (build-shlip-helper): Unless told otherwise, add
|
||||
-Wl,-z,defs to linker command line.
|
||||
* rt/Makefile (librt.so): Link with ld.so.
|
||||
* dlfcn/Makefile (libdl.so): Likewise.
|
||||
|
||||
2003-01-05 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/s390/s390-32/socket.S: Add support for
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
2003-01-05 Kaz Kojima <kkojima@rr.iij4u.or.jp>
|
||||
|
||||
* 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.
|
||||
|
||||
2003-01-04 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: New file.
|
||||
|
||||
@ -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 @@ typedef struct
|
||||
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 @@ typedef struct
|
||||
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 */
|
||||
|
||||
@ -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\
|
||||
");
|
||||
|
||||
163
linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
Normal file
163
linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
Normal file
@ -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
|
||||
Loading…
Reference in New Issue
Block a user