[commits] r15410 - in /fsf/trunk/libc: ChangeLog resolv/Makefile

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Sep 22 00:02:14 2011
New Revision: 15410

Log:
Import glibc-mainline for 2011-09-22

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/resolv/Makefile

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Sep 22 00:02:14 2011
@@ -1,3 +1,10 @@
+2011-09-21  Chung-Lin Tang  <cltang@xxxxxxxxxxxxxxxx>
+	    Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+	    Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* resolv/Makefile (LDLIBS-resolv.so): Link in $(elfobjdir)/ld.so
+	if needed for __stack_chk_guard.
+
 2011-09-19  Roland McGrath  <roland@xxxxxxxxxxxxx>
 
 	* sysdeps/posix/spawni.c (script_execute): Always define it.

Modified: fsf/trunk/libc/resolv/Makefile
==============================================================================
--- fsf/trunk/libc/resolv/Makefile (original)
+++ fsf/trunk/libc/resolv/Makefile Thu Sep 22 00:02:14 2011
@@ -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 @@
 # 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 \