Mercurial > illumos > illumos-gate
changeset 13912:368aba3d1b08
3441 -zassert-deflib messages are in the wrong place
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Garrett D'Amore <garrett@damore.org>
| author | Richard Lowe <richlowe@richlowe.net> |
|---|---|
| date | Tue, 01 Jan 2013 21:15:12 -0500 |
| parents | 0b6822cb3649 |
| children | c0a3acf5ac47 |
| files | usr/src/cmd/sgs/libld/common/libld.msg usr/src/cmd/sgs/rtld/common/rtld.msg |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/sgs/libld/common/libld.msg Tue Jan 01 21:15:54 2013 -0500 +++ b/usr/src/cmd/sgs/libld/common/libld.msg Tue Jan 01 21:15:12 2013 -0500 @@ -1263,6 +1263,11 @@ @ MSG_DBG_AOUT_FMT "debug: a.out: " @ MSG_DBG_NAME_FMT "debug: %s: " +# -z assert-deflib strings + +@ MSG_ARG_ASSDEFLIB_MALFORMED "library name malformed: %s" +@ MSG_ARG_ASSDEFLIB_FOUND "dynamic library found on default search path \ + (%s): lib%s.so" @ _END_ @@ -1469,11 +1474,6 @@ @ MSG_ARG_GUIDE_NO_TEXT "notext" @ MSG_ARG_GUIDE_NO_UNUSED "nounused" -# -z assert-deflib strings -@ MSG_ARG_ASSDEFLIB_MALFORMED "library name malformed: %s" -@ MSG_ARG_ASSDEFLIB_FOUND "dynamic library found on default search path \ - (%s): lib%s.so" - # Environment variable strings @ MSG_LD_RUN_PATH "LD_RUN_PATH"
--- a/usr/src/cmd/sgs/rtld/common/rtld.msg Tue Jan 01 21:15:54 2013 -0500 +++ b/usr/src/cmd/sgs/rtld/common/rtld.msg Tue Jan 01 21:15:12 2013 -0500 @@ -273,6 +273,8 @@ @ MSG_USD_RUNPATH " unused search path=%s (RUNPATH/RPATH from \ file %s)\n" +@ MSG_CAP_IGN_UNKCAP "ignoring unknown capability: %s" + @ _END_ # The following strings represent reserved words, files, pathnames and symbols. @@ -300,7 +302,6 @@ @ MSG_STR_ONE "1" @ MSG_CAP_DELIMIT "," -@ MSG_CAP_IGN_UNKCAP "ignoring unknown capability: %s" @ MSG_SUNW_OST_SGS "SUNW_OST_SGS" @ MSG_SUNW_OST_OSLIB "SUNW_OST_OSLIB"