From bc998d034f45d1828a8663b2eed928faf22a7d01 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 14 Sep 2017 17:11:35 +0000 Subject: libgo: update to go1.9 Reviewed-on: https://go-review.googlesource.com/63753 From-SVN: r252767 --- gotools/ChangeLog | 12 ++++++++++++ gotools/Makefile.am | 53 +++++++++++++++++----------------------------------- gotools/Makefile.in | 54 +++++++++++++++++------------------------------------ 3 files changed, 46 insertions(+), 73 deletions(-) (limited to 'gotools') diff --git a/gotools/ChangeLog b/gotools/ChangeLog index 0a84eefba66..8fac16e3712 100644 --- a/gotools/ChangeLog +++ b/gotools/ChangeLog @@ -1,3 +1,15 @@ +2017-09-14 Ian Lance Taylor + + * Makefile.am (LIBGOTOOL): Define. + (go_cmd_go_files): Update for Go 1.9 release. + (go$(EXEEXT)): Depend on and link against $(LIBGOTOOL). + (CHECK_ENV): Add definition of shell variable fl. + (check-go-tool): Update for rearrangement of cmd/go sources in Go + 1.9 release. Echo failure message if test fails. + (check-runtime): Echo failure message if test fails. + (check-cgo-test, check-carchive-test): Likewise. + * Makefile.in: Rebuild. + 2017-08-30 Ian Lance Taylor * configure.ac: Substitute GOC_FOR_TARGET and GCC_FOR_TARGET. diff --git a/gotools/Makefile.am b/gotools/Makefile.am index 41a2c72dc5b..4f13ffe31c3 100644 --- a/gotools/Makefile.am +++ b/gotools/Makefile.am @@ -28,6 +28,8 @@ STAMP = echo timestamp > libgodir = ../$(target_noncanonical)/libgo LIBGODEP = $(libgodir)/libgo.la +LIBGOTOOL = $(libgodir)/libgotool.a + if NATIVE # Use the compiler we just built. GOCOMPILER = $(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) @@ -48,34 +50,8 @@ libgomiscdir = $(srcdir)/../libgo/misc go_cmd_go_files = \ $(cmdsrcdir)/go/alldocs.go \ - $(cmdsrcdir)/go/bug.go \ - $(cmdsrcdir)/go/build.go \ - $(cmdsrcdir)/go/clean.go \ - $(cmdsrcdir)/go/context.go \ - $(cmdsrcdir)/go/discovery.go \ - $(cmdsrcdir)/go/doc.go \ - $(cmdsrcdir)/go/env.go \ - $(cmdsrcdir)/go/fix.go \ - $(cmdsrcdir)/go/fmt.go \ - $(cmdsrcdir)/go/generate.go \ - $(cmdsrcdir)/go/get.go \ $(cmdsrcdir)/go/go11.go \ - $(cmdsrcdir)/go/help.go \ - $(cmdsrcdir)/go/http.go \ - $(cmdsrcdir)/go/list.go \ - $(cmdsrcdir)/go/main.go \ - $(cmdsrcdir)/go/note.go \ - $(cmdsrcdir)/go/pkg.go \ - $(cmdsrcdir)/go/run.go \ - $(cmdsrcdir)/go/signal.go \ - $(cmdsrcdir)/go/signal_unix.go \ - $(cmdsrcdir)/go/test.go \ - $(cmdsrcdir)/go/testflag.go \ - $(cmdsrcdir)/go/tool.go \ - $(cmdsrcdir)/go/vcs.go \ - $(cmdsrcdir)/go/version.go \ - $(cmdsrcdir)/go/vet.go \ - $(libgodir)/zstdpkglist.go + $(cmdsrcdir)/go/main.go go_cmd_gofmt_files = \ $(cmdsrcdir)/gofmt/doc.go \ @@ -124,8 +100,8 @@ bin_PROGRAMS = go$(EXEEXT) gofmt$(EXEEXT) noinst_PROGRAMS = cgo$(EXEEXT) man_MANS = go.1 gofmt.1 -go$(EXEEXT): $(go_cmd_go_files) zdefaultcc.go $(LIBGODEP) - $(GOLINK) $(go_cmd_go_files) zdefaultcc.go $(LIBS) $(NET_LIBS) +go$(EXEEXT): $(go_cmd_go_files) $(LIBGOTOOL) $(LIBGODEP) + $(GOLINK) $(go_cmd_go_files) $(LIBGOTOOL) $(LIBS) $(NET_LIBS) gofmt$(EXEEXT): $(go_cmd_gofmt_files) $(LIBGODEP) $(GOLINK) $(go_cmd_gofmt_files) $(LIBS) $(NET_LIBS) cgo$(EXEEXT): $(go_cmd_cgo_files) zdefaultcc.go $(LIBGODEP) @@ -175,6 +151,8 @@ check-gcc: Makefile # CHECK_ENV sets up the environment to run the newly built go tool. # If you change this, change ECHO_ENV, below. +# The fl shell variable is used to avoid having FAIL appear +# in the log unnecessarily. CHECK_ENV = \ PATH=`echo $(abs_builddir):$${PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ export PATH; \ @@ -190,7 +168,8 @@ CHECK_ENV = \ LD_LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ export LD_LIBRARY_PATH; \ GOROOT=$${abs_libgodir}; \ - export GOROOT; + export GOROOT; \ + fl1="FA"; fl2="IL"; fl="$${fl1}$${fl2}"; # ECHO_ENV is a variant of CHECK_ENV to put into a testlog file. # It assumes that abs_libgodir is set. @@ -201,16 +180,18 @@ check-go-tool: go$(EXEEXT) cgo$(EXEEXT) check-head check-gccgo check-gcc rm -rf check-go-dir cmd_go-testlog $(MKDIR_P) check-go-dir/src/cmd/go cp $(cmdsrcdir)/go/*.go check-go-dir/src/cmd/go/ - cp $(libgodir)/zstdpkglist.go check-go-dir/src/cmd/go/ - cp zdefaultcc.go check-go-dir/src/cmd/go/ + cp -r $(cmdsrcdir)/go/internal check-go-dir/src/cmd/go/ + cp $(libgodir)/zstdpkglist.go check-go-dir/src/cmd/go/internal/load/ + cp $(libgodir)/zdefaultcc.go check-go-dir/src/cmd/go/internal/cfg/ cp -r $(cmdsrcdir)/go/testdata check-go-dir/src/cmd/go/ + cp -r $(cmdsrcdir)/internal check-go-dir/src/cmd/ @abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \ abs_checkdir=`cd check-go-dir && $(PWD_COMMAND)`; \ echo "cd check-go-dir/src/cmd/go && $(ECHO_ENV) GOPATH=$${abs_checkdir} $(abs_builddir)/go$(EXEEXT) test -test.short -test.v" > cmd_go-testlog $(CHECK_ENV) \ GOPATH=`cd check-go-dir && $(PWD_COMMAND)`; \ export GOPATH; \ - (cd check-go-dir/src/cmd/go && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) > cmd_go-testlog 2>&1 || true + (cd check-go-dir/src/cmd/go && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) >> cmd_go-testlog 2>&1 || echo "--- $${fl} go test cmd/go (0.00s)" >> cmd_go-testlog grep '^--- ' cmd_go-testlog | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' # check-runtime runs `go test runtime` in our environment. @@ -232,7 +213,7 @@ check-runtime: go$(EXEEXT) cgo$(EXEEXT) check-head check-gccgo check-gcc GOARCH=`$(abs_builddir)/go$(EXEEXT) env GOARCH`; \ GOOS=`$(abs_builddir)/go$(EXEEXT) env GOOS`; \ files=`$(SHELL) $(libgosrcdir)/../match.sh --goarch=$${GOARCH} --goos=$${GOOS} --srcdir=$(libgosrcdir)/runtime --extrafiles="$(libgodir)/runtime_sysinfo.go $(libgodir)/sigtab.go" --tag=libffi`; \ - $(SHELL) $(libgosrcdir)/../testsuite/gotest --goarch=$${GOARCH} --goos=$${GOOS} --basedir=$(libgosrcdir)/.. --srcdir=$(libgosrcdir)/runtime --pkgpath=runtime --pkgfiles="$${files}" -test.v >> runtime-testlog 2>&1 || true + $(SHELL) $(libgosrcdir)/../testsuite/gotest --goarch=$${GOARCH} --goos=$${GOOS} --basedir=$(libgosrcdir)/.. --srcdir=$(libgosrcdir)/runtime --pkgpath=runtime --pkgfiles="$${files}" -test.v >> runtime-testlog 2>&1 || echo "--- $${fl} go test runtime (0.00s)" >> runtime-testlog grep '^--- ' runtime-testlog | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' # check-cgo-test runs `go test misc/cgo/test` in our environment. @@ -245,7 +226,7 @@ check-cgo-test: go$(EXEEXT) cgo$(EXEEXT) check-head check-gccgo check-gcc $(CHECK_ENV) \ GOTRACEBACK=2; \ export GOTRACEBACK; \ - (cd cgo-test-dir/misc/cgo/test && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) >> cgo-testlog 2>&1 || true + (cd cgo-test-dir/misc/cgo/test && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) >> cgo-testlog 2>&1 || echo "--- $${fl} go test misc/cgo/test (0.00s)" >> cgo-testlog grep '^--- ' cgo-testlog | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' # check-carchive-test runs `go test misc/cgo/testcarchive/carchive_test.go` @@ -259,7 +240,7 @@ check-carchive-test: go$(EXEEXT) cgo$(EXEEXT) check-head check-gccgo check-gcc $(CHECK_ENV) \ LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ export LIBRARY_PATH; \ - (cd carchive-test-dir/misc/cgo/testcarchive && $(abs_builddir)/go$(EXEEXT) test -test.v carchive_test.go) >> carchive-testlog 2>&1 || true + (cd carchive-test-dir/misc/cgo/testcarchive && $(abs_builddir)/go$(EXEEXT) test -test.v carchive_test.go) >> carchive-testlog 2>&1 || echo "--- $${fl} go test misc/cgo/testcarchive (0.00s)" >> carchive-testlog grep '^--- ' carchive-testlog | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' # The check targets runs the tests and assembles the output files. diff --git a/gotools/Makefile.in b/gotools/Makefile.in index 148665a46e9..b9734f151cc 100644 --- a/gotools/Makefile.in +++ b/gotools/Makefile.in @@ -255,6 +255,7 @@ PWD_COMMAND = $${PWDCMD-pwd} STAMP = echo timestamp > libgodir = ../$(target_noncanonical)/libgo LIBGODEP = $(libgodir)/libgo.la +LIBGOTOOL = $(libgodir)/libgotool.a @NATIVE_FALSE@GOCOMPILER = $(GOC) # Use the compiler we just built. @@ -268,34 +269,8 @@ cmdsrcdir = $(libgosrcdir)/cmd libgomiscdir = $(srcdir)/../libgo/misc go_cmd_go_files = \ $(cmdsrcdir)/go/alldocs.go \ - $(cmdsrcdir)/go/bug.go \ - $(cmdsrcdir)/go/build.go \ - $(cmdsrcdir)/go/clean.go \ - $(cmdsrcdir)/go/context.go \ - $(cmdsrcdir)/go/discovery.go \ - $(cmdsrcdir)/go/doc.go \ - $(cmdsrcdir)/go/env.go \ - $(cmdsrcdir)/go/fix.go \ - $(cmdsrcdir)/go/fmt.go \ - $(cmdsrcdir)/go/generate.go \ - $(cmdsrcdir)/go/get.go \ $(cmdsrcdir)/go/go11.go \ - $(cmdsrcdir)/go/help.go \ - $(cmdsrcdir)/go/http.go \ - $(cmdsrcdir)/go/list.go \ - $(cmdsrcdir)/go/main.go \ - $(cmdsrcdir)/go/note.go \ - $(cmdsrcdir)/go/pkg.go \ - $(cmdsrcdir)/go/run.go \ - $(cmdsrcdir)/go/signal.go \ - $(cmdsrcdir)/go/signal_unix.go \ - $(cmdsrcdir)/go/test.go \ - $(cmdsrcdir)/go/testflag.go \ - $(cmdsrcdir)/go/tool.go \ - $(cmdsrcdir)/go/vcs.go \ - $(cmdsrcdir)/go/version.go \ - $(cmdsrcdir)/go/vet.go \ - $(libgodir)/zstdpkglist.go + $(cmdsrcdir)/go/main.go go_cmd_gofmt_files = \ $(cmdsrcdir)/gofmt/doc.go \ @@ -330,6 +305,8 @@ MOSTLYCLEANFILES = \ # CHECK_ENV sets up the environment to run the newly built go tool. # If you change this, change ECHO_ENV, below. +# The fl shell variable is used to avoid having FAIL appear +# in the log unnecessarily. @NATIVE_TRUE@CHECK_ENV = \ @NATIVE_TRUE@ PATH=`echo $(abs_builddir):$${PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ @NATIVE_TRUE@ export PATH; \ @@ -345,7 +322,8 @@ MOSTLYCLEANFILES = \ @NATIVE_TRUE@ LD_LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ @NATIVE_TRUE@ export LD_LIBRARY_PATH; \ @NATIVE_TRUE@ GOROOT=$${abs_libgodir}; \ -@NATIVE_TRUE@ export GOROOT; +@NATIVE_TRUE@ export GOROOT; \ +@NATIVE_TRUE@ fl1="FA"; fl2="IL"; fl="$${fl1}$${fl2}"; # ECHO_ENV is a variant of CHECK_ENV to put into a testlog file. @@ -598,8 +576,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@NATIVE_FALSE@uninstall-local: @NATIVE_FALSE@install-exec-local: +@NATIVE_FALSE@uninstall-local: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \ @@ -707,8 +685,8 @@ s-zdefaultcc: Makefile mostlyclean-local: rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir -@NATIVE_TRUE@go$(EXEEXT): $(go_cmd_go_files) zdefaultcc.go $(LIBGODEP) -@NATIVE_TRUE@ $(GOLINK) $(go_cmd_go_files) zdefaultcc.go $(LIBS) $(NET_LIBS) +@NATIVE_TRUE@go$(EXEEXT): $(go_cmd_go_files) $(LIBGOTOOL) $(LIBGODEP) +@NATIVE_TRUE@ $(GOLINK) $(go_cmd_go_files) $(LIBGOTOOL) $(LIBS) $(NET_LIBS) @NATIVE_TRUE@gofmt$(EXEEXT): $(go_cmd_gofmt_files) $(LIBGODEP) @NATIVE_TRUE@ $(GOLINK) $(go_cmd_gofmt_files) $(LIBS) $(NET_LIBS) @NATIVE_TRUE@cgo$(EXEEXT): $(go_cmd_cgo_files) zdefaultcc.go $(LIBGODEP) @@ -761,16 +739,18 @@ mostlyclean-local: @NATIVE_TRUE@ rm -rf check-go-dir cmd_go-testlog @NATIVE_TRUE@ $(MKDIR_P) check-go-dir/src/cmd/go @NATIVE_TRUE@ cp $(cmdsrcdir)/go/*.go check-go-dir/src/cmd/go/ -@NATIVE_TRUE@ cp $(libgodir)/zstdpkglist.go check-go-dir/src/cmd/go/ -@NATIVE_TRUE@ cp zdefaultcc.go check-go-dir/src/cmd/go/ +@NATIVE_TRUE@ cp -r $(cmdsrcdir)/go/internal check-go-dir/src/cmd/go/ +@NATIVE_TRUE@ cp $(libgodir)/zstdpkglist.go check-go-dir/src/cmd/go/internal/load/ +@NATIVE_TRUE@ cp $(libgodir)/zdefaultcc.go check-go-dir/src/cmd/go/internal/cfg/ @NATIVE_TRUE@ cp -r $(cmdsrcdir)/go/testdata check-go-dir/src/cmd/go/ +@NATIVE_TRUE@ cp -r $(cmdsrcdir)/internal check-go-dir/src/cmd/ @NATIVE_TRUE@ @abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \ @NATIVE_TRUE@ abs_checkdir=`cd check-go-dir && $(PWD_COMMAND)`; \ @NATIVE_TRUE@ echo "cd check-go-dir/src/cmd/go && $(ECHO_ENV) GOPATH=$${abs_checkdir} $(abs_builddir)/go$(EXEEXT) test -test.short -test.v" > cmd_go-testlog @NATIVE_TRUE@ $(CHECK_ENV) \ @NATIVE_TRUE@ GOPATH=`cd check-go-dir && $(PWD_COMMAND)`; \ @NATIVE_TRUE@ export GOPATH; \ -@NATIVE_TRUE@ (cd check-go-dir/src/cmd/go && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) > cmd_go-testlog 2>&1 || true +@NATIVE_TRUE@ (cd check-go-dir/src/cmd/go && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) >> cmd_go-testlog 2>&1 || echo "--- $${fl} go test cmd/go (0.00s)" >> cmd_go-testlog @NATIVE_TRUE@ grep '^--- ' cmd_go-testlog | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' # check-runtime runs `go test runtime` in our environment. @@ -792,7 +772,7 @@ mostlyclean-local: @NATIVE_TRUE@ GOARCH=`$(abs_builddir)/go$(EXEEXT) env GOARCH`; \ @NATIVE_TRUE@ GOOS=`$(abs_builddir)/go$(EXEEXT) env GOOS`; \ @NATIVE_TRUE@ files=`$(SHELL) $(libgosrcdir)/../match.sh --goarch=$${GOARCH} --goos=$${GOOS} --srcdir=$(libgosrcdir)/runtime --extrafiles="$(libgodir)/runtime_sysinfo.go $(libgodir)/sigtab.go" --tag=libffi`; \ -@NATIVE_TRUE@ $(SHELL) $(libgosrcdir)/../testsuite/gotest --goarch=$${GOARCH} --goos=$${GOOS} --basedir=$(libgosrcdir)/.. --srcdir=$(libgosrcdir)/runtime --pkgpath=runtime --pkgfiles="$${files}" -test.v >> runtime-testlog 2>&1 || true +@NATIVE_TRUE@ $(SHELL) $(libgosrcdir)/../testsuite/gotest --goarch=$${GOARCH} --goos=$${GOOS} --basedir=$(libgosrcdir)/.. --srcdir=$(libgosrcdir)/runtime --pkgpath=runtime --pkgfiles="$${files}" -test.v >> runtime-testlog 2>&1 || echo "--- $${fl} go test runtime (0.00s)" >> runtime-testlog @NATIVE_TRUE@ grep '^--- ' runtime-testlog | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' # check-cgo-test runs `go test misc/cgo/test` in our environment. @@ -805,7 +785,7 @@ mostlyclean-local: @NATIVE_TRUE@ $(CHECK_ENV) \ @NATIVE_TRUE@ GOTRACEBACK=2; \ @NATIVE_TRUE@ export GOTRACEBACK; \ -@NATIVE_TRUE@ (cd cgo-test-dir/misc/cgo/test && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) >> cgo-testlog 2>&1 || true +@NATIVE_TRUE@ (cd cgo-test-dir/misc/cgo/test && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) >> cgo-testlog 2>&1 || echo "--- $${fl} go test misc/cgo/test (0.00s)" >> cgo-testlog @NATIVE_TRUE@ grep '^--- ' cgo-testlog | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' # check-carchive-test runs `go test misc/cgo/testcarchive/carchive_test.go` @@ -819,7 +799,7 @@ mostlyclean-local: @NATIVE_TRUE@ $(CHECK_ENV) \ @NATIVE_TRUE@ LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ @NATIVE_TRUE@ export LIBRARY_PATH; \ -@NATIVE_TRUE@ (cd carchive-test-dir/misc/cgo/testcarchive && $(abs_builddir)/go$(EXEEXT) test -test.v carchive_test.go) >> carchive-testlog 2>&1 || true +@NATIVE_TRUE@ (cd carchive-test-dir/misc/cgo/testcarchive && $(abs_builddir)/go$(EXEEXT) test -test.v carchive_test.go) >> carchive-testlog 2>&1 || echo "--- $${fl} go test misc/cgo/testcarchive (0.00s)" >> carchive-testlog @NATIVE_TRUE@ grep '^--- ' carchive-testlog | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' # The check targets runs the tests and assembles the output files. -- cgit v1.2.3