aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.main12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.main b/Makefile.main
index 238a1e9..d71635b 100644
--- a/Makefile.main
+++ b/Makefile.main
@@ -78,12 +78,18 @@ ifeq ($(SKIBOOT_GCOV),1)
CFLAGS += -fprofile-arcs -ftest-coverage -DSKIBOOT_GCOV=1
endif
+# Stack protector disabled for now. gcc tends to use the TLS to
+# access the canary (depending on how gcc was built), and this won't
+# work for us.
+#
ifeq ($(STACK_CHECK),1)
-CFLAGS += -fstack-protector-all -pg
+#CFLAGS += -fstack-protector-all -pg
+CFLAGS += -fno-stack-protector -pg
CPPFLAGS += -DSTACK_CHECK_ENABLED
else
-CFLAGS += -fstack-protector
-CFLAGS += $(call try-cflag,$(CC),-fstack-protector-strong)
+CFLAGS += -fno-stack-protector
+#CFLAGS += -fstack-protector
+#CFLAGS += $(call try-cflag,$(CC),-fstack-protector-strong)
endif
CFLAGS += $(call try-cflag,$(CC),-Wjump-misses-init) \