summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--conform/GlibcConform.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d4af4ec086..832eed1f14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2015-10-27 Joseph Myers <joseph@codesourcery.com>
+ * conform/GlibcConform.pm ($CFLAGS{"ISO11"}): Use -std=c11 instead
+ of -std=c1x -D_ISOC11_SOURCE.
+
* configure.ac (libc_cv_compiler_ok): Require GCC 4.7 or later.
* configure: Regenerated.
* manual/install.texi (Tools for Compilation): Document
diff --git a/conform/GlibcConform.pm b/conform/GlibcConform.pm
index 8aeada4821..218b6ec63a 100644
--- a/conform/GlibcConform.pm
+++ b/conform/GlibcConform.pm
@@ -27,7 +27,7 @@ require Exporter;
# Compiler options for each standard.
$CFLAGS{"ISO"} = "-ansi";
$CFLAGS{"ISO99"} = "-std=c99";
-$CFLAGS{"ISO11"} = "-std=c1x -D_ISOC11_SOURCE";
+$CFLAGS{"ISO11"} = "-std=c11";
$CFLAGS{"POSIX"} = "-D_POSIX_C_SOURCE=199506L -ansi";
$CFLAGS{"XPG3"} = "-ansi -D_XOPEN_SOURCE";
$CFLAGS{"XPG4"} = "-ansi -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED";