libgo: update to go1.7rc3

    
    Reviewed-on: https://go-review.googlesource.com/25150

From-SVN: r238662

1 files changed, 208 insertions, 48 deletions

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 216ab6a..740885e 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -174,14 +174,14 @@ am_libnetgo_a_OBJECTS = $(am__objects_3)
 libnetgo_a_OBJECTS = $(am_libnetgo_a_OBJECTS)
 LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = bufio.lo bytes.lo bytes/index.lo crypto.lo \
-	encoding.lo errors.lo expvar.lo flag.lo fmt.lo hash.lo html.lo \
-	image.lo io.lo log.lo math.lo mime.lo net.lo os.lo path.lo \
-	reflect-go.lo reflect/makefunc_ffi_c.lo regexp.lo \
-	runtime-go.lo sort.lo strconv.lo strings.lo strings/index.lo \
-	sync.lo syscall.lo syscall/errno.lo syscall/signame.lo \
-	syscall/wait.lo testing.lo time-go.lo unicode.lo \
-	archive/tar.lo archive/zip.lo compress/bzip2.lo \
+am__DEPENDENCIES_2 = bufio.lo bytes.lo bytes/index.lo context.lo \
+	crypto.lo encoding.lo errors.lo expvar.lo flag.lo fmt.lo \
+	hash.lo html.lo image.lo io.lo log.lo math.lo mime.lo net.lo \
+	os.lo path.lo reflect-go.lo reflect/makefunc_ffi_c.lo \
+	regexp.lo runtime-go.lo sort.lo strconv.lo strings.lo \
+	strings/index.lo sync.lo syscall.lo syscall/errno.lo \
+	syscall/signame.lo syscall/wait.lo testing.lo time-go.lo \
+	unicode.lo archive/tar.lo archive/zip.lo compress/bzip2.lo \
 	compress/flate.lo compress/gzip.lo compress/lzw.lo \
 	compress/zlib.lo container/heap.lo container/list.lo \
 	container/ring.lo crypto/aes.lo crypto/cipher.lo crypto/des.lo \
@@ -199,22 +199,24 @@ am__DEPENDENCIES_2 = bufio.lo bytes.lo bytes/index.lo crypto.lo \
 	go/ast.lo go/build.lo go/constant.lo go/doc.lo go/format.lo \
 	go/importer.lo go/internal/gcimporter.lo \
 	go/internal/gccgoimporter.lo go/parser.lo go/printer.lo \
-	go/scanner.lo go/token.lo go/types.lo hash/adler32.lo \
-	hash/crc32.lo hash/crc64.lo hash/fnv.lo net/http/cgi.lo \
-	net/http/cookiejar.lo net/http/fcgi.lo net/http/httptest.lo \
+	go/scanner.lo go/token.lo go/types.lo \
+	golang_org/x/net/http2/hpack.lo \
+	golang_org/x/net/lex/httplex.lo $(golang_org_x_net_route_lo) \
+	hash/adler32.lo hash/crc32.lo hash/crc64.lo hash/fnv.lo \
+	net/http/cgi.lo net/http/cookiejar.lo net/http/fcgi.lo \
+	net/http/httptest.lo net/http/httptrace.lo \
 	net/http/httputil.lo net/http/internal.lo net/http/pprof.lo \
 	image/color.lo image/color/palette.lo image/draw.lo \
 	image/gif.lo image/internal/imageutil.lo image/jpeg.lo \
-	image/png.lo index/suffixarray.lo \
-	internal/golang.org/x/net/http2/hpack.lo internal/race.lo \
-	internal/singleflight.lo internal/syscall/unix.lo \
-	internal/testenv.lo internal/trace.lo io/ioutil.lo \
-	log/syslog.lo log/syslog/syslog_c.lo math/big.lo math/cmplx.lo \
-	math/rand.lo mime/multipart.lo mime/quotedprintable.lo \
-	net/http.lo net/internal/socktest.lo net/mail.lo net/rpc.lo \
-	net/smtp.lo net/textproto.lo net/url.lo old/regexp.lo \
-	old/template.lo os/exec.lo $(am__DEPENDENCIES_1) os/signal.lo \
-	os/user.lo path/filepath.lo regexp/syntax.lo \
+	image/png.lo index/suffixarray.lo internal/nettrace.lo \
+	internal/race.lo internal/singleflight.lo \
+	internal/syscall/unix.lo internal/testenv.lo internal/trace.lo \
+	io/ioutil.lo log/syslog.lo log/syslog/syslog_c.lo math/big.lo \
+	math/cmplx.lo math/rand.lo mime/multipart.lo \
+	mime/quotedprintable.lo net/http.lo net/internal/socktest.lo \
+	net/mail.lo net/rpc.lo net/smtp.lo net/textproto.lo net/url.lo \
+	old/regexp.lo old/template.lo os/exec.lo $(am__DEPENDENCIES_1) \
+	os/signal.lo os/user.lo path/filepath.lo regexp/syntax.lo \
 	net/rpc/jsonrpc.lo runtime/debug.lo runtime/pprof.lo \
 	sync/atomic.lo sync/atomic_c.lo text/scanner.lo \
 	text/tabwriter.lo text/template.lo text/template/parse.lo \
@@ -576,6 +578,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 toolexeclibgo_DATA = \
 	bufio.gox \
 	bytes.gox \
+	context.gox \
 	crypto.gox \
 	encoding.gox \
 	errors.gox \
@@ -758,6 +761,7 @@ toolexeclibgonethttp_DATA = \
 	net/http/cookiejar.gox \
 	net/http/fcgi.gox \
 	net/http/httptest.gox \
+	net/http/httptrace.gox \
 	net/http/httputil.gox \
 	net/http/pprof.gox
 
@@ -946,6 +950,9 @@ go_bytes_files = \
 go_bytes_c_files = \
 	go/bytes/indexbyte.c
 
+go_context_files = \
+	go/context/context.go
+
 go_crypto_files = \
 	go/crypto/crypto.go
 
@@ -1086,9 +1093,10 @@ go_mime_files = \
 @LIBGO_IS_DRAGONFLY_TRUE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_LINUX_FALSE@go_net_sendfile_file = go/net/sendfile_dragonfly.go
 @LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sendfile_file = go/net/sendfile_freebsd.go
 @LIBGO_IS_LINUX_TRUE@go_net_sendfile_file = go/net/sendfile_linux.go
-@LIBGO_IS_DRAGONFLY_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@go_net_interface_file = go/net/interface_stub.go
-@LIBGO_IS_DRAGONFLY_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@go_net_interface_file = go/net/interface_dragonfly.go
-@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@go_net_interface_file = go/net/interface_netbsd.go
+@LIBGO_IS_DRAGONFLY_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_OPENBSD_FALSE@go_net_interface_file = go/net/interface_stub.go
+@LIBGO_IS_DRAGONFLY_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_OPENBSD_TRUE@go_net_interface_file = go/net/interface_bsdvar.go
+@LIBGO_IS_DRAGONFLY_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@go_net_interface_file = go/net/interface_bsdvar.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@go_net_interface_file = go/net/interface_bsdvar.go
 @LIBGO_IS_LINUX_TRUE@go_net_interface_file = go/net/interface_linux.go
 @LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_LINUX_FALSE@go_net_cloexec_file = go/net/sys_cloexec.go
 @LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_cloexec_file = go/net/sock_cloexec.go go/net/hook_cloexec.go
@@ -1129,6 +1137,7 @@ go_net_common_files = \
 	go/net/nss.go \
 	go/net/parse.go \
 	go/net/pipe.go \
+	go/net/port.go \
 	go/net/fd_poll_runtime.go \
 	go/net/port_unix.go \
 	$(go_net_sendfile_file) \
@@ -1190,6 +1199,10 @@ go_netgo_files = \
 @LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_DRAGONFLY_FALSE@@LIBGO_IS_FREEBSD_TRUE@go_os_sticky_file = go/os/sticky_bsd.go
 @LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_DRAGONFLY_TRUE@go_os_sticky_file = go/os/sticky_bsd.go
 @LIBGO_IS_DARWIN_TRUE@go_os_sticky_file = go/os/sticky_bsd.go
+@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_LINUX_FALSE@go_os_wait_file = go/os/wait_unimp.go
+@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_LINUX_FALSE@go_os_wait_file = go/os/wait_wait6.go
+@LIBGO_IS_DARWIN_TRUE@@LIBGO_IS_LINUX_FALSE@go_os_wait_file = go/os/wait_waitid.go
+@LIBGO_IS_LINUX_TRUE@go_os_wait_file = go/os/wait_waitid.go
 go_os_files = \
 	$(go_os_dir_file) \
 	go/os/dir.go \
@@ -1215,7 +1228,8 @@ go_os_files = \
 	$(go_os_sys_file) \
 	$(go_os_cloexec_file) \
 	go/os/types.go \
-	go/os/types_unix.go
+	go/os/types_unix.go \
+	$(go_os_wait_file)
 
 go_path_files = \
 	go/path/match.go \
@@ -1248,6 +1262,7 @@ go_runtime_files = \
 	go/runtime/error.go \
 	go/runtime/extern.go \
 	go/runtime/mem.go \
+	go/runtime/symtab.go \
 	version.go
 
 noinst_DATA = zstdpkglist.go
@@ -1304,6 +1319,7 @@ go_testing_files = \
 	go/testing/benchmark.go \
 	go/testing/cover.go \
 	go/testing/example.go \
+	go/testing/match.go \
 	go/testing/testing.go
 
 go_time_files = \
@@ -1331,6 +1347,7 @@ go_unicode_files = \
 @LIBGO_IS_SOLARIS_TRUE@archive_tar_atim_file = go/archive/tar/stat_atim.go
 go_archive_tar_files = \
 	go/archive/tar/common.go \
+	go/archive/tar/format.go \
 	go/archive/tar/reader.go \
 	go/archive/tar/stat_unix.go \
 	go/archive/tar/writer.go \
@@ -1349,8 +1366,9 @@ go_compress_bzip2_files = \
 	go/compress/bzip2/move_to_front.go
 
 go_compress_flate_files = \
-	go/compress/flate/copy.go \
 	go/compress/flate/deflate.go \
+	go/compress/flate/deflatefast.go \
+	go/compress/flate/dict_decoder.go \
 	go/compress/flate/huffman_bit_writer.go \
 	go/compress/flate/huffman_code.go \
 	go/compress/flate/inflate.go \
@@ -1382,7 +1400,8 @@ go_crypto_aes_files = \
 	go/crypto/aes/block.go \
 	go/crypto/aes/cipher.go \
 	go/crypto/aes/cipher_generic.go \
-	go/crypto/aes/const.go
+	go/crypto/aes/const.go \
+	go/crypto/aes/modes.go
 
 go_crypto_cipher_files = \
 	go/crypto/cipher/cbc.go \
@@ -1418,7 +1437,8 @@ go_crypto_md5_files = \
 	go/crypto/md5/md5block.go \
 	go/crypto/md5/md5block_generic.go
 
-@LIBGO_IS_LINUX_FALSE@crypto_rand_file = 
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_OPENBSD_FALSE@crypto_rand_file = 
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_OPENBSD_TRUE@crypto_rand_file = go/crypto/rand/rand_openbsd.go
 @LIBGO_IS_LINUX_TRUE@crypto_rand_file = go/crypto/rand/rand_linux.go
 go_crypto_rand_files = \
 	go/crypto/rand/eagain.go \
@@ -1443,11 +1463,13 @@ go_crypto_sha1_files = \
 
 go_crypto_sha256_files = \
 	go/crypto/sha256/sha256.go \
-	go/crypto/sha256/sha256block.go
+	go/crypto/sha256/sha256block.go \
+	go/crypto/sha256/sha256block_generic.go
 
 go_crypto_sha512_files = \
 	go/crypto/sha512/sha512.go \
-	go/crypto/sha512/sha512block.go
+	go/crypto/sha512/sha512block.go \
+	go/crypto/sha512/sha512block_generic.go
 
 go_crypto_subtle_files = \
 	go/crypto/subtle/constant_time.go
@@ -1523,7 +1545,10 @@ go_debug_macho_files = \
 
 go_debug_pe_files = \
 	go/debug/pe/file.go \
-	go/debug/pe/pe.go
+	go/debug/pe/pe.go \
+	go/debug/pe/section.go \
+	go/debug/pe/string.go \
+	go/debug/pe/symbol.go
 
 go_debug_plan9obj_files = \
 	go/debug/plan9obj/file.go \
@@ -1688,6 +1713,39 @@ go_go_internal_gccgoimporter_files = \
 	go/go/internal/gccgoimporter/importer.go \
 	go/go/internal/gccgoimporter/parser.go
 
+go_golang_org_x_net_http2_hpack_files = \
+	go/golang_org/x/net/http2/hpack/encode.go \
+	go/golang_org/x/net/http2/hpack/hpack.go \
+	go/golang_org/x/net/http2/hpack/huffman.go \
+	go/golang_org/x/net/http2/hpack/tables.go
+
+go_golang_org_x_net_lex_httplex_files = \
+	go/golang_org/x/net/lex/httplex/httplex.go
+
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DARWIN_TRUE@x_net_route_files = 
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DRAGONFLY_TRUE@x_net_route_files = 
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@x_net_route_files = 
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_NETBSD_TRUE@x_net_route_files = 
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_OPENBSD_TRUE@x_net_route_files = 
+@LIBGO_IS_386_TRUE@@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@x_net_route_freebsd_file = 
+@LIBGO_IS_ARM_TRUE@@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@x_net_route_freebsd_file = 
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_X86_64_TRUE@x_net_route_freebsd_file = 
+@LIBGO_IS_BSD_TRUE@go_golang_org_x_net_route_files = \
+@LIBGO_IS_BSD_TRUE@	go/golang_org/x/net/route/address.go \
+@LIBGO_IS_BSD_TRUE@	go/golang_org/x/net/route/binary.go \
+@LIBGO_IS_BSD_TRUE@	go/golang_org/x/net/route/interface.go \
+@LIBGO_IS_BSD_TRUE@	go/golang_org/x/net/route/message.go \
+@LIBGO_IS_BSD_TRUE@	go/golang_org/x/net/route/route.go \
+@LIBGO_IS_BSD_TRUE@	go/golang_org/x/net/route/syscall.go \
+@LIBGO_IS_BSD_TRUE@	go/golang_org/x/net/route/sys.go \
+@LIBGO_IS_BSD_TRUE@	$(x_net_route_files)
+
+@LIBGO_IS_BSD_TRUE@golang_org_x_net_route_lo = \
+@LIBGO_IS_BSD_TRUE@	golang_org/x/net/route/route.lo
+
+@LIBGO_IS_BSD_TRUE@golang_org_x_net_route_check = \
+@LIBGO_IS_BSD_TRUE@	golang_org/x/net/route/check
+
 go_hash_adler32_files = \
 	go/hash/adler32/adler32.go
 
@@ -1750,11 +1808,8 @@ go_index_suffixarray_files = \
 	go/index/suffixarray/qsufsort.go \
 	go/index/suffixarray/suffixarray.go
 
-go_internal_golang_org_x_net_http2_hpack_files = \
-	go/internal/golang.org/x/net/http2/hpack/encode.go \
-	go/internal/golang.org/x/net/http2/hpack/hpack.go \
-	go/internal/golang.org/x/net/http2/hpack/huffman.go \
-	go/internal/golang.org/x/net/http2/hpack/tables.go
+go_internal_nettrace_files = \
+	go/internal/nettrace/nettrace.go
 
 go_internal_race_files = \
 	go/internal/race/doc.go \
@@ -1763,13 +1818,15 @@ go_internal_race_files = \
 go_internal_singleflight_files = \
 	go/internal/singleflight/singleflight.go
 
-@LIBGO_IS_386_FALSE@@LIBGO_IS_ARM_FALSE@@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_MIPS64_FALSE@@LIBGO_IS_PPC64_FALSE@@LIBGO_IS_X86_64_FALSE@internal_syscall_unix_getrandom_files = go/internal/syscall/unix/getrandom_linux.go go/internal/syscall/unix/getrandom_linux_generic.go
+@LIBGO_IS_386_FALSE@@LIBGO_IS_ARM_FALSE@@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_MIPS64_FALSE@@LIBGO_IS_PPC64_FALSE@@LIBGO_IS_S390X_FALSE@@LIBGO_IS_X86_64_FALSE@internal_syscall_unix_getrandom_files = go/internal/syscall/unix/getrandom_linux.go go/internal/syscall/unix/getrandom_linux_generic.go
+@LIBGO_IS_386_FALSE@@LIBGO_IS_ARM_FALSE@@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_MIPS64_FALSE@@LIBGO_IS_PPC64_FALSE@@LIBGO_IS_S390X_TRUE@@LIBGO_IS_X86_64_FALSE@internal_syscall_unix_getrandom_files = go/internal/syscall/unix/getrandom_linux.go go/internal/syscall/unix/getrandom_linux_s390x.go
 @LIBGO_IS_386_FALSE@@LIBGO_IS_ARM_FALSE@@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_MIPS64_TRUE@@LIBGO_IS_PPC64_FALSE@@LIBGO_IS_X86_64_FALSE@internal_syscall_unix_getrandom_files = go/internal/syscall/unix/getrandom_linux.go go/internal/syscall/unix/getrandom_linux_mips64x.go
 @LIBGO_IS_386_FALSE@@LIBGO_IS_ARM_FALSE@@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_PPC64_TRUE@@LIBGO_IS_X86_64_FALSE@internal_syscall_unix_getrandom_files = go/internal/syscall/unix/getrandom_linux.go go/internal/syscall/unix/getrandom_linux_ppc64x.go
 @LIBGO_IS_386_FALSE@@LIBGO_IS_ARM_TRUE@@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_X86_64_FALSE@internal_syscall_unix_getrandom_files = go/internal/syscall/unix/getrandom_linux.go go/internal/syscall/unix/getrandom_linux_arm.go
 @LIBGO_IS_386_FALSE@@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_X86_64_TRUE@internal_syscall_unix_getrandom_files = go/internal/syscall/unix/getrandom_linux.go go/internal/syscall/unix/getrandom_linux_amd64.go
 @LIBGO_IS_386_TRUE@@LIBGO_IS_LINUX_TRUE@internal_syscall_unix_getrandom_files = go/internal/syscall/unix/getrandom_linux.go go/internal/syscall/unix/getrandom_linux_386.go
-@LIBGO_IS_LINUX_FALSE@internal_syscall_unix_getrandom_files = 
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_OPENBSD_FALSE@internal_syscall_unix_getrandom_files = 
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_OPENBSD_TRUE@internal_syscall_unix_getrandom_files = go/internal/syscall/unix/getentropy_openbsd.go
 go_internal_syscall_unix_files = \
 	go/internal/syscall/unix/dummy.go \
 	$(internal_syscall_unix_getrandom_files)
@@ -1779,6 +1836,7 @@ go_internal_testenv_files = \
 
 go_internal_trace_files = \
 	go/internal/trace/goroutines.go \
+	go/internal/trace/order.go \
 	go/internal/trace/parser.go
 
 go_io_ioutil_files = \
@@ -1844,8 +1902,8 @@ go_net_http_files = \
 	go/net/http/fs.go \
 	go/net/http/h2_bundle.go \
 	go/net/http/header.go \
+	go/net/http/http.go \
 	go/net/http/jar.go \
-	go/net/http/lex.go \
 	go/net/http/method.go \
 	go/net/http/request.go \
 	go/net/http/response.go \
@@ -1885,12 +1943,16 @@ go_net_http_fcgi_files = \
 	go/net/http/fcgi/fcgi.go
 
 go_net_http_httptest_files = \
+	go/net/http/httptest/httptest.go \
 	go/net/http/httptest/recorder.go \
 	go/net/http/httptest/server.go
 
 go_net_http_pprof_files = \
 	go/net/http/pprof/pprof.go
 
+go_net_http_httptrace_files = \
+	go/net/http/httptrace/trace.go
+
 go_net_http_httputil_files = \
 	go/net/http/httputil/dump.go \
 	go/net/http/httputil/httputil.go \
@@ -1932,11 +1994,14 @@ go_os_signal_files = \
 
 @LIBGO_IS_SOLARIS_FALSE@os_user_decls_file = go/os/user/decls_unix.go
 @LIBGO_IS_SOLARIS_TRUE@os_user_decls_file = go/os/user/decls_solaris.go
+@LIBGO_IS_SOLARIS_FALSE@os_user_listgroups_file = go/os/user/listgroups_unix.go
+@LIBGO_IS_SOLARIS_TRUE@os_user_listgroups_file = go/os/user/listgroups_solaris.go
 go_os_user_files = \
 	go/os/user/lookup.go \
 	go/os/user/lookup_unix.go \
 	go/os/user/user.go \
-	$(os_user_decls_file)
+	$(os_user_decls_file) \
+	$(os_user_listgroups_file)
 
 go_path_filepath_files = \
 	go/path/filepath/match.go \
@@ -2158,6 +2223,7 @@ libgo_go_objs = \
 	bufio.lo \
 	bytes.lo \
 	bytes/index.lo \
+	context.lo \
 	crypto.lo \
 	encoding.lo \
 	errors.lo \
@@ -2253,6 +2319,9 @@ libgo_go_objs = \
 	go/scanner.lo \
 	go/token.lo \
 	go/types.lo \
+	golang_org/x/net/http2/hpack.lo \
+	golang_org/x/net/lex/httplex.lo \
+	$(golang_org_x_net_route_lo) \
 	hash/adler32.lo \
 	hash/crc32.lo \
 	hash/crc64.lo \
@@ -2261,6 +2330,7 @@ libgo_go_objs = \
 	net/http/cookiejar.lo \
 	net/http/fcgi.lo \
 	net/http/httptest.lo \
+	net/http/httptrace.lo \
 	net/http/httputil.lo \
 	net/http/internal.lo \
 	net/http/pprof.lo \
@@ -2272,7 +2342,7 @@ libgo_go_objs = \
 	image/jpeg.lo \
 	image/png.lo \
 	index/suffixarray.lo \
-	internal/golang.org/x/net/http2/hpack.lo \
+	internal/nettrace.lo \
 	internal/race.lo \
 	internal/singleflight.lo \
 	internal/syscall/unix.lo \
@@ -2439,6 +2509,7 @@ BUILDGOX = \
 TEST_PACKAGES = \
 	bufio/check \
 	bytes/check \
+	context/check \
 	errors/check \
 	expvar/check \
 	flag/check \
@@ -2522,6 +2593,9 @@ TEST_PACKAGES = \
 	go/scanner/check \
 	go/token/check \
 	go/types/check \
+	golang_org/x/net/http2/hpack/check \
+	golang_org/x/net/lex/httplex/check \
+	$(golang_org_x_net_route_check) \
 	hash/adler32/check \
 	hash/crc32/check \
 	hash/crc64/check \
@@ -2531,7 +2605,6 @@ TEST_PACKAGES = \
 	image/jpeg/check \
 	image/png/check \
 	index/suffixarray/check \
-	internal/golang.org/x/net/http2/hpack/check \
 	internal/singleflight/check \
 	internal/trace/check \
 	io/ioutil/check \
@@ -2546,6 +2619,7 @@ TEST_PACKAGES = \
 	net/http/cookiejar/check \
 	net/http/fcgi/check \
 	net/http/httptest/check \
+	net/http/httptrace/check \
 	net/http/httputil/check \
 	net/http/internal/check \
 	net/internal/socktest/check \
@@ -4761,6 +4835,34 @@ s-zstdpkglist: Makefile
 	echo '}' >> zstdpkglist.go.tmp
 	$(SHELL) $(srcdir)/mvifdiff.sh zstdpkglist.go.tmp zstdpkglist.go
 	$(STAMP) $@
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DARWIN_TRUE@	go/golang_org/x/net/route/interface_classic.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DARWIN_TRUE@	go/golang_org/x/net/route/interface_multicast.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DARWIN_TRUE@	go/golang_org/x/net/route/route_classic.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DARWIN_TRUE@	go/golang_org/x/net/route/sys_darwin.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DARWIN_TRUE@	go/golang_org/x/net/route/zsys_darwin.go
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DRAGONFLY_TRUE@	go/golang_org/x/net/route/interface_announce.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DRAGONFLY_TRUE@	go/golang_org/x/net/route/interface_classic.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DRAGONFLY_TRUE@	go/golang_org/x/net/route/interface_multicast.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DRAGONFLY_TRUE@	go/golang_org/x/net/route/route_classic.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DRAGONFLY_TRUE@	go/golang_org/x/net/route/sys_dragonfly.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_DRAGONFLY_TRUE@	go/golang_org/x/net/route/zsys_dragonfly.go
+@LIBGO_IS_386_TRUE@@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@	go/golang_org/x/net/route/zsys_freebsd_386.go
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_X86_64_TRUE@	go/golang_org/x/net/route/zsys_freebsd_amd64.go
+@LIBGO_IS_ARM_TRUE@@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@	go/golang_org/x/net/route/zsys_freebsd_arm.go
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@	go/golang_org/x/net/route/interface_announce.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@	go/golang_org/x/net/route/interface_freebsd.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@	go/golang_org/x/net/route/interface_multicast.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@	go/golang_org/x/net/route/route_classic.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@	go/golang_org/x/net/route/sys_freebsd.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_FREEBSD_TRUE@	$(x_net_route_freebsd_file)
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_NETBSD_TRUE@	go/golang_org/x/net/route/interface_announce.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_NETBSD_TRUE@	go/golang_org/x/net/route/interface_classic.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_NETBSD_TRUE@	go/golang_org/x/net/route/route_classic.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_NETBSD_TRUE@	go/golang_org/x/net/route/sys_netbsd.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_NETBSD_TRUE@	go/golang_org/x/net/route/zsys_netbsd.go
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_OPENBSD_TRUE@	go/golang_org/x/net/route/route_openbsd.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_OPENBSD_TRUE@	go/golang_org/x/net/route/sys_openbsd.go \
+@LIBGO_IS_BSD_TRUE@@LIBGO_IS_OPENBSD_TRUE@	go/golang_org/x/net/route/zsys_openbsd.go
 
 libcalls.go: s-libcalls; @true
 s-libcalls: libcalls-list go/syscall/mksyscall.awk $(go_base_syscall_files)
@@ -4841,6 +4943,15 @@ bytes/check: $(CHECK_DEPS)
 	@$(CHECK)
 .PHONY: bytes/check
 
+@go_include@ context.lo.dep
+context.lo.dep: $(go_context_files)
+	$(BUILDDEPS)
+context.lo: $(go_context_files)
+	$(BUILDPACKAGE)
+context/check: $(CHECK_DEPS)
+	@$(CHECK)
+.PHONY: context/check
+
 @go_include@ crypto.lo.dep
 crypto.lo.dep: $(go_crypto_files)
 	$(BUILDDEPS)
@@ -5656,6 +5767,33 @@ go/internal/gccgoimporter/check: $(CHECK_DEPS)
 	@$(CHECK)
 .PHONY: go/internal/gccgoimporter/check
 
+@go_include@ golang_org/x/net/http2/hpack.lo.dep
+golang_org/x/net/http2/hpack.lo.dep: $(go_golang_org_x_net_http2_hpack_files)
+	$(BUILDDEPS)
+golang_org/x/net/http2/hpack.lo: $(go_golang_org_x_net_http2_hpack_files)
+	$(BUILDPACKAGE)
+golang_org/x/net/http2/hpack/check: $(CHECK_DEPS)
+	@$(CHECK)
+.PHONY: golang_org/x/net/http2/hpack/check
+
+@go_include@ golang_org/x/net/lex/httplex.lo.dep
+golang_org/x/net/lex/httplex.lo.dep: $(go_golang_org_x_net_lex_httplex_files)
+	$(BUILDDEPS)
+golang_org/x/net/lex/httplex.lo: $(go_golang_org_x_net_lex_httplex_files)
+	$(BUILDPACKAGE)
+golang_org/x/net/lex/httplex/check: $(CHECK_DEPS)
+	@$(CHECK)
+.PHONY: golang_org/x/net/lex/httplex/check
+
+@LIBGO_IS_BSD_TRUE@@go_include@ golang_org/x/net/route.lo.dep
+@LIBGO_IS_BSD_TRUE@golang_org/x/net/route.lo.dep: $(go_golang_org_x_net_route_files)
+@LIBGO_IS_BSD_TRUE@	$(BUILDDEPS)
+@LIBGO_IS_BSD_TRUE@golang_org/x/net/route.lo: $(go_golang_org_x_net_route_files)
+@LIBGO_IS_BSD_TRUE@	$(BUILDPACKAGE)
+@LIBGO_IS_BSD_TRUE@golang_org/x/net/route/check: $(CHECK_DEPS)
+@LIBGO_IS_BSD_TRUE@	@$(CHECK)
+.PHONY: golang_org/x/net/route/check
+
 @go_include@ hash/adler32.lo.dep
 hash/adler32.lo.dep: $(go_hash_adler32_files)
 	$(BUILDDEPS)
@@ -5764,14 +5902,14 @@ index/suffixarray/check: $(CHECK_DEPS)
 	@$(CHECK)
 .PHONY: index/suffixarray/check
 
-@go_include@ internal/golang.org/x/net/http2/hpack.lo.dep
-internal/golang.org/x/net/http2/hpack.lo.dep: $(go_internal_golang_org_x_net_http2_hpack_files)
+@go_include@ internal/nettrace.lo.dep
+internal/nettrace.lo.dep: $(go_internal_nettrace_files)
 	$(BUILDDEPS)
-internal/golang.org/x/net/http2/hpack.lo: $(go_internal_golang_org_x_net_http2_hpack_files)
+internal/nettrace.lo: $(go_internal_nettrace_files)
 	$(BUILDPACKAGE)
-internal/golang.org/x/net/http2/hpack/check: $(CHECK_DEPS)
+internal/nettrace/check: $(CHECK_DEPS)
 	@$(CHECK)
-.PHONY: internal/golang.org/x/net/http2/hpack/check
+.PHONY: internal/nettrace/check
 
 @go_include@ internal/race.lo.dep
 internal/race.lo.dep: $(go_internal_race_files)
@@ -5974,6 +6112,15 @@ net/http/httptest/check: $(check_deps)
 	@$(CHECK)
 .PHONY: net/http/httptest/check
 
+@go_include@ net/http/httptrace.lo.dep
+net/http/httptrace.lo.dep: $(go_net_http_httptrace_files)
+	$(BUILDDEPS)
+net/http/httptrace.lo: $(go_net_http_httptrace_files)
+	$(BUILDPACKAGE)
+net/http/httptrace/check: $(check_deps)
+	@$(CHECK)
+.PHONY: net/http/httptrace/check
+
 @go_include@ net/http/httputil.lo.dep
 net/http/httputil.lo.dep: $(go_net_http_httputil_files)
 	$(BUILDDEPS)
@@ -6205,6 +6352,8 @@ bufio.gox: bufio.lo
 	$(BUILDGOX)
 bytes.gox: bytes.lo
 	$(BUILDGOX)
+context.gox: context.lo
+	$(BUILDGOX)
 crypto.gox: crypto.lo
 	$(BUILDGOX)
 encoding.gox: encoding.lo
@@ -6399,6 +6548,15 @@ go/internal/gcimporter.gox: go/internal/gcimporter.lo
 go/internal/gccgoimporter.gox: go/internal/gccgoimporter.lo
 	$(BUILDGOX)
 
+golang_org/x/net/http2/hpack.gox: golang_org/x/net/http2/hpack.lo
+	$(BUILDGOX)
+
+golang_org/x/net/lex/httplex.gox: golang_org/x/net/lex/httplex.lo
+	$(BUILDGOX)
+
+@LIBGO_IS_BSD_TRUE@golang_org/x/net/route.gox: golang_org/x/net/route.lo
+@LIBGO_IS_BSD_TRUE@	$(BUILDGOX)
+
 hash/adler32.gox: hash/adler32.lo
 	$(BUILDGOX)
 hash/crc32.gox: hash/crc32.lo
@@ -6427,7 +6585,7 @@ image/color/palette.gox: image/color/palette.lo
 index/suffixarray.gox: index/suffixarray.lo
 	$(BUILDGOX)
 
-internal/golang.org/x/net/http2/hpack.gox: internal/golang.org/x/net/http2/hpack.lo
+internal/nettrace.gox: internal/nettrace.lo
 	$(BUILDGOX)
 internal/race.gox: internal/race.lo
 	$(BUILDGOX)
@@ -6479,6 +6637,8 @@ net/http/fcgi.gox: net/http/fcgi.lo
 	$(BUILDGOX)
 net/http/httptest.gox: net/http/httptest.lo
 	$(BUILDGOX)
+net/http/httptrace.gox: net/http/httptrace.lo
+	$(BUILDGOX)
 net/http/httputil.gox: net/http/httputil.lo
 	$(BUILDGOX)
 net/http/pprof.gox: net/http/pprof.lo