diff options
| author | Toomas Soome <tsoome@me.com> | 2016-05-16 11:43:16 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2017-11-10 10:45:17 -0500 |
| commit | b960a2708664bae74456527012602c0464e7f8ef (patch) | |
| tree | bd234d04435e9ce4a873bcca15d99bcb804fbb3e | |
| parent | 272952165423c254ad7708f1b3fe2ff0a6ce408b (diff) | |
| download | illumos-joyent-b960a2708664bae74456527012602c0464e7f8ef.tar.gz | |
8756 tools: btxld should be able to only add version
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/tools/btxld/btxld.1onbld | 5 | ||||
| -rw-r--r-- | usr/src/tools/btxld/btxld.c | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/usr/src/tools/btxld/btxld.1onbld b/usr/src/tools/btxld/btxld.1onbld index 4cb423ba79..a31a81244d 100644 --- a/usr/src/tools/btxld/btxld.1onbld +++ b/usr/src/tools/btxld/btxld.1onbld @@ -22,7 +22,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd Apr 20, 2017 +.Dd Nov 8, 2017 .Dt BTXLD 1ONBLD .Os .Sh NAME @@ -38,6 +38,7 @@ .Op Fl l Ar file .Op Fl o Ar filename .Op Fl P Ar page +.Op Fl V Ar version .Op Fl W Ar page .Ar file .Sh DESCRIPTION @@ -79,6 +80,8 @@ Specify the first page of the client's segment to be marked where .Ar page may be 0 or 1. +.It Fl V Ar version +Specify the version string. .It Fl W Ar page Specify the first page of the client's segment to be marked .Sq writable , diff --git a/usr/src/tools/btxld/btxld.c b/usr/src/tools/btxld/btxld.c index 62e8e868d6..486119d1a9 100644 --- a/usr/src/tools/btxld/btxld.c +++ b/usr/src/tools/btxld/btxld.c @@ -85,10 +85,9 @@ static const char cinfo[] = static const char oinfo[] = "output: fmt=%s size=%x text=%x data=%x org=%x entry=%x\n"; -static const char *lname = - BTX_PATH "/btxldr/btxldr"; /* BTX loader */ -static const char *bname = - BTX_PATH "/btx/btx"; /* BTX kernel */ +/* BTX loader and kernel is only provided from command line */ +static const char *lname = NULL; +static const char *bname = NULL; static const char *oname = "a.out"; /* Output filename */ @@ -177,7 +176,8 @@ main(int argc, char *argv[]) if (argc != 1) usage(); atexit(cleanup); - btxld(*argv); + if (lname != NULL && bname != NULL) + btxld(*argv); if (version != NULL) add_version(oname, version); return 0; |