Add rules to build libresolv with SSP flags

diff --git a/ChangeLog b/ChangeLog
index 189424cb1c6d76c62824d79dabea8cdb4c534f37..60ecaad1bc8a75c4edc3f7f42f255b14aa431df0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-17  Ulrich Drepper  <drepper@gmail.com>
+
+       * Makeconfig (override CFLAGS): Add library-specific CFLAGS.
+       * resolv/Makefile: Define CFLAGS-libresolv.
+
 2011-08-17  Andreas Schwab  <schwab@redhat.com>
 
        * nss/makedb.c (compute_tables): Make variables used in nested
@@ -18,7 +23,7 @@
        specifies first scope to show.
        (dl_open_worker): Update callers.  Move printing scope of new
        object to before the relocation.
-       * rtld.c (dl_main): Update _dl_show_scope call.
+       * elf/rtld.c (dl_main): Update _dl_show_scope call.
        * sysdeps/generic/ldsodefs.h: Update declaration.
 
        * elf/dl-open.c (_dl_show_scope): Use _dl_debug_printf to generate the
@@ -56,7 +61,7 @@
 
 2011-08-13  Ulrich Drepper  <drepper@gmail.com>
 
-       * elf/dl-open.c: Rename show_scope to _dl_schow_scope and export.
+       * elf/dl-open.c: Rename show_scope to _dl_show_scope and export.
        (dl_open_worker): Call _dl_show_scope when DL_DEBUG_SCOPES is set.
        * elf/rtld.c (dl_main): Set l_name of vDSO.
        Call _dl_show_scope when DL_DEBUG_SCOPES.

diff --git a/Makeconfig b/Makeconfig
index cc5c3a9ffb4e77abeffe8f67ee10083383437ecf..feca6038ce86c28684dbc4c1cb14fee328ce3c11 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -708,7 +708,9 @@ CPPFLAGS = $($(subdir)-CPPFLAGS) $(+includes) $(defines) \
 override CFLAGS        = -std=gnu99 $(gnu89-inline-CFLAGS) \
                  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
                  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
-                 $(CFLAGS-$(@F))
+                 $(CFLAGS-$(@F)) \
+                 $(foreach lib,$(libof-$(basename $(@F))) \
+                               $(libof-$(<F)) $(libof-$(@F)),$(CFLAGS-$(lib)))
 override CXXFLAGS = $(c++-sysincludes) \
                    $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \
                    $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F))

diff --git a/resolv/Makefile b/resolv/Makefile
index 42e3505646905e6f88b576b87a8182fbf40dccea..ec3788faeb084401744fd6d89240621489a9efc2 100644 (file)
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -76,6 +76,9 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
            -Dgetnetbyname=res_getnetbyname \
            -Dgetnetbyaddr=res_getnetbyaddr
 
+ifeq (yes,$(have-ssp))
+CFLAGS-libresolv += -fstack-protector
+endif
 CFLAGS-res_hconf.c = -fexceptions
 
 # The BIND code elicits some harmless warnings.