From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 8 Jan 2015 21:41:14 +0000 (-0800)
Subject: NPTL: Fixed missed conditionalization of setxid hooey.
X-Git-Tag: upstream/2.30~6494
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc40d25e50621b8762d05c0984d572c1bc7507bf;p=external%2Fglibc.git

NPTL: Fixed missed conditionalization of setxid hooey.
---

diff --git a/ChangeLog b/ChangeLog
index 1d1d04b..23e1b33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-08  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/nptl-init.c (pthread_functions): Conditionalize
+	.ptr__nptl_setxid initialization on [SIGSETXID].
+
 	* sysdeps/nptl/sys/procfs.h: New file.
 	* nptl_db/Makefile (headers): Add it.
 	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Don't add it.
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index a85fac5..1ad41c5 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -140,7 +140,9 @@ static const struct pthread_functions pthread_functions =
     .ptr_nthreads = &__nptl_nthreads,
     .ptr___pthread_unwind = &__pthread_unwind,
     .ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd,
+# ifdef SIGSETXID
     .ptr__nptl_setxid = __nptl_setxid,
+# endif
     /* For now only the stack cache needs to be freed.  */
     .ptr_freeres = nptl_freeres,
     .ptr_set_robust = __nptl_set_robust