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/common/sys/elf.h | |
| 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/common/sys/elf.h')
| -rw-r--r-- | usr/src/uts/common/sys/elf.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/uts/common/sys/elf.h b/usr/src/uts/common/sys/elf.h index 1a2ca397ef..384c6daf99 100644 --- a/usr/src/uts/common/sys/elf.h +++ b/usr/src/uts/common/sys/elf.h @@ -21,6 +21,7 @@ /* * Copyright 2012 DEY Storage Systems, Inc. All rights reserved. * Copyright (c) 2018, Joyent, Inc. + * Copyright 2020 Oxide Computer Company */ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. @@ -1018,7 +1019,8 @@ typedef Elf64_Word Elf64_Capchain; #define NT_SPYMASTER 23 /* psinfo_t for agent LWP spymaster */ #define NT_SECFLAGS 24 /* process security-flags */ #define NT_LWPNAME 25 /* prlwpname_t */ -#define NT_NUM 25 +#define NT_UPANIC 26 /* prupanic_t */ +#define NT_NUM 26 #ifdef _KERNEL |