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/libctf/common/mapfile-vers | |
| 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/libctf/common/mapfile-vers')
| -rw-r--r-- | usr/src/lib/libctf/common/mapfile-vers | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/lib/libctf/common/mapfile-vers b/usr/src/lib/libctf/common/mapfile-vers index beb313d668..a0fee17cac 100644 --- a/usr/src/lib/libctf/common/mapfile-vers +++ b/usr/src/lib/libctf/common/mapfile-vers @@ -162,7 +162,7 @@ SYMBOL_VERSION SUNWprivate_1.1 { ctf_type_size; ctf_type_visit; ctf_version; - _libctf_debug; + _libctf_debug { ASSERT = { TYPE = OBJECT; SIZE = 4; }; }; local: *; }; |