From d7329d4b4d297b5638aef7fc4d5eaf9ad7845d7a Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 14 Mar 2014 10:46:38 -0700 Subject: Fix two stray cases using #ifdef vs #if for TLS_TCB_AT_TP. --- ChangeLog | 6 ++++++ nptl/pthread_create.c | 2 +- nptl/sysdeps/pthread/createthread.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fef3cf5cb5..ae102928a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-03-14 Roland McGrath + + * nptl/pthread_create.c (__pthread_create_2_1): Test TLS_TCB_AT_TP + with #if rather than #ifdef. + * nptl/sysdeps/pthread/createthread.c (create_thread): Likewise. + 2014-03-14 H.J. Lu * sysdeps/x86_64/configure.ac: Check AVX-512 assembler support diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index cee0806d52..38e69cb496 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -496,7 +496,7 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg) performed in 'get_cached_stack'. This way we avoid doing this if the stack freshly allocated with 'mmap'. */ -#ifdef TLS_TCB_AT_TP +#if TLS_TCB_AT_TP /* Reference to the TCB itself. */ pd->header.self = pd; diff --git a/nptl/sysdeps/pthread/createthread.c b/nptl/sysdeps/pthread/createthread.c index 93f93eebd4..e1856f7b1c 100644 --- a/nptl/sysdeps/pthread/createthread.c +++ b/nptl/sysdeps/pthread/createthread.c @@ -147,7 +147,7 @@ static int create_thread (struct pthread *pd, const struct pthread_attr *attr, STACK_VARIABLES_PARMS) { -#ifdef TLS_TCB_AT_TP +#if TLS_TCB_AT_TP assert (pd->header.tcb != NULL); #endif -- cgit 1.4.1