qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2003-03-15  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/x86_64/pthreaddef.h (CURRENT_STACK_FRAME): Don't use
	__builtin_frame_address, use stack pointer.

	* sysdeps/unix/sysv/linux/jmp-unwind.c: Use CURRENT_STACK_FRAME
	instead of __builtin_frame_pointer.
This commit is contained in:
Ulrich Drepper 2003-03-15 09:51:22 +00:00
parent 92ed3daf01
commit a87731e262
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nptl/ChangeLog
View File

@ -1,3 +1,11 @@
2003-03-15 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/pthreaddef.h (CURRENT_STACK_FRAME): Don't use
__builtin_frame_address, use stack pointer.
* sysdeps/unix/sysv/linux/jmp-unwind.c: Use CURRENT_STACK_FRAME
instead of __builtin_frame_pointer.
2003-03-14 Ulrich Drepper <drepper@redhat.com> 2003-03-14 Ulrich Drepper <drepper@redhat.com>
* tst-basic1.c (do_test): Add cast to avoid warning. * tst-basic1.c (do_test): Add cast to avoid warning.

3
nptl/sysdeps/unix/sysv/linux/jmp-unwind.c
View File

@ -20,6 +20,7 @@
#include <setjmp.h> #include <setjmp.h>
#include <stddef.h> #include <stddef.h>
#include <pthread-functions.h> #include <pthread-functions.h>
#include <pthreaddef.h>
extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
#pragma weak __pthread_cleanup_upto #pragma weak __pthread_cleanup_upto
@ -35,5 +36,5 @@ _longjmp_unwind (jmp_buf env, int val)
#endif #endif
if (fptr != NULL) if (fptr != NULL)
fptr (env->__jmpbuf, __builtin_frame_address (0)); fptr (env->__jmpbuf, CURRENT_STACK_FRAME);
} }

7
nptl/sysdeps/x86_64/pthreaddef.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002 Free Software Foundation, Inc. /* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -34,8 +34,9 @@
#define SIGCANCEL __SIGRTMIN #define SIGCANCEL __SIGRTMIN
/* Location of current stack frame. */ /* Location of current stack frame. The frame pointer is not usable. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0) #define CURRENT_STACK_FRAME \
({ char *frame; asm ("movq %%rsp, %0" : "=r" (frame)); frame; })
/* XXX Until we have a better place keep the definitions here. */ /* XXX Until we have a better place keep the definitions here. */

12
nptl/sysdeps/x86_64/tls.h
View File

@ -253,6 +253,18 @@ typedef struct
}}) }})
#define CALL_THREAD_FCT(descr) \
({ void *__res; \
asm volatile ("movq %%fs:%P2, %%rdi\n\t" \
"callq *%%fs:%P1" \
: "=a" (__res) \
: "i" (offsetof (struct pthread, start_routine)), \
"i" (offsetof (struct pthread, arg)) \
: "di", "si", "cx", "dx", "r8", "r9", "r10", "r11", \
"memory", "cc"); \
__res; })
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */
#endif /* tls.h */ #endif /* tls.h */