conformtest: Check namespace within __attribute__.

This commit is contained in:
Joseph Myers 2012-05-01 20:05:14 +00:00
parent 9af0bf29de
commit c9140a622e
2 changed files with 7 additions and 2 deletions

View File

@ -1,5 +1,9 @@
2012-05-01 Joseph Myers <joseph@codesourcery.com>
* conform/conformtest.pl ($CFLAGS_namespace): Define separately
from $CFLAGS, without defining away __attribute__ calls.
(checknamespace): Use $CFLAGS_namespace.
* conform/conformtest.pl (@keywords): Only include C99 keywords
for standards based on C99 or C11.

View File

@ -43,7 +43,8 @@ $CFLAGS{"XOPEN2K"} = "-std=c99 -D_XOPEN_SOURCE=600";
$CFLAGS{"XOPEN2K8"} = "-std=c99 -D_XOPEN_SOURCE=700";
$CFLAGS{"POSIX2008"} = "-std=c99 -D_POSIX_C_SOURCE=200809L";
$CFLAGS = "$flags -fno-builtin '-D__attribute__(x)=' $CFLAGS{$standard} -D_ISOMAC";
$CFLAGS_namespace = "$flags -fno-builtin $CFLAGS{$standard} -D_ISOMAC";
$CFLAGS = "$CFLAGS_namespace '-D__attribute__(x)='";
# Check standard name for validity.
die "unknown standard \"$standard\"" if ($CFLAGS{$standard} eq "");
@ -262,7 +263,7 @@ sub checknamespace {
undef %errors;
$nknown = 0;
open (CONTENT, "$CC $CFLAGS -E $fnamebase.c -P -Wp,-dN | sed -e '/^# [1-9]/d' -e '/^[[:space:]]*\$/d' |");
open (CONTENT, "$CC $CFLAGS_namespace -E $fnamebase.c -P -Wp,-dN | sed -e '/^# [1-9]/d' -e '/^[[:space:]]*\$/d' |");
loop: while (<CONTENT>) {
chop;
if (/^#define (.*)/) {