doc: replace references to {5..9}{g,l} with go tool compile and go tool link

I updated some references to 6g, 6l and friends that I came across, as those
programs don't exist anymore. I also fixed some echos in make.rc to match other make.* scripts while I was there.

Change-Id: Ib84532cd4688cf65174dd9869e5d42af98a20a48
Reviewed-on: https://go-review.googlesource.com/11162
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/cmd/go/alldocs.go b/src/cmd/go/alldocs.go
index 9001562e5a1d0659b52a01d1d9fbc4ea11dce5d6..d5a77a9df679f53c43d6e62effa99b60c4ce863d 100644 (file)
--- a/src/cmd/go/alldocs.go
+++ b/src/cmd/go/alldocs.go
@@ -106,7 +106,7 @@ and test commands:
        -gccgoflags 'arg list'
                arguments to pass on each gccgo compiler/linker invocation.
        -gcflags 'arg list'
-               arguments to pass on each 5g, 6g, 8g, or 9g compiler invocation.
+               arguments to pass on each go tool compile invocation.
        -installsuffix suffix
                a suffix to use in the name of the package installation directory,
                in order to keep output separate from default builds.
@@ -114,9 +114,9 @@ and test commands:
                or, if set explicitly, has _race appended to it.  Using a -buildmode
                option that requires non-default compile flags has a similar effect.
        -ldflags 'flag list'
-               arguments to pass on each 5l, 6l, 8l, or 9l linker invocation.
+               arguments to pass on each go tool link invocation.
        -asmflags 'flag list'
-               arguments to pass on each asm assembler invocation.
+               arguments to pass on each go tool asm invocation.
        -tags 'tag list'
                a list of build tags to consider satisfied during the build.
                For more information about build tags, see the description of

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 07b4c307947725bf8f2710b3078b07efbb38d0a3..c0ae2dd9d4502c0f120bc87b830c67b62dcc111a 100644 (file)
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -86,7 +86,7 @@ and test commands:
        -gccgoflags 'arg list'
                arguments to pass on each gccgo compiler/linker invocation.
        -gcflags 'arg list'
-               arguments to pass on each 5g, 6g, 8g, or 9g compiler invocation.
+               arguments to pass on each go tool compile invocation.
        -installsuffix suffix
                a suffix to use in the name of the package installation directory,
                in order to keep output separate from default builds.
@@ -94,9 +94,9 @@ and test commands:
                or, if set explicitly, has _race appended to it.  Using a -buildmode
                option that requires non-default compile flags has a similar effect.
        -ldflags 'flag list'
-               arguments to pass on each 5l, 6l, 8l, or 9l linker invocation.
+               arguments to pass on each go tool link invocation.
        -asmflags 'flag list'
-               arguments to pass on each asm assembler invocation.
+               arguments to pass on each go tool asm invocation.
        -tags 'tag list'
                a list of build tags to consider satisfied during the build.
                For more information about build tags, see the description of

diff --git a/src/make.bash b/src/make.bash
index 365664303e1eaa0fee26a179d1b552d027d0dbe5..f17648aff51b5e5be2015395650d5fe28101b13d 100755 (executable)
--- a/src/make.bash
+++ b/src/make.bash
@@ -19,10 +19,10 @@
 #
 # GOOS: The target operating system for installed packages and tools.
 #
-# GO_GCFLAGS: Additional 5g/6g/8g arguments to use when
+# GO_GCFLAGS: Additional go tool compile arguments to use when
 # building the packages and commands.
 #
-# GO_LDFLAGS: Additional 5l/6l/8l arguments to use when
+# GO_LDFLAGS: Additional go tool link arguments to use when
 # building the commands.
 #
 # CGO_ENABLED: Controls cgo usage during the build. Set it to 1

diff --git a/src/make.bat b/src/make.bat
index dca7f666542579edf6c8e9140a65b8d90b99b9cd..0efdcc576c1a92d21caa444d2dea13aae99d4751 100644 (file)
--- a/src/make.bat
+++ b/src/make.bat
@@ -16,10 +16,10 @@
 ::
 :: GOOS: The target operating system for installed packages and tools.
 ::
-:: GO_GCFLAGS: Additional 5g/6g/8g arguments to use when
+:: GO_GCFLAGS: Additional go tool compile arguments to use when
 :: building the packages and commands.
 ::
-:: GO_LDFLAGS: Additional 5l/6l/8l arguments to use when
+:: GO_LDFLAGS: Additional go tool link arguments to use when
 :: building the commands.
 ::
 :: CGO_ENABLED: Controls cgo usage during the build. Set it to 1

diff --git a/src/make.rc b/src/make.rc
index 1d51f2842ecccadfe5fbd848b5e681c604b9d455..60162045ede4b077275631489a0eaa0ffe1434d9 100755 (executable)
--- a/src/make.rc
+++ b/src/make.rc
@@ -19,10 +19,10 @@
 #
 # GOOS: The target operating system for installed packages and tools.
 #
-# GO_GCFLAGS: Additional 5g/6g/8g arguments to use when
+# GO_GCFLAGS: Additional go tool compile arguments to use when
 # building the packages and commands.
 #
-# GO_LDFLAGS: Additional 5l/6l/8l arguments to use when
+# GO_LDFLAGS: Additional go tool link arguments to use when
 # building the commands.
 #
 # CGO_ENABLED: Controls cgo usage during the build. Set it to 1
@@ -41,7 +41,7 @@ rm -f ./runtime/runtime_defs.go
 # Determine the host compiler toolchain.
 eval `{grep '^(CC|LD|O)=' /$objtype/mkfile}
 
-echo '# Building Go bootstrap tool.'
+echo '##### Building Go bootstrap tool.'
 echo cmd/dist
 GOROOT = `{cd .. && pwd}
 if(! ~ $#GOROOT_BOOTSTRAP 1)
@@ -79,13 +79,13 @@ if(~ $sysname vx32)
        pflag = (-p 1)
 
 if(! ~ $GOHOSTARCH $GOARCH || ! ~ $GOHOSTOS $GOOS){
-       echo '# Building packages and commands for host,' $GOHOSTOS/$GOHOSTARCH^.
+       echo '##### Building packages and commands for host,' $GOHOSTOS/$GOHOSTARCH^.
        GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH \
                $GOTOOLDIR/go_bootstrap install -gcflags $"GO_GCFLAGS -ldflags $"GO_LDFLAGS -v $pflag std cmd
        echo
 }
 
-echo '# Building packages and commands for' $GOOS/$GOARCH^.
+echo '##### Building packages and commands for' $GOOS/$GOARCH^.
 $GOTOOLDIR/go_bootstrap install -gcflags $"GO_GCFLAGS -ldflags $"GO_LDFLAGS -v $pflag std cmd
 echo