[Bug regex/18497] regcomp wcscoll, wcscmp namespace

["cvs-commit at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=18497

--- Comment #1 from cvs-commit at gcc dot gnu.org <cvs-commit at gcc dot gnu.org> ---
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  2f44ee08dbf51d39ef5692699cc35f93faf64db1 (commit)
      from  d3ab671c942ba15a5b20f383ce71e387f17ae2c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2f44ee08dbf51d39ef5692699cc35f93faf64db1

commit 2f44ee08dbf51d39ef5692699cc35f93faf64db1
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Tue Jun 9 21:07:30 2015 +0000

    Fix regcomp wcscoll, wcscmp namespace (bug 18497).

    regcomp brings in references to wcscoll, which isn't in all the
    standards that contain regcomp.  In turn, wcscoll brings in references
    to wcscmp, also not in all those standards.  This patch fixes this by
    making those functions into weak aliases of __wcscoll and __wcscmp and
    calling those names instead as needed.

    Tested for x86_64 and x86 (testsuite, and that disassembly of
    installed shared libraries is unchanged by the patch).

        [BZ #18497]
        * wcsmbs/wcscmp.c [!WCSCMP] (WCSCMP): Define as __wcscmp instead
        of wcscmp.
        (wcscmp): Define as weak alias of WCSCMP.
        * wcsmbs/wcscoll.c (STRCOLL): Define as __wcscoll instead of
        wcscoll.
        (USE_HIDDEN_DEF): Define.
        [!USE_IN_EXTENDED_LOCALE_MODEL] (wcscoll): Define as weak alias of
        __wcscoll.  Don't use libc_hidden_weak.
        * wcsmbs/wcscoll_l.c (STRCMP): Define as __wcscmp instead of
        wcscmp.
        * sysdeps/i386/i686/multiarch/wcscmp-c.c
        [SHARED] (libc_hidden_def): Define __GI___wcscmp instead of
        __GI_wcscmp.
        (weak_alias): Undefine and redefine.
        * sysdeps/i386/i686/multiarch/wcscmp.S (wcscmp): Rename to
        __wcscmp and define as weak alias of __wcscmp.
        * sysdeps/x86_64/wcscmp.S (wcscmp): Likewise.
        * include/wchar.h (__wcscmp): Declare.  Use libc_hidden_proto.
        (__wcscoll): Likewise.
        (wcscmp): Don't use libc_hidden_proto.
        (wcscoll): Likewise.
        * posix/regcomp.c (build_range_exp): Call __wcscoll instead of
        wcscoll.
        * posix/regexec.c (check_node_accept_bytes): Likewise.
        * conform/Makefile (test-xfail-XPG3/regex.h/linknamespace): Remove
        variable.
        (test-xfail-XPG4/regex.h/linknamespace): Likewise.
        (test-xfail-POSIX/regex.h/linknamespace): Likewise.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                              |   30 ++++++++++++++++++++++++++++++
 NEWS                                   |    2 +-
 conform/Makefile                       |    3 ---
 include/wchar.h                        |   11 ++++++++---
 posix/regcomp.c                        |    6 +++---
 posix/regexec.c                        |    4 ++--
 sysdeps/i386/i686/multiarch/wcscmp-c.c |    4 +++-
 sysdeps/i386/i686/multiarch/wcscmp.S   |    7 ++++---
 sysdeps/x86_64/wcscmp.S                |    7 ++++---
 wcsmbs/wcscmp.c                        |    3 ++-
 wcsmbs/wcscoll.c                       |    5 +++--
 wcsmbs/wcscoll_l.c                     |    2 +-
 12 files changed, 61 insertions(+), 23 deletions(-)

-- 
You are receiving this mail because:
You are on the CC list for the bug.