diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-06-22 10:31:07 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-06-22 10:31:07 +0000 |
| commit | 1877bc9d8f2be143fbe530347a945850d0ecd234 (patch) | |
| tree | fe99374fe0af943707c608a4112f662b9d8d7aa3 /include | |
| parent | e0a3d9d1152a05c7c8ba6cd713e394c862ce9252 (diff) | |
| download | upstream-1877bc9d8f2be143fbe530347a945850d0ecd234.tar.gz upstream-1877bc9d8f2be143fbe530347a945850d0ecd234.tar.bz2 upstream-1877bc9d8f2be143fbe530347a945850d0ecd234.zip | |
gcc/musl: rework SSP-support
Make musl provide libssp_nonshared.a and make GCC link it unconditionally
if musl is used. This should be a no-op if SSP is disabled and seems to be
the only reliable way of dealing with SSP over all packages due to the mess
that is linkerflags handling in packages.
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 46108
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardening.mk | 2 | ||||
| -rw-r--r-- | include/package-defaults.mk | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/hardening.mk b/include/hardening.mk index 8a24b3ca15..c1f0bcb19e 100644 --- a/include/hardening.mk +++ b/include/hardening.mk @@ -21,13 +21,11 @@ endif ifdef CONFIG_PKG_CC_STACKPROTECTOR_REGULAR ifeq ($(strip $(PKG_CC_STACKPROTECTOR_REGULAR)),1) TARGET_CFLAGS += -fstack-protector - TARGET_LDFLAGS += -fstack-protector endif endif ifdef CONFIG_PKG_CC_STACKPROTECTOR_STRONG ifeq ($(strip $(PKG_CC_STACKPROTECTOR_STRONG)),1) TARGET_CFLAGS += -fstack-protector-strong - TARGET_LDFLAGS += -fstack-protector-strong endif endif ifdef CONFIG_PKG_FORTIFY_SOURCE_1 diff --git a/include/package-defaults.mk b/include/package-defaults.mk index a5e9fbe915..2896b4c783 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -5,7 +5,7 @@ # See /LICENSE for more information. # -PKG_DEFAULT_DEPENDS = +libc +(SSP_SUPPORT&&!USE_MUSL):libssp +USE_GLIBC:librt +USE_GLIBC:libpthread +PKG_DEFAULT_DEPENDS = +libc +SSP_SUPPORT:libssp +USE_GLIBC:librt +USE_GLIBC:libpthread ifneq ($(PKG_NAME),toolchain) PKG_FIXUP_DEPENDS = $(if $(filter kmod-%,$(1)),$(2),$(PKG_DEFAULT_DEPENDS) $(filter-out $(PKG_DEFAULT_DEPENDS),$(2))) |