summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel/Makefile.intel
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@fingolfin.org>2020-10-24 17:43:02 -0700
committerRobert Mustacchi <rm@fingolfin.org>2020-11-17 08:52:10 -0800
commit5a0af8165ce9590e7a18f1ef4f9badc4dd72c6e6 (patch)
tree762f2de7c139aee157730b0e788d3a61462554e9 /usr/src/uts/intel/Makefile.intel
parent6a817834d81cc75ce12d0d393320837b1fec1e85 (diff)
downloadillumos-joyent-5a0af8165ce9590e7a18f1ef4f9badc4dd72c6e6.tar.gz
13274 enable -fstack-protector-strong by default in user land
Reviewed by: Andy Fiddaman <andy@omniosce.org> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr/src/uts/intel/Makefile.intel')
-rw-r--r--usr/src/uts/intel/Makefile.intel30
1 files changed, 0 insertions, 30 deletions
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel
index 64e027fe15..dd614a82a2 100644
--- a/usr/src/uts/intel/Makefile.intel
+++ b/usr/src/uts/intel/Makefile.intel
@@ -128,36 +128,6 @@ CFLAGS += $(SPACEFLAG)
CFLAGS += $(CCUNBOUND)
CFLAGS += $(CFLAGS_uts)
CFLAGS += -xstrconst
-
-#
-# Options to control which version of stack-protector we enable. This
-# gives us a bit of flexibility and is unfortunately necessary as some
-# modules do not function correctly with our defaults (qede).
-#
-# o STACKPROTECT_ Sets the appropriate version for the compiler
-# o STACKPROTECT_strong Sets us to use strong on all of the
-# compilers it supports. This is the same
-# as the default.
-#
-# o STACKPROTECT_none Disables the stack protector.
-#
-# o STACKPROTECT_all Enables it for everything.
-#
-# o STACKPROTECT_basic Enables the basic stack protector.
-#
-# -fstack-protector-strong is not available in our gcc4 which is why we
-# have per-compiler versions below.
-#
-STACKPROTECT_ = -_gcc4=-fstack-protector
-STACKPROTECT_ += -_gcc7=-fstack-protector-strong
-STACKPROTECT_ += -_gcc8=-fstack-protector-strong
-STACKPROTECT_ += -_gcc9=-fstack-protector-strong
-
-STACKPROTECT_strong = $(STACKPROTECT_)
-STACKPROTECT_none = -_gcc=-fstack-protector-none
-STACKPROTECT_all = -_gcc=-fstack-protector-all
-STACKPROTECT_basic = -_gcc=-fstack-protector
-
CFLAGS += $(STACKPROTECT_$(STACKPROTECT))
ASFLAGS_XARCH_32 = $(i386_ASFLAGS)