Fix instantiation of transaction expressions.

[pf3gnuchains/gcc-fork.git] / libgo / Makefile.in

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 9d61859..3dae2a9 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -103,7 +103,7 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
        "$(DESTDIR)$(toolexeclibgoencodingdir)" \
        "$(DESTDIR)$(toolexeclibgoexpdir)" \
        "$(DESTDIR)$(toolexeclibgoexpguidir)" \
-       "$(DESTDIR)$(toolexeclibgoexpregexpdir)" \
+       "$(DESTDIR)$(toolexeclibgoexpsqldir)" \
        "$(DESTDIR)$(toolexeclibgoexptemplatedir)" \
        "$(DESTDIR)$(toolexeclibgogodir)" \
        "$(DESTDIR)$(toolexeclibgohashdir)" \
@@ -116,6 +116,7 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
        "$(DESTDIR)$(toolexeclibgoolddir)" \
        "$(DESTDIR)$(toolexeclibgoosdir)" \
        "$(DESTDIR)$(toolexeclibgopathdir)" \
+       "$(DESTDIR)$(toolexeclibgoregexpdir)" \
        "$(DESTDIR)$(toolexeclibgorpcdir)" \
        "$(DESTDIR)$(toolexeclibgoruntimedir)" \
        "$(DESTDIR)$(toolexeclibgosyncdir)" \
@@ -131,22 +132,21 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = asn1/asn1.lo big/big.lo bufio/bufio.lo \
        bytes/bytes.lo bytes/index.lo cmath/cmath.lo crypto/crypto.lo \
-       csv/csv.lo ebnf/ebnf.lo exec/exec.lo expvar/expvar.lo \
-       flag/flag.lo fmt/fmt.lo gob/gob.lo hash/hash.lo html/html.lo \
-       http/http.lo image/image.lo io/io.lo json/json.lo log/log.lo \
-       math/math.lo mail/mail.lo mime/mime.lo net/net.lo \
-       netchan/netchan.lo os/os.lo patch/patch.lo path/path.lo \
-       rand/rand.lo reflect/reflect.lo regexp/regexp.lo rpc/rpc.lo \
-       runtime/runtime.lo scanner/scanner.lo smtp/smtp.lo \
+       csv/csv.lo exec/exec.lo expvar/expvar.lo flag/flag.lo \
+       fmt/fmt.lo gob/gob.lo hash/hash.lo html/html.lo http/http.lo \
+       image/image.lo io/io.lo json/json.lo log/log.lo math/math.lo \
+       mail/mail.lo mime/mime.lo net/net.lo os/os.lo patch/patch.lo \
+       path/path.lo rand/rand.lo reflect/reflect.lo regexp/regexp.lo \
+       rpc/rpc.lo runtime/runtime.lo scanner/scanner.lo smtp/smtp.lo \
        sort/sort.lo strconv/strconv.lo strings/strings.lo \
        sync/sync.lo syslog/syslog.lo syslog/syslog_c.lo \
        tabwriter/tabwriter.lo template/template.lo time/time.lo \
-       try/try.lo unicode/unicode.lo url/url.lo utf16/utf16.lo \
-       utf8/utf8.lo websocket/websocket.lo xml/xml.lo archive/tar.lo \
+       unicode/unicode.lo url/url.lo utf16/utf16.lo utf8/utf8.lo \
+       websocket/websocket.lo xml/xml.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 \
-       container/vector.lo crypto/aes.lo crypto/blowfish.lo \
+       crypto/aes.lo crypto/bcrypt.lo crypto/blowfish.lo \
        crypto/cast5.lo crypto/cipher.lo crypto/des.lo crypto/dsa.lo \
        crypto/ecdsa.lo crypto/elliptic.lo crypto/hmac.lo \
        crypto/md4.lo crypto/md5.lo crypto/ocsp.lo crypto/openpgp.lo \
@@ -159,21 +159,22 @@ am__DEPENDENCIES_2 = asn1/asn1.lo big/big.lo bufio/bufio.lo \
        crypto/x509/pkix.lo debug/dwarf.lo debug/elf.lo debug/gosym.lo \
        debug/macho.lo debug/pe.lo encoding/ascii85.lo \
        encoding/base32.lo encoding/base64.lo encoding/binary.lo \
-       encoding/git85.lo encoding/hex.lo encoding/pem.lo \
-       exp/datafmt.lo exp/gui.lo exp/norm.lo exp/regexp.lo \
-       exp/gui/x11.lo exp/regexp/syntax.lo exp/template/html.lo \
-       go/ast.lo go/build.lo go/doc.lo go/parser.lo go/printer.lo \
-       go/scanner.lo go/token.lo go/typechecker.lo go/types.lo \
+       encoding/git85.lo encoding/hex.lo encoding/pem.lo exp/ebnf.lo \
+       exp/gui.lo exp/norm.lo exp/spdy.lo exp/sql.lo exp/ssh.lo \
+       exp/terminal.lo exp/types.lo exp/gui/x11.lo exp/sql/driver.lo \
+       exp/template/html.lo go/ast.lo go/build.lo go/doc.lo \
+       go/parser.lo go/printer.lo go/scanner.lo go/token.lo \
        hash/adler32.lo hash/crc32.lo hash/crc64.lo hash/fnv.lo \
        http/cgi.lo http/fcgi.lo http/httptest.lo http/pprof.lo \
-       http/spdy.lo image/bmp.lo image/draw.lo image/gif.lo \
+       image/bmp.lo image/color.lo image/draw.lo image/gif.lo \
        image/jpeg.lo image/png.lo image/tiff.lo image/ycbcr.lo \
        index/suffixarray.lo io/ioutil.lo mime/multipart.lo \
-       net/dict.lo net/textproto.lo old/template.lo \
-       $(am__DEPENDENCIES_1) os/user.lo os/signal.lo path/filepath.lo \
-       rpc/jsonrpc.lo runtime/debug.lo runtime/pprof.lo \
-       sync/atomic.lo sync/atomic_c.lo syscalls/syscall.lo \
-       syscalls/errno.lo template/parse.lo testing/testing.lo \
+       net/dict.lo net/textproto.lo old/netchan.lo old/regexp.lo \
+       old/template.lo $(am__DEPENDENCIES_1) os/user.lo os/signal.lo \
+       path/filepath.lo regexp/syntax.lo rpc/jsonrpc.lo \
+       runtime/debug.lo runtime/pprof.lo sync/atomic.lo \
+       sync/atomic_c.lo syscall/syscall.lo syscall/errno.lo \
+       syscall/wait.lo template/parse.lo testing/testing.lo \
        testing/iotest.lo testing/quick.lo testing/script.lo
 libgo_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -197,14 +198,14 @@ am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
        runtime/go-map-index.c runtime/go-map-len.c \
        runtime/go-map-range.c runtime/go-nanotime.c \
        runtime/go-new-channel.c runtime/go-new-map.c runtime/go-new.c \
-       runtime/go-note.c runtime/go-panic.c runtime/go-panic-defer.c \
-       runtime/go-print.c runtime/go-rand.c runtime/go-rec-big.c \
-       runtime/go-rec-nb-big.c runtime/go-rec-nb-small.c \
-       runtime/go-rec-small.c runtime/go-recover.c \
-       runtime/go-reflect.c runtime/go-reflect-call.c \
-       runtime/go-reflect-chan.c runtime/go-reflect-map.c \
-       runtime/go-rune.c runtime/go-runtime-error.c \
-       runtime/go-sched.c runtime/go-select.c runtime/go-semacquire.c \
+       runtime/go-note.c runtime/go-panic.c runtime/go-print.c \
+       runtime/go-rec-big.c runtime/go-rec-nb-big.c \
+       runtime/go-rec-nb-small.c runtime/go-rec-small.c \
+       runtime/go-recover.c runtime/go-reflect.c \
+       runtime/go-reflect-call.c runtime/go-reflect-chan.c \
+       runtime/go-reflect-map.c runtime/go-rune.c \
+       runtime/go-runtime-error.c runtime/go-sched.c \
+       runtime/go-select.c runtime/go-semacquire.c \
        runtime/go-send-big.c runtime/go-send-nb-big.c \
        runtime/go-send-nb-small.c runtime/go-send-small.c \
        runtime/go-setenv.c runtime/go-signal.c runtime/go-strcmp.c \
@@ -220,7 +221,8 @@ am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
        runtime/cpuprof.c runtime/mcache.c runtime/mcentral.c \
        runtime/mem_posix_memalign.c runtime/mem.c runtime/mfinal.c \
        runtime/mfixalloc.c runtime/mgc0.c runtime/mheap.c \
-       runtime/msize.c runtime/proc.c runtime/thread.c \
+       runtime/msize.c runtime/proc.c runtime/runtime.c \
+       runtime/thread.c runtime/yield.c \
        runtime/rtems-task-variable-add.c chan.c iface.c malloc.c \
        map.c mprof.c reflect.c sigqueue.c string.c
 @HAVE_SYS_MMAN_H_FALSE@am__objects_1 = mem_posix_memalign.lo
@@ -238,10 +240,9 @@ am__objects_3 = go-append.lo go-assert.lo go-assert-interface.lo \
        go-interface-val-compare.lo go-lock-os-thread.lo \
        go-make-slice.lo go-map-delete.lo go-map-index.lo \
        go-map-len.lo go-map-range.lo go-nanotime.lo go-new-channel.lo \
-       go-new-map.lo go-new.lo go-note.lo go-panic.lo \
-       go-panic-defer.lo go-print.lo go-rand.lo go-rec-big.lo \
-       go-rec-nb-big.lo go-rec-nb-small.lo go-rec-small.lo \
-       go-recover.lo go-reflect.lo go-reflect-call.lo \
+       go-new-map.lo go-new.lo go-note.lo go-panic.lo go-print.lo \
+       go-rec-big.lo go-rec-nb-big.lo go-rec-nb-small.lo \
+       go-rec-small.lo go-recover.lo go-reflect.lo go-reflect-call.lo \
        go-reflect-chan.lo go-reflect-map.lo go-rune.lo \
        go-runtime-error.lo go-sched.lo go-select.lo go-semacquire.lo \
        go-send-big.lo go-send-nb-big.lo go-send-nb-small.lo \
@@ -253,9 +254,9 @@ am__objects_3 = go-append.lo go-assert.lo go-assert-interface.lo \
        go-unreflect.lo go-unsafe-new.lo go-unsafe-newarray.lo \
        go-unsafe-pointer.lo go-unwind.lo cpuprof.lo mcache.lo \
        mcentral.lo $(am__objects_1) mfinal.lo mfixalloc.lo mgc0.lo \
-       mheap.lo msize.lo proc.lo thread.lo $(am__objects_2) chan.lo \
-       iface.lo malloc.lo map.lo mprof.lo reflect.lo sigqueue.lo \
-       string.lo
+       mheap.lo msize.lo proc.lo runtime.lo thread.lo yield.lo \
+       $(am__objects_2) chan.lo iface.lo malloc.lo map.lo mprof.lo \
+       reflect.lo sigqueue.lo string.lo
 am_libgo_la_OBJECTS = $(am__objects_3)
 libgo_la_OBJECTS = $(am_libgo_la_OBJECTS)
 libgo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -294,16 +295,16 @@ DATA = $(toolexeclibgo_DATA) $(toolexeclibgoarchive_DATA) \
        $(toolexeclibgocrypto_DATA) $(toolexeclibgocryptoopenpgp_DATA) \
        $(toolexeclibgocryptox509_DATA) $(toolexeclibgodebug_DATA) \
        $(toolexeclibgoencoding_DATA) $(toolexeclibgoexp_DATA) \
-       $(toolexeclibgoexpgui_DATA) $(toolexeclibgoexpregexp_DATA) \
+       $(toolexeclibgoexpgui_DATA) $(toolexeclibgoexpsql_DATA) \
        $(toolexeclibgoexptemplate_DATA) $(toolexeclibgogo_DATA) \
        $(toolexeclibgohash_DATA) $(toolexeclibgohttp_DATA) \
        $(toolexeclibgoimage_DATA) $(toolexeclibgoindex_DATA) \
        $(toolexeclibgoio_DATA) $(toolexeclibgomime_DATA) \
        $(toolexeclibgonet_DATA) $(toolexeclibgoold_DATA) \
        $(toolexeclibgoos_DATA) $(toolexeclibgopath_DATA) \
-       $(toolexeclibgorpc_DATA) $(toolexeclibgoruntime_DATA) \
-       $(toolexeclibgosync_DATA) $(toolexeclibgotemplate_DATA) \
-       $(toolexeclibgotesting_DATA)
+       $(toolexeclibgoregexp_DATA) $(toolexeclibgorpc_DATA) \
+       $(toolexeclibgoruntime_DATA) $(toolexeclibgosync_DATA) \
+       $(toolexeclibgotemplate_DATA) $(toolexeclibgotesting_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -376,7 +377,10 @@ GOARCH = @GOARCH@
 GOC = @GOC@
 GOCFLAGS = $(CFLAGS)
 GOOS = @GOOS@
-GO_SYSCALLS_SYSCALL_OS_ARCH_FILE = @GO_SYSCALLS_SYSCALL_OS_ARCH_FILE@
+GO_LIBCALL_OS_ARCH_FILE = @GO_LIBCALL_OS_ARCH_FILE@
+GO_LIBCALL_OS_FILE = @GO_LIBCALL_OS_FILE@
+GO_SYSCALL_OS_ARCH_FILE = @GO_SYSCALL_OS_ARCH_FILE@
+GO_SYSCALL_OS_FILE = @GO_SYSCALL_OS_FILE@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -420,9 +424,11 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SIZEOF_STRUCT_EPOLL_EVENT = @SIZEOF_STRUCT_EPOLL_EVENT@
 SPLIT_STACK = @SPLIT_STACK@
 STRINGOPS_FLAG = @STRINGOPS_FLAG@
 STRIP = @STRIP@
+STRUCT_EPOLL_EVENT_FD_OFFSET = @STRUCT_EPOLL_EVENT_FD_OFFSET@
 VERSION = @VERSION@
 WARN_FLAGS = @WARN_FLAGS@
 WERROR = @WERROR@
@@ -572,7 +578,6 @@ toolexeclibgo_DATA = \
        cmath.gox \
        crypto.gox \
        csv.gox \
-       ebnf.gox \
        exec.gox \
        expvar.gox \
        flag.gox \
@@ -589,7 +594,6 @@ toolexeclibgo_DATA = \
        mail.gox \
        mime.gox \
        net.gox \
-       netchan.gox \
        os.gox \
        patch.gox \
        path.gox \
@@ -610,7 +614,6 @@ toolexeclibgo_DATA = \
        template.gox \
        testing.gox \
        time.gox \
-       try.gox \
        unicode.gox \
        url.gox \
        utf16.gox \
@@ -635,12 +638,12 @@ toolexeclibgocontainerdir = $(toolexeclibgodir)/container
 toolexeclibgocontainer_DATA = \
        container/heap.gox \
        container/list.gox \
-       container/ring.gox \
-       container/vector.gox
+       container/ring.gox
 
 toolexeclibgocryptodir = $(toolexeclibgodir)/crypto
 toolexeclibgocrypto_DATA = \
        crypto/aes.gox \
+       crypto/bcrypt.gox \
        crypto/blowfish.gox \
        crypto/cast5.gox \
        crypto/cipher.gox \
@@ -698,18 +701,22 @@ toolexeclibgoencoding_DATA = \
 
 toolexeclibgoexpdir = $(toolexeclibgodir)/exp
 toolexeclibgoexp_DATA = \
-       exp/datafmt.gox \
+       exp/ebnf.gox \
        exp/gui.gox \
        exp/norm.gox \
-       exp/regexp.gox
+       exp/spdy.gox \
+       exp/sql.gox \
+       exp/ssh.gox \
+       exp/terminal.gox \
+       exp/types.gox
 
 toolexeclibgoexpguidir = $(toolexeclibgoexpdir)/gui
 toolexeclibgoexpgui_DATA = \
        exp/gui/x11.gox
 
-toolexeclibgoexpregexpdir = $(toolexeclibgoexpdir)/regexp
-toolexeclibgoexpregexp_DATA = \
-       exp/regexp/syntax.gox
+toolexeclibgoexpsqldir = $(toolexeclibgoexpdir)/sql
+toolexeclibgoexpsql_DATA = \
+       exp/sql/driver.gox
 
 toolexeclibgoexptemplatedir = $(toolexeclibgoexpdir)/template
 toolexeclibgoexptemplate_DATA = \
@@ -723,9 +730,7 @@ toolexeclibgogo_DATA = \
        go/parser.gox \
        go/printer.gox \
        go/scanner.gox \
-       go/token.gox \
-       go/typechecker.gox \
-       go/types.gox
+       go/token.gox
 
 toolexeclibgohashdir = $(toolexeclibgodir)/hash
 toolexeclibgohash_DATA = \
@@ -739,12 +744,12 @@ toolexeclibgohttp_DATA = \
        http/cgi.gox \
        http/fcgi.gox \
        http/httptest.gox \
-       http/pprof.gox \
-       http/spdy.gox
+       http/pprof.gox
 
 toolexeclibgoimagedir = $(toolexeclibgodir)/image
 toolexeclibgoimage_DATA = \
        image/bmp.gox \
+       image/color.gox \
        image/draw.gox \
        image/gif.gox \
        image/jpeg.gox \
@@ -771,6 +776,8 @@ toolexeclibgonet_DATA = \
 
 toolexeclibgoolddir = $(toolexeclibgodir)/old
 toolexeclibgoold_DATA = \
+       old/netchan.gox \
+       old/regexp.gox \
        old/template.gox
 
 toolexeclibgoosdir = $(toolexeclibgodir)/os
@@ -787,6 +794,10 @@ toolexeclibgopathdir = $(toolexeclibgodir)/path
 toolexeclibgopath_DATA = \
        path/filepath.gox
 
+toolexeclibgoregexpdir = $(toolexeclibgodir)/regexp
+toolexeclibgoregexp_DATA = \
+       regexp/syntax.gox
+
 toolexeclibgorpcdir = $(toolexeclibgodir)/rpc
 toolexeclibgorpc_DATA = \
        rpc/jsonrpc.gox
@@ -854,9 +865,7 @@ runtime_files = \
        runtime/go-new.c \
        runtime/go-note.c \
        runtime/go-panic.c \
-       runtime/go-panic-defer.c \
        runtime/go-print.c \
-       runtime/go-rand.c \
        runtime/go-rec-big.c \
        runtime/go-rec-nb-big.c \
        runtime/go-rec-nb-small.c \
@@ -905,7 +914,9 @@ runtime_files = \
        runtime/mheap.c \
        runtime/msize.c \
        runtime/proc.c \
+       runtime/runtime.c \
        runtime/thread.c \
+       runtime/yield.c \
        $(rtems_task_variable_add_file) \
        chan.c \
        iface.c \
@@ -961,10 +972,6 @@ go_csv_files = \
        go/csv/reader.go \
        go/csv/writer.go
 
-go_ebnf_files = \
-       go/ebnf/ebnf.go \
-       go/ebnf/parser.go
-
 go_exec_files = \
        go/exec/exec.go \
        go/exec/lp_unix.go
@@ -1000,6 +1007,7 @@ go_html_files = \
        go/html/escape.go \
        go/html/node.go \
        go/html/parse.go \
+       go/html/render.go \
        go/html/token.go
 
 go_http_files = \
@@ -1007,6 +1015,7 @@ go_http_files = \
        go/http/client.go \
        go/http/cookie.go \
        go/http/dump.go \
+       go/http/filetransport.go \
        go/http/fs.go \
        go/http/header.go \
        go/http/lex.go \
@@ -1021,7 +1030,6 @@ go_http_files = \
        go/http/transport.go
 
 go_image_files = \
-       go/image/color.go \
        go/image/format.go \
        go/image/geom.go \
        go/image/image.go \
@@ -1044,6 +1052,7 @@ go_log_files = \
        go/log/log.go
 
 go_math_files = \
+       go/math/abs.go \
        go/math/acosh.go \
        go/math/asin.go \
        go/math/asinh.go \
@@ -1054,15 +1063,13 @@ go_math_files = \
        go/math/cbrt.go \
        go/math/const.go \
        go/math/copysign.go \
+       go/math/dim.go \
        go/math/erf.go \
        go/math/exp.go \
        go/math/exp_port.go \
        go/math/exp2.go \
        go/math/expm1.go \
-       go/math/fabs.go \
-       go/math/fdim.go \
        go/math/floor.go \
-       go/math/fmod.go \
        go/math/frexp.go \
        go/math/gamma.go \
        go/math/hypot.go \
@@ -1076,6 +1083,7 @@ go_math_files = \
        go/math/log1p.go \
        go/math/log10.go \
        go/math/logb.go \
+       go/math/mod.go \
        go/math/modf.go \
        go/math/nextafter.go \
        go/math/pow.go \
@@ -1154,11 +1162,6 @@ go_net_files = \
        go/net/unixsock.go \
        go/net/unixsock_posix.go
 
-go_netchan_files = \
-       go/netchan/common.go \
-       go/netchan/export.go \
-       go/netchan/import.go
-
 @LIBGO_IS_386_FALSE@@LIBGO_IS_SOLARIS_TRUE@@LIBGO_IS_SPARC_FALSE@go_os_dir_file = go/os/dir_regfile.go
 @LIBGO_IS_386_FALSE@@LIBGO_IS_SOLARIS_TRUE@@LIBGO_IS_SPARC_TRUE@go_os_dir_file = go/os/dir_largefile.go
 @LIBGO_IS_386_TRUE@@LIBGO_IS_SOLARIS_TRUE@go_os_dir_file = go/os/dir_largefile.go
@@ -1216,6 +1219,7 @@ go_reflect_files = \
        go/reflect/value.go
 
 go_regexp_files = \
+       go/regexp/exec.go \
        go/regexp/regexp.go
 
 go_rpc_files = \
@@ -1255,6 +1259,7 @@ go_strconv_files = \
 
 go_strings_files = \
        go/strings/reader.go \
+       go/strings/replace.go \
        go/strings/strings.go
 
 go_sync_files = \
@@ -1287,21 +1292,19 @@ go_template_files = \
 
 go_testing_files = \
        go/testing/benchmark.go \
+       go/testing/example.go \
        go/testing/testing.go
 
 go_time_files = \
        go/time/format.go \
        go/time/sleep.go \
        go/time/sys.go \
-       go/time/sys_posix.go \
+       go/time/sys_unix.go \
        go/time/tick.go \
        go/time/time.go \
        go/time/zoneinfo_posix.go \
        go/time/zoneinfo_unix.go
 
-go_try_files = \
-       go/try/try.go
-
 go_unicode_files = \
        go/unicode/casetables.go \
        go/unicode/digit.go \
@@ -1321,6 +1324,8 @@ go_utf8_files = \
 
 go_websocket_files = \
        go/websocket/client.go \
+       go/websocket/hixie.go \
+       go/websocket/hybi.go \
        go/websocket/server.go \
        go/websocket/websocket.go
 
@@ -1375,17 +1380,15 @@ go_container_list_files = \
 go_container_ring_files = \
        go/container/ring/ring.go
 
-go_container_vector_files = \
-       go/container/vector/defs.go \
-       go/container/vector/intvector.go \
-       go/container/vector/stringvector.go \
-       go/container/vector/vector.go
-
 go_crypto_aes_files = \
        go/crypto/aes/block.go \
        go/crypto/aes/cipher.go \
        go/crypto/aes/const.go
 
+go_crypto_bcrypt_files = \
+       go/crypto/bcrypt/base64.go \
+       go/crypto/bcrypt/bcrypt.go
+
 go_crypto_blowfish_files = \
        go/crypto/blowfish/block.go \
        go/crypto/blowfish/const.go \
@@ -1478,6 +1481,7 @@ go_crypto_tls_files = \
        go/crypto/tls/handshake_server.go \
        go/crypto/tls/key_agreement.go \
        go/crypto/tls/prf.go \
+       go/crypto/tls/root_unix.go \
        go/crypto/tls/tls.go
 
 go_crypto_twofish_files = \
@@ -1485,6 +1489,7 @@ go_crypto_twofish_files = \
 
 go_crypto_x509_files = \
        go/crypto/x509/cert_pool.go \
+       go/crypto/x509/pkcs1.go \
        go/crypto/x509/verify.go \
        go/crypto/x509/x509.go
 
@@ -1556,7 +1561,8 @@ go_encoding_base64_files = \
        go/encoding/base64/base64.go
 
 go_encoding_binary_files = \
-       go/encoding/binary/binary.go
+       go/encoding/binary/binary.go \
+       go/encoding/binary/varint.go
 
 go_encoding_git85_files = \
        go/encoding/git85/git.go
@@ -1567,9 +1573,9 @@ go_encoding_hex_files = \
 go_encoding_pem_files = \
        go/encoding/pem/pem.go
 
-go_exp_datafmt_files = \
-       go/exp/datafmt/datafmt.go \
-       go/exp/datafmt/parser.go
+go_exp_ebnf_files = \
+       go/exp/ebnf/ebnf.go \
+       go/exp/ebnf/parser.go
 
 go_exp_gui_files = \
        go/exp/gui/gui.go
@@ -1577,29 +1583,63 @@ go_exp_gui_files = \
 go_exp_norm_files = \
        go/exp/norm/composition.go \
        go/exp/norm/forminfo.go \
+       go/exp/norm/input.go \
        go/exp/norm/normalize.go \
+       go/exp/norm/readwriter.go \
        go/exp/norm/tables.go \
        go/exp/norm/trie.go
 
-go_exp_regexp_files = \
-       go/exp/regexp/exec.go \
-       go/exp/regexp/regexp.go
+go_exp_spdy_files = \
+       go/exp/spdy/read.go \
+       go/exp/spdy/types.go \
+       go/exp/spdy/write.go
+
+go_exp_sql_files = \
+       go/exp/sql/convert.go \
+       go/exp/sql/sql.go
+
+go_exp_ssh_files = \
+       go/exp/ssh/channel.go \
+       go/exp/ssh/common.go \
+       go/exp/ssh/doc.go \
+       go/exp/ssh/messages.go \
+       go/exp/ssh/server.go \
+       go/exp/ssh/server_shell.go \
+       go/exp/ssh/transport.go
+
+go_exp_terminal_files = \
+       go/exp/terminal/shell.go \
+       go/exp/terminal/terminal.go
+
+go_exp_types_files = \
+       go/exp/types/check.go \
+       go/exp/types/const.go \
+       go/exp/types/exportdata.go \
+       go/exp/types/gcimporter.go \
+       go/exp/types/types.go \
+       go/exp/types/universe.go
 
 go_exp_gui_x11_files = \
        go/exp/gui/x11/auth.go \
        go/exp/gui/x11/conn.go
 
+go_exp_sql_driver_files = \
+       go/exp/sql/driver/driver.go \
+       go/exp/sql/driver/types.go
+
 go_exp_template_html_files = \
+       go/exp/template/html/attr.go \
+       go/exp/template/html/clone.go \
+       go/exp/template/html/content.go \
        go/exp/template/html/context.go \
-       go/exp/template/html/escape.go
-
-go_exp_regexp_syntax_files = \
-       go/exp/regexp/syntax/compile.go \
-       go/exp/regexp/syntax/parse.go \
-       go/exp/regexp/syntax/perl_groups.go \
-       go/exp/regexp/syntax/prog.go \
-       go/exp/regexp/syntax/regexp.go \
-       go/exp/regexp/syntax/simplify.go
+       go/exp/template/html/css.go \
+       go/exp/template/html/doc.go \
+       go/exp/template/html/error.go \
+       go/exp/template/html/escape.go \
+       go/exp/template/html/html.go \
+       go/exp/template/html/js.go \
+       go/exp/template/html/transition.go \
+       go/exp/template/html/url.go
 
 go_go_ast_files = \
        go/go/ast/ast.go \
@@ -1617,7 +1657,8 @@ go_go_build_files = \
 
 go_go_doc_files = \
        go/go/doc/comment.go \
-       go/go/doc/doc.go
+       go/go/doc/doc.go \
+       go/go/doc/example.go
 
 go_go_parser_files = \
        go/go/parser/interface.go \
@@ -1633,22 +1674,9 @@ go_go_scanner_files = \
 
 go_go_token_files = \
        go/go/token/position.go \
+       go/go/token/serialize.go \
        go/go/token/token.go
 
-go_go_typechecker_files = \
-       go/go/typechecker/scope.go \
-       go/go/typechecker/type.go \
-       go/go/typechecker/typechecker.go \
-       go/go/typechecker/universe.go
-
-go_go_types_files = \
-       go/go/types/check.go \
-       go/go/types/const.go \
-       go/go/types/exportdata.go \
-       go/go/types/gcimporter.go \
-       go/go/types/types.go \
-       go/go/types/universe.go
-
 go_hash_adler32_files = \
        go/hash/adler32/adler32.go
 
@@ -1677,14 +1705,12 @@ go_http_httptest_files = \
 go_http_pprof_files = \
        go/http/pprof/pprof.go
 
-go_http_spdy_files = \
-       go/http/spdy/read.go \
-       go/http/spdy/types.go \
-       go/http/spdy/write.go
-
 go_image_bmp_files = \
        go/image/bmp/reader.go
 
+go_image_color_files = \
+       go/image/color/color.go
+
 go_image_draw_files = \
        go/image/draw/draw.go
 
@@ -1704,6 +1730,7 @@ go_image_png_files = \
 
 go_image_tiff_files = \
        go/image/tiff/buffer.go \
+       go/image/tiff/compress.go \
        go/image/tiff/consts.go \
        go/image/tiff/reader.go
 
@@ -1733,6 +1760,14 @@ go_net_textproto_files = \
        go/net/textproto/textproto.go \
        go/net/textproto/writer.go
 
+go_old_netchan_files = \
+       go/old/netchan/common.go \
+       go/old/netchan/export.go \
+       go/old/netchan/import.go
+
+go_old_regexp_files = \
+       go/old/regexp/regexp.go
+
 go_old_template_files = \
        go/old/template/doc.go \
        go/old/template/execute.go \
@@ -1754,6 +1789,14 @@ go_path_filepath_files = \
        go/path/filepath/path.go \
        go/path/filepath/path_unix.go
 
+go_regexp_syntax_files = \
+       go/regexp/syntax/compile.go \
+       go/regexp/syntax/parse.go \
+       go/regexp/syntax/perl_groups.go \
+       go/regexp/syntax/prog.go \
+       go/regexp/syntax/regexp.go \
+       go/regexp/syntax/simplify.go
+
 go_rpc_jsonrpc_files = \
        go/rpc/jsonrpc/client.go \
        go/rpc/jsonrpc/server.go
@@ -1787,97 +1830,85 @@ go_testing_quick_files = \
 go_testing_script_files = \
        go/testing/script/script.go
 
-@LIBGO_IS_RTEMS_FALSE@syscall_syscall_file = syscalls/syscall.go
+@LIBGO_IS_RTEMS_FALSE@syscall_syscall_file = go/syscall/syscall_unix.go
 
 # Define Syscall and Syscall6.
-@LIBGO_IS_RTEMS_TRUE@syscall_syscall_file = syscalls/syscall_stubs.go
-# Use lseek on 64-bit Solaris.
-@LIBGO_IS_386_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@@LIBGO_IS_SPARC_FALSE@syscall_filesize_file = syscalls/sysfile_regfile.go
-# Use lseek64 on 32-bit Solaris/SPARC.
-@LIBGO_IS_386_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@@LIBGO_IS_SPARC_TRUE@syscall_filesize_file = syscalls/sysfile_largefile.go
-# Use lseek64 on 32-bit Solaris/x86.
-@LIBGO_IS_386_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_filesize_file = syscalls/sysfile_largefile.go
-# Use lseek by default.
-@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@syscall_filesize_file = syscalls/sysfile_regfile.go
+@LIBGO_IS_RTEMS_TRUE@syscall_syscall_file = go/syscall/syscall_stubs.go
+@LIBGO_IS_RTEMS_FALSE@syscall_exec_file = go/syscall/exec_unix.go
 
-# Declare libc functions that vary for largefile systems.
-# Always use lseek64 on GNU/Linux.
-@LIBGO_IS_LINUX_TRUE@syscall_filesize_file = syscalls/sysfile_largefile.go
-@LIBGO_IS_386_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@@LIBGO_IS_SPARC_FALSE@syscall_stat_file = syscalls/sysfile_stat_regfile.go
-@LIBGO_IS_386_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@@LIBGO_IS_SPARC_TRUE@syscall_stat_file = syscalls/sysfile_stat_largefile.go
-@LIBGO_IS_386_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_stat_file = syscalls/sysfile_stat_largefile.go
-@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@syscall_stat_file = syscalls/sysfile_stat_regfile.go
-@LIBGO_IS_LINUX_TRUE@syscall_stat_file = syscalls/sysfile_stat_largefile.go
-@LIBGO_IS_RTEMS_FALSE@syscall_exec_os_file = syscalls/exec.go
-
-# Define ForkExec, PtraceForkExec, and Exec.
-@LIBGO_IS_RTEMS_TRUE@syscall_exec_os_file = syscalls/exec_stubs.go
-@HAVE_WAIT4_FALSE@syscall_wait_file = syscalls/waitpid.go
+# Define ForkExec and Exec.
+@LIBGO_IS_RTEMS_TRUE@syscall_exec_file = go/syscall/exec_stubs.go
+@HAVE_WAIT4_FALSE@syscall_wait_file = go/syscall/libcall_waitpid.go
 
 # Define Wait4.
-@HAVE_WAIT4_TRUE@syscall_wait_file = syscalls/wait4.go
-@LIBGO_IS_RTEMS_FALSE@syscall_sleep_file = syscalls/sleep_select.go
+@HAVE_WAIT4_TRUE@syscall_wait_file = go/syscall/libcall_wait4.go
+@LIBGO_IS_RTEMS_FALSE@syscall_sleep_file = go/syscall/sleep_select.go
 
 # Define Sleep.
-@LIBGO_IS_RTEMS_TRUE@syscall_sleep_file = syscalls/sleep_rtems.go
-@HAVE_STRERROR_R_FALSE@@LIBGO_IS_RTEMS_FALSE@syscall_errstr_file = syscalls/errstr_nor.go
-@HAVE_STRERROR_R_TRUE@@LIBGO_IS_RTEMS_FALSE@syscall_errstr_file = syscalls/errstr.go
+@LIBGO_IS_RTEMS_TRUE@syscall_sleep_file = go/syscall/sleep_rtems.go
+@HAVE_STRERROR_R_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_FALSE@syscall_errstr_file = go/syscall/errstr_nor.go
+@HAVE_STRERROR_R_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_FALSE@syscall_errstr_file = go/syscall/errstr.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_TRUE@syscall_errstr_file = go/syscall/errstr_linux.go
 
 # Define Errstr.
-@LIBGO_IS_RTEMS_TRUE@syscall_errstr_file = syscalls/errstr_rtems.go
-# On other systems we hope strerror_r is just strerror_r.
-@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_FALSE@syscall_errstr_decl_file = syscalls/errstr_decl.go
-# On GNU/Linux the POSIX strerror_r is called __xpg_strerror_r.
-@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_RTEMS_FALSE@syscall_errstr_decl_file = syscalls/errstr_decl_linux.go
-
-# Declare libc_strerror_r which is the Go name for strerror_r.
-# RTEMS uses newlib in which strerror_r returns char *.
-@LIBGO_IS_RTEMS_TRUE@syscall_errstr_decl_file = syscalls/errstr_decl_rtems.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@syscall_socket_os_file = syscalls/socket_bsd.go
-@LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@syscall_socket_os_file = syscalls/socket_irix.go
-@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_socket_os_file = syscalls/socket_solaris.go
+@LIBGO_IS_LINUX_TRUE@syscall_errstr_file = go/syscall/errstr_linux.go
+# Use lseek on 64-bit Solaris.
+@LIBGO_IS_386_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@@LIBGO_IS_SPARC_FALSE@syscall_size_file = go/syscall/libcall_posix_regfile.go
+# Use lseek64 on 32-bit Solaris/SPARC.
+@LIBGO_IS_386_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@@LIBGO_IS_SPARC_TRUE@syscall_size_file = go/syscall/libcall_posix_largefile.go
+# Use lseek64 on 32-bit Solaris/x86.
+@LIBGO_IS_386_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_size_file = go/syscall/libcall_posix_largefile.go
+# Use lseek by default.
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@syscall_size_file = go/syscall/libcall_posix_regfile.go
 
-# Define socket sizes and types.
-@LIBGO_IS_LINUX_TRUE@syscall_socket_os_file = syscalls/socket_linux.go
-@LIBGO_IS_LINUX_FALSE@syscall_socket_epoll_file = 
+# Declare libc functions that vary for largefile systems.
+# Always use lseek64 on GNU/Linux.
+@LIBGO_IS_LINUX_TRUE@syscall_size_file = go/syscall/libcall_posix_largefile.go
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@syscall_socket_file = go/syscall/socket_bsd.go
+@LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@syscall_socket_file = go/syscall/socket_irix.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_socket_file = go/syscall/socket_solaris.go
 
-# Support for epoll.
-@LIBGO_IS_LINUX_TRUE@syscall_socket_epoll_file = syscalls/socket_epoll.go
-@LIBGO_IS_386_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_uname_file = syscalls/syscall_uname.go
+# Define socket sizes and types.
+@LIBGO_IS_LINUX_TRUE@syscall_socket_file = go/syscall/socket_linux.go epoll.go
+@LIBGO_IS_386_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_uname_file = go/syscall/libcall_uname.go
 
 # Support for uname.
-# 32-bit Solaris 2/x86 needs _nuname, handled in syscall_solaris_386.go.
+# 32-bit Solaris 2/x86 needs _nuname, handled in libcall_solaris_386.go.
 @LIBGO_IS_386_TRUE@@LIBGO_IS_SOLARIS_TRUE@syscall_uname_file = 
-@LIBGO_IS_SOLARIS_FALSE@syscall_uname_file = syscalls/syscall_uname.go
+@LIBGO_IS_SOLARIS_FALSE@syscall_uname_file = go/syscall/libcall_uname.go
 @LIBGO_IS_LINUX_FALSE@syscall_netlink_file = 
 
 # Support for netlink sockets and messages.
-@LIBGO_IS_LINUX_TRUE@syscall_netlink_file = syscalls/netlink_linux.go
-go_syscall_files = \
-       $(syscall_errstr_file) \
-       $(syscall_errstr_decl_file) \
-       syscalls/exec_helpers.go \
-       $(syscall_exec_os_file) \
+@LIBGO_IS_LINUX_TRUE@syscall_netlink_file = go/syscall/netlink_linux.go
+go_base_syscall_files = \
+       go/syscall/libcall_support.go \
+       go/syscall/libcall_posix.go \
+       go/syscall/socket.go \
+       go/syscall/str.go \
+       go/syscall/syscall.go \
+       $(syscall_syscall_file) \
+       $(syscall_exec_file) \
        $(syscall_wait_file) \
-       $(syscall_filesize_file) \
-       $(syscall_netlink_file) \
-       $(syscall_stat_file) \
        $(syscall_sleep_file) \
-       syscalls/socket.go \
-       $(syscall_socket_os_file) \
-       $(syscall_socket_epoll_file) \
-       $(syscall_syscall_file) \
+       $(syscall_errstr_file) \
+       $(syscall_size_file) \
+       $(syscall_socket_file) \
        $(syscall_uname_file) \
-       syscalls/syscall_unix.go \
-       syscalls/stringbyte.go \
-       syscalls/syscall_$(GOOS).go \
-       $(GO_SYSCALLS_SYSCALL_OS_ARCH_FILE) \
-       syscalls/sysfile_posix.go \
+       $(syscall_netlink_file) \
+       $(GO_LIBCALL_OS_FILE) \
+       $(GO_LIBCALL_OS_ARCH_FILE) \
+       $(GO_SYSCALL_OS_FILE) \
+       $(GO_SYSCALL_OS_ARCH_FILE)
+
+go_syscall_files = \
+       $(go_base_syscall_files) \
+       libcalls.go \
        sysinfo.go \
        syscall_arch.go
 
 go_syscall_c_files = \
-       syscalls/errno.c
+       go/syscall/errno.c \
+       go/syscall/wait.c
 
 @LIBGO_IS_LINUX_FALSE@os_lib_inotify_lo = 
 
@@ -1892,7 +1923,6 @@ libgo_go_objs = \
        cmath/cmath.lo \
        crypto/crypto.lo \
        csv/csv.lo \
-       ebnf/ebnf.lo \
        exec/exec.lo \
        expvar/expvar.lo \
        flag/flag.lo \
@@ -1909,7 +1939,6 @@ libgo_go_objs = \
        mail/mail.lo \
        mime/mime.lo \
        net/net.lo \
-       netchan/netchan.lo \
        os/os.lo \
        patch/patch.lo \
        path/path.lo \
@@ -1929,7 +1958,6 @@ libgo_go_objs = \
        tabwriter/tabwriter.lo \
        template/template.lo \
        time/time.lo \
-       try/try.lo \
        unicode/unicode.lo \
        url/url.lo \
        utf16/utf16.lo \
@@ -1946,8 +1974,8 @@ libgo_go_objs = \
        container/heap.lo \
        container/list.lo \
        container/ring.lo \
-       container/vector.lo \
        crypto/aes.lo \
+       crypto/bcrypt.lo \
        crypto/blowfish.lo \
        crypto/cast5.lo \
        crypto/cipher.lo \
@@ -1990,12 +2018,16 @@ libgo_go_objs = \
        encoding/git85.lo \
        encoding/hex.lo \
        encoding/pem.lo \
-       exp/datafmt.lo \
+       exp/ebnf.lo \
        exp/gui.lo \
        exp/norm.lo \
-       exp/regexp.lo \
+       exp/spdy.lo \
+       exp/sql.lo \
+       exp/ssh.lo \
+       exp/terminal.lo \
+       exp/types.lo \
        exp/gui/x11.lo \
-       exp/regexp/syntax.lo \
+       exp/sql/driver.lo \
        exp/template/html.lo \
        go/ast.lo \
        go/build.lo \
@@ -2004,8 +2036,6 @@ libgo_go_objs = \
        go/printer.lo \
        go/scanner.lo \
        go/token.lo \
-       go/typechecker.lo \
-       go/types.lo \
        hash/adler32.lo \
        hash/crc32.lo \
        hash/crc64.lo \
@@ -2014,8 +2044,8 @@ libgo_go_objs = \
        http/fcgi.lo \
        http/httptest.lo \
        http/pprof.lo \
-       http/spdy.lo \
        image/bmp.lo \
+       image/color.lo \
        image/draw.lo \
        image/gif.lo \
        image/jpeg.lo \
@@ -2027,18 +2057,22 @@ libgo_go_objs = \
        mime/multipart.lo \
        net/dict.lo \
        net/textproto.lo \
+       old/netchan.lo \
+       old/regexp.lo \
        old/template.lo \
        $(os_lib_inotify_lo) \
        os/user.lo \
        os/signal.lo \
        path/filepath.lo \
+       regexp/syntax.lo \
        rpc/jsonrpc.lo \
        runtime/debug.lo \
        runtime/pprof.lo \
        sync/atomic.lo \
        sync/atomic_c.lo \
-       syscalls/syscall.lo \
-       syscalls/errno.lo \
+       syscall/syscall.lo \
+       syscall/errno.lo \
+       syscall/wait.lo \
        template/parse.lo \
        testing/testing.lo \
        testing/iotest.lo \
@@ -2077,6 +2111,8 @@ GOTESTFLAGS =
 CHECK = \
        GC="$(GOC) $(GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \
        export GC; \
+       GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \
+       export GOLIBS; \
        RUNTESTFLAGS="$(RUNTESTFLAGS)"; \
        export RUNTESTFLAGS; \
        MAKE="$(MAKE)"; \
@@ -2147,7 +2183,6 @@ TEST_PACKAGES = \
        bytes/check \
        cmath/check \
        csv/check \
-       ebnf/check \
        exec/check \
        expvar/check \
        flag/check \
@@ -2163,7 +2198,6 @@ TEST_PACKAGES = \
        mail/check \
        mime/check \
        net/check \
-       netchan/check \
        os/check \
        patch/check \
        path/check \
@@ -2182,7 +2216,6 @@ TEST_PACKAGES = \
        tabwriter/check \
        template/check \
        time/check \
-       try/check \
        unicode/check \
        url/check \
        utf16/check \
@@ -2199,8 +2232,8 @@ TEST_PACKAGES = \
        container/heap/check \
        container/list/check \
        container/ring/check \
-       container/vector/check \
        crypto/aes/check \
+       crypto/bcrypt/check \
        crypto/blowfish/check \
        crypto/cast5/check \
        crypto/cipher/check \
@@ -2240,10 +2273,12 @@ TEST_PACKAGES = \
        encoding/git85/check \
        encoding/hex/check \
        encoding/pem/check \
-       exp/datafmt/check \
+       exp/ebnf/check \
        exp/norm/check \
-       exp/regexp/check \
-       exp/regexp/syntax/check \
+       exp/spdy/check \
+       exp/sql/check \
+       exp/ssh/check \
+       exp/terminal/check \
        exp/template/html/check \
        go/ast/check \
        $(go_build_check_omitted_since_it_calls_6g) \
@@ -2251,7 +2286,6 @@ TEST_PACKAGES = \
        go/printer/check \
        go/scanner/check \
        go/token/check \
-       go/typechecker/check \
        $(go_types_check_omitted_since_it_calls_6g) \
        hash/adler32/check \
        hash/crc32/check \
@@ -2259,7 +2293,6 @@ TEST_PACKAGES = \
        hash/fnv/check \
        http/cgi/check \
        http/fcgi/check \
-       http/spdy/check \
        image/draw/check \
        image/jpeg/check \
        image/png/check \
@@ -2269,11 +2302,14 @@ TEST_PACKAGES = \
        io/ioutil/check \
        mime/multipart/check \
        net/textproto/check \
+       old/netchan/check \
+       old/regexp/check \
        old/template/check \
        $(os_inotify_check) \
        os/user/check \
        os/signal/check \
        path/filepath/check \
+       regexp/syntax/check \
        rpc/jsonrpc/check \
        sync/atomic/check \
        template/parse/check \
@@ -2455,10 +2491,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-new-map.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-new.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-note.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-panic-defer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-panic.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-print.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-rand.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-rec-big.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-rec-nb-big.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-rec-nb-small.Plo@am__quote@
@@ -2513,9 +2547,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reflect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtems-task-variable-add.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtime.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigqueue.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yield.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -2825,13 +2861,6 @@ go-panic.lo: runtime/go-panic.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o go-panic.lo `test -f 'runtime/go-panic.c' || echo '$(srcdir)/'`runtime/go-panic.c
 
-go-panic-defer.lo: runtime/go-panic-defer.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT go-panic-defer.lo -MD -MP -MF $(DEPDIR)/go-panic-defer.Tpo -c -o go-panic-defer.lo `test -f 'runtime/go-panic-defer.c' || echo '$(srcdir)/'`runtime/go-panic-defer.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-panic-defer.Tpo $(DEPDIR)/go-panic-defer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-panic-defer.c' object='go-panic-defer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o go-panic-defer.lo `test -f 'runtime/go-panic-defer.c' || echo '$(srcdir)/'`runtime/go-panic-defer.c
-
 go-print.lo: runtime/go-print.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT go-print.lo -MD -MP -MF $(DEPDIR)/go-print.Tpo -c -o go-print.lo `test -f 'runtime/go-print.c' || echo '$(srcdir)/'`runtime/go-print.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-print.Tpo $(DEPDIR)/go-print.Plo
@@ -2839,13 +2868,6 @@ go-print.lo: runtime/go-print.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o go-print.lo `test -f 'runtime/go-print.c' || echo '$(srcdir)/'`runtime/go-print.c
 
-go-rand.lo: runtime/go-rand.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT go-rand.lo -MD -MP -MF $(DEPDIR)/go-rand.Tpo -c -o go-rand.lo `test -f 'runtime/go-rand.c' || echo '$(srcdir)/'`runtime/go-rand.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-rand.Tpo $(DEPDIR)/go-rand.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-rand.c' object='go-rand.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o go-rand.lo `test -f 'runtime/go-rand.c' || echo '$(srcdir)/'`runtime/go-rand.c
-
 go-rec-big.lo: runtime/go-rec-big.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT go-rec-big.lo -MD -MP -MF $(DEPDIR)/go-rec-big.Tpo -c -o go-rec-big.lo `test -f 'runtime/go-rec-big.c' || echo '$(srcdir)/'`runtime/go-rec-big.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-rec-big.Tpo $(DEPDIR)/go-rec-big.Plo
@@ -3189,6 +3211,13 @@ proc.lo: runtime/proc.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o proc.lo `test -f 'runtime/proc.c' || echo '$(srcdir)/'`runtime/proc.c
 
+runtime.lo: runtime/runtime.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT runtime.lo -MD -MP -MF $(DEPDIR)/runtime.Tpo -c -o runtime.lo `test -f 'runtime/runtime.c' || echo '$(srcdir)/'`runtime/runtime.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/runtime.Tpo $(DEPDIR)/runtime.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/runtime.c' object='runtime.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o runtime.lo `test -f 'runtime/runtime.c' || echo '$(srcdir)/'`runtime/runtime.c
+
 thread.lo: runtime/thread.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT thread.lo -MD -MP -MF $(DEPDIR)/thread.Tpo -c -o thread.lo `test -f 'runtime/thread.c' || echo '$(srcdir)/'`runtime/thread.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/thread.Tpo $(DEPDIR)/thread.Plo
@@ -3196,6 +3225,13 @@ thread.lo: runtime/thread.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o thread.lo `test -f 'runtime/thread.c' || echo '$(srcdir)/'`runtime/thread.c
 
+yield.lo: runtime/yield.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yield.lo -MD -MP -MF $(DEPDIR)/yield.Tpo -c -o yield.lo `test -f 'runtime/yield.c' || echo '$(srcdir)/'`runtime/yield.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/yield.Tpo $(DEPDIR)/yield.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/yield.c' object='yield.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yield.lo `test -f 'runtime/yield.c' || echo '$(srcdir)/'`runtime/yield.c
+
 rtems-task-variable-add.lo: runtime/rtems-task-variable-add.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rtems-task-variable-add.lo -MD -MP -MF $(DEPDIR)/rtems-task-variable-add.Tpo -c -o rtems-task-variable-add.lo `test -f 'runtime/rtems-task-variable-add.c' || echo '$(srcdir)/'`runtime/rtems-task-variable-add.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/rtems-task-variable-add.Tpo $(DEPDIR)/rtems-task-variable-add.Plo
@@ -3448,26 +3484,26 @@ uninstall-toolexeclibgoexpguiDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgoexpguidir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgoexpguidir)" && rm -f $$files
-install-toolexeclibgoexpregexpDATA: $(toolexeclibgoexpregexp_DATA)
+install-toolexeclibgoexpsqlDATA: $(toolexeclibgoexpsql_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibgoexpregexpdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgoexpregexpdir)"
-       @list='$(toolexeclibgoexpregexp_DATA)'; test -n "$(toolexeclibgoexpregexpdir)" || list=; \
+       test -z "$(toolexeclibgoexpsqldir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgoexpsqldir)"
+       @list='$(toolexeclibgoexpsql_DATA)'; test -n "$(toolexeclibgoexpsqldir)" || list=; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
        done | $(am__base_list) | \
        while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolexeclibgoexpregexpdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgoexpregexpdir)" || exit $$?; \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolexeclibgoexpsqldir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgoexpsqldir)" || exit $$?; \
        done
 
-uninstall-toolexeclibgoexpregexpDATA:
+uninstall-toolexeclibgoexpsqlDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(toolexeclibgoexpregexp_DATA)'; test -n "$(toolexeclibgoexpregexpdir)" || list=; \
+       @list='$(toolexeclibgoexpsql_DATA)'; test -n "$(toolexeclibgoexpsqldir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(toolexeclibgoexpregexpdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(toolexeclibgoexpregexpdir)" && rm -f $$files
+       echo " ( cd '$(DESTDIR)$(toolexeclibgoexpsqldir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgoexpsqldir)" && rm -f $$files
 install-toolexeclibgoexptemplateDATA: $(toolexeclibgoexptemplate_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibgoexptemplatedir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgoexptemplatedir)"
@@ -3708,6 +3744,26 @@ uninstall-toolexeclibgopathDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgopathdir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgopathdir)" && rm -f $$files
+install-toolexeclibgoregexpDATA: $(toolexeclibgoregexp_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(toolexeclibgoregexpdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgoregexpdir)"
+       @list='$(toolexeclibgoregexp_DATA)'; test -n "$(toolexeclibgoregexpdir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolexeclibgoregexpdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgoregexpdir)" || exit $$?; \
+       done
+
+uninstall-toolexeclibgoregexpDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(toolexeclibgoregexp_DATA)'; test -n "$(toolexeclibgoregexpdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(toolexeclibgoregexpdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgoregexpdir)" && rm -f $$files
 install-toolexeclibgorpcDATA: $(toolexeclibgorpc_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibgorpcdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgorpcdir)"
@@ -4125,7 +4181,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) all-multi $(DATA) \
                config.h
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibgodir)" "$(DESTDIR)$(toolexeclibgoarchivedir)" "$(DESTDIR)$(toolexeclibgocompressdir)" "$(DESTDIR)$(toolexeclibgocontainerdir)" "$(DESTDIR)$(toolexeclibgocryptodir)" "$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)" "$(DESTDIR)$(toolexeclibgocryptox509dir)" "$(DESTDIR)$(toolexeclibgodebugdir)" "$(DESTDIR)$(toolexeclibgoencodingdir)" "$(DESTDIR)$(toolexeclibgoexpdir)" "$(DESTDIR)$(toolexeclibgoexpguidir)" "$(DESTDIR)$(toolexeclibgoexpregexpdir)" "$(DESTDIR)$(toolexeclibgoexptemplatedir)" "$(DESTDIR)$(toolexeclibgogodir)" "$(DESTDIR)$(toolexeclibgohashdir)" "$(DESTDIR)$(toolexeclibgohttpdir)" "$(DESTDIR)$(toolexeclibgoimagedir)" "$(DESTDIR)$(toolexeclibgoindexdir)" "$(DESTDIR)$(toolexeclibgoiodir)" "$(DESTDIR)$(toolexeclibgomimedir)" "$(DESTDIR)$(toolexeclibgonetdir)" "$(DESTDIR)$(toolexeclibgoolddir)" "$(DESTDIR)$(toolexeclibgoosdir)" "$(DESTDIR)$(toolexeclibgopathdir)" "$(DESTDIR)$(toolexeclibgorpcdir)" "$(DESTDIR)$(toolexeclibgoruntimedir)" "$(DESTDIR)$(toolexeclibgosyncdir)" "$(DESTDIR)$(toolexeclibgotemplatedir)" "$(DESTDIR)$(toolexeclibgotestingdir)"; do \
+       for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibgodir)" "$(DESTDIR)$(toolexeclibgoarchivedir)" "$(DESTDIR)$(toolexeclibgocompressdir)" "$(DESTDIR)$(toolexeclibgocontainerdir)" "$(DESTDIR)$(toolexeclibgocryptodir)" "$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)" "$(DESTDIR)$(toolexeclibgocryptox509dir)" "$(DESTDIR)$(toolexeclibgodebugdir)" "$(DESTDIR)$(toolexeclibgoencodingdir)" "$(DESTDIR)$(toolexeclibgoexpdir)" "$(DESTDIR)$(toolexeclibgoexpguidir)" "$(DESTDIR)$(toolexeclibgoexpsqldir)" "$(DESTDIR)$(toolexeclibgoexptemplatedir)" "$(DESTDIR)$(toolexeclibgogodir)" "$(DESTDIR)$(toolexeclibgohashdir)" "$(DESTDIR)$(toolexeclibgohttpdir)" "$(DESTDIR)$(toolexeclibgoimagedir)" "$(DESTDIR)$(toolexeclibgoindexdir)" "$(DESTDIR)$(toolexeclibgoiodir)" "$(DESTDIR)$(toolexeclibgomimedir)" "$(DESTDIR)$(toolexeclibgonetdir)" "$(DESTDIR)$(toolexeclibgoolddir)" "$(DESTDIR)$(toolexeclibgoosdir)" "$(DESTDIR)$(toolexeclibgopathdir)" "$(DESTDIR)$(toolexeclibgoregexpdir)" "$(DESTDIR)$(toolexeclibgorpcdir)" "$(DESTDIR)$(toolexeclibgoruntimedir)" "$(DESTDIR)$(toolexeclibgosyncdir)" "$(DESTDIR)$(toolexeclibgotemplatedir)" "$(DESTDIR)$(toolexeclibgotestingdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
@@ -4196,15 +4252,16 @@ install-exec-am: install-multi install-toolexeclibLIBRARIES \
        install-toolexeclibgodebugDATA \
        install-toolexeclibgoencodingDATA install-toolexeclibgoexpDATA \
        install-toolexeclibgoexpguiDATA \
-       install-toolexeclibgoexpregexpDATA \
+       install-toolexeclibgoexpsqlDATA \
        install-toolexeclibgoexptemplateDATA \
        install-toolexeclibgogoDATA install-toolexeclibgohashDATA \
        install-toolexeclibgohttpDATA install-toolexeclibgoimageDATA \
        install-toolexeclibgoindexDATA install-toolexeclibgoioDATA \
        install-toolexeclibgomimeDATA install-toolexeclibgonetDATA \
        install-toolexeclibgooldDATA install-toolexeclibgoosDATA \
-       install-toolexeclibgopathDATA install-toolexeclibgorpcDATA \
-       install-toolexeclibgoruntimeDATA install-toolexeclibgosyncDATA \
+       install-toolexeclibgopathDATA install-toolexeclibgoregexpDATA \
+       install-toolexeclibgorpcDATA install-toolexeclibgoruntimeDATA \
+       install-toolexeclibgosyncDATA \
        install-toolexeclibgotemplateDATA \
        install-toolexeclibgotestingDATA
 
@@ -4260,7 +4317,7 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        uninstall-toolexeclibgoencodingDATA \
        uninstall-toolexeclibgoexpDATA \
        uninstall-toolexeclibgoexpguiDATA \
-       uninstall-toolexeclibgoexpregexpDATA \
+       uninstall-toolexeclibgoexpsqlDATA \
        uninstall-toolexeclibgoexptemplateDATA \
        uninstall-toolexeclibgogoDATA uninstall-toolexeclibgohashDATA \
        uninstall-toolexeclibgohttpDATA \
@@ -4268,7 +4325,9 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        uninstall-toolexeclibgoindexDATA uninstall-toolexeclibgoioDATA \
        uninstall-toolexeclibgomimeDATA uninstall-toolexeclibgonetDATA \
        uninstall-toolexeclibgooldDATA uninstall-toolexeclibgoosDATA \
-       uninstall-toolexeclibgopathDATA uninstall-toolexeclibgorpcDATA \
+       uninstall-toolexeclibgopathDATA \
+       uninstall-toolexeclibgoregexpDATA \
+       uninstall-toolexeclibgorpcDATA \
        uninstall-toolexeclibgoruntimeDATA \
        uninstall-toolexeclibgosyncDATA \
        uninstall-toolexeclibgotemplateDATA \
@@ -4303,15 +4362,16 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        install-toolexeclibgodebugDATA \
        install-toolexeclibgoencodingDATA install-toolexeclibgoexpDATA \
        install-toolexeclibgoexpguiDATA \
-       install-toolexeclibgoexpregexpDATA \
+       install-toolexeclibgoexpsqlDATA \
        install-toolexeclibgoexptemplateDATA \
        install-toolexeclibgogoDATA install-toolexeclibgohashDATA \
        install-toolexeclibgohttpDATA install-toolexeclibgoimageDATA \
        install-toolexeclibgoindexDATA install-toolexeclibgoioDATA \
        install-toolexeclibgomimeDATA install-toolexeclibgonetDATA \
        install-toolexeclibgooldDATA install-toolexeclibgoosDATA \
-       install-toolexeclibgopathDATA install-toolexeclibgorpcDATA \
-       install-toolexeclibgoruntimeDATA install-toolexeclibgosyncDATA \
+       install-toolexeclibgopathDATA install-toolexeclibgoregexpDATA \
+       install-toolexeclibgorpcDATA install-toolexeclibgoruntimeDATA \
+       install-toolexeclibgosyncDATA \
        install-toolexeclibgotemplateDATA \
        install-toolexeclibgotestingDATA installcheck installcheck-am \
        installdirs installdirs-am maintainer-clean \
@@ -4331,7 +4391,7 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        uninstall-toolexeclibgoencodingDATA \
        uninstall-toolexeclibgoexpDATA \
        uninstall-toolexeclibgoexpguiDATA \
-       uninstall-toolexeclibgoexpregexpDATA \
+       uninstall-toolexeclibgoexpsqlDATA \
        uninstall-toolexeclibgoexptemplateDATA \
        uninstall-toolexeclibgogoDATA uninstall-toolexeclibgohashDATA \
        uninstall-toolexeclibgohttpDATA \
@@ -4339,7 +4399,9 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        uninstall-toolexeclibgoindexDATA uninstall-toolexeclibgoioDATA \
        uninstall-toolexeclibgomimeDATA uninstall-toolexeclibgonetDATA \
        uninstall-toolexeclibgooldDATA uninstall-toolexeclibgoosDATA \
-       uninstall-toolexeclibgopathDATA uninstall-toolexeclibgorpcDATA \
+       uninstall-toolexeclibgopathDATA \
+       uninstall-toolexeclibgoregexpDATA \
+       uninstall-toolexeclibgorpcDATA \
        uninstall-toolexeclibgoruntimeDATA \
        uninstall-toolexeclibgosyncDATA \
        uninstall-toolexeclibgotemplateDATA \
@@ -4383,6 +4445,14 @@ s-version: Makefile
        $(SHELL) $(srcdir)/../move-if-change version.go.tmp version.go
        $(STAMP) $@
 
+libcalls.go: s-libcalls; @true
+s-libcalls: Makefile go/syscall/mksyscall.awk $(go_base_syscall_files)
+       rm -f libcalls.go.tmp
+       files=`echo $^ | sed -e 's/Makefile//' -e 's|[^ ]*go/syscall/mksyscall.awk||'`; \
+       $(AWK) -f $(srcdir)/go/syscall/mksyscall.awk $${files} > libcalls.go.tmp
+       $(SHELL) $(srcdir)/../move-if-change libcalls.go.tmp libcalls.go
+       $(STAMP) $@
+
 syscall_arch.go: s-syscall_arch; @true
 s-syscall_arch: Makefile
        rm -f syscall_arch.go.tmp
@@ -4392,6 +4462,40 @@ s-syscall_arch: Makefile
        $(SHELL) $(srcdir)/../move-if-change syscall_arch.go.tmp syscall_arch.go
        $(STAMP) $@
 
+sysinfo.go: s-sysinfo; @true
+s-sysinfo: $(srcdir)/mksysinfo.sh config.h
+       CC="$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OSCFLAGS)" $(SHELL) $(srcdir)/mksysinfo.sh
+       $(SHELL) $(srcdir)/../move-if-change tmp-sysinfo.go sysinfo.go
+       $(STAMP) $@
+
+# The epoll struct has an embedded union and is packed on x86_64,
+# which is too complicated for mksysinfo.sh.  We find the offset of
+# the only field we care about in configure.ac, and generate the
+# struct here.
+epoll.go: s-epoll; @true
+s-epoll: Makefile
+       rm -f epoll.go.tmp
+       echo 'package syscall' > epoll.go.tmp
+       echo 'type EpollEvent struct {' >> epoll.go.tmp
+       echo '  Events uint32' >> epoll.go.tmp
+       case "$(SIZEOF_STRUCT_EPOLL_EVENT),$(STRUCT_EPOLL_EVENT_FD_OFFSET)" in \
+       0,0) echo 1>&2 "*** struct epoll_event data.fd offset unknown"; \
+          exit 1; ;; \
+       8,4) echo '     Fd int32' >> epoll.go.tmp; ;; \
+       12,4) echo '    Fd int32' >> epoll.go.tmp; \
+          echo '       Pad [4]byte' >> epoll.go.tmp; ;; \
+       12,8) echo '    Pad [4]byte' >> epoll.go.tmp; \
+          echo '       Fd int32' >> epoll.go.tmp; ;; \
+       16,8) echo '    Pad [4]byte' >> epoll.go.tmp; \
+          echo '       Fd int32' >> epoll.go.tmp; \
+          echo '       Pad2 [4]byte' >> epoll.go.tmp; ;; \
+       *) echo 1>&2 "*** struct epoll_event unsupported"; \
+          exit 1; ;; \
+       esac
+       echo '}' >> epoll.go.tmp
+       $(SHELL) $(srcdir)/../move-if-change epoll.go.tmp epoll.go
+       $(STAMP) $@
+
 asn1/asn1.lo: $(go_asn1_files) big.gox bytes.gox fmt.gox io.gox os.gox \
                reflect.gox strconv.gox strings.gox time.gox
        $(BUILDPACKAGE)
@@ -4439,13 +4543,6 @@ csv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: csv/check
 
-ebnf/ebnf.lo: $(go_ebnf_files) container/vector.gox go/scanner.gox \
-               go/token.gox os.gox strconv.gox unicode.gox utf8.gox
-       $(BUILDPACKAGE)
-ebnf/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: ebnf/check
-
 exec/exec.lo: $(go_exec_files) bytes.gox io.gox os.gox strconv.gox \
                strings.gox syscall.gox
        $(BUILDPACKAGE)
@@ -4467,7 +4564,7 @@ flag/check: $(CHECK_DEPS)
 .PHONY: flag/check
 
 fmt/fmt.lo: $(go_fmt_files) bytes.gox io.gox math.gox os.gox reflect.gox \
-               strconv.gox strings.gox unicode.gox utf8.gox
+               strconv.gox strings.gox sync.gox unicode.gox utf8.gox
        $(BUILDPACKAGE)
 fmt/check: $(CHECK_DEPS)
        @$(CHECK)
@@ -4487,8 +4584,8 @@ hash/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: hash/check
 
-html/html.lo: $(go_html_files) bytes.gox io.gox os.gox strconv.gox strings.gox \
-               utf8.gox
+html/html.lo: $(go_html_files) bufio.gox bytes.gox fmt.gox io.gox os.gox \
+               strconv.gox strings.gox utf8.gox
        $(BUILDPACKAGE)
 html/check: $(CHECK_DEPS)
        @$(CHECK)
@@ -4505,7 +4602,8 @@ http/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: http/check
 
-image/image.lo: $(go_image_files) bufio.gox io.gox os.gox strconv.gox
+image/image.lo: $(go_image_files) bufio.gox image/color.gox io.gox os.gox \
+               strconv.gox
        $(BUILDPACKAGE)
 image/check: $(CHECK_DEPS)
        @$(CHECK)
@@ -4561,13 +4659,6 @@ net/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: net/check
 
-netchan/netchan.lo: $(go_netchan_files) gob.gox io.gox log.gox net.gox os.gox \
-               reflect.gox strconv.gox sync.gox time.gox
-       $(BUILDPACKAGE)
-netchan/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: netchan/check
-
 os/os.lo: $(go_os_files) runtime.gox sync.gox syscall.gox
        $(BUILDPACKAGE)
 os/check: $(CHECK_DEPS)
@@ -4605,8 +4696,8 @@ reflect/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: reflect/check
 
-regexp/regexp.lo: $(go_regexp_files) bytes.gox io.gox os.gox strings.gox \
-               utf8.gox
+regexp/regexp.lo: $(go_regexp_files) bytes.gox io.gox os.gox \
+               regexp/syntax.gox strconv.gox strings.gox sync.gox utf8.gox
        $(BUILDPACKAGE)
 regexp/check: $(CHECK_DEPS)
        @$(CHECK)
@@ -4653,7 +4744,7 @@ strconv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: strconv/check
 
-strings/strings.lo: $(go_strings_files) os.gox unicode.gox utf8.gox
+strings/strings.lo: $(go_strings_files) io.gox os.gox unicode.gox utf8.gox
        $(BUILDPACKAGE)
 strings/check: $(CHECK_DEPS)
        @$(CHECK)
@@ -4688,8 +4779,9 @@ template/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: template/check
 
-testing/testing.lo: $(go_testing_files) flag.gox fmt.gox os.gox regexp.gox \
-               runtime.gox runtime/pprof.gox strings.gox strconv.gox time.gox
+testing/testing.lo: $(go_testing_files) bytes.gox flag.gox fmt.gox io.gox \
+               os.gox regexp.gox runtime.gox runtime/pprof.gox strings.gox \
+               strconv.gox time.gox
        $(BUILDPACKAGE)
 testing/check: $(CHECK_DEPS)
        @$(CHECK)
@@ -4702,12 +4794,6 @@ time/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: time/check
 
-try/try.lo: $(go_try_files) fmt.gox io.gox os.gox reflect.gox unicode.gox
-       $(BUILDPACKAGE)
-try/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: try/check
-
 unicode/unicode.lo: $(go_unicode_files)
        $(BUILDPACKAGE)
 unicode/check: $(CHECK_DEPS)
@@ -4733,8 +4819,10 @@ utf8/check: $(CHECK_DEPS)
 .PHONY: utf8/check
 
 websocket/websocket.lo: $(go_websocket_files) bufio.gox bytes.gox \
-               crypto/md5.gox crypto/tls.gox encoding/binary.gox fmt.gox \
-               http.gox io.gox net.gox os.gox rand.gox strings.gox url.gox
+               crypto/md5.gox crypto/rand.gox crypto/sha1.gox crypto/tls.gox \
+               encoding/base64.gox encoding/binary.gox fmt.gox http.gox \
+               io.gox io/ioutil.gox json.gox net.gox os.gox rand.gox \
+               strings.gox strconv.gox sync.gox url.gox
        $(BUILDPACKAGE)
 websocket/check: $(CHECK_DEPS)
        @$(CHECK)
@@ -4823,13 +4911,6 @@ container/ring/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: container/ring/check
 
-container/vector.lo: $(go_container_vector_files)
-       $(BUILDPACKAGE)
-container/vector/check: $(CHECK_DEPS)
-       @$(MKDIR_P) container/vector
-       @$(CHECK)
-.PHONY: container/vector/check
-
 crypto/aes.lo: $(go_crypto_aes_files) os.gox strconv.gox
        $(BUILDPACKAGE)
 crypto/aes/check: $(CHECK_DEPS)
@@ -4837,6 +4918,15 @@ crypto/aes/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/aes/check
 
+crypto/bcrypt.lo: $(go_crypto_bcrypt_files) crypto/blowfish.gox \
+               crypto/rand.gox crypto/subtle.gox encoding/base64.gox \
+               fmt.gox io.gox os.gox strconv.gox
+       $(BUILDPACKAGE)
+crypto/bcrypt/check: $(CHECK_DEPS)
+       @$(MKDIR_P) crypto/bcrypt
+       @$(CHECK)
+.PHONY: crypto/bcrypt/check
+
 crypto/blowfish.lo: $(go_crypto_blowfish_files) os.gox strconv.gox
        $(BUILDPACKAGE)
 crypto/blowfish/check: $(CHECK_DEPS)
@@ -4989,12 +5079,12 @@ crypto/subtle/check: $(CHECK_DEPS)
 .PHONY: crypto/subtle/check
 
 crypto/tls.lo: $(go_crypto_tls_files) big.gox bytes.gox crypto.gox \
-               crypto/aes.gox crypto/cipher.gox crypto/elliptic.gox \
-               crypto/hmac.gox crypto/md5.gox crypto/rand.gox crypto/rc4.gox \
-               crypto/rsa.gox crypto/sha1.gox crypto/subtle.gox \
-               crypto/x509.gox crypto/x509/pkix.gox encoding/pem.gox \
-               hash.gox io.gox io/ioutil.gox net.gox os.gox strconv.gox \
-               strings.gox sync.gox time.gox
+               crypto/aes.gox crypto/cipher.gox crypto/des.gox \
+               crypto/elliptic.gox crypto/hmac.gox crypto/md5.gox \
+               crypto/rand.gox crypto/rc4.gox crypto/rsa.gox crypto/sha1.gox \
+               crypto/subtle.gox crypto/x509.gox crypto/x509/pkix.gox \
+               encoding/pem.gox hash.gox io.gox io/ioutil.gox net.gox os.gox \
+               strconv.gox strings.gox sync.gox time.gox
        $(BUILDPACKAGE)
 crypto/tls/check: $(CHECK_DEPS)
        @$(MKDIR_P) crypto/tls
@@ -5169,14 +5259,13 @@ encoding/pem/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: encoding/pem/check
 
-exp/datafmt.lo: $(go_exp_datafmt_files) bytes.gox fmt.gox go/scanner.gox \
-               go/token.gox io.gox os.gox reflect.gox runtime.gox \
-               strconv.gox strings.gox
+exp/ebnf.lo: $(go_exp_ebnf_files) scanner.gox go/token.gox os.gox \
+               strconv.gox unicode.gox utf8.gox
        $(BUILDPACKAGE)
-exp/datafmt/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/datafmt
+exp/ebnf/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/ebnf
        @$(CHECK)
-.PHONY: exp/datafmt/check
+.PHONY: exp/ebnf/check
 
 exp/gui.lo: $(go_exp_gui_files) image.gox image/draw.gox os.gox
        $(BUILDPACKAGE)
@@ -5185,20 +5274,55 @@ exp/gui/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: exp/gui/check
 
-exp/norm.lo: $(go_exp_norm_files) utf8.gox
+exp/norm.lo: $(go_exp_norm_files) io.gox os.gox utf8.gox
        $(BUILDPACKAGE)
 exp/norm/check: $(CHECK_DEPS)
        @$(MKDIR_P) exp/norm
        @$(CHECK)
 .PHONY: exp/norm/check
 
-exp/regexp.lo: $(go_exp_regexp_files) bytes.gox exp/regexp/syntax.gox io.gox \
-               os.gox strings.gox sync.gox utf8.gox
+exp/spdy.lo: $(go_exp_spdy_files) bytes.gox compress/zlib.gox \
+               encoding/binary.gox http.gox io.gox os.gox strings.gox
+       $(BUILDPACKAGE)
+exp/spdy/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/spdy
+       @$(CHECK)
+.PHONY: exp/spdy/check
+
+exp/sql.lo: $(go_exp_sql_files) exp/sql/driver.gox fmt.gox os.gox reflect.gox \
+               runtime.gox strconv.gox sync.gox
+       $(BUILDPACKAGE)
+exp/sql/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/sql
+       @$(CHECK)
+.PHONY: exp/sql/check
+
+exp/ssh.lo: $(go_exp_ssh_files) big.gox bufio.gox bytes.gox crypto.gox \
+               crypto/aes.gox crypto/cipher.gox crypto/hmac.gox \
+               crypto/rand.gox crypto/rsa.gox crypto/sha1.gox \
+               crypto/subtle.gox crypto/x509.gox encoding/pem.gox hash.gox \
+               io.gox net.gox os.gox reflect.gox strconv.gox sync.gox
        $(BUILDPACKAGE)
-exp/regexp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/regexp
+exp/ssh/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/ssh
        @$(CHECK)
-.PHONY: exp/regexp/check
+.PHONY: exp/ssh/check
+
+exp/terminal.lo: $(go_exp_terminal_files) io.gox os.gox syscall.gox
+       $(BUILDPACKAGE)
+exp/terminal/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/terminal
+       @$(CHECK)
+.PHONY: exp/terminal/check
+
+exp/types.lo: $(go_exp_types_files) big.gox bufio.gox fmt.gox go/ast.gox \
+               go/token.gox io.gox os.gox path/filepath.gox runtime.gox \
+               scanner.gox sort.gox strconv.gox strings.gox
+       $(BUILDPACKAGE)
+exp/types/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/types
+       @$(CHECK)
+.PHONY: exp/types/check
 
 exp/gui/x11.lo: $(go_exp_gui_x11_files) bufio.gox exp/gui.gox image.gox \
                image/draw.gox io.gox log.gox net.gox os.gox strconv.gox \
@@ -5209,15 +5333,17 @@ exp/gui/x11/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: exp/gui/x11/check
 
-exp/regexp/syntax.lo: $(go_exp_regexp_syntax_files) bytes.gox os.gox sort.gox strconv.gox strings.gox unicode.gox utf8.gox
+exp/sql/driver.lo: $(go_exp_sql_driver_files) fmt.gox os.gox reflect.gox \
+               strconv.gox
        $(BUILDPACKAGE)
-exp/regexp/syntax/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/regexp/syntax
+exp/sql/driver/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/sql/driver
        @$(CHECK)
-.PHONY: exp/regexp/syntax/check
+.PHONY: exp/sql/driver/check
 
-exp/template/html.lo: $(go_exp_template_html_files) fmt.gox template.gox \
-               template/parse.gox
+exp/template/html.lo: $(go_exp_template_html_files) bytes.gox fmt.gox \
+               html.gox json.gox os.gox strings.gox template.gox \
+               template/parse.gox unicode.gox utf8.gox 
        $(BUILDPACKAGE)
 exp/template/html/check: $(CHECK_DEPS)
        @$(MKDIR_P) exp/template/html
@@ -5232,9 +5358,10 @@ go/ast/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: go/ast/check
 
-go/build.lo: $(go_go_build_files) bytes.gox exec.gox fmt.gox go/parser.gox \
-               go/token.gox log.gox os.gox path/filepath.gox regexp.gox \
-               runtime.gox strconv.gox strings.gox runtime.gox
+go/build.lo: $(go_go_build_files) bytes.gox exec.gox fmt.gox go/ast.gox \
+               go/doc.gox go/parser.gox go/token.gox io/ioutil.gox log.gox \
+               os.gox path.gox path/filepath.gox regexp.gox runtime.gox \
+               sort.gox strconv.gox strings.gox runtime.gox unicode.gox
        $(BUILDPACKAGE)
 go/build/check: $(CHECK_DEPS)
        @$(MKDIR_P) go/build
@@ -5251,7 +5378,7 @@ s-syslist: Makefile
        $(STAMP) $@
 
 go/doc.lo: $(go_go_doc_files) go/ast.gox go/token.gox io.gox regexp.gox \
-               sort.gox strings.gox template.gox
+               sort.gox strings.gox template.gox unicode.gox utf8.gox
        $(BUILDPACKAGE)
 go/doc/check: $(CHECK_DEPS)
        @$(MKDIR_P) go/doc
@@ -5269,7 +5396,7 @@ go/parser/check: $(CHECK_DEPS)
 
 go/printer.lo: $(go_go_printer_files) bytes.gox fmt.gox go/ast.gox \
                go/token.gox io.gox os.gox path/filepath.gox reflect.gox \
-               runtime.gox strings.gox tabwriter.gox
+               strings.gox tabwriter.gox
        $(BUILDPACKAGE)
 go/printer/check: $(CHECK_DEPS)
        @$(MKDIR_P) go/printer
@@ -5285,30 +5412,14 @@ go/scanner/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: go/scanner/check
 
-go/token.lo: $(go_go_token_files) fmt.gox strconv.gox
+go/token.lo: $(go_go_token_files) fmt.gox gob.gox io.gox os.gox sort.gox \
+               strconv.gox sync.gox
        $(BUILDPACKAGE)
 go/token/check: $(CHECK_DEPS)
        @$(MKDIR_P) go/token
        @$(CHECK)
 .PHONY: go/token/check
 
-go/typechecker.lo: $(go_go_typechecker_files) fmt.gox go/ast.gox go/token.gox \
-               go/scanner.gox os.gox
-       $(BUILDPACKAGE)
-go/typechecker/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/typechecker
-       @$(CHECK)
-.PHONY: go/typechecker/check
-
-go/types.lo: $(go_go_types_files) big.gox bufio.gox fmt.gox go/ast.gox \
-               go/token.gox io.gox os.gox path/filepath.gox runtime.gox \
-               scanner.gox sort.gox strconv.gox strings.gox
-       $(BUILDPACKAGE)
-go/types/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/types
-       @$(CHECK)
-.PHONY: go/types/check
-
 hash/adler32.lo: $(go_hash_adler32_files) hash.gox os.gox
        $(BUILDPACKAGE)
 hash/adler32/check: $(CHECK_DEPS)
@@ -5372,23 +5483,21 @@ http/pprof/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: http/pprof/check
 
-http/spdy.lo: $(go_http_spdy_files) bytes.gox compress/zlib.gox \
-               encoding/binary.gox http.gox io.gox os.gox strconv.gox \
-               strings.gox sync.gox
-       $(BUILDPACKAGE)
-http/spdy/check: $(CHECK_DEPS)
-       @$(MKDIR_P) http/spdy
-       @$(CHECK)
-.PHONY: http/spdy/check
-
-image/bmp.lo: $(go_image_bmp_files) image.gox io.gox os.gox
+image/bmp.lo: $(go_image_bmp_files) image.gox image/color.gox io.gox os.gox
        $(BUILDPACKAGE)
 image/bmp/check: $(CHECK_DEPS)
        @$(MKDIR_P) image/bmp
        @$(CHECK)
 .PHONY: image/bmp/check
 
-image/draw.lo: $(go_image_draw_files) image.gox image/ycbcr.gox
+image/color.lo: $(go_image_color_files)
+       $(BUILDPACKAGE)
+image/color/check: $(CHECK_DEPS)
+       @$(MKDIR_P) image/color
+       @$(CHECK)
+.PHONY: image/color/check
+
+image/draw.lo: $(go_image_draw_files) image.gox image/color.gox image/ycbcr.gox
        $(BUILDPACKAGE)
 image/draw/check: $(CHECK_DEPS)
        @$(MKDIR_P) image/draw
@@ -5396,46 +5505,48 @@ image/draw/check: $(CHECK_DEPS)
 .PHONY: image/draw/check
 
 image/gif.lo: $(go_image_gif_files) bufio.gox compress/lzw.gox fmt.gox \
-               image.gox io.gox os.gox
+               image.gox image/color.gox io.gox os.gox
        $(BUILDPACKAGE)
 image/gif/check: $(CHECK_DEPS)
        @$(MKDIR_P) image/gif
        @$(CHECK)
 .PHONY: image/gif/check
 
-image/jpeg.lo: $(go_image_jpeg_files) bufio.gox image.gox image/ycbcr.gox \
-               io.gox os.gox
+image/jpeg.lo: $(go_image_jpeg_files) bufio.gox image.gox image/color.gox \
+               image/ycbcr.gox io.gox os.gox
        $(BUILDPACKAGE)
 image/jpeg/check: $(CHECK_DEPS)
        @$(MKDIR_P) image/jpeg
        @$(CHECK)
 .PHONY: image/jpeg/check
 
-image/png.lo: $(go_image_png_files) bufio.gox compress/zlib.gox fmt.gox \
-               hash.gox hash/crc32.gox image.gox io.gox os.gox strconv.gox
+image/png.lo: $(go_image_png_files) bufio.gox compress/zlib.gox \
+               encoding/binary.gox fmt.gox hash.gox hash/crc32.gox image.gox \
+               image/color.gox io.gox os.gox strconv.gox
        $(BUILDPACKAGE)
 image/png/check: $(CHECK_DEPS)
        @$(MKDIR_P) image/png
        @$(CHECK)
 .PHONY: image/png/check
 
-image/tiff.lo: $(go_image_tiff_files) compress/lzw.gox compress/zlib.gox \
-               encoding/binary.gox image.gox io.gox io/ioutil.gox os.gox
+image/tiff.lo: $(go_image_tiff_files) bufio.gox compress/lzw.gox \
+               compress/zlib.gox encoding/binary.gox image.gox \
+               image/color.gox io.gox io/ioutil.gox os.gox
        $(BUILDPACKAGE)
 image/tiff/check: $(CHECK_DEPS)
        @$(MKDIR_P) image/tiff
        @$(CHECK)
 .PHONY: image/tiff/check
 
-image/ycbcr.lo: $(go_image_ycbcr_files) image.gox
+image/ycbcr.lo: $(go_image_ycbcr_files) image.gox image/color.gox
        $(BUILDPACKAGE)
 image/ycbcr/check: $(CHECK_DEPS)
        @$(MKDIR_P) image/ycbcr
        @$(CHECK)
 .PHONY: image/ycbcr/check
 
-index/suffixarray.lo: $(go_index_suffixarray_files) bytes.gox regexp.gox \
-               sort.gox
+index/suffixarray.lo: $(go_index_suffixarray_files) bytes.gox \
+               encoding/binary.gox io.gox os.gox regexp.gox sort.gox
        $(BUILDPACKAGE)
 index/suffixarray/check: $(CHECK_DEPS)
        @$(MKDIR_P) index/suffixarray
@@ -5464,13 +5575,30 @@ net/dict.lo: $(go_net_dict_files) net/textproto.gox os.gox strconv.gox \
        $(BUILDPACKAGE)
 
 net/textproto.lo: $(go_net_textproto_files) bufio.gox bytes.gox fmt.gox \
-               io.gox io/ioutil.gox net.gox os.gox strconv.gox sync.gox
+               io.gox io/ioutil.gox net.gox os.gox strings.gox strconv.gox \
+               sync.gox
        $(BUILDPACKAGE)
 net/textproto/check: $(CHECK_DEPS)
        @$(MKDIR_P) net/textproto
        @$(CHECK)
 .PHONY: net/textproto/check
 
+old/netchan.lo: $(go_old_netchan_files) gob.gox io.gox log.gox net.gox os.gox \
+               reflect.gox strconv.gox sync.gox time.gox
+       $(BUILDPACKAGE)
+old/netchan/check: $(CHECK_DEPS)
+       @$(MKDIR_P) old/netchan
+       @$(CHECK)
+.PHONY: old/netchan/check
+
+old/regexp.lo: $(go_old_regexp_files) bytes.gox io.gox os.gox strings.gox \
+               utf8.gox
+       $(BUILDPACKAGE)
+old/regexp/check: $(CHECK_DEPS)
+       @$(MKDIR_P) old/regexp
+       @$(CHECK)
+.PHONY: old/regexp/check
+
 old/template.lo: $(go_old_template_files) bytes.gox fmt.gox io.gox \
                io/ioutil.gox os.gox reflect.gox strconv.gox strings.gox \
                unicode.gox utf8.gox
@@ -5510,6 +5638,14 @@ path/filepath/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: path/filepath/check
 
+regexp/syntax.lo: $(go_regexp_syntax_files) bytes.gox os.gox sort.gox \
+               strconv.gox strings.gox unicode.gox utf8.gox
+       $(BUILDPACKAGE)
+regexp/syntax/check: $(CHECK_DEPS)
+       @$(MKDIR_P) regexp/syntax
+       @$(CHECK)
+.PHONY: regexp/syntax/check
+
 rpc/jsonrpc.lo: $(go_rpc_jsonrpc_files) fmt.gox io.gox json.gox net.gox \
                os.gox rpc.gox sync.gox
        $(BUILDPACKAGE)
@@ -5574,16 +5710,12 @@ testing/script/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: testing/script/check
 
-sysinfo.go: s-sysinfo; @true
-s-sysinfo: $(srcdir)/mksysinfo.sh config.h
-       CC="$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(OSCFLAGS)" $(SHELL) $(srcdir)/mksysinfo.sh
-       $(SHELL) $(srcdir)/../move-if-change tmp-sysinfo.go sysinfo.go
-       $(STAMP) $@
-
-syscalls/syscall.lo: $(go_syscall_files) sync.gox
+syscall/syscall.lo: $(go_syscall_files) sync.gox
        $(BUILDPACKAGE)
-syscalls/errno.lo: $(go_syscall_c_files) syscalls/syscall.lo
-       $(LTCOMPILE) -c -o $@ $(srcdir)/syscalls/errno.c
+syscall/errno.lo: go/syscall/errno.c
+       $(LTCOMPILE) -c -o $@ $<
+syscall/wait.lo: go/syscall/wait.c
+       $(LTCOMPILE) -c -o $@ $<
 
 asn1.gox: asn1/asn1.lo
        $(BUILDGOX)
@@ -5599,8 +5731,6 @@ crypto.gox: crypto/crypto.lo
        $(BUILDGOX)
 csv.gox: csv/csv.lo
        $(BUILDGOX)
-ebnf.gox: ebnf/ebnf.lo
-       $(BUILDGOX)
 exec.gox: exec/exec.lo
        $(BUILDGOX)
 expvar.gox: expvar/expvar.lo
@@ -5633,8 +5763,6 @@ mime.gox: mime/mime.lo
        $(BUILDGOX)
 net.gox: net/net.lo
        $(BUILDGOX)
-netchan.gox: netchan/netchan.lo
-       $(BUILDGOX)
 os.gox: os/os.lo
        $(BUILDGOX)
 patch.gox: patch/patch.lo
@@ -5665,7 +5793,7 @@ sync.gox: sync/sync.lo
        $(BUILDGOX)
 syslog.gox: syslog/syslog.lo
        $(BUILDGOX)
-syscall.gox: syscalls/syscall.lo
+syscall.gox: syscall/syscall.lo
        $(BUILDGOX)
 tabwriter.gox: tabwriter/tabwriter.lo
        $(BUILDGOX)
@@ -5675,8 +5803,6 @@ testing.gox: testing/testing.lo
        $(BUILDGOX)
 time.gox: time/time.lo
        $(BUILDGOX)
-try.gox: try/try.lo
-       $(BUILDGOX)
 unicode.gox: unicode/unicode.lo
        $(BUILDGOX)
 url.gox: url/url.lo
@@ -5712,11 +5838,11 @@ container/list.gox: container/list.lo
        $(BUILDGOX)
 container/ring.gox: container/ring.lo
        $(BUILDGOX)
-container/vector.gox: container/vector.lo
-       $(BUILDGOX)
 
 crypto/aes.gox: crypto/aes.lo
        $(BUILDGOX)
+crypto/bcrypt.gox: crypto/bcrypt.lo
+       $(BUILDGOX)
 crypto/blowfish.gox: crypto/blowfish.lo
        $(BUILDGOX)
 crypto/cast5.gox: crypto/cast5.lo
@@ -5806,19 +5932,27 @@ encoding/hex.gox: encoding/hex.lo
 encoding/pem.gox: encoding/pem.lo
        $(BUILDGOX)
 
-exp/datafmt.gox: exp/datafmt.lo
+exp/ebnf.gox: exp/ebnf.lo
        $(BUILDGOX)
 exp/gui.gox: exp/gui.lo
        $(BUILDGOX)
 exp/norm.gox: exp/norm.lo
        $(BUILDGOX)
-exp/regexp.gox: exp/regexp.lo
+exp/spdy.gox: exp/spdy.lo
+       $(BUILDGOX)
+exp/sql.gox: exp/sql.lo
+       $(BUILDGOX)
+exp/ssh.gox: exp/ssh.lo
+       $(BUILDGOX)
+exp/terminal.gox: exp/terminal.lo
+       $(BUILDGOX)
+exp/types.gox: exp/types.lo
        $(BUILDGOX)
 
 exp/gui/x11.gox: exp/gui/x11.lo
        $(BUILDGOX)
 
-exp/regexp/syntax.gox: exp/regexp/syntax.lo
+exp/sql/driver.gox: exp/sql/driver.lo
        $(BUILDGOX)
 
 exp/template/html.gox: exp/template/html.lo
@@ -5838,10 +5972,6 @@ go/scanner.gox: go/scanner.lo
        $(BUILDGOX)
 go/token.gox: go/token.lo
        $(BUILDGOX)
-go/typechecker.gox: go/typechecker.lo
-       $(BUILDGOX)
-go/types.gox: go/types.lo
-       $(BUILDGOX)
 
 hash/adler32.gox: hash/adler32.lo
        $(BUILDGOX)
@@ -5860,11 +5990,11 @@ http/httptest.gox: http/httptest.lo
        $(BUILDGOX)
 http/pprof.gox: http/pprof.lo
        $(BUILDGOX)
-http/spdy.gox: http/spdy.lo
-       $(BUILDGOX)
 
 image/bmp.gox: image/bmp.lo
        $(BUILDGOX)
+image/color.gox: image/color.lo
+       $(BUILDGOX)
 image/draw.gox: image/draw.lo
        $(BUILDGOX)
 image/gif.gox: image/gif.lo
@@ -5892,6 +6022,10 @@ net/dict.gox: net/dict.lo
 net/textproto.gox: net/textproto.lo
        $(BUILDGOX)
 
+old/netchan.gox: old/netchan.lo
+       $(BUILDGOX)
+old/regexp.gox: old/regexp.lo
+       $(BUILDGOX)
 old/template.gox: old/template.lo
        $(BUILDGOX)
 
@@ -5905,6 +6039,9 @@ os/signal.gox: os/signal.lo
 path/filepath.gox: path/filepath.lo
        $(BUILDGOX)
 
+regexp/syntax.gox: regexp/syntax.lo
+       $(BUILDGOX)
+
 rpc/jsonrpc.gox: rpc/jsonrpc.lo
        $(BUILDGOX)