5l, 6l, 8l: accept only one object file

(package main; others are pulled in automatically)

R=ken2
CC=golang-dev
https://golang.org/cl/194069

diff --git a/src/cmd/5l/obj.c b/src/cmd/5l/obj.c
index 1ccac71bc1c17ca78a7c948acc884dbdc83a4c1b..274d502b844dc854a1c428ac163793ede0509911 100644 (file)
--- a/src/cmd/5l/obj.c
+++ b/src/cmd/5l/obj.c
@@ -80,7 +80,7 @@ linkername[] =
 void
 usage(void)
 {
-       fprint(2, "usage: 5l [-options] objects\n");
+       fprint(2, "usage: 5l [-options] main.5\n");
        errorexit();
 }
 
@@ -144,7 +144,7 @@ main(int argc, char *argv[])
 
        USED(argc);
 
-       if(*argv == 0)
+       if(argc != 1)
                usage();
 
        libinit();
@@ -258,8 +258,8 @@ main(int argc, char *argv[])
        firstp = prg();
        lastp = firstp;
 
-       while(*argv)
-               objfile(*argv++, "main");
+       objfile(argv[0], "main");
+
        if(!debug['l'])
                loadlib();
 

diff --git a/src/cmd/6l/obj.c b/src/cmd/6l/obj.c
index ca679737144b3e5d5351b076f8b3e431cba76422..cbb20616a7e068a6d369e8eb8a0e7fd3facdffe5 100644 (file)
--- a/src/cmd/6l/obj.c
+++ b/src/cmd/6l/obj.c
@@ -76,7 +76,7 @@ isobjfile(char *f)
 void
 usage(void)
 {
-       fprint(2, "usage: 6l [-options] [-E entry] [-H head] [-L dir] [-T text] [-R rnd] [-o out] files...\n");
+       fprint(2, "usage: 6l [-options] [-E entry] [-H head] [-L dir] [-T text] [-R rnd] [-o out] main.6\n");
        exits("usage");
 }
 
@@ -136,8 +136,8 @@ main(int argc, char *argv[])
                        readundefs(ARGF(), SIMPORT);
                break;
        } ARGEND
-       USED(argc);
-       if(*argv == 0)
+
+       if(argc != 1)
                usage();
 
        libinit();
@@ -346,8 +346,7 @@ main(int argc, char *argv[])
        firstp = prg();
        lastp = firstp;
 
-       while(*argv)
-               objfile(*argv++, "main");
+       objfile(argv[0], "main");
 
        if(!debug['l'])
                loadlib();

diff --git a/src/cmd/8l/obj.c b/src/cmd/8l/obj.c
index b83293496ae64b1be7f10ea98ba31a4a490d6424..bcdc548dfc1218f2cab4cfc08bb984eff577abf2 100644 (file)
--- a/src/cmd/8l/obj.c
+++ b/src/cmd/8l/obj.c
@@ -81,7 +81,7 @@ isobjfile(char *f)
 void
 usage(void)
 {
-       fprint(2, "usage: 8l [-options] [-E entry] [-H head] [-L dir] [-T text] [-R rnd] [-o out] files...\n");
+       fprint(2, "usage: 8l [-options] [-E entry] [-H head] [-L dir] [-T text] [-R rnd] [-o out] main.8\n");
        exits("usage");
 }
 
@@ -142,8 +142,8 @@ main(int argc, char *argv[])
                        readundefs(ARGF(), SIMPORT);
                break;
        } ARGEND
-       USED(argc);
-       if(*argv == 0)
+
+       if(argc != 1)
                usage();
 
        mywhatsys();    // get goos
@@ -384,8 +384,7 @@ main(int argc, char *argv[])
        firstp = prg();
        lastp = firstp;
 
-       while(*argv)
-               objfile(*argv++, "main");
+       objfile(argv[0], "main");
 
        if(!debug['l'])
                loadlib();

diff --git a/test/fixedbugs/bug160.go b/test/fixedbugs/bug160.go
index 0ae9d4ec19da7c63aacbcce6495b9ccfe9ed87c7..8fd53ea079560269c0f431d72bbd93678eb7b858 100644 (file)
--- a/test/fixedbugs/bug160.go
+++ b/test/fixedbugs/bug160.go
@@ -1,4 +1,4 @@
-// $G $D/bug160.dir/x.go && $G $D/bug160.dir/y.go && $L y.$A x.$A && ./$A.out
+// $G $D/bug160.dir/x.go && $G $D/bug160.dir/y.go && $L y.$A && ./$A.out
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style