OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* elf/stackguard-macros.h (STACK_CHK_GUARD): Fix s390/s390x definition. 

Reported by Ulrich Weigand <uweigand@de.ibm.com>.

	* elf/stackguard-macros.h (STACK_CHK_GUARD): Add ia64 definition.
This commit is contained in:
Ulrich Drepper 2005-07-07 06:10:18 +00:00
parent 587d6ddc60
commit 253eb3a0ac
7 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-07-05 Jakub Jelinek <jakub@redhat.com>
* elf/stackguard-macros.h (STACK_CHK_GUARD): Fix s390/s390x definition.
Reported by Ulrich Weigand <uweigand@de.ibm.com>.
* elf/stackguard-macros.h (STACK_CHK_GUARD): Add ia64 definition.
2005-07-06 Ulrich Drepper <drepper@redhat.com>
* elf/dl-error.c (_dl_signal_error): When testing for executable

7
elf/stackguard-macros.h
View File

@ -20,10 +20,13 @@
({ uintptr_t x; asm ("ld [%%g7+0x14], %0" : "=r" (x)); x; })
#elif defined __s390x__
# define STACK_CHK_GUARD \
({ uintptr_t x; asm ("ear %0,%a0; sllg %0,%0,32; ear %0,%a1; lg %0,0x28(%0)" : "=r" (x)); x; })
({ uintptr_t x; asm ("ear %0,%%a0; sllg %0,%0,32; ear %0,%%a1; lg %0,0x28(%0)" : "=a" (x)); x; })
#elif defined __s390__
# define STACK_CHK_GUARD \
({ uintptr_t x; asm ("ear %0,%%a0; l %0,0x14(%0)" : "=r" (x)); x; })
({ uintptr_t x; asm ("ear %0,%%a0; l %0,0x14(%0)" : "=a" (x)); x; })
#elif defined __ia64__
# define STACK_CHK_GUARD \
({ uintptr_t x; asm ("adds %0 = -8, r13;; ld8 %0 = [%0]" : "=r" (x)); x; })
#else
extern uintptr_t __stack_chk_guard;
# define STACK_CHK_GUARD __stack_chk_guard

13
nptl/ChangeLog
View File

@ -1,3 +1,16 @@
2005-07-05 Jakub Jelinek <jakub@redhat.com>
* descr.h (PTHREAD_STRUCT_END_PADDING): Define.
* sysdeps/ia64/tls.h (TLS_PRE_TCB_SIZE): If PTHREAD_STRUCT_END_PADDING
is smaller than 8 bytes, increase TLS_PRE_TCB_SIZE by 16 bytes.
(THREAD_SYSINFO, THREAD_SELF, DB_THREAD_SELF): Don't assume
TLS_PRE_TCB_SIZE is sizeof (struct pthread).
(THREAD_SET_STACK_GUARD, THREAD_COPY_STACK_GUARD): Define.
* sysdeps/ia64/tcb-offsets.sym (PID, TID, MULTIPLE_THREADS_OFFSET):
Use TLS_PRE_TCB_SIZE instead of sizeof (struct pthread).
* sysdeps/unix/sysv/linux/ia64/createthread.c (TLS_VALUE): Don't
assume TLS_PRE_TCB_SIZE is sizeof (struct pthread).
2005-06-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/i386/tls.h (tcbhead_t): Add stack_guard field.

7
nptl/descr.h
View File

@ -254,6 +254,13 @@ struct pthread
/* Resolver state. */
struct __res_state res;
/* If you add fields after the res field above, please adjust
the following macro. */
#define PTHREAD_STRUCT_END_PADDING \
(sizeof (struct pthread) - offsetof (struct pthread, res) \
- sizeof (((struct pthread *) 0)->res))
} __attribute ((aligned (TCB_ALIGNMENT)));

6
nptl/sysdeps/ia64/tcb-offsets.sym
View File

@ -1,7 +1,7 @@
#include <sysdep.h>
#include <tls.h>
PID offsetof (struct pthread, pid) - sizeof (struct pthread)
TID offsetof (struct pthread, tid) - sizeof (struct pthread)
MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) - sizeof (struct pthread)
PID offsetof (struct pthread, pid) - TLS_PRE_TCB_SIZE
TID offsetof (struct pthread, tid) - TLS_PRE_TCB_SIZE
MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) - TLS_PRE_TCB_SIZE
SYSINFO_OFFSET offsetof (tcbhead_t, private)

26
nptl/sysdeps/ia64/tls.h
View File

@ -80,8 +80,15 @@ register struct pthread *__thread_self __asm__("r13");
/* This is the size of the TCB. */
# define TLS_TCB_SIZE sizeof (tcbhead_t)
/* This is the size we need before TCB. */
# define TLS_PRE_TCB_SIZE sizeof (struct pthread)
/* This is the size we need before TCB.
If there is not any room for uintptr_t stack_guard in struct pthread's
final padding, we need to put struct pthread 16 byte slower. */
# define TLS_PRE_TCB_SIZE \
(sizeof (struct pthread) \
+ (PTHREAD_STRUCT_END_PADDING < sizeof (uintptr_t) \
? ((sizeof (uintptr_t) + __alignof__ (struct pthread) - 1)\
& ~(__alignof__ (struct pthread) - 1)) \
: 0))
/* Alignment requirements for the TCB. */
# define TLS_TCB_ALIGN __alignof__ (struct pthread)
@ -106,7 +113,8 @@ register struct pthread *__thread_self __asm__("r13");
(((tcbhead_t *) (descr))->dtv)
#define THREAD_SELF_SYSINFO (((tcbhead_t *) __thread_self)->private)
#define THREAD_SYSINFO(pd) (((tcbhead_t *) ((pd) + 1))->private)
#define THREAD_SYSINFO(pd) \
(((tcbhead_t *) ((char *) (pd) + TLS_PRE_TCB_SIZE))->private)
#if defined NEED_DL_SYSINFO
# define INIT_SYSINFO THREAD_SELF_SYSINFO = (void *) GLRO(dl_sysinfo)
@ -125,10 +133,11 @@ register struct pthread *__thread_self __asm__("r13");
(((tcbhead_t *)__thread_self)->dtv)
/* Return the thread descriptor for the current thread. */
# define THREAD_SELF (__thread_self - 1)
# define THREAD_SELF \
((struct pthread *) ((char *) __thread_self - TLS_PRE_TCB_SIZE))
/* Magic for libthread_db to know how to do THREAD_SELF. */
# define DB_THREAD_SELF REGISTER (64, 64, 13 * 8, -sizeof (struct pthread))
# define DB_THREAD_SELF REGISTER (64, 64, 13 * 8, -TLS_PRE_TCB_SIZE)
/* Access to data in the thread descriptor is easy. */
#define THREAD_GETMEM(descr, member) \
@ -140,6 +149,13 @@ register struct pthread *__thread_self __asm__("r13");
#define THREAD_SETMEM_NC(descr, member, idx, value) \
descr->member[idx] = (value)
/* Set the stack guard field in TCB head. */
#define THREAD_SET_STACK_GUARD(value) \
(((uintptr_t *) __thread_self)[-1] = (value))
#define THREAD_COPY_STACK_GUARD(descr) \
(((uintptr_t *) ((char *) (descr) + TLS_PRE_TCB_SIZE))[-1] \
= ((uintptr_t *) __thread_self)[-1])
#endif /* __ASSEMBLER__ */
#endif /* tls.h */

4
nptl/sysdeps/unix/sysv/linux/ia64/createthread.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
/* Copyright (C) 2003, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>.
@ -18,7 +18,7 @@
02111-1307 USA. */
/* Value passed to 'clone' for initialization of the thread register. */
#define TLS_VALUE (pd + 1)
#define TLS_VALUE ((char *) pd + TLS_PRE_TCB_SIZE)
#define ARCH_CLONE __clone2