diff --git a/ChangeLog b/ChangeLog
index a0d07fd13d..d2dd7d468d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-06-21  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #21622]
+	* sysdeps/unix/sysv/linux/tile/bits/sigaction.h (SA_RESTART):
+	Define for [__USE_UNIX98 || __USE_XOPEN2K8], not [__USE_UNIX98 ||
+	__USE_MISC].
+	(SA_NODEFER): Likewise.
+	(SA_RESETHAND): Likewise.
+
 2017-06-21  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf/dl-tunables.list (glibc.tune.ifunc): Removed.
diff --git a/sysdeps/unix/sysv/linux/tile/bits/sigaction.h b/sysdeps/unix/sysv/linux/tile/bits/sigaction.h
index 5a9ae2888a..6b8c1d7de0 100644
--- a/sysdeps/unix/sysv/linux/tile/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/tile/bits/sigaction.h
@@ -57,6 +57,8 @@ struct sigaction
 #if defined __USE_UNIX98 || defined __USE_MISC
 # define SA_NOPTRACE  0x02000000 /* Don't ptrace this signal. */
 # define SA_ONSTACK   0x08000000 /* Use signal stack by using `sa_restorer'. */
+#endif
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define SA_RESTART   0x10000000 /* Restart syscall on signal return.  */
 # define SA_NODEFER   0x40000000 /* Don't automatically block the signal when
 				    its handler is being executed.  */