From aebe10032963f5424498752732e316ff3438a8f3 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Tue, 18 Mar 2014 08:54:04 -0500
Subject: [PATCH] Add stardard definition on conform processing

This patch adds the -std=c99 option when preprocessing the data files
from the conform testcases. It fixes an issue where the compiler may
split the 'macro bool' defition from stdbool.h-data in two lines and
thus breaking the conform script.
---
 ChangeLog              | 6 ++++++
 conform/conformtest.pl | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f67727473..84c4bfb8b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-18  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+	* conform/conformtest.pl: Add standard definition when calling C
+	preprocessor on data files.
+	(checknamespace): Remove unused variable.
+
 2014-03-18  Joseph Myers  <joseph@codesourcery.com>
 
 	* math/gen-libm-test.pl (parse_args): Handle plus_oflow,
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 085fbb8c6d..c8c1d2a839 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -264,7 +264,6 @@ sub checknamespace {
   close (TESTFILE);
 
   undef %errors;
-  $nknown = 0;
   open (CONTENT, "$CC $CFLAGS_namespace -E $fnamebase.c -P -Wp,-dN | sed -e '/^# [1-9]/d' -e '/^[[:space:]]*\$/d' |");
   loop: while (<CONTENT>) {
     chop;
@@ -324,7 +323,7 @@ while ($#headers >= 0) {
   printf ("Testing <$h>\n");
   printf ("----------" . "-" x length ($h) . "\n");
 
-  open (CONTROL, "$CC -E -D$standard -x c data/$h-data |");
+  open (CONTROL, "$CC -E -D$standard -std=c99 -x c data/$h-data |");
   control: while (<CONTROL>) {
     chop;
     next control if (/^#/);