about summary refs log tree commit diff
path: root/resolv
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-10-19 13:07:28 -0400
committerMike Frysinger <vapier@gentoo.org>2015-10-19 15:36:48 -0400
commit6ab674ebff5e60c62b126d0ac2e774e581916afe (patch)
tree72e72448b982e3715630f091e3be4612244f6589 /resolv
parentcf6d542db3dfe26402b6adaa740a578b54767f65 (diff)
downloadglibc-6ab674ebff5e60c62b126d0ac2e774e581916afe.tar.gz
glibc-6ab674ebff5e60c62b126d0ac2e774e581916afe.tar.xz
glibc-6ab674ebff5e60c62b126d0ac2e774e581916afe.zip
use -fstack-protector-strong when available
With gcc-4.9, a new -fstack-protector-strong flag is available that is
between -fstack-protector (pretty weak) and -fstack-protector-all (pretty
strong) that provides good trade-offs between overhead but still providing
good coverage.  Update the places in glibc that use ssp to use this flag
when it's available.

This also kills off the indirection of hardcoding the flag name in the
Makefiles and adding it based on a have-ssp boolean.  Instead, the build
always expands the $(stack-protector) variable to the best ssp setting.
This makes the build logic a bit simpler and allows people to easily set
to a diff flag like:
	make stack-protector=-fstack-protector-all
Diffstat (limited to 'resolv')
-rw-r--r--resolv/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/resolv/Makefile b/resolv/Makefile
index 1dcb75f7c7..add74875c6 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -90,9 +90,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
 	    -Dgetnetbyname=res_getnetbyname \
 	    -Dgetnetbyaddr=res_getnetbyaddr
 
-ifeq (yes,$(have-ssp))
-CFLAGS-libresolv += -fstack-protector
-endif
+CFLAGS-libresolv += $(stack-protector)
 CFLAGS-res_hconf.c = -fexceptions
 
 # The BIND code elicits some harmless warnings.