diff options
| author | Dan McDonald <danmcd@joyent.com> | 2020-11-17 11:01:04 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-11-17 11:01:04 -0500 |
| commit | 5a1b3228538dfeb09e05cc2bdfad707ee4d698d7 (patch) | |
| tree | 8611282076e7c9fea544bd5f0cddb24d3307ddc1 | |
| parent | 4e230541132f1431873292b3d6bfa531bb1536c8 (diff) | |
| parent | f0b6369dcf843cd097edef20ec38c11b7ae127d6 (diff) | |
| download | illumos-joyent-5a1b3228538dfeb09e05cc2bdfad707ee4d698d7.tar.gz | |
[illumos-gate merge]
commit f0b6369dcf843cd097edef20ec38c11b7ae127d6
13285 remove incomplete kmod guidance implementation
| -rw-r--r-- | usr/src/cmd/sgs/include/libld.h | 1 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/libld/common/args.c | 5 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/libld/common/libld.msg | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/usr/src/cmd/sgs/include/libld.h b/usr/src/cmd/sgs/include/libld.h index dc125ec90b..3e821ecdbe 100644 --- a/usr/src/cmd/sgs/include/libld.h +++ b/usr/src/cmd/sgs/include/libld.h @@ -538,7 +538,6 @@ struct ofl_desc { #define FLG_OFG_NO_MF 0x00000008 /* use v2 mapfile syntax */ #define FLG_OFG_NO_TEXT 0x00000010 /* verify pure text segment */ #define FLG_OFG_NO_UNUSED 0x00000020 /* remove unused dependency */ -#define FLG_OFG_NO_KMOD 0x00000040 /* use -z type=kmod */ /* * Test to see if a guidance should be given for a given category diff --git a/usr/src/cmd/sgs/libld/common/args.c b/usr/src/cmd/sgs/libld/common/args.c index 93beb46c22..9898b7b08d 100644 --- a/usr/src/cmd/sgs/libld/common/args.c +++ b/usr/src/cmd/sgs/libld/common/args.c @@ -325,11 +325,6 @@ check_flags(Ofl_desc * ofl, int argc) if (otype == OT_RELOC) { if (dflag == SET_UNKNOWN) dflag = SET_FALSE; - if ((dflag == SET_TRUE) && - OFL_GUIDANCE(ofl, FLG_OFG_NO_KMOD)) { - ld_eprintf(ofl, ERR_GUIDANCE, - MSG_INTL(MSG_GUIDE_KMOD)); - } } else if (otype == OT_KMOD) { if (dflag != SET_UNKNOWN) { ld_eprintf(ofl, ERR_FATAL, diff --git a/usr/src/cmd/sgs/libld/common/libld.msg b/usr/src/cmd/sgs/libld/common/libld.msg index ee0a45dce8..bc4aebea88 100644 --- a/usr/src/cmd/sgs/libld/common/libld.msg +++ b/usr/src/cmd/sgs/libld/common/libld.msg @@ -709,7 +709,6 @@ @ MSG_GUIDE_TEXT "position independent (PIC) code recommended for \ shared objects" @ MSG_GUIDE_UNUSED "removal of unused dependency recommended: %s" -@ MSG_GUIDE_KMOD "use -z type=kmod, not -r -dy" @ _END_ |