[Bug libc/21740] multiple definition of `__stack_chk_fail_local'

[cvs-commit at gcc dot gnu.org]

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

--- Comment #3 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, hjl/pr21742 has been created
        at  f0dbaf3228dba8a775f4dfa8eb405c20a655ec7f (commit)

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

commit f0dbaf3228dba8a775f4dfa8eb405c20a655ec7f
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sun Jul 9 11:52:33 2017 -0700

    Don't include _dl_resolve_conflicts in libc.a [BZ #21742]

    Since _dl_resolve_conflicts is only used in elf/rtld.c, don't include
    it in libc.a.

        [BZ #21742]
        * elf/Makefile (dl-routines): Move dl-conflict to ...
        (rtld-routines): Here.

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0d39682d454560648089aa6513bef50503b98ac4

commit 0d39682d454560648089aa6513bef50503b98ac4
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sun Jul 9 08:39:17 2017 -0700

    Remove debug/stack_chk_fail_local.c [BZ #21740]

    Since

    commit 524a8ef2ad76af8ac049293d993a1856b0d888fb
    Author: Nick Alcock <nick.alcock@oracle.com>
    Date:   Mon Dec 26 10:08:57 2016 +0100

        PLT avoidance for __stack_chk_fail [BZ #7065]

        Add a hidden __stack_chk_fail_local alias to libc.so,
        and make sure that on targets which use __stack_chk_fail,
        this does not introduce a local PLT reference into libc.so.

    added

    strong_alias (__stack_chk_fail, __stack_chk_fail_local)

    to debug/stack_chk_fail.c, debug/stack_chk_fail_local.c should be
    removed.

        * [BZ #21740]
        * debug/Makefile (static-only-routines): Remove
        stack_chk_fail_local.
        * debug/stack_chk_fail_local.c: Removed.

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

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