diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/sysdeps/i386/tls.h | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/powerpc/tls.h | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/s390/tls.h | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/sh/tls.h | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/sparc/tls.h | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/tls.h | 2 |
6 files changed, 7 insertions, 10 deletions
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h index 4183ee82b8..2f8d11def1 100644 --- a/nptl/sysdeps/i386/tls.h +++ b/nptl/sysdeps/i386/tls.h @@ -195,7 +195,7 @@ union user_desc_init /* Code to initially initialize the thread pointer. This might need special attention since 'errno' is not yet available and if the operation can cause a failure 'errno' must not be touched. */ -# define TLS_INIT_TP(thrdescr, secondcall) \ +# define TLS_INIT_TP(thrdescr) \ ({ void *_thrdescr = (thrdescr); \ tcbhead_t *_head = _thrdescr; \ union user_desc_init _segdescr; \ @@ -208,10 +208,7 @@ union user_desc_init INIT_SYSINFO; \ \ /* The 'entry_number' field. Let the kernel pick a value. */ \ - if (secondcall) \ - _segdescr.vals[0] = TLS_GET_GS () >> 3; \ - else \ - _segdescr.vals[0] = -1; \ + _segdescr.vals[0] = -1; \ /* The 'base_addr' field. Pointer to the TCB. */ \ _segdescr.vals[1] = (unsigned long int) _thrdescr; \ /* The 'limit' field. We use 4GB which is 0xfffff pages. */ \ diff --git a/nptl/sysdeps/powerpc/tls.h b/nptl/sysdeps/powerpc/tls.h index 556c8d59a5..91cc6f3f44 100644 --- a/nptl/sysdeps/powerpc/tls.h +++ b/nptl/sysdeps/powerpc/tls.h @@ -129,7 +129,7 @@ register void *__thread_register __asm__ ("r13"); /* Code to initially initialize the thread pointer. This might need special attention since 'errno' is not yet available and if the operation can cause a failure 'errno' must not be touched. */ -# define TLS_INIT_TP(tcbp, secondcall) \ +# define TLS_INIT_TP(tcbp) \ (__thread_register = (void *) (tcbp) + TLS_TCB_OFFSET, NULL) /* Return the address of the dtv for the current thread. */ diff --git a/nptl/sysdeps/s390/tls.h b/nptl/sysdeps/s390/tls.h index 2019882f2c..bb7c339096 100644 --- a/nptl/sysdeps/s390/tls.h +++ b/nptl/sysdeps/s390/tls.h @@ -119,7 +119,7 @@ typedef struct /* Code to initially initialize the thread pointer. This might need special attention since 'errno' is not yet available and if the operation can cause a failure 'errno' must not be touched. */ -# define TLS_INIT_TP(thrdescr, secondcall) \ +# define TLS_INIT_TP(thrdescr) \ ({ void *_thrdescr = (thrdescr); \ tcbhead_t *_head = _thrdescr; \ \ diff --git a/nptl/sysdeps/sh/tls.h b/nptl/sysdeps/sh/tls.h index 84e464c448..a0660d2854 100644 --- a/nptl/sysdeps/sh/tls.h +++ b/nptl/sysdeps/sh/tls.h @@ -99,7 +99,7 @@ typedef struct /* Code to initially initialize the thread pointer. This might need special attention since 'errno' is not yet available and if the operation can cause a failure 'errno' must not be touched. */ -# define TLS_INIT_TP(tcbp, secondcall) \ +# define TLS_INIT_TP(tcbp) \ ({ __asm __volatile ("ldc %0,gbr" : : "r" (tcbp)); 0; }) /* Return the address of the dtv for the current thread. */ diff --git a/nptl/sysdeps/sparc/tls.h b/nptl/sysdeps/sparc/tls.h index 755bc23e57..4a1dce7f65 100644 --- a/nptl/sysdeps/sparc/tls.h +++ b/nptl/sysdeps/sparc/tls.h @@ -107,7 +107,7 @@ register struct pthread *__thread_self __asm__("%g7"); (((tcbhead_t *) (descr))->dtv) /* Code to initially initialize the thread pointer. */ -# define TLS_INIT_TP(descr, secondcall) \ +# define TLS_INIT_TP(descr) \ (__thread_self = (__typeof (__thread_self)) (descr), NULL) /* Return the address of the dtv for the current thread. */ diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h index 30bd449528..fb671f4795 100644 --- a/nptl/sysdeps/x86_64/tls.h +++ b/nptl/sysdeps/x86_64/tls.h @@ -144,7 +144,7 @@ typedef struct We have to make the syscall for both uses of the macro since the address might be (and probably is) different. */ -# define TLS_INIT_TP(thrdescr, secondcall) \ +# define TLS_INIT_TP(thrdescr) \ ({ void *_thrdescr = (thrdescr); \ tcbhead_t *_head = _thrdescr; \ int _result; \ |