mirror of git://sourceware.org/git/glibc.git
conformtest: Use correct keyword set for underlying C standard.
This commit is contained in:
parent
343222a2a0
commit
9af0bf29de
|
@ -1,5 +1,8 @@
|
||||||
2012-05-01 Joseph Myers <joseph@codesourcery.com>
|
2012-05-01 Joseph Myers <joseph@codesourcery.com>
|
||||||
|
|
||||||
|
* conform/conformtest.pl (@keywords): Only include C99 keywords
|
||||||
|
for standards based on C99 or C11.
|
||||||
|
|
||||||
* conform/data/iso646.h-data [ISO || POSIX || XPG3 || XPG4]:
|
* conform/data/iso646.h-data [ISO || POSIX || XPG3 || XPG4]:
|
||||||
Disable tests.
|
Disable tests.
|
||||||
* conform/data/stdint.h-data [ISO || POSIX || XPG3 || XPG4 ||
|
* conform/data/stdint.h-data [ISO || POSIX || XPG3 || XPG4 ||
|
||||||
|
|
|
@ -64,12 +64,15 @@ die "unknown standard \"$standard\"" if ($CFLAGS{$standard} eq "");
|
||||||
# $mustprepend{'wordexp.h'} = "#include <stddef.h>\n";
|
# $mustprepend{'wordexp.h'} = "#include <stddef.h>\n";
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# These are the ISO C99 keywords.
|
# These are the ISO C90 keywords.
|
||||||
@keywords = ('auto', 'break', 'case', 'char', 'const', 'continue', 'default',
|
@keywords = ('auto', 'break', 'case', 'char', 'const', 'continue', 'default',
|
||||||
'do', 'double', 'else', 'enum', 'extern', 'float', 'for', 'goto',
|
'do', 'double', 'else', 'enum', 'extern', 'float', 'for', 'goto',
|
||||||
'if', 'inline', 'int', 'long', 'register', 'restrict', 'return',
|
'if', 'int', 'long', 'register', 'return',
|
||||||
'short', 'signed', 'sizeof', 'static', 'struct', 'switch',
|
'short', 'signed', 'sizeof', 'static', 'struct', 'switch',
|
||||||
'typedef', 'union', 'unsigned', 'void', 'volatile', 'while');
|
'typedef', 'union', 'unsigned', 'void', 'volatile', 'while');
|
||||||
|
if ($CFLAGS{$standard} =~ /-std=(c99|c1x)/) {
|
||||||
|
push (@keywords, 'inline', 'restrict');
|
||||||
|
}
|
||||||
|
|
||||||
# Make a hash table from this information.
|
# Make a hash table from this information.
|
||||||
while ($#keywords >= 0) {
|
while ($#keywords >= 0) {
|
||||||
|
|
Loading…
Reference in New Issue