diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-15 12:35:24 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-15 12:35:24 +0000 |
commit | 0e6c921499ae7b69ddacef08cedbe2dbc597bc72 (patch) | |
tree | a86b62ad8ae353236485fc2a9f87887629eaf461 /usr/src/lib/libc/sparc | |
parent | b8a2ac4c2cdd0c26c705976b7ea699f6951d9e05 (diff) | |
parent | e25cb0e77ab84d3147918b8aef1f5161fbccb30e (diff) | |
download | illumos-joyent-0e6c921499ae7b69ddacef08cedbe2dbc597bc72.tar.gz |
[illumos-gate merge]
commit e25cb0e77ab84d3147918b8aef1f5161fbccb30e
11967 need TAA mitigation
commit b666b5bebdde1067e2d0f2b91fd28a5243311a1a
12165 lp: argument to 'alloca' may be too large
commit dd2ed563fd8f7f157d5cd583cae81fef585c2ffc
12151 libc: specifies less restrictive attribute than its target
commit e830fb12ed60bbd91c87459b169b5d1cc6ef0b9e
10241 ZFS not detecting faulty spares in a timely manner
12132 zfs-retire agent crashes fmd on systems without vdev devids
12034 zfs test send_encrypted_props can fail
commit 356ce177517a15babb8fd801d490f239298643b7
12178 Allow bytes to be removed from a custr
Conflicts:
usr/src/uts/intel/sys/x86_archext.h
usr/src/uts/common/fs/zfs/spa_misc.c
usr/src/test/util-tests/tests/Makefile
Diffstat (limited to 'usr/src/lib/libc/sparc')
-rw-r--r-- | usr/src/lib/libc/sparc/gen/siglongjmp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/lib/libc/sparc/gen/siglongjmp.c b/usr/src/lib/libc/sparc/gen/siglongjmp.c index 83a640397d..d72c076a8c 100644 --- a/usr/src/lib/libc/sparc/gen/siglongjmp.c +++ b/usr/src/lib/libc/sparc/gen/siglongjmp.c @@ -25,11 +25,7 @@ */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#pragma weak _siglongjmp = siglongjmp +/* All Rights Reserved */ #include "lint.h" #include <sys/types.h> @@ -41,6 +37,8 @@ #include "sigjmp_struct.h" #include "libc.h" +#pragma weak _siglongjmp = siglongjmp + void siglongjmp(sigjmp_buf env, int val) { |