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
 }