diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-04-14 23:34:37 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-04-14 23:34:44 -0400 |
| commit | f608a347058c01d3b62c685fe06ea23a960d9f6d (patch) | |
| tree | 29c8f6210e2d63e2e8be7377972c8422fb330004 /usr/src/lib/libadm | |
| parent | 6217dab3ea0ce7eb1b96394433a940cbc96a3fde (diff) | |
| parent | 15276eb5b5c891978242f14352c27676ed336244 (diff) | |
| download | illumos-joyent-f608a347058c01d3b62c685fe06ea23a960d9f6d.tar.gz | |
[illumos-gate merge]
commit 15276eb5b5c891978242f14352c27676ed336244
13704 add Ice Lake Xeon to PPIN list
13705 add recent Intel models to x86_archext.h
commit 6dcbfae4aa2c2aab7ebd7174bd2f0232528126b7
13201 IPS image re-hydration fails
commit 8222814ef8560ee0ba222eca8ca5acffc6cd0e44
13487 want mapfile-based assertions about symbol properties
commit 99ea293e719ac006d413e4fde6ac0d5cd4dd6c59
7668 zfs get only outputs 3 columns if "clones" property is empty
Conflicts:
usr/src/lib/libzfs/common/mapfile-vers
Diffstat (limited to 'usr/src/lib/libadm')
| -rw-r--r-- | usr/src/lib/libadm/common/mapfile-vers | 56 |
1 files changed, 34 insertions, 22 deletions
diff --git a/usr/src/lib/libadm/common/mapfile-vers b/usr/src/lib/libadm/common/mapfile-vers index 914a9f530d..eed3e03c79 100644 --- a/usr/src/lib/libadm/common/mapfile-vers +++ b/usr/src/lib/libadm/common/mapfile-vers @@ -55,7 +55,7 @@ SYMBOL_VERSION SUNW_1.1 { SYMBOL_VERSION SUNW_0.7 { global: - pkgdir; + pkgdir { ASSERT = { TYPE = OBJECT; SIZE = addrsize; }; }; read_vtoc; write_vtoc; }; @@ -74,7 +74,12 @@ SYMBOL_VERSION SUNWprivate_1.1 { ckgid_err; ckgid_hlp; ckgid_val; - ckindent; + ckindent { + ASSERT = { + TYPE = OBJECT; + SIZE = 4; + }; + }; ckint; ckint_err; ckint_hlp; @@ -88,7 +93,12 @@ SYMBOL_VERSION SUNWprivate_1.1 { ckpath_hlp; ckpath_stx; ckpath_val; - ckquit; + ckquit { + ASSERT = { + TYPE = OBJECT; + SIZE = 4; + }; + }; ckrange; ckrange_err; ckrange_hlp; @@ -106,7 +116,12 @@ SYMBOL_VERSION SUNWprivate_1.1 { ckuid_err; ckuid_hlp; ckuid_val; - ckwidth; + ckwidth { + ASSERT = { + TYPE = OBJECT; + SIZE = 4; + }; + }; ckyorn; ckyorn_err; ckyorn_hlp; @@ -136,7 +151,12 @@ SYMBOL_VERSION SUNWprivate_1.1 { _moddevtabrec; _opendevtab; _opendgrptab; - pkgfile; + pkgfile { + ASSERT = { + TYPE = OBJECT; + SIZE = addrsize; + }; + }; pkginfo; pkginfofind; pkgnmchk; @@ -175,26 +195,18 @@ $if _sparc || (_x86 && _ELF32) SYMBOL_VERSION SUNW_0.7 { global: - circf; - sed; - nbra { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 }; -$if _ELF32 - loc1 { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 }; - loc2 { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 }; - locs { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 }; -$elif _ELF64 - loc1 { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x8 }; - loc2 { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x8 }; - locs { TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x8 }; -$else -$error unknown ELFCLASS -$endif + circf { ASSERT = { TYPE = OBJECT; SIZE = 4; }; }; + sed { ASSERT = { TYPE = OBJECT; SIZE = 4; }; }; + nbra { TYPE = DATA; FILTER = libgen.so.1; SIZE = addrsize; }; + loc1 { TYPE = DATA; FILTER = libgen.so.1; SIZE = addrsize; }; + loc2 { TYPE = DATA; FILTER = libgen.so.1; SIZE = addrsize; }; + locs { TYPE = DATA; FILTER = libgen.so.1; SIZE = addrsize; }; }; SYMBOL_VERSION SUNWprivate_1.1 { global: - advance { TYPE = FUNCTION; FILTER = libgen.so.1 }; - compile { TYPE = FUNCTION; FILTER = libgen.so.1 }; - step { TYPE = FUNCTION; FILTER = libgen.so.1 }; + advance { TYPE = FUNCTION; FILTER = libgen.so.1; }; + compile { TYPE = FUNCTION; FILTER = libgen.so.1; }; + step { TYPE = FUNCTION; FILTER = libgen.so.1; }; }; $endif |