summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-18 22:38:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-18 22:38:13 +0100
commit543317246450d28830c36dd9489e9d8c0efc0755 (patch)
tree4f75304a2849670645ed14da21958479d37ff4f2
parent2e1568ff598de94efdaa37a5b504cbd70db0a358 (diff)
handle ssp support for glibc/eglibc/gcc
-rw-r--r--toolchain/eglibc/Makefile2
-rw-r--r--toolchain/gcc/Makefile3
-rw-r--r--toolchain/glibc/Makefile7
3 files changed, 10 insertions, 2 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index c5f2a5653..a72141f5a 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -9,6 +9,8 @@ include ${TOPDIR}/mk/buildhlp.mk
ifneq ($(ADK_DEBUG),)
TARGET_CFLAGS+= -O2
endif
+# ssp partially supported
+TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS))
EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \
--host=$(REAL_GNU_TARGET_NAME) \
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index b1ce84f98..190cdf689 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -3,6 +3,9 @@
include $(TOPDIR)/rules.mk
include ../rules.mk
+
+TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS))
+
include Makefile.inc
GCC_CONFOPTS= --prefix=$(STAGING_HOST_DIR) \
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index d492b9837..f466021a7 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -5,11 +5,14 @@ include $(TOPDIR)/rules.mk
include ../rules.mk
# glibc does not compile with Os
-TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS))
+TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS))
ifneq ($(ADK_DEBUG),)
-TARGET_CFLAGS+=-O2
+TARGET_CFLAGS+= -O2
endif
+# ssp partially supported
+TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS))
+
include Makefile.inc
include ${TOPDIR}/mk/buildhlp.mk