AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Link libresolv.so with ld.so for __stack_chk_guard.

Browse Source
This commit is contained in:
Joseph Myers 2011-09-21 13:27:50 -07:00 committed by Roland McGrath
parent ecb1482ffd
commit e057a1b593
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2011-09-21 Chung-Lin Tang <cltang@codesourcery.com>
Maxim Kuvyrkov <maxim@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* resolv/Makefile (LDLIBS-resolv.so): Link in $(elfobjdir)/ld.so
if needed for __stack_chk_guard.
2011-09-19 Roland McGrath <roland@hack.frob.com>
* sysdeps/posix/spawni.c (script_execute): Always define it.

8
resolv/Makefile
View File

@ -1,4 +1,5 @@
# Copyright (C) 1994-2001,2003,2004,2007,2008 Free Software Foundation, Inc.
# Copyright (C) 1994-2001,2003,2004,2007,2008,2011
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@ -88,6 +89,11 @@ CFLAGS-res_hconf.c = -fexceptions
# This ensures they will load libc.so for needed symbols if loaded by
# a statically-linked program that hasn't already loaded it.
$(objpfx)libresolv.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a
# Some hosts need '__stack_chk_guard', so pull in the definition from
# ld.so if required.
ifeq (yesyes,$(have-ssp)$(elf))
LDLIBS-resolv.so += $(as-needed) $(elfobjdir)/ld.so $(no-as-needed)
endif
# The DNS NSS modules needs the resolver.
$(objpfx)libnss_dns.so: $(objpfx)libresolv.so $(common-objpfx)libc.so \