diff options
| author | Dan McDonald <danmcd@joyent.com> | 2020-11-17 14:48:44 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-11-17 14:48:44 -0500 |
| commit | 2d6415143e9c1044d04ebf846f72f232883413cb (patch) | |
| tree | 555fae9f2f89b0c9a4d8c4bbd66b02b70ded9fc7 /usr/src/uts/intel | |
| parent | 5a1b3228538dfeb09e05cc2bdfad707ee4d698d7 (diff) | |
| parent | 5a0af8165ce9590e7a18f1ef4f9badc4dd72c6e6 (diff) | |
| download | illumos-joyent-release-20201119.tar.gz | |
[illumos-gate merge]release-20201119
commit 5a0af8165ce9590e7a18f1ef4f9badc4dd72c6e6
13274 enable -fstack-protector-strong by default in user land
commit 6a817834d81cc75ce12d0d393320837b1fec1e85
5788 Want support for GCC's stack protector in libc
commit 350ffdd54baf880f440ddf9697666e283894ded1
13273 want upanic(2)
commit 7fdea60d55a95f0e46066fd021c4ef1b1321bafc
13300 mlxcx_cq_setup() doesn't take required locks for ASSERTs
Merge notes:
- Manifest changes to match package changes (including shipping libssp_ns.a)
- Modified lx_vdso tools to not include SSP, to match other build-only tools.
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel | 30 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/name_to_sysnum | 1 |
2 files changed, 1 insertions, 30 deletions
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel index 636eebcb94..39166ec07f 100644 --- a/usr/src/uts/intel/Makefile.intel +++ b/usr/src/uts/intel/Makefile.intel @@ -129,36 +129,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) diff --git a/usr/src/uts/intel/os/name_to_sysnum b/usr/src/uts/intel/os/name_to_sysnum index 7fd73f512d..dd7b5ca3bb 100644 --- a/usr/src/uts/intel/os/name_to_sysnum +++ b/usr/src/uts/intel/os/name_to_sysnum @@ -118,6 +118,7 @@ readv 121 writev 122 preadv 123 pwritev 124 +upanic 125 getrandom 126 mmapobj 127 setrlimit 128 |