summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-10-17 11:30:15 -0700
committerRoland McGrath <roland@hack.frob.com>2014-10-17 11:30:15 -0700
commitb0643088bc7387e04cf53dcf7331d02f7fa62c72 (patch)
treed6a6108097ce93ec876b8d3ceb7f51876fb92550
parent33cc770b986b5a913576cf264e6dff3b0f6aea95 (diff)
downloadglibc-b0643088bc7387e04cf53dcf7331d02f7fa62c72.tar.gz
Fix NPTL build error when missing __NR_set_robust_list.
-rw-r--r--ChangeLog5
-rw-r--r--nptl/nptl-init.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a5cddd895..502bd42136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-17 Roland McGrath <roland@hack.frob.com>
+
+ * nptl/nptl-init.c (__nptl_set_robust): Conditionalize body on
+ [__NR_set_robust_list].
+
2014-10-17 Siddhesh Poyarekar <siddhesh@redhat.com>
* string/strcoll_l.c (get_next_seq): Fix up formatting.
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 9f7b20a90e..44223a7a41 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -162,9 +162,11 @@ static
void
__nptl_set_robust (struct pthread *self)
{
+#ifdef __NR_set_robust_list
INTERNAL_SYSCALL_DECL (err);
INTERNAL_SYSCALL (set_robust_list, err, 2, &self->robust_head,
sizeof (struct robust_list_head));
+#endif
}