diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-05-21 16:24:24 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-05-21 16:24:24 +0000 |
| commit | 9d12d7652b830635528639ece2206ecf5bb9ffbf (patch) | |
| tree | c07b7cd522d2af39a0e8f834a8816cdccd6c0618 | |
| parent | 0f87de79e935b2f8bcc2b90ab750a358c26f6715 (diff) | |
| download | glibc-9d12d7652b830635528639ece2206ecf5bb9ffbf.zip glibc-9d12d7652b830635528639ece2206ecf5bb9ffbf.tar.gz glibc-9d12d7652b830635528639ece2206ecf5bb9ffbf.tar.bz2 | |
linknamespace: whitelist re_syntax_options.
This patch adds re_syntax_options (bug 18442) to the set of symbols
that are whitelisted in the linknamespace tests because, while the
references to them are genuine bugs that should be fixed, the
involvement of data symbols makes them harder to fix than most such
bugs.
Tested for x86_64 and x86.
* conform/linknamespace.pl (@whitelist): Add re_syntax_options.
* conform/Makefile (test-xfail-UNIX98/regex.h/linknamespace):
Remove variable.
(test-xfail-XOPEN2K/regex.h/linknamespace): Likewise.
(test-xfail-POSIX2008/regex.h/linknamespace): Likewise.
(test-xfail-XOPEN2K8/regex.h/linknamespace): Likewise.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | conform/Makefile | 4 | ||||
| -rw-r--r-- | conform/linknamespace.pl | 5 |
3 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,12 @@ +2015-05-21 Joseph Myers <joseph@codesourcery.com> + + * conform/linknamespace.pl (@whitelist): Add re_syntax_options. + * conform/Makefile (test-xfail-UNIX98/regex.h/linknamespace): + Remove variable. + (test-xfail-XOPEN2K/regex.h/linknamespace): Likewise. + (test-xfail-POSIX2008/regex.h/linknamespace): Likewise. + (test-xfail-XOPEN2K8/regex.h/linknamespace): Likewise. + 2015-05-21 Florian Weimer <fweimer@redhat.com> * stdio-common/vfprintf.c (LABEL, JUMP_TABLE_BASE_LABEL, REF): diff --git a/conform/Makefile b/conform/Makefile index 6840aeb..bdd7203 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -375,7 +375,6 @@ test-xfail-UNIX98/fnmatch.h/linknamespace = yes test-xfail-UNIX98/glob.h/linknamespace = yes test-xfail-UNIX98/mqueue.h/linknamespace = yes test-xfail-UNIX98/netdb.h/linknamespace = yes -test-xfail-UNIX98/regex.h/linknamespace = yes test-xfail-UNIX98/stdio.h/linknamespace = yes test-xfail-UNIX98/stdlib.h/linknamespace = yes test-xfail-UNIX98/syslog.h/linknamespace = yes @@ -386,7 +385,6 @@ test-xfail-XOPEN2K/fmtmsg.h/linknamespace = yes test-xfail-XOPEN2K/fnmatch.h/linknamespace = yes test-xfail-XOPEN2K/glob.h/linknamespace = yes test-xfail-XOPEN2K/netdb.h/linknamespace = yes -test-xfail-XOPEN2K/regex.h/linknamespace = yes test-xfail-XOPEN2K/signal.h/linknamespace = yes test-xfail-XOPEN2K/stdlib.h/linknamespace = yes test-xfail-XOPEN2K/sys/wait.h/linknamespace = yes @@ -396,13 +394,11 @@ test-xfail-XOPEN2K/unistd.h/linknamespace = yes test-xfail-XOPEN2K/wordexp.h/linknamespace = yes test-xfail-POSIX2008/grp.h/linknamespace = yes test-xfail-POSIX2008/netdb.h/linknamespace = yes -test-xfail-POSIX2008/regex.h/linknamespace = yes test-xfail-POSIX2008/semaphore.h/linknamespace = yes test-xfail-POSIX2008/unistd.h/linknamespace = yes test-xfail-XOPEN2K8/fmtmsg.h/linknamespace = yes test-xfail-XOPEN2K8/grp.h/linknamespace = yes test-xfail-XOPEN2K8/netdb.h/linknamespace = yes test-xfail-XOPEN2K8/pwd.h/linknamespace = yes -test-xfail-XOPEN2K8/regex.h/linknamespace = yes test-xfail-XOPEN2K8/syslog.h/linknamespace = yes test-xfail-XOPEN2K8/unistd.h/linknamespace = yes diff --git a/conform/linknamespace.pl b/conform/linknamespace.pl index 8ea437d..847d2dd 100644 --- a/conform/linknamespace.pl +++ b/conform/linknamespace.pl @@ -46,9 +46,12 @@ close (STDSYMS) || die ("close $stdsyms_file: $!\n"); # linkage when stdio.h included (and possibly not then), not # generally. # +# * Bug 18442: re_syntax_options wrongly brought in by regcomp and +# used by re_comp. +# # * False positive: matherr only used conditionally. # -@whitelist = qw(signgam stdin stdout stderr matherr); +@whitelist = qw(signgam stdin stdout stderr re_syntax_options matherr); foreach my $sym (@whitelist) { $stdsyms{$sym} = 1; } |