mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

conformtest: Fix namespace testing.

Browse Source
This commit is contained in:
Joseph Myers 2013-09-04 20:47:21 +00:00
parent 9fc2e09ffa
commit b92a20b560
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2013-09-04 Joseph Myers <joseph@codesourcery.com>
* conform/conformtest.pl (newtoken): Treat tokens not allowed as
errors.
(top level): Treat second token from macro or constant entries for
allowed headers as allowed.
* include/complex.h: Condition internal declarations on
[!_ISOMAC].
* include/fenv.h: Condition include of <stdbool.h> and internal
declarations on [!_ISOMAC].
2013-09-04 Chris Leonard <cjl@sugarlabs,.org> 2013-09-04 Chris Leonard <cjl@sugarlabs,.org>

4
conform/conformtest.pl
View File

@ -236,6 +236,8 @@ sub newtoken {
for ($idx = 0; $idx <= $#allow; ++$idx) { for ($idx = 0; $idx <= $#allow; ++$idx) {
return if (poorfnmatch ($allow[$idx], $token)); return if (poorfnmatch ($allow[$idx], $token));
} }
$errors{$token} = 1;
} }
@ -786,7 +788,7 @@ while ($#headers >= 0) {
if (/^element *({([^}]*)}|([^ ]*)) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*) *(.*)/) { if (/^element *({([^}]*)}|([^ ]*)) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*) *(.*)/) {
push @allow, $7; push @allow, $7;
} elsif (/^(macro|constant|macro-constant|macro-int-constant) +([a-zA-Z0-9_]*) *(?:{([^}]*)} *)?(?:([>=<!]+) ([A-Za-z0-9_-]*))?/) { } elsif (/^(macro|constant|macro-constant|macro-int-constant) +([a-zA-Z0-9_]*) *(?:{([^}]*)} *)?(?:([>=<!]+) ([A-Za-z0-9_-]*))?/) {
push @allow, $1; push @allow, $2;
} elsif (/^(type|tag) *({([^}]*)|([a-zA-Z0-9_]*))/) { } elsif (/^(type|tag) *({([^}]*)|([a-zA-Z0-9_]*))/) {
my($type) = "$3$4"; my($type) = "$3$4";

2
include/complex.h
View File

@ -1,11 +1,13 @@
#ifndef _COMPLEX_H #ifndef _COMPLEX_H
# include <math/complex.h> # include <math/complex.h>
# ifndef _ISOMAC
/* Return the complex inverse hyperbolic sine of finite nonzero Z, /* Return the complex inverse hyperbolic sine of finite nonzero Z,
with the imaginary part of the result subtracted from pi/2 if ADJ with the imaginary part of the result subtracted from pi/2 if ADJ
is nonzero. */ is nonzero. */
extern complex float __kernel_casinhf (complex float z, int adj); extern complex float __kernel_casinhf (complex float z, int adj);
extern complex double __kernel_casinh (complex double z, int adj); extern complex double __kernel_casinh (complex double z, int adj);
extern complex long double __kernel_casinhl (complex long double z, int adj); extern complex long double __kernel_casinhl (complex long double z, int adj);
# endif
#endif #endif

4
include/fenv.h
View File

@ -1,8 +1,8 @@
#ifndef _FENV_H #ifndef _FENV_H
#include <math/fenv.h> #include <math/fenv.h>
#include <stdbool.h>
#ifndef _ISOMAC #ifndef _ISOMAC
# include <stdbool.h>
/* Now define the internal interfaces. */ /* Now define the internal interfaces. */
extern int __feclearexcept (int __excepts); extern int __feclearexcept (int __excepts);
@ -22,7 +22,6 @@ libm_hidden_proto (feholdexcept)
libm_hidden_proto (feupdateenv) libm_hidden_proto (feupdateenv)
libm_hidden_proto (fetestexcept) libm_hidden_proto (fetestexcept)
libm_hidden_proto (feclearexcept) libm_hidden_proto (feclearexcept)
#endif
/* Rounding mode context. This allows functions to set/restore rounding mode /* Rounding mode context. This allows functions to set/restore rounding mode
only when the desired rounding mode is different from the current rounding only when the desired rounding mode is different from the current rounding
@ -32,5 +31,6 @@ struct rm_ctx
fenv_t env; fenv_t env;
bool updated_status; bool updated_status;
}; };
#endif
#endif #endif