about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-01-08 13:41:14 -0800
committerRoland McGrath <roland@hack.frob.com>2015-01-08 13:41:14 -0800
commitcc40d25e50621b8762d05c0984d572c1bc7507bf (patch)
treec40196d70af314ef3e12b2254820f3d686388e89
parent9287adf0895d4cf2f25d34c13c0f47202c01ddd0 (diff)
downloadglibc-cc40d25e50621b8762d05c0984d572c1bc7507bf.tar.gz
glibc-cc40d25e50621b8762d05c0984d572c1bc7507bf.tar.xz
glibc-cc40d25e50621b8762d05c0984d572c1bc7507bf.zip
NPTL: Fixed missed conditionalization of setxid hooey.
-rw-r--r--ChangeLog3
-rw-r--r--nptl/nptl-init.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d1d04b78d..23e1b335b2 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 a85fac5c66..1ad41c5bb3 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