From da0c02eee173701ed0a055adda040ec596812045 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 8 Jul 2003 21:08:13 +0000 Subject: Update. 2003-07-08 Jakub Jelinek * pthreadP.h (__pthread_unwind_next, __pthread_register_cancel, __pthread_unregister_cancel): Add prototypes and hidden_proto. * unwind.c (__pthread_unwind_next): Add hidden_def. * cleanup.c (__pthread_register_cancel, __pthread_unregister_cancel): Likewise. * sysdeps/unix/sysv/linux/i386/i486/sem_wait.S (__new_sem_wait): Use HIDDEN_JUMPTARGET to jump to __pthread_unwind. * sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S (sem_timedwait): Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_wait.S (sem_wait): Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S (sem_timedwait): Likewise. * sysdeps/unix/sysv/linux/i386/pthread_once.S (__pthread_once): Use HIDDEN_JUMPTARGET to call __pthread_register_cancel, __pthread_unregister_cancel and __pthread_unwind_next. --- nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S | 2 +- nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S | 2 +- nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S | 6 +++--- nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S | 2 +- nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'nptl/sysdeps') diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S index 9afe85f205..b48a309f53 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S @@ -187,6 +187,6 @@ sem_timedwait: LOCK orl $0x10, %gs:CANCELHANDLING movl %gs:CLEANUP_JMP_BUF, %eax - jmp __pthread_unwind + jmp HIDDEN_JUMPTARGET (__pthread_unwind) cfi_endproc .size sem_timedwait,.-sem_timedwait diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S index ba4f54cd64..b7674dc3ba 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S @@ -123,7 +123,7 @@ __new_sem_wait: LOCK orl $0x10, %gs:CANCELHANDLING movl %gs:CLEANUP_JMP_BUF, %eax - jmp __pthread_unwind + jmp HIDDEN_JUMPTARGET (__pthread_unwind) cfi_endproc .size __new_sem_wait,.-__new_sem_wait versioned_symbol(libpthread, __new_sem_wait, sem_wait, GLIBC_2_1) diff --git a/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S b/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S index 3bab92f990..107a9a919e 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S @@ -112,14 +112,14 @@ __pthread_once: jne 7f leal 8(%esp), %eax - call __pthread_register_cancel + call HIDDEN_JUMPTARGET(__pthread_register_cancel) /* Call the user-provided initialization function. */ call *24+UNWINDBUFSIZE(%esp) /* Pop the cleanup handler. */ leal 8(%esp), %eax - call __pthread_unregister_cancel + call HIDDEN_JUMPTARGET(__pthread_unregister_cancel) addl $UNWINDBUFSIZE+8, %esp cfi_adjust_cfa_offset (-UNWINDBUFSIZE-8) @@ -156,7 +156,7 @@ __pthread_once: ENTER_KERNEL leal 8(%esp), %eax - call __pthread_unwind_next /* Note: no @PLT. */ + call HIDDEN_JUMPTARGET (__pthread_unwind_next) /* NOTREACHED */ hlt cfi_endproc diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S index 7626d7b250..d90e03b55b 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S @@ -170,6 +170,6 @@ sem_timedwait: LOCK orl $0x10, %fs:CANCELHANDLING movq %fs:CLEANUP_JMP_BUF, %rdi - jmp __pthread_unwind + jmp HIDDEN_JUMPTARGET (__pthread_unwind) cfi_endproc .size sem_timedwait,.-sem_timedwait diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S index 32742309fb..76957bc139 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S @@ -115,6 +115,6 @@ sem_wait: LOCK orl $0x10, %fs:CANCELHANDLING movq %fs:CLEANUP_JMP_BUF, %rdi - jmp __pthread_unwind + jmp HIDDEN_JUMPTARGET (__pthread_unwind) cfi_endproc .size sem_wait,.-sem_wait -- cgit 1.4.1