1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b0a0bd83c..0ec9284ce8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-03-17  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #21260]
+	* sysdeps/unix/sysv/linux/alpha/Makefile
+	[$(subdir) = conform] (conformtest-xfail-conds): New variable.
+
 	* conform/conformtest.pl ($cross): New variable.
 	(--cross): New command-line option.
 	(runtest): Skip test execution when cross-compiling.