From: Roland McGrath <roland@hack.frob.com>
Date: Fri, 14 Mar 2014 17:46:38 +0000 (-0700)
Subject: Fix two stray cases using #ifdef vs #if for TLS_TCB_AT_TP.
X-Git-Tag: glibc-2.20~750
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7329d4b4d297b5638aef7fc4d5eaf9ad7845d7a;p=thirdparty%2Fglibc.git

Fix two stray cases using #ifdef vs #if for TLS_TCB_AT_TP.
---

diff --git a/ChangeLog b/ChangeLog
index fef3cf5cb51..ae102928a65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-14  Roland McGrath  <roland@hack.frob.com>
+
+	* 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  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86_64/configure.ac: Check AVX-512 assembler support
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index cee0806d52e..38e69cb496b 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 93f93eebd4a..e1856f7b1c5 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