diff options
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/Makefile | 4 | ||||
| -rw-r--r-- | resolv/res_libc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/resolv/Makefile b/resolv/Makefile index b4287dec0b..a7c3f5adab 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1994-2001,2003,2004,2007,2008,2011 +# Copyright (C) 1994-2001,2003,2004,2007,2008,2011,2012 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -91,7 +91,7 @@ CFLAGS-res_hconf.c = -fexceptions $(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)) +ifeq (yes,$(have-ssp)) LDLIBS-resolv.so += $(as-needed) $(elfobjdir)/ld.so $(no-as-needed) endif diff --git a/resolv/res_libc.c b/resolv/res_libc.c index 1f6b3a19ef..48d3200b7e 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -133,7 +133,7 @@ extern __thread struct __res_state *__libc_resp /* We declare this with compat_symbol so that it's not visible at link time. Programs must use the accessor functions. */ -#if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING +#if defined SHARED && defined DO_VERSIONING # include <shlib-compat.h> compat_symbol (libc, _res, _res, GLIBC_2_0); #endif |