OSDN Git Service

syscall: Fill out GNU/Linux support.
[pf3gnuchains/gcc-fork.git] / libgo / Makefile.in
index 2e1ea76..0fac351 100644 (file)
@@ -97,12 +97,12 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
        "$(DESTDIR)$(toolexeclibgocompressdir)" \
        "$(DESTDIR)$(toolexeclibgocontainerdir)" \
        "$(DESTDIR)$(toolexeclibgocryptodir)" \
-       "$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)" \
        "$(DESTDIR)$(toolexeclibgocryptox509dir)" \
+       "$(DESTDIR)$(toolexeclibgodatabasedir)" \
+       "$(DESTDIR)$(toolexeclibgodatabasesqldir)" \
        "$(DESTDIR)$(toolexeclibgodebugdir)" \
        "$(DESTDIR)$(toolexeclibgoencodingdir)" \
        "$(DESTDIR)$(toolexeclibgoexpdir)" \
-       "$(DESTDIR)$(toolexeclibgoexpsqldir)" \
        "$(DESTDIR)$(toolexeclibgogodir)" \
        "$(DESTDIR)$(toolexeclibgohashdir)" \
        "$(DESTDIR)$(toolexeclibgohtmldir)" \
@@ -137,43 +137,36 @@ am__DEPENDENCIES_2 = bufio/bufio.lo bytes/bytes.lo bytes/index.lo \
        crypto/crypto.lo errors/errors.lo expvar/expvar.lo \
        flag/flag.lo fmt/fmt.lo hash/hash.lo html/html.lo \
        image/image.lo io/io.lo log/log.lo math/math.lo net/net.lo \
-       os/exec.lo os/os.lo patch/patch.lo path/path.lo \
-       reflect/reflect.lo regexp/regexp.lo runtime/runtime.lo \
-       sort/sort.lo strconv/strconv.lo strings/strings.lo \
-       sync/sync.lo time/time.lo unicode/unicode.lo \
-       websocket/websocket.lo archive/tar.lo archive/zip.lo \
+       os/exec.lo os/os.lo path/path.lo reflect/reflect.lo \
+       regexp/regexp.lo runtime/runtime.lo sort/sort.lo \
+       strconv/strconv.lo strings/strings.lo sync/sync.lo \
+       time/time.lo unicode/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/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 crypto/rand.lo crypto/rc4.lo \
-       crypto/ripemd160.lo crypto/rsa.lo crypto/sha1.lo \
-       crypto/sha256.lo crypto/sha512.lo crypto/subtle.lo \
-       crypto/tls.lo crypto/twofish.lo crypto/x509.lo crypto/xtea.lo \
-       crypto/openpgp/armor.lo crypto/openpgp/elgamal.lo \
-       crypto/openpgp/error.lo crypto/openpgp/packet.lo \
-       crypto/openpgp/s2k.lo crypto/x509/pkix.lo debug/dwarf.lo \
-       debug/elf.lo debug/gosym.lo debug/macho.lo debug/pe.lo \
-       encoding/ascii85.lo encoding/asn1.lo encoding/base32.lo \
-       encoding/base64.lo encoding/binary.lo encoding/csv.lo \
-       encoding/git85.lo encoding/gob.lo encoding/hex.lo \
+       crypto/elliptic.lo crypto/hmac.lo crypto/md5.lo crypto/rand.lo \
+       crypto/rc4.lo crypto/rsa.lo crypto/sha1.lo crypto/sha256.lo \
+       crypto/sha512.lo crypto/subtle.lo crypto/tls.lo crypto/x509.lo \
+       crypto/x509/pkix.lo database/sql.lo database/sql/driver.lo \
+       debug/dwarf.lo debug/elf.lo debug/gosym.lo debug/macho.lo \
+       debug/pe.lo encoding/ascii85.lo encoding/asn1.lo \
+       encoding/base32.lo encoding/base64.lo encoding/binary.lo \
+       encoding/csv.lo encoding/gob.lo encoding/hex.lo \
        encoding/json.lo encoding/pem.lo encoding/xml.lo exp/ebnf.lo \
-       exp/norm.lo exp/spdy.lo exp/sql.lo exp/ssh.lo exp/terminal.lo \
-       exp/types.lo exp/sql/driver.lo html/template.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 net/http/cgi.lo net/http/fcgi.lo \
-       net/http/httptest.lo net/http/httputil.lo net/http/pprof.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 log/syslog.lo \
-       log/syslog/syslog_c.lo math/big.lo math/cmplx.lo math/rand.lo \
-       mime/mime.lo mime/multipart.lo net/dict.lo net/http.lo \
+       exp/html.lo exp/norm.lo exp/proxy.lo exp/signal.lo \
+       exp/terminal.lo exp/types.lo exp/utf8string.lo \
+       html/template.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 net/http/cgi.lo \
+       net/http/fcgi.lo net/http/httptest.lo net/http/httputil.lo \
+       net/http/pprof.lo image/color.lo image/draw.lo image/gif.lo \
+       image/jpeg.lo image/png.lo index/suffixarray.lo io/ioutil.lo \
+       log/syslog.lo log/syslog/syslog_c.lo math/big.lo math/cmplx.lo \
+       math/rand.lo mime/mime.lo mime/multipart.lo net/http.lo \
        net/mail.lo net/rpc.lo net/smtp.lo net/textproto.lo net/url.lo \
        old/netchan.lo old/regexp.lo old/template.lo \
-       $(am__DEPENDENCIES_1) os/user.lo os/signal.lo path/filepath.lo \
+       $(am__DEPENDENCIES_1) 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 \
        syscall/syscall.lo syscall/errno.lo syscall/wait.lo \
@@ -199,16 +192,18 @@ am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
        runtime/go-interface-val-compare.c runtime/go-make-slice.c \
        runtime/go-map-delete.c runtime/go-map-index.c \
        runtime/go-map-len.c runtime/go-map-range.c \
-       runtime/go-nanotime.c runtime/go-now.c runtime/go-new-map.c \
-       runtime/go-new.c runtime/go-panic.c runtime/go-print.c \
-       runtime/go-recover.c runtime/go-reflect.c \
-       runtime/go-reflect-call.c runtime/go-reflect-map.c \
-       runtime/go-rune.c runtime/go-runtime-error.c \
-       runtime/go-setenv.c runtime/go-signal.c runtime/go-strcmp.c \
+       runtime/go-matherr.c runtime/go-nanotime.c runtime/go-now.c \
+       runtime/go-new-map.c runtime/go-new.c runtime/go-nosys.c \
+       runtime/go-panic.c runtime/go-print.c runtime/go-recover.c \
+       runtime/go-reflect.c runtime/go-reflect-call.c \
+       runtime/go-reflect-map.c runtime/go-rune.c \
+       runtime/go-runtime-error.c runtime/go-setenv.c \
+       runtime/go-signal.c runtime/go-strcmp.c \
        runtime/go-string-to-byte-array.c \
        runtime/go-string-to-int-array.c runtime/go-strplus.c \
        runtime/go-strslice.c runtime/go-trampoline.c \
-       runtime/go-type-eface.c runtime/go-type-error.c \
+       runtime/go-type-complex.c runtime/go-type-eface.c \
+       runtime/go-type-error.c runtime/go-type-float.c \
        runtime/go-type-identity.c runtime/go-type-interface.c \
        runtime/go-type-string.c runtime/go-typedesc-equal.c \
        runtime/go-typestring.c runtime/go-unreflect.c \
@@ -236,21 +231,23 @@ am__objects_4 = go-append.lo go-assert.lo go-assert-interface.lo \
        go-int-array-to-string.lo go-int-to-string.lo \
        go-interface-compare.lo go-interface-eface-compare.lo \
        go-interface-val-compare.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-now.lo go-new-map.lo go-new.lo go-panic.lo go-print.lo \
-       go-recover.lo go-reflect.lo go-reflect-call.lo \
-       go-reflect-map.lo go-rune.lo go-runtime-error.lo go-setenv.lo \
-       go-signal.lo go-strcmp.lo go-string-to-byte-array.lo \
-       go-string-to-int-array.lo go-strplus.lo go-strslice.lo \
-       go-trampoline.lo go-type-eface.lo go-type-error.lo \
-       go-type-identity.lo go-type-interface.lo go-type-string.lo \
-       go-typedesc-equal.lo go-typestring.lo go-unreflect.lo \
-       go-unsafe-new.lo go-unsafe-newarray.lo go-unsafe-pointer.lo \
-       go-unwind.lo chan.lo cpuprof.lo $(am__objects_1) mcache.lo \
-       mcentral.lo $(am__objects_2) mfinal.lo mfixalloc.lo mgc0.lo \
-       mheap.lo msize.lo proc.lo runtime.lo thread.lo yield.lo \
-       $(am__objects_3) iface.lo malloc.lo map.lo mprof.lo reflect.lo \
-       runtime1.lo sema.lo sigqueue.lo string.lo time.lo
+       go-map-index.lo go-map-len.lo go-map-range.lo go-matherr.lo \
+       go-nanotime.lo go-now.lo go-new-map.lo go-new.lo go-nosys.lo \
+       go-panic.lo go-print.lo go-recover.lo go-reflect.lo \
+       go-reflect-call.lo go-reflect-map.lo go-rune.lo \
+       go-runtime-error.lo go-setenv.lo go-signal.lo go-strcmp.lo \
+       go-string-to-byte-array.lo go-string-to-int-array.lo \
+       go-strplus.lo go-strslice.lo go-trampoline.lo \
+       go-type-complex.lo go-type-eface.lo go-type-error.lo \
+       go-type-float.lo go-type-identity.lo go-type-interface.lo \
+       go-type-string.lo go-typedesc-equal.lo go-typestring.lo \
+       go-unreflect.lo go-unsafe-new.lo go-unsafe-newarray.lo \
+       go-unsafe-pointer.lo go-unwind.lo chan.lo cpuprof.lo \
+       $(am__objects_1) mcache.lo mcentral.lo $(am__objects_2) \
+       mfinal.lo mfixalloc.lo mgc0.lo mheap.lo msize.lo proc.lo \
+       runtime.lo thread.lo yield.lo $(am__objects_3) iface.lo \
+       malloc.lo map.lo mprof.lo reflect.lo runtime1.lo sema.lo \
+       sigqueue.lo string.lo time.lo
 am_libgo_la_OBJECTS = $(am__objects_4)
 libgo_la_OBJECTS = $(am_libgo_la_OBJECTS)
 libgo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -286,10 +283,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        ps-recursive uninstall-recursive
 DATA = $(toolexeclibgo_DATA) $(toolexeclibgoarchive_DATA) \
        $(toolexeclibgocompress_DATA) $(toolexeclibgocontainer_DATA) \
-       $(toolexeclibgocrypto_DATA) $(toolexeclibgocryptoopenpgp_DATA) \
-       $(toolexeclibgocryptox509_DATA) $(toolexeclibgodebug_DATA) \
-       $(toolexeclibgoencoding_DATA) $(toolexeclibgoexp_DATA) \
-       $(toolexeclibgoexpsql_DATA) $(toolexeclibgogo_DATA) \
+       $(toolexeclibgocrypto_DATA) $(toolexeclibgocryptox509_DATA) \
+       $(toolexeclibgodatabase_DATA) $(toolexeclibgodatabasesql_DATA) \
+       $(toolexeclibgodebug_DATA) $(toolexeclibgoencoding_DATA) \
+       $(toolexeclibgoexp_DATA) $(toolexeclibgogo_DATA) \
        $(toolexeclibgohash_DATA) $(toolexeclibgohtml_DATA) \
        $(toolexeclibgoimage_DATA) $(toolexeclibgoindex_DATA) \
        $(toolexeclibgoio_DATA) $(toolexeclibgolog_DATA) \
@@ -395,6 +392,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MATH_FLAG = @MATH_FLAG@
 MATH_LIBS = @MATH_LIBS@
 MKDIR_P = @MKDIR_P@
 NET_LIBS = @NET_LIBS@
@@ -453,7 +451,6 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
-glibgo_prefixdir = @glibgo_prefixdir@
 glibgo_toolexecdir = @glibgo_toolexecdir@
 glibgo_toolexeclibdir = @glibgo_toolexeclibdir@
 go_include = @go_include@
@@ -474,6 +471,7 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 multi_basedir = @multi_basedir@
+nover_glibgo_toolexeclibdir = @nover_glibgo_toolexeclibdir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -503,13 +501,14 @@ PWD_COMMAND = $${PWDCMD-pwd}
 STAMP = echo timestamp >
 toolexecdir = $(glibgo_toolexecdir)
 toolexeclibdir = $(glibgo_toolexeclibdir)
+toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
 WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
 
 # -I/-D flags to pass when compiling.
 AM_CPPFLAGS = -I $(srcdir)/runtime $(LIBFFIINCS) $(PTHREAD_CFLAGS)
 ACLOCAL_AMFLAGS = -I ./config -I ../config
 AM_CFLAGS = -fexceptions -fplan9-extensions $(SPLIT_STACK) $(WARN_CFLAGS) \
-       $(STRINGOPS_FLAG) \
+       $(STRINGOPS_FLAG) $(OSCFLAGS) \
        -I $(srcdir)/../libgcc -I $(MULTIBUILDTOP)../../gcc/include
 
 @USING_SPLIT_STACK_TRUE@AM_LDFLAGS = -XCClinker $(SPLIT_STACK)
@@ -566,7 +565,6 @@ AM_MAKEFLAGS = \
 FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 toolexeclib_LTLIBRARIES = libgo.la
 toolexeclib_LIBRARIES = libgobegin.a
-toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias)
 toolexeclibgo_DATA = \
        bufio.gox \
        bytes.gox \
@@ -584,7 +582,6 @@ toolexeclibgo_DATA = \
        mime.gox \
        net.gox \
        os.gox \
-       patch.gox \
        path.gox \
        reflect.gox \
        regexp.gox \
@@ -596,8 +593,7 @@ toolexeclibgo_DATA = \
        syscall.gox \
        testing.gox \
        time.gox \
-       unicode.gox \
-       websocket.gox
+       unicode.gox
 
 toolexeclibgoarchivedir = $(toolexeclibgodir)/archive
 toolexeclibgoarchive_DATA = \
@@ -621,44 +617,35 @@ toolexeclibgocontainer_DATA = \
 toolexeclibgocryptodir = $(toolexeclibgodir)/crypto
 toolexeclibgocrypto_DATA = \
        crypto/aes.gox \
-       crypto/bcrypt.gox \
-       crypto/blowfish.gox \
-       crypto/cast5.gox \
        crypto/cipher.gox \
        crypto/des.gox \
        crypto/dsa.gox \
        crypto/ecdsa.gox \
        crypto/elliptic.gox \
        crypto/hmac.gox \
-       crypto/md4.gox \
        crypto/md5.gox \
-       crypto/ocsp.gox \
-       crypto/openpgp.gox \
        crypto/rand.gox \
        crypto/rc4.gox \
-       crypto/ripemd160.gox \
        crypto/rsa.gox \
        crypto/sha1.gox \
        crypto/sha256.gox \
        crypto/sha512.gox \
        crypto/subtle.gox \
        crypto/tls.gox \
-       crypto/twofish.gox \
-       crypto/x509.gox \
-       crypto/xtea.gox
-
-toolexeclibgocryptoopenpgpdir = $(toolexeclibgocryptodir)/openpgp
-toolexeclibgocryptoopenpgp_DATA = \
-       crypto/openpgp/armor.gox \
-       crypto/openpgp/elgamal.gox \
-       crypto/openpgp/error.gox \
-       crypto/openpgp/packet.gox \
-       crypto/openpgp/s2k.gox
+       crypto/x509.gox
 
 toolexeclibgocryptox509dir = $(toolexeclibgocryptodir)/x509
 toolexeclibgocryptox509_DATA = \
        crypto/x509/pkix.gox
 
+toolexeclibgodatabasedir = $(toolexeclibgodir)/database
+toolexeclibgodatabase_DATA = \
+       database/sql.gox
+
+toolexeclibgodatabasesqldir = $(toolexeclibgodatabasedir)/sql
+toolexeclibgodatabasesql_DATA = \
+       database/sql/driver.gox
+
 toolexeclibgodebugdir = $(toolexeclibgodir)/debug
 toolexeclibgodebug_DATA = \
        debug/dwarf.gox \
@@ -675,7 +662,6 @@ toolexeclibgoencoding_DATA = \
        encoding/base64.gox \
        encoding/binary.gox \
        encoding/csv.gox \
-       encoding/git85.gox \
        encoding/gob.gox \
        encoding/hex.gox \
        encoding/json.gox \
@@ -689,17 +675,14 @@ toolexeclibgoencoding_DATA = \
 toolexeclibgoexpdir = $(toolexeclibgodir)/exp
 toolexeclibgoexp_DATA = \
        exp/ebnf.gox \
+       exp/html.gox \
        $(exp_inotify_gox) \
        exp/norm.gox \
-       exp/spdy.gox \
-       exp/sql.gox \
-       exp/ssh.gox \
+       exp/proxy.gox \
+       exp/signal.gox \
        exp/terminal.gox \
-       exp/types.gox
-
-toolexeclibgoexpsqldir = $(toolexeclibgoexpdir)/sql
-toolexeclibgoexpsql_DATA = \
-       exp/sql/driver.gox
+       exp/types.gox \
+       exp/utf8string.gox
 
 toolexeclibgogodir = $(toolexeclibgodir)/go
 toolexeclibgogo_DATA = \
@@ -724,14 +707,11 @@ toolexeclibgohtml_DATA = \
 
 toolexeclibgoimagedir = $(toolexeclibgodir)/image
 toolexeclibgoimage_DATA = \
-       image/bmp.gox \
        image/color.gox \
        image/draw.gox \
        image/gif.gox \
        image/jpeg.gox \
-       image/png.gox \
-       image/tiff.gox \
-       image/ycbcr.gox
+       image/png.gox
 
 toolexeclibgoindexdir = $(toolexeclibgodir)/index
 toolexeclibgoindex_DATA = \
@@ -757,7 +737,6 @@ toolexeclibgomime_DATA = \
 
 toolexeclibgonetdir = $(toolexeclibgodir)/net
 toolexeclibgonet_DATA = \
-       net/dict.gox \
        net/http.gox \
        net/mail.gox \
        net/rpc.gox \
@@ -786,8 +765,7 @@ toolexeclibgoold_DATA = \
 toolexeclibgoosdir = $(toolexeclibgodir)/os
 toolexeclibgoos_DATA = \
        os/exec.gox \
-       os/user.gox \
-       os/signal.gox
+       os/user.gox
 
 toolexeclibgopathdir = $(toolexeclibgodir)/path
 toolexeclibgopath_DATA = \
@@ -861,10 +839,12 @@ runtime_files = \
        runtime/go-map-index.c \
        runtime/go-map-len.c \
        runtime/go-map-range.c \
+       runtime/go-matherr.c \
        runtime/go-nanotime.c \
        runtime/go-now.c \
        runtime/go-new-map.c \
        runtime/go-new.c \
+       runtime/go-nosys.c \
        runtime/go-panic.c \
        runtime/go-print.c \
        runtime/go-recover.c \
@@ -881,8 +861,10 @@ runtime_files = \
        runtime/go-strplus.c \
        runtime/go-strslice.c \
        runtime/go-trampoline.c \
+       runtime/go-type-complex.c \
        runtime/go-type-eface.c \
        runtime/go-type-error.c \
+       runtime/go-type-float.c \
        runtime/go-type-identity.c \
        runtime/go-type-interface.c \
        runtime/go-type-string.c \
@@ -953,21 +935,15 @@ go_hash_files = \
        go/hash/hash.go
 
 go_html_files = \
-       go/html/const.go \
-       go/html/doc.go \
-       go/html/doctype.go \
        go/html/entity.go \
-       go/html/escape.go \
-       go/html/node.go \
-       go/html/parse.go \
-       go/html/render.go \
-       go/html/token.go
+       go/html/escape.go
 
 go_image_files = \
        go/image/format.go \
        go/image/geom.go \
        go/image/image.go \
-       go/image/names.go
+       go/image/names.go \
+       go/image/ycbcr.go
 
 go_io_files = \
        go/io/multi.go \
@@ -992,14 +968,11 @@ go_math_files = \
        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/floor.go \
        go/math/frexp.go \
        go/math/gamma.go \
        go/math/hypot.go \
-       go/math/hypot_port.go \
        go/math/j0.go \
        go/math/j1.go \
        go/math/jn.go \
@@ -1020,7 +993,6 @@ go_math_files = \
        go/math/sincos.go \
        go/math/sinh.go \
        go/math/sqrt.go \
-       go/math/sqrt_port.go \
        go/math/tan.go \
        go/math/tanh.go \
        go/math/unsafe.go
@@ -1033,10 +1005,12 @@ go_mime_files = \
 
 # By default use select with pipes.  Most systems should have
 # something better.
-@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_FALSE@go_net_fd_os_file = go/net/fd_select.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_RTEMS_FALSE@go_net_fd_os_file = go/net/fd_select.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@@LIBGO_IS_RTEMS_FALSE@go_net_fd_os_file = go/net/fd_netbsd.go
 @LIBGO_IS_LINUX_TRUE@@LIBGO_IS_RTEMS_FALSE@go_net_fd_os_file = go/net/fd_linux.go
 @LIBGO_IS_RTEMS_TRUE@go_net_fd_os_file = go/net/fd_select.go
-@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_FALSE@go_net_newpollserver_file = go/net/newpollserver.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_RTEMS_FALSE@go_net_newpollserver_file = go/net/newpollserver.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@@LIBGO_IS_RTEMS_FALSE@go_net_newpollserver_file = go/net/newpollserver.go
 @LIBGO_IS_LINUX_TRUE@@LIBGO_IS_RTEMS_FALSE@go_net_newpollserver_file = go/net/newpollserver.go
 @LIBGO_IS_RTEMS_TRUE@go_net_newpollserver_file = go/net/newpollserver_rtems.go
 @LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_cgo_file = go/net/cgo_bsd.go
@@ -1047,9 +1021,18 @@ go_mime_files = \
 @LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sock_file = go/net/sock_linux.go
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sock_file = go/net/sock_linux.go
 @LIBGO_IS_LINUX_TRUE@go_net_sock_file = go/net/sock_linux.go
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockopt_file = go/net/sockopt_bsd.go
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sockopt_file = go/net/sockopt_linux.go
+@LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sockopt_file = go/net/sockopt_linux.go
+@LIBGO_IS_LINUX_TRUE@go_net_sockopt_file = go/net/sockopt_linux.go
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockoptip_file = go/net/sockoptip_bsd.go
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sockoptip_file = go/net/sockoptip_linux.go
+@LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sockoptip_file = go/net/sockoptip_linux.go
+@LIBGO_IS_LINUX_TRUE@go_net_sockoptip_file = go/net/sockoptip_linux.go
 @LIBGO_IS_LINUX_FALSE@go_net_sendfile_file = go/net/sendfile_stub.go
 @LIBGO_IS_LINUX_TRUE@go_net_sendfile_file = go/net/sendfile_linux.go
-@LIBGO_IS_LINUX_FALSE@go_net_interface_file = go/net/interface_stub.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@go_net_interface_file = go/net/interface_stub.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@go_net_interface_file = go/net/interface_netbsd.go
 @LIBGO_IS_LINUX_TRUE@go_net_interface_file = go/net/interface_linux.go
 go_net_files = \
        go/net/cgo_unix.go \
@@ -1059,6 +1042,7 @@ go_net_files = \
        go/net/dnsclient_unix.go \
        go/net/dnsconfig.go \
        go/net/dnsmsg.go \
+       go/net/doc.go \
        $(go_net_newpollserver_file) \
        go/net/fd.go \
        $(go_net_fd_os_file) \
@@ -1079,6 +1063,10 @@ go_net_files = \
        $(go_net_sendfile_file) \
        go/net/sock.go \
        $(go_net_sock_file) \
+       go/net/sockopt.go \
+       $(go_net_sockopt_file) \
+       go/net/sockoptip.go \
+       $(go_net_sockoptip_file) \
        go/net/tcpsock.go \
        go/net/tcpsock_posix.go \
        go/net/udpsock.go \
@@ -1096,9 +1084,12 @@ go_net_files = \
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_os_sys_file = go/os/sys_uname.go
 @LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_os_sys_file = go/os/sys_uname.go
 @LIBGO_IS_LINUX_TRUE@go_os_sys_file = go/os/sys_linux.go
+@LIBGO_IS_SOLARIS_FALSE@go_os_stat_file = go/os/stat.go
+@LIBGO_IS_SOLARIS_TRUE@go_os_stat_file = go/os/stat_solaris.go
 go_os_files = \
        $(go_os_dir_file) \
        go/os/dir.go \
+       go/os/doc.go \
        go/os/env.go \
        go/os/error.go \
        go/os/error_posix.go \
@@ -1112,19 +1103,13 @@ go_os_files = \
        go/os/path.go \
        go/os/path_unix.go \
        go/os/proc.go \
-       go/os/stat.go \
+       $(go_os_stat_file) \
        go/os/str.go \
        $(go_os_sys_file) \
        go/os/time.go \
        go/os/types.go \
        signal_unix.go
 
-go_patch_files = \
-       go/patch/apply.go \
-       go/patch/git.go \
-       go/patch/patch.go \
-       go/patch/textdiff.go
-
 go_path_files = \
        go/path/match.go \
        go/path/path.go
@@ -1162,6 +1147,7 @@ go_strconv_files = \
        go/strconv/atof.go \
        go/strconv/atoi.go \
        go/strconv/decimal.go \
+       go/strconv/extfloat.go \
        go/strconv/ftoa.go \
        go/strconv/itoa.go \
        go/strconv/quote.go
@@ -1196,7 +1182,6 @@ go_testing_files = \
 go_time_files = \
        go/time/format.go \
        go/time/sleep.go \
-       go/time/sys.go \
        go/time/sys_unix.go \
        go/time/tick.go \
        go/time/time.go \
@@ -1210,13 +1195,6 @@ go_unicode_files = \
        go/unicode/letter.go \
        go/unicode/tables.go
 
-go_websocket_files = \
-       go/websocket/client.go \
-       go/websocket/hixie.go \
-       go/websocket/hybi.go \
-       go/websocket/server.go \
-       go/websocket/websocket.go
-
 go_archive_tar_files = \
        go/archive/tar/common.go \
        go/archive/tar/reader.go \
@@ -1239,8 +1217,7 @@ go_compress_flate_files = \
        go/compress/flate/huffman_code.go \
        go/compress/flate/inflate.go \
        go/compress/flate/reverse_bits.go \
-       go/compress/flate/token.go \
-       go/compress/flate/util.go
+       go/compress/flate/token.go
 
 go_compress_gzip_files = \
        go/compress/gzip/gzip.go \
@@ -1268,25 +1245,12 @@ go_crypto_aes_files = \
        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 \
-       go/crypto/blowfish/cipher.go
-
-go_crypto_cast5_files = \
-       go/crypto/cast5/cast5.go
-
 go_crypto_cipher_files = \
        go/crypto/cipher/cbc.go \
        go/crypto/cipher/cfb.go \
        go/crypto/cipher/cipher.go \
        go/crypto/cipher/ctr.go \
        go/crypto/cipher/io.go \
-       go/crypto/cipher/ocfb.go \
        go/crypto/cipher/ofb.go
 
 go_crypto_des_files = \
@@ -1301,28 +1265,16 @@ go_crypto_ecdsa_files = \
        go/crypto/ecdsa/ecdsa.go
 
 go_crypto_elliptic_files = \
-       go/crypto/elliptic/elliptic.go
+       go/crypto/elliptic/elliptic.go \
+       go/crypto/elliptic/p224.go
 
 go_crypto_hmac_files = \
        go/crypto/hmac/hmac.go
 
-go_crypto_md4_files = \
-       go/crypto/md4/md4.go \
-       go/crypto/md4/md4block.go
-
 go_crypto_md5_files = \
        go/crypto/md5/md5.go \
        go/crypto/md5/md5block.go
 
-go_crypto_ocsp_files = \
-       go/crypto/ocsp/ocsp.go
-
-go_crypto_openpgp_files = \
-       go/crypto/openpgp/canonical_text.go \
-       go/crypto/openpgp/keys.go \
-       go/crypto/openpgp/read.go \
-       go/crypto/openpgp/write.go
-
 go_crypto_rand_files = \
        go/crypto/rand/rand.go \
        go/crypto/rand/rand_unix.go \
@@ -1331,10 +1283,6 @@ go_crypto_rand_files = \
 go_crypto_rc4_files = \
        go/crypto/rc4/rc4.go
 
-go_crypto_ripemd160_files = \
-       go/crypto/ripemd160/ripemd160.go \
-       go/crypto/ripemd160/ripemd160block.go
-
 go_crypto_rsa_files = \
        go/crypto/rsa/pkcs1v15.go \
        go/crypto/rsa/rsa.go
@@ -1367,9 +1315,6 @@ go_crypto_tls_files = \
        go/crypto/tls/root_unix.go \
        go/crypto/tls/tls.go
 
-go_crypto_twofish_files = \
-       go/crypto/twofish/twofish.go
-
 go_crypto_x509_files = \
        go/crypto/x509/cert_pool.go \
        go/crypto/x509/pkcs1.go \
@@ -1377,40 +1322,17 @@ go_crypto_x509_files = \
        go/crypto/x509/verify.go \
        go/crypto/x509/x509.go
 
-go_crypto_xtea_files = \
-       go/crypto/xtea/block.go \
-       go/crypto/xtea/cipher.go
-
-go_crypto_openpgp_armor_files = \
-       go/crypto/openpgp/armor/armor.go \
-       go/crypto/openpgp/armor/encode.go
-
-go_crypto_openpgp_elgamal_files = \
-       go/crypto/openpgp/elgamal/elgamal.go
-
-go_crypto_openpgp_error_files = \
-       go/crypto/openpgp/error/error.go
-
-go_crypto_openpgp_packet_files = \
-       go/crypto/openpgp/packet/compressed.go \
-       go/crypto/openpgp/packet/encrypted_key.go \
-       go/crypto/openpgp/packet/literal.go \
-       go/crypto/openpgp/packet/one_pass_signature.go \
-       go/crypto/openpgp/packet/packet.go \
-       go/crypto/openpgp/packet/private_key.go \
-       go/crypto/openpgp/packet/public_key.go \
-       go/crypto/openpgp/packet/reader.go \
-       go/crypto/openpgp/packet/signature.go \
-       go/crypto/openpgp/packet/symmetric_key_encrypted.go \
-       go/crypto/openpgp/packet/symmetrically_encrypted.go \
-       go/crypto/openpgp/packet/userid.go
-
-go_crypto_openpgp_s2k_files = \
-       go/crypto/openpgp/s2k/s2k.go
-
 go_crypto_x509_pkix_files = \
        go/crypto/x509/pkix/pkix.go
 
+go_database_sql_files = \
+       go/database/sql/convert.go \
+       go/database/sql/sql.go
+
+go_database_sql_driver_files = \
+       go/database/sql/driver/driver.go \
+       go/database/sql/driver/types.go
+
 go_debug_dwarf_files = \
        go/debug/dwarf/buf.go \
        go/debug/dwarf/const.go \
@@ -1457,9 +1379,6 @@ go_encoding_csv_files = \
        go/encoding/csv/reader.go \
        go/encoding/csv/writer.go
 
-go_encoding_git85_files = \
-       go/encoding/git85/git.go
-
 go_encoding_gob_files = \
        go/encoding/gob/decode.go \
        go/encoding/gob/decoder.go \
@@ -1486,12 +1405,25 @@ go_encoding_pem_files = \
 go_encoding_xml_files = \
        go/encoding/xml/marshal.go \
        go/encoding/xml/read.go \
+       go/encoding/xml/typeinfo.go \
        go/encoding/xml/xml.go
 
 go_exp_ebnf_files = \
        go/exp/ebnf/ebnf.go \
        go/exp/ebnf/parser.go
 
+go_exp_html_files = \
+       go/exp/html/const.go \
+       go/exp/html/doc.go \
+       go/exp/html/doctype.go \
+       go/exp/html/entity.go \
+       go/exp/html/escape.go \
+       go/exp/html/foreign.go \
+       go/exp/html/node.go \
+       go/exp/html/parse.go \
+       go/exp/html/render.go \
+       go/exp/html/token.go
+
 go_exp_inotify_files = \
        go/exp/inotify/inotify_linux.go
 
@@ -1504,28 +1436,14 @@ go_exp_norm_files = \
        go/exp/norm/tables.go \
        go/exp/norm/trie.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/cipher.go \
-       go/exp/ssh/client.go \
-       go/exp/ssh/client_auth.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/session.go \
-       go/exp/ssh/tcpip.go \
-       go/exp/ssh/transport.go
+go_exp_proxy_files = \
+       go/exp/proxy/direct.go \
+       go/exp/proxy/per_host.go \
+       go/exp/proxy/proxy.go \
+       go/exp/proxy/socks5.go
+
+go_exp_signal_files = \
+       go/exp/signal/signal.go
 
 go_exp_terminal_files = \
        go/exp/terminal/terminal.go \
@@ -1539,9 +1457,8 @@ go_exp_types_files = \
        go/exp/types/types.go \
        go/exp/types/universe.go
 
-go_exp_sql_driver_files = \
-       go/exp/sql/driver/driver.go \
-       go/exp/sql/driver/types.go
+go_exp_utf8string_files = \
+       go/exp/utf8string/string.go
 
 go_go_ast_files = \
        go/go/ast/ast.go \
@@ -1561,7 +1478,10 @@ go_go_build_files = \
 go_go_doc_files = \
        go/go/doc/comment.go \
        go/go/doc/doc.go \
-       go/go/doc/example.go
+       go/go/doc/example.go \
+       go/go/doc/exports.go \
+       go/go/doc/filter.go \
+       go/go/doc/reader.go
 
 go_go_parser_files = \
        go/go/parser/interface.go \
@@ -1608,11 +1528,9 @@ go_html_template_files = \
        go/html/template/transition.go \
        go/html/template/url.go
 
-go_image_bmp_files = \
-       go/image/bmp/reader.go
-
 go_image_color_files = \
-       go/image/color/color.go
+       go/image/color/color.go \
+       go/image/color/ycbcr.go
 
 go_image_draw_files = \
        go/image/draw/draw.go
@@ -1631,15 +1549,6 @@ go_image_png_files = \
        go/image/png/reader.go \
        go/image/png/writer.go
 
-go_image_tiff_files = \
-       go/image/tiff/buffer.go \
-       go/image/tiff/compress.go \
-       go/image/tiff/consts.go \
-       go/image/tiff/reader.go
-
-go_image_ycbcr_files = \
-       go/image/ycbcr/ycbcr.go
-
 go_index_suffixarray_files = \
        go/index/suffixarray/qsufsort.go \
        go/index/suffixarray/suffixarray.go
@@ -1682,9 +1591,6 @@ go_mime_multipart_files = \
        go/mime/multipart/multipart.go \
        go/mime/multipart/writer.go
 
-go_net_dict_files = \
-       go/net/dict/dict.go
-
 go_net_http_files = \
        go/net/http/chunked.go \
        go/net/http/client.go \
@@ -1692,6 +1598,7 @@ go_net_http_files = \
        go/net/http/filetransport.go \
        go/net/http/fs.go \
        go/net/http/header.go \
+       go/net/http/jar.go \
        go/net/http/lex.go \
        go/net/http/request.go \
        go/net/http/response.go \
@@ -1761,9 +1668,6 @@ go_os_user_files = \
        go/os/user/user.go \
        go/os/user/lookup_unix.go
 
-go_os_signal_files = \
-       go/os/signal/signal.go
-
 go_path_filepath_files = \
        go/path/filepath/match.go \
        go/path/filepath/path.go \
@@ -1826,17 +1730,20 @@ go_unicode_utf16_files = \
        go/unicode/utf16/utf16.go
 
 go_unicode_utf8_files = \
-       go/unicode/utf8/string.go \
        go/unicode/utf8/utf8.go
 
 @LIBGO_IS_RTEMS_FALSE@syscall_syscall_file = go/syscall/syscall_unix.go
 
 # Define Syscall and Syscall6.
 @LIBGO_IS_RTEMS_TRUE@syscall_syscall_file = go/syscall/syscall_stubs.go
-@LIBGO_IS_RTEMS_FALSE@syscall_exec_file = go/syscall/exec_unix.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_FALSE@syscall_exec_file = go/syscall/exec_unix.go
+@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_RTEMS_FALSE@syscall_exec_file = go/syscall/exec_unix.go
 
 # Define ForkExec and Exec.
 @LIBGO_IS_RTEMS_TRUE@syscall_exec_file = go/syscall/exec_stubs.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_FALSE@syscall_exec_os_file = go/syscall/exec_bsd.go
+@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_RTEMS_FALSE@syscall_exec_os_file = go/syscall/exec_linux.go
+@LIBGO_IS_RTEMS_TRUE@syscall_exec_os_file = 
 @HAVE_WAIT4_FALSE@@LIBGO_IS_RTEMS_FALSE@syscall_wait_file = go/syscall/libcall_waitpid.go
 @HAVE_WAIT4_TRUE@@LIBGO_IS_RTEMS_FALSE@syscall_wait_file = go/syscall/libcall_wait4.go
 
@@ -1880,19 +1787,31 @@ go_unicode_utf8_files = \
 # 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 = go/syscall/libcall_uname.go
+@LIBGO_IS_LINUX_FALSE@syscall_sockcmsg_file = 
+
+# GNU/Linux specific socket control messages.
+@LIBGO_IS_LINUX_TRUE@syscall_sockcmsg_file = go/syscall/sockcmsg_linux.go
 @LIBGO_IS_LINUX_FALSE@syscall_netlink_file = 
 
 # Support for netlink sockets and messages.
 @LIBGO_IS_LINUX_TRUE@syscall_netlink_file = go/syscall/netlink_linux.go
+@LIBGO_IS_LINUX_FALSE@syscall_lsf_file = 
+
+# GNU/Linux specific socket filters.
+@LIBGO_IS_LINUX_TRUE@syscall_lsf_file = go/syscall/lsf_linux.go
 go_base_syscall_files = \
        go/syscall/env_unix.go \
+       go/syscall/syscall_errno.go \
        go/syscall/libcall_support.go \
        go/syscall/libcall_posix.go \
        go/syscall/socket.go \
+       go/syscall/sockcmsg_unix.go \
        go/syscall/str.go \
        go/syscall/syscall.go \
+       $(syscall_sockcmsg_file) \
        $(syscall_syscall_file) \
        $(syscall_exec_file) \
+       $(syscall_exec_os_file) \
        $(syscall_wait_file) \
        $(syscall_sleep_file) \
        $(syscall_errstr_file) \
@@ -1900,6 +1819,7 @@ go_base_syscall_files = \
        $(syscall_socket_file) \
        $(syscall_uname_file) \
        $(syscall_netlink_file) \
+       $(syscall_lsf_file) \
        $(GO_LIBCALL_OS_FILE) \
        $(GO_LIBCALL_OS_ARCH_FILE) \
        $(GO_SYSCALL_OS_FILE) \
@@ -1937,7 +1857,6 @@ libgo_go_objs = \
        net/net.lo \
        os/exec.lo \
        os/os.lo \
-       patch/patch.lo \
        path/path.lo \
        reflect/reflect.lo \
        regexp/regexp.lo \
@@ -1948,7 +1867,6 @@ libgo_go_objs = \
        sync/sync.lo \
        time/time.lo \
        unicode/unicode.lo \
-       websocket/websocket.lo \
        archive/tar.lo \
        archive/zip.lo \
        compress/bzip2.lo \
@@ -1960,37 +1878,25 @@ libgo_go_objs = \
        container/list.lo \
        container/ring.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 \
        crypto/rand.lo \
        crypto/rc4.lo \
-       crypto/ripemd160.lo \
        crypto/rsa.lo \
        crypto/sha1.lo \
        crypto/sha256.lo \
        crypto/sha512.lo \
        crypto/subtle.lo \
        crypto/tls.lo \
-       crypto/twofish.lo \
        crypto/x509.lo \
-       crypto/xtea.lo \
-       crypto/openpgp/armor.lo \
-       crypto/openpgp/elgamal.lo \
-       crypto/openpgp/error.lo \
-       crypto/openpgp/packet.lo \
-       crypto/openpgp/s2k.lo \
        crypto/x509/pkix.lo \
+       database/sql.lo \
+       database/sql/driver.lo \
        debug/dwarf.lo \
        debug/elf.lo \
        debug/gosym.lo \
@@ -2002,20 +1908,19 @@ libgo_go_objs = \
        encoding/base64.lo \
        encoding/binary.lo \
        encoding/csv.lo \
-       encoding/git85.lo \
        encoding/gob.lo \
        encoding/hex.lo \
        encoding/json.lo \
        encoding/pem.lo \
        encoding/xml.lo \
        exp/ebnf.lo \
+       exp/html.lo \
        exp/norm.lo \
-       exp/spdy.lo \
-       exp/sql.lo \
-       exp/ssh.lo \
+       exp/proxy.lo \
+       exp/signal.lo \
        exp/terminal.lo \
        exp/types.lo \
-       exp/sql/driver.lo \
+       exp/utf8string.lo \
        html/template.lo \
        go/ast.lo \
        go/build.lo \
@@ -2033,14 +1938,11 @@ libgo_go_objs = \
        net/http/httptest.lo \
        net/http/httputil.lo \
        net/http/pprof.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 \
        log/syslog.lo \
@@ -2050,7 +1952,6 @@ libgo_go_objs = \
        math/rand.lo \
        mime/mime.lo \
        mime/multipart.lo \
-       net/dict.lo \
        net/http.lo \
        net/mail.lo \
        net/rpc.lo \
@@ -2062,7 +1963,6 @@ libgo_go_objs = \
        old/template.lo \
        $(os_lib_inotify_lo) \
        os/user.lo \
-       os/signal.lo \
        path/filepath.lo \
        regexp/syntax.lo \
        net/rpc/jsonrpc.lo \
@@ -2159,7 +2059,6 @@ CHECK_DEPS = libgo.la libgobegin.a \
        $(toolexeclibgocompress_DATA) \
        $(toolexeclibgocontainer_DATA) \
        $(toolexeclibgocrypto_DATA) \
-       $(toolexeclibgocryptoopenpgp_DATA) \
        $(toolexeclibgodebug_DATA) \
        $(toolexeclibgoencoding_DATA) \
        $(toolexeclibgoexp_DATA) \
@@ -2208,7 +2107,6 @@ TEST_PACKAGES = \
        mime/check \
        net/check \
        os/check \
-       patch/check \
        path/check \
        reflect/check \
        regexp/check \
@@ -2219,7 +2117,6 @@ TEST_PACKAGES = \
        sync/check \
        time/check \
        unicode/check \
-       websocket/check \
        archive/tar/check \
        archive/zip/check \
        compress/bzip2/check \
@@ -2231,35 +2128,24 @@ TEST_PACKAGES = \
        container/list/check \
        container/ring/check \
        crypto/aes/check \
-       crypto/bcrypt/check \
-       crypto/blowfish/check \
-       crypto/cast5/check \
        crypto/cipher/check \
        crypto/des/check \
        crypto/dsa/check \
        crypto/ecdsa/check \
        crypto/elliptic/check \
        crypto/hmac/check \
-       crypto/md4/check \
        crypto/md5/check \
-       crypto/ocsp/check \
-       crypto/openpgp/check \
        crypto/rand/check \
        crypto/rc4/check \
-       crypto/ripemd160/check \
        crypto/rsa/check \
        crypto/sha1/check \
        crypto/sha256/check \
        crypto/sha512/check \
        crypto/subtle/check \
        crypto/tls/check \
-       crypto/twofish/check \
        crypto/x509/check \
-       crypto/xtea/check \
-       crypto/openpgp/armor/check \
-       crypto/openpgp/elgamal/check \
-       crypto/openpgp/packet/check \
-       crypto/openpgp/s2k/check \
+       database/sql/check \
+       database/sql/driver/check \
        debug/dwarf/check \
        debug/elf/check \
        debug/macho/check \
@@ -2270,19 +2156,19 @@ TEST_PACKAGES = \
        encoding/base64/check \
        encoding/binary/check \
        encoding/csv/check \
-       encoding/git85/check \
        encoding/gob/check \
        encoding/hex/check \
        encoding/json/check \
        encoding/pem/check \
        encoding/xml/check \
        exp/ebnf/check \
+       exp/html/check \
        $(exp_inotify_check) \
        exp/norm/check \
-       exp/spdy/check \
-       exp/sql/check \
-       exp/ssh/check \
+       exp/proxy/check \
+       exp/signal/check \
        exp/terminal/check \
+       exp/utf8string/check \
        html/template/check \
        go/ast/check \
        $(go_build_check_omitted_since_it_calls_6g) \
@@ -2296,11 +2182,10 @@ TEST_PACKAGES = \
        hash/crc32/check \
        hash/crc64/check \
        hash/fnv/check \
+       image/color/check \
        image/draw/check \
        image/jpeg/check \
        image/png/check \
-       image/tiff/check \
-       image/ycbcr/check \
        index/suffixarray/check \
        io/ioutil/check \
        log/syslog/check \
@@ -2323,7 +2208,6 @@ TEST_PACKAGES = \
        old/template/check \
        os/exec/check \
        os/user/check \
-       os/signal/check \
        path/filepath/check \
        regexp/syntax/check \
        sync/atomic/check \
@@ -2500,9 +2384,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-map-index.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-map-len.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-map-range.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-matherr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-nanotime.Plo@am__quote@
 @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-nosys.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-now.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@
@@ -2520,8 +2406,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-strplus.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-strslice.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-trampoline.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-type-complex.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-type-eface.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-type-error.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-type-float.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-type-identity.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-type-interface.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-type-string.Plo@am__quote@
@@ -2785,6 +2673,13 @@ go-map-range.lo: runtime/go-map-range.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-map-range.lo `test -f 'runtime/go-map-range.c' || echo '$(srcdir)/'`runtime/go-map-range.c
 
+go-matherr.lo: runtime/go-matherr.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-matherr.lo -MD -MP -MF $(DEPDIR)/go-matherr.Tpo -c -o go-matherr.lo `test -f 'runtime/go-matherr.c' || echo '$(srcdir)/'`runtime/go-matherr.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-matherr.Tpo $(DEPDIR)/go-matherr.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-matherr.c' object='go-matherr.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-matherr.lo `test -f 'runtime/go-matherr.c' || echo '$(srcdir)/'`runtime/go-matherr.c
+
 go-nanotime.lo: runtime/go-nanotime.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-nanotime.lo -MD -MP -MF $(DEPDIR)/go-nanotime.Tpo -c -o go-nanotime.lo `test -f 'runtime/go-nanotime.c' || echo '$(srcdir)/'`runtime/go-nanotime.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-nanotime.Tpo $(DEPDIR)/go-nanotime.Plo
@@ -2813,6 +2708,13 @@ go-new.lo: runtime/go-new.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-new.lo `test -f 'runtime/go-new.c' || echo '$(srcdir)/'`runtime/go-new.c
 
+go-nosys.lo: runtime/go-nosys.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-nosys.lo -MD -MP -MF $(DEPDIR)/go-nosys.Tpo -c -o go-nosys.lo `test -f 'runtime/go-nosys.c' || echo '$(srcdir)/'`runtime/go-nosys.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-nosys.Tpo $(DEPDIR)/go-nosys.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-nosys.c' object='go-nosys.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-nosys.lo `test -f 'runtime/go-nosys.c' || echo '$(srcdir)/'`runtime/go-nosys.c
+
 go-panic.lo: runtime/go-panic.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.lo -MD -MP -MF $(DEPDIR)/go-panic.Tpo -c -o go-panic.lo `test -f 'runtime/go-panic.c' || echo '$(srcdir)/'`runtime/go-panic.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-panic.Tpo $(DEPDIR)/go-panic.Plo
@@ -2925,6 +2827,13 @@ go-trampoline.lo: runtime/go-trampoline.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-trampoline.lo `test -f 'runtime/go-trampoline.c' || echo '$(srcdir)/'`runtime/go-trampoline.c
 
+go-type-complex.lo: runtime/go-type-complex.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-type-complex.lo -MD -MP -MF $(DEPDIR)/go-type-complex.Tpo -c -o go-type-complex.lo `test -f 'runtime/go-type-complex.c' || echo '$(srcdir)/'`runtime/go-type-complex.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-type-complex.Tpo $(DEPDIR)/go-type-complex.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-type-complex.c' object='go-type-complex.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-type-complex.lo `test -f 'runtime/go-type-complex.c' || echo '$(srcdir)/'`runtime/go-type-complex.c
+
 go-type-eface.lo: runtime/go-type-eface.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-type-eface.lo -MD -MP -MF $(DEPDIR)/go-type-eface.Tpo -c -o go-type-eface.lo `test -f 'runtime/go-type-eface.c' || echo '$(srcdir)/'`runtime/go-type-eface.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-type-eface.Tpo $(DEPDIR)/go-type-eface.Plo
@@ -2939,6 +2848,13 @@ go-type-error.lo: runtime/go-type-error.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-type-error.lo `test -f 'runtime/go-type-error.c' || echo '$(srcdir)/'`runtime/go-type-error.c
 
+go-type-float.lo: runtime/go-type-float.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-type-float.lo -MD -MP -MF $(DEPDIR)/go-type-float.Tpo -c -o go-type-float.lo `test -f 'runtime/go-type-float.c' || echo '$(srcdir)/'`runtime/go-type-float.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-type-float.Tpo $(DEPDIR)/go-type-float.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-type-float.c' object='go-type-float.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-type-float.lo `test -f 'runtime/go-type-float.c' || echo '$(srcdir)/'`runtime/go-type-float.c
+
 go-type-identity.lo: runtime/go-type-identity.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-type-identity.lo -MD -MP -MF $(DEPDIR)/go-type-identity.Tpo -c -o go-type-identity.lo `test -f 'runtime/go-type-identity.c' || echo '$(srcdir)/'`runtime/go-type-identity.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-type-identity.Tpo $(DEPDIR)/go-type-identity.Plo
@@ -3274,46 +3190,66 @@ uninstall-toolexeclibgocryptoDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgocryptodir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgocryptodir)" && rm -f $$files
-install-toolexeclibgocryptoopenpgpDATA: $(toolexeclibgocryptoopenpgp_DATA)
+install-toolexeclibgocryptox509DATA: $(toolexeclibgocryptox509_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibgocryptoopenpgpdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)"
-       @list='$(toolexeclibgocryptoopenpgp_DATA)'; test -n "$(toolexeclibgocryptoopenpgpdir)" || list=; \
+       test -z "$(toolexeclibgocryptox509dir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgocryptox509dir)"
+       @list='$(toolexeclibgocryptox509_DATA)'; test -n "$(toolexeclibgocryptox509dir)" || 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)$(toolexeclibgocryptoopenpgpdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)" || exit $$?; \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolexeclibgocryptox509dir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgocryptox509dir)" || exit $$?; \
        done
 
-uninstall-toolexeclibgocryptoopenpgpDATA:
+uninstall-toolexeclibgocryptox509DATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(toolexeclibgocryptoopenpgp_DATA)'; test -n "$(toolexeclibgocryptoopenpgpdir)" || list=; \
+       @list='$(toolexeclibgocryptox509_DATA)'; test -n "$(toolexeclibgocryptox509dir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)" && rm -f $$files
-install-toolexeclibgocryptox509DATA: $(toolexeclibgocryptox509_DATA)
+       echo " ( cd '$(DESTDIR)$(toolexeclibgocryptox509dir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgocryptox509dir)" && rm -f $$files
+install-toolexeclibgodatabaseDATA: $(toolexeclibgodatabase_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibgocryptox509dir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgocryptox509dir)"
-       @list='$(toolexeclibgocryptox509_DATA)'; test -n "$(toolexeclibgocryptox509dir)" || list=; \
+       test -z "$(toolexeclibgodatabasedir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgodatabasedir)"
+       @list='$(toolexeclibgodatabase_DATA)'; test -n "$(toolexeclibgodatabasedir)" || 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)$(toolexeclibgocryptox509dir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgocryptox509dir)" || exit $$?; \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolexeclibgodatabasedir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgodatabasedir)" || exit $$?; \
        done
 
-uninstall-toolexeclibgocryptox509DATA:
+uninstall-toolexeclibgodatabaseDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(toolexeclibgocryptox509_DATA)'; test -n "$(toolexeclibgocryptox509dir)" || list=; \
+       @list='$(toolexeclibgodatabase_DATA)'; test -n "$(toolexeclibgodatabasedir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(toolexeclibgocryptox509dir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(toolexeclibgocryptox509dir)" && rm -f $$files
+       echo " ( cd '$(DESTDIR)$(toolexeclibgodatabasedir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgodatabasedir)" && rm -f $$files
+install-toolexeclibgodatabasesqlDATA: $(toolexeclibgodatabasesql_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(toolexeclibgodatabasesqldir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgodatabasesqldir)"
+       @list='$(toolexeclibgodatabasesql_DATA)'; test -n "$(toolexeclibgodatabasesqldir)" || 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)$(toolexeclibgodatabasesqldir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgodatabasesqldir)" || exit $$?; \
+       done
+
+uninstall-toolexeclibgodatabasesqlDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(toolexeclibgodatabasesql_DATA)'; test -n "$(toolexeclibgodatabasesqldir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(toolexeclibgodatabasesqldir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgodatabasesqldir)" && rm -f $$files
 install-toolexeclibgodebugDATA: $(toolexeclibgodebug_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibgodebugdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgodebugdir)"
@@ -3374,26 +3310,6 @@ uninstall-toolexeclibgoexpDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgoexpdir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgoexpdir)" && rm -f $$files
-install-toolexeclibgoexpsqlDATA: $(toolexeclibgoexpsql_DATA)
-       @$(NORMAL_INSTALL)
-       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)$(toolexeclibgoexpsqldir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgoexpsqldir)" || exit $$?; \
-       done
-
-uninstall-toolexeclibgoexpsqlDATA:
-       @$(NORMAL_UNINSTALL)
-       @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)$(toolexeclibgoexpsqldir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(toolexeclibgoexpsqldir)" && rm -f $$files
 install-toolexeclibgogoDATA: $(toolexeclibgogo_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibgogodir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgogodir)"
@@ -4151,7 +4067,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)$(toolexeclibgoexpsqldir)" "$(DESTDIR)$(toolexeclibgogodir)" "$(DESTDIR)$(toolexeclibgohashdir)" "$(DESTDIR)$(toolexeclibgohtmldir)" "$(DESTDIR)$(toolexeclibgoimagedir)" "$(DESTDIR)$(toolexeclibgoindexdir)" "$(DESTDIR)$(toolexeclibgoiodir)" "$(DESTDIR)$(toolexeclibgologdir)" "$(DESTDIR)$(toolexeclibgomathdir)" "$(DESTDIR)$(toolexeclibgomimedir)" "$(DESTDIR)$(toolexeclibgonetdir)" "$(DESTDIR)$(toolexeclibgonethttpdir)" "$(DESTDIR)$(toolexeclibgonetrpcdir)" "$(DESTDIR)$(toolexeclibgoolddir)" "$(DESTDIR)$(toolexeclibgoosdir)" "$(DESTDIR)$(toolexeclibgopathdir)" "$(DESTDIR)$(toolexeclibgoregexpdir)" "$(DESTDIR)$(toolexeclibgoruntimedir)" "$(DESTDIR)$(toolexeclibgosyncdir)" "$(DESTDIR)$(toolexeclibgotestingdir)" "$(DESTDIR)$(toolexeclibgotextdir)" "$(DESTDIR)$(toolexeclibgotexttemplatedir)" "$(DESTDIR)$(toolexeclibgounicodedir)"; do \
+       for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibgodir)" "$(DESTDIR)$(toolexeclibgoarchivedir)" "$(DESTDIR)$(toolexeclibgocompressdir)" "$(DESTDIR)$(toolexeclibgocontainerdir)" "$(DESTDIR)$(toolexeclibgocryptodir)" "$(DESTDIR)$(toolexeclibgocryptox509dir)" "$(DESTDIR)$(toolexeclibgodatabasedir)" "$(DESTDIR)$(toolexeclibgodatabasesqldir)" "$(DESTDIR)$(toolexeclibgodebugdir)" "$(DESTDIR)$(toolexeclibgoencodingdir)" "$(DESTDIR)$(toolexeclibgoexpdir)" "$(DESTDIR)$(toolexeclibgogodir)" "$(DESTDIR)$(toolexeclibgohashdir)" "$(DESTDIR)$(toolexeclibgohtmldir)" "$(DESTDIR)$(toolexeclibgoimagedir)" "$(DESTDIR)$(toolexeclibgoindexdir)" "$(DESTDIR)$(toolexeclibgoiodir)" "$(DESTDIR)$(toolexeclibgologdir)" "$(DESTDIR)$(toolexeclibgomathdir)" "$(DESTDIR)$(toolexeclibgomimedir)" "$(DESTDIR)$(toolexeclibgonetdir)" "$(DESTDIR)$(toolexeclibgonethttpdir)" "$(DESTDIR)$(toolexeclibgonetrpcdir)" "$(DESTDIR)$(toolexeclibgoolddir)" "$(DESTDIR)$(toolexeclibgoosdir)" "$(DESTDIR)$(toolexeclibgopathdir)" "$(DESTDIR)$(toolexeclibgoregexpdir)" "$(DESTDIR)$(toolexeclibgoruntimedir)" "$(DESTDIR)$(toolexeclibgosyncdir)" "$(DESTDIR)$(toolexeclibgotestingdir)" "$(DESTDIR)$(toolexeclibgotextdir)" "$(DESTDIR)$(toolexeclibgotexttemplatedir)" "$(DESTDIR)$(toolexeclibgounicodedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
@@ -4217,16 +4133,17 @@ install-exec-am: install-multi install-toolexeclibLIBRARIES \
        install-toolexeclibgocompressDATA \
        install-toolexeclibgocontainerDATA \
        install-toolexeclibgocryptoDATA \
-       install-toolexeclibgocryptoopenpgpDATA \
        install-toolexeclibgocryptox509DATA \
+       install-toolexeclibgodatabaseDATA \
+       install-toolexeclibgodatabasesqlDATA \
        install-toolexeclibgodebugDATA \
        install-toolexeclibgoencodingDATA install-toolexeclibgoexpDATA \
-       install-toolexeclibgoexpsqlDATA install-toolexeclibgogoDATA \
-       install-toolexeclibgohashDATA install-toolexeclibgohtmlDATA \
-       install-toolexeclibgoimageDATA install-toolexeclibgoindexDATA \
-       install-toolexeclibgoioDATA install-toolexeclibgologDATA \
-       install-toolexeclibgomathDATA install-toolexeclibgomimeDATA \
-       install-toolexeclibgonetDATA install-toolexeclibgonethttpDATA \
+       install-toolexeclibgogoDATA install-toolexeclibgohashDATA \
+       install-toolexeclibgohtmlDATA install-toolexeclibgoimageDATA \
+       install-toolexeclibgoindexDATA install-toolexeclibgoioDATA \
+       install-toolexeclibgologDATA install-toolexeclibgomathDATA \
+       install-toolexeclibgomimeDATA install-toolexeclibgonetDATA \
+       install-toolexeclibgonethttpDATA \
        install-toolexeclibgonetrpcDATA install-toolexeclibgooldDATA \
        install-toolexeclibgoosDATA install-toolexeclibgopathDATA \
        install-toolexeclibgoregexpDATA \
@@ -4281,13 +4198,13 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        uninstall-toolexeclibgocompressDATA \
        uninstall-toolexeclibgocontainerDATA \
        uninstall-toolexeclibgocryptoDATA \
-       uninstall-toolexeclibgocryptoopenpgpDATA \
        uninstall-toolexeclibgocryptox509DATA \
+       uninstall-toolexeclibgodatabaseDATA \
+       uninstall-toolexeclibgodatabasesqlDATA \
        uninstall-toolexeclibgodebugDATA \
        uninstall-toolexeclibgoencodingDATA \
-       uninstall-toolexeclibgoexpDATA \
-       uninstall-toolexeclibgoexpsqlDATA \
-       uninstall-toolexeclibgogoDATA uninstall-toolexeclibgohashDATA \
+       uninstall-toolexeclibgoexpDATA uninstall-toolexeclibgogoDATA \
+       uninstall-toolexeclibgohashDATA \
        uninstall-toolexeclibgohtmlDATA \
        uninstall-toolexeclibgoimageDATA \
        uninstall-toolexeclibgoindexDATA uninstall-toolexeclibgoioDATA \
@@ -4329,16 +4246,17 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        install-toolexeclibgocompressDATA \
        install-toolexeclibgocontainerDATA \
        install-toolexeclibgocryptoDATA \
-       install-toolexeclibgocryptoopenpgpDATA \
        install-toolexeclibgocryptox509DATA \
+       install-toolexeclibgodatabaseDATA \
+       install-toolexeclibgodatabasesqlDATA \
        install-toolexeclibgodebugDATA \
        install-toolexeclibgoencodingDATA install-toolexeclibgoexpDATA \
-       install-toolexeclibgoexpsqlDATA install-toolexeclibgogoDATA \
-       install-toolexeclibgohashDATA install-toolexeclibgohtmlDATA \
-       install-toolexeclibgoimageDATA install-toolexeclibgoindexDATA \
-       install-toolexeclibgoioDATA install-toolexeclibgologDATA \
-       install-toolexeclibgomathDATA install-toolexeclibgomimeDATA \
-       install-toolexeclibgonetDATA install-toolexeclibgonethttpDATA \
+       install-toolexeclibgogoDATA install-toolexeclibgohashDATA \
+       install-toolexeclibgohtmlDATA install-toolexeclibgoimageDATA \
+       install-toolexeclibgoindexDATA install-toolexeclibgoioDATA \
+       install-toolexeclibgologDATA install-toolexeclibgomathDATA \
+       install-toolexeclibgomimeDATA install-toolexeclibgonetDATA \
+       install-toolexeclibgonethttpDATA \
        install-toolexeclibgonetrpcDATA install-toolexeclibgooldDATA \
        install-toolexeclibgoosDATA install-toolexeclibgopathDATA \
        install-toolexeclibgoregexpDATA \
@@ -4357,13 +4275,13 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        uninstall-toolexeclibgocompressDATA \
        uninstall-toolexeclibgocontainerDATA \
        uninstall-toolexeclibgocryptoDATA \
-       uninstall-toolexeclibgocryptoopenpgpDATA \
        uninstall-toolexeclibgocryptox509DATA \
+       uninstall-toolexeclibgodatabaseDATA \
+       uninstall-toolexeclibgodatabasesqlDATA \
        uninstall-toolexeclibgodebugDATA \
        uninstall-toolexeclibgoencodingDATA \
-       uninstall-toolexeclibgoexpDATA \
-       uninstall-toolexeclibgoexpsqlDATA \
-       uninstall-toolexeclibgogoDATA uninstall-toolexeclibgohashDATA \
+       uninstall-toolexeclibgoexpDATA uninstall-toolexeclibgogoDATA \
+       uninstall-toolexeclibgohashDATA \
        uninstall-toolexeclibgohtmlDATA \
        uninstall-toolexeclibgoimageDATA \
        uninstall-toolexeclibgoindexDATA uninstall-toolexeclibgoioDATA \
@@ -4596,7 +4514,9 @@ log/check: $(CHECK_DEPS)
 math/math.lo.dep: $(go_math_files)
        $(BUILDDEPS)
 math/math.lo: $(go_math_files)
-       $(BUILDPACKAGE)
+       $(MKDIR_P) $(@D)
+       files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \
+       $(LTGOCOMPILE) $(MATH_FLAG) -I . -c -fgo-prefix="libgo_$(@D)" -o $@ $$files
 math/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: math/check
@@ -4632,15 +4552,6 @@ signal_unix.go: $(srcdir)/go/os/mkunixsignals.sh sysinfo.go
        $(SHELL) $(srcdir)/go/os/mkunixsignals.sh sysinfo.go > $@.tmp
        mv -f $@.tmp $@
 
-@go_include@ patch/patch.lo.dep
-patch/patch.lo.dep: $(go_patch_files)
-       $(BUILDDEPS)
-patch/patch.lo: $(go_patch_files)
-       $(BUILDPACKAGE)
-patch/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: patch/check
-
 @go_include@ path/path.lo.dep
 path/path.lo.dep: $(go_path_files)
        $(BUILDDEPS)
@@ -4750,15 +4661,6 @@ unicode/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: unicode/check
 
-@go_include@ websocket/websocket.lo.dep
-websocket/websocket.lo.dep: $(go_websocket_files)
-       $(BUILDDEPS)
-websocket/websocket.lo: $(go_websocket_files)
-       $(BUILDPACKAGE)
-websocket/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: websocket/check
-
 @go_include@ archive/tar.lo.dep
 archive/tar.lo.dep: $(go_archive_tar_files)
        $(BUILDDEPS)
@@ -4869,36 +4771,6 @@ crypto/aes/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/aes/check
 
-@go_include@ crypto/bcrypt.lo.dep
-crypto/bcrypt.lo.dep: $(go_crypto_bcrypt_files)
-       $(BUILDDEPS)
-crypto/bcrypt.lo: $(go_crypto_bcrypt_files)
-       $(BUILDPACKAGE)
-crypto/bcrypt/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/bcrypt
-       @$(CHECK)
-.PHONY: crypto/bcrypt/check
-
-@go_include@ crypto/blowfish.lo.dep
-crypto/blowfish.lo.dep: $(go_crypto_blowfish_files)
-       $(BUILDDEPS)
-crypto/blowfish.lo: $(go_crypto_blowfish_files)
-       $(BUILDPACKAGE)
-crypto/blowfish/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/blowfish
-       @$(CHECK)
-.PHONY: crypto/blowfish/check
-
-@go_include@ crypto/cast5.lo.dep
-crypto/cast5.lo.dep: $(go_crypto_cast5_files)
-       $(BUILDDEPS)
-crypto/cast5.lo: $(go_crypto_cast5_files)
-       $(BUILDPACKAGE)
-crypto/cast5/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/cast5
-       @$(CHECK)
-.PHONY: crypto/cast5/check
-
 @go_include@ crypto/cipher.lo.dep
 crypto/cipher.lo.dep: $(go_crypto_cipher_files)
        $(BUILDDEPS)
@@ -4959,16 +4831,6 @@ crypto/hmac/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/hmac/check
 
-@go_include@ crypto/md4.lo.dep
-crypto/md4.lo.dep: $(go_crypto_md4_files)
-       $(BUILDDEPS)
-crypto/md4.lo: $(go_crypto_md4_files)
-       $(BUILDPACKAGE)
-crypto/md4/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/md4
-       @$(CHECK)
-.PHONY: crypto/md4/check
-
 @go_include@ crypto/md5.lo.dep
 crypto/md5.lo.dep: $(go_crypto_md5_files)
        $(BUILDDEPS)
@@ -4979,26 +4841,6 @@ crypto/md5/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/md5/check
 
-@go_include@ crypto/ocsp.lo.dep
-crypto/ocsp.lo.dep: $(go_crypto_ocsp_files)
-       $(BUILDDEPS)
-crypto/ocsp.lo: $(go_crypto_ocsp_files)
-       $(BUILDPACKAGE)
-crypto/ocsp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/ocsp
-       @$(CHECK)
-.PHONY: crypto/ocsp/check
-
-@go_include@ crypto/openpgp.lo.dep
-crypto/openpgp.lo.dep: $(go_crypto_openpgp_files)
-       $(BUILDDEPS)
-crypto/openpgp.lo: $(go_crypto_openpgp_files)
-       $(BUILDPACKAGE)
-crypto/openpgp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp
-       @$(CHECK)
-.PHONY: crypto/openpgp/check
-
 @go_include@ crypto/rand.lo.dep
 crypto/rand.lo.dep: $(go_crypto_rand_files)
        $(BUILDDEPS)
@@ -5019,16 +4861,6 @@ crypto/rc4/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/rc4/check
 
-@go_include@ crypto/ripemd160.lo.dep
-crypto/ripemd160.lo.dep: $(go_crypto_ripemd160_files)
-       $(BUILDDEPS)
-crypto/ripemd160.lo: $(go_crypto_ripemd160_files)
-       $(BUILDPACKAGE)
-crypto/ripemd160/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/ripemd160
-       @$(CHECK)
-.PHONY: crypto/ripemd160/check
-
 @go_include@ crypto/rsa.lo.dep
 crypto/rsa.lo.dep: $(go_crypto_rsa_files)
        $(BUILDDEPS)
@@ -5089,16 +4921,6 @@ crypto/tls/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/tls/check
 
-@go_include@ crypto/twofish.lo.dep
-crypto/twofish.lo.dep: $(go_crypto_twofish_files)
-       $(BUILDDEPS)
-crypto/twofish.lo: $(go_crypto_twofish_files)
-       $(BUILDPACKAGE)
-crypto/twofish/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/twofish
-       @$(CHECK)
-.PHONY: crypto/twofish/check
-
 @go_include@ crypto/x509.lo.dep
 crypto/x509.lo.dep: $(go_crypto_x509_files)
        $(BUILDDEPS)
@@ -5109,75 +4931,35 @@ crypto/x509/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/x509/check
 
-@go_include@ crypto/xtea.lo.dep
-crypto/xtea.lo.dep: $(go_crypto_xtea_files)
-       $(BUILDDEPS)
-crypto/xtea.lo: $(go_crypto_xtea_files)
-       $(BUILDPACKAGE)
-crypto/xtea/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/xtea
-       @$(CHECK)
-.PHONY: crypto/xtea/check
-
-@go_include@ crypto/openpgp/armor.lo.dep
-crypto/openpgp/armor.lo.dep: $(go_crypto_openpgp_armor_files)
-       $(BUILDDEPS)
-crypto/openpgp/armor.lo: $(go_crypto_openpgp_armor_files)
-       $(BUILDPACKAGE)
-crypto/openpgp/armor/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/armor
-       @$(CHECK)
-.PHONY: crypto/openpgp/armor/check
-
-@go_include@ crypto/openpgp/elgamal.lo.dep
-crypto/openpgp/elgamal.lo.dep: $(go_crypto_openpgp_elgamal_files)
-       $(BUILDDEPS)
-crypto/openpgp/elgamal.lo: $(go_crypto_openpgp_elgamal_files)
-       $(BUILDPACKAGE)
-crypto/openpgp/elgamal/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/elgamal
-       @$(CHECK)
-.PHONY: crypto/openpgp/elgamal/check
-
-@go_include@ crypto/openpgp/error.lo.dep
-crypto/openpgp/error.lo.dep: $(go_crypto_openpgp_error_files)
-       $(BUILDDEPS)
-crypto/openpgp/error.lo: $(go_crypto_openpgp_error_files)
-       $(BUILDPACKAGE)
-crypto/openpgp/error/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/error
-       @$(CHECK)
-.PHONY: crypto/openpgp/error/check
-
-@go_include@ crypto/openpgp/packet.lo.dep
-crypto/openpgp/packet.lo.dep: $(go_crypto_openpgp_packet_files)
+@go_include@ crypto/x509/pkix.lo.dep
+crypto/x509/pkix.lo.dep: $(go_crypto_x509_pkix_files)
        $(BUILDDEPS)
-crypto/openpgp/packet.lo: $(go_crypto_openpgp_packet_files)
+crypto/x509/pkix.lo: $(go_crypto_x509_pkix_files)
        $(BUILDPACKAGE)
-crypto/openpgp/packet/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/packet
+crypto/x509/pkix/check: $(CHECK_DEPS)
+       @$(MKDIR_P) crypto/x509/pkix
        @$(CHECK)
-.PHONY: crypto/openpgp/packet/check
+.PHONY: crypto/x509/pkix/check
 
-@go_include@ crypto/openpgp/s2k.lo.dep
-crypto/openpgp/s2k.lo.dep: $(go_crypto_openpgp_s2k_files)
+@go_include@ database/sql.lo.dep
+database/sql.lo.dep: $(go_database_sql_files)
        $(BUILDDEPS)
-crypto/openpgp/s2k.lo: $(go_crypto_openpgp_s2k_files)
+database/sql.lo: $(go_database_sql_files)
        $(BUILDPACKAGE)
-crypto/openpgp/s2k/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/s2k
+database/sql/check: $(CHECK_DEPS)
+       @$(MKDIR_P) database/sql
        @$(CHECK)
-.PHONY: crypto/openpgp/s2k/check
+.PHONY: database/sql/check
 
-@go_include@ crypto/x509/pkix.lo.dep
-crypto/x509/pkix.lo.dep: $(go_crypto_x509_pkix_files)
+@go_include@ database/sql/driver.lo.dep
+database/sql/driver.lo.dep: $(go_database_sql_driver_files)
        $(BUILDDEPS)
-crypto/x509/pkix.lo: $(go_crypto_x509_pkix_files)
+database/sql/driver.lo: $(go_database_sql_driver_files)
        $(BUILDPACKAGE)
-crypto/x509/pkix/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/x509/pkix
+database/sql/driver/check: $(CHECK_DEPS)
+       @$(MKDIR_P) database/sql/driver
        @$(CHECK)
-.PHONY: crypto/x509/pkix/check
+.PHONY: database/sql/driver/check
 
 @go_include@ debug/dwarf.lo.dep
 debug/dwarf.lo.dep: $(go_debug_dwarf_files)
@@ -5289,16 +5071,6 @@ encoding/csv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: encoding/csv/check
 
-@go_include@ encoding/git85.lo.dep
-encoding/git85.lo.dep: $(go_encoding_git85_files)
-       $(BUILDDEPS)
-encoding/git85.lo: $(go_encoding_git85_files)
-       $(BUILDPACKAGE)
-encoding/git85/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/git85
-       @$(CHECK)
-.PHONY: encoding/git85/check
-
 @go_include@ encoding/gob.lo.dep
 encoding/gob.lo.dep: $(go_encoding_gob_files)
        $(BUILDDEPS)
@@ -5359,6 +5131,16 @@ exp/ebnf/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: exp/ebnf/check
 
+@go_include@ exp/html.lo.dep
+exp/html.lo.dep: $(go_exp_html_files)
+       $(BUILDDEPS)
+exp/html.lo: $(go_exp_html_files)
+       $(BUILDPACKAGE)
+exp/html/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/html
+       @$(CHECK)
+.PHONY: exp/html/check
+
 @go_include@ exp/norm.lo.dep
 exp/norm.lo.dep: $(go_exp_norm_files)
        $(BUILDDEPS)
@@ -5369,35 +5151,25 @@ exp/norm/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: exp/norm/check
 
-@go_include@ exp/spdy.lo.dep
-exp/spdy.lo.dep: $(go_exp_spdy_files)
-       $(BUILDDEPS)
-exp/spdy.lo: $(go_exp_spdy_files)
-       $(BUILDPACKAGE)
-exp/spdy/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/spdy
-       @$(CHECK)
-.PHONY: exp/spdy/check
-
-@go_include@ exp/sql.lo.dep
-exp/sql.lo.dep: $(go_exp_sql_files)
+@go_include@ exp/proxy.lo.dep
+exp/proxy.lo.dep: $(go_exp_proxy_files)
        $(BUILDDEPS)
-exp/sql.lo: $(go_exp_sql_files)
+exp/proxy.lo: $(go_exp_proxy_files)
        $(BUILDPACKAGE)
-exp/sql/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/sql
+exp/proxy/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/proxy
        @$(CHECK)
-.PHONY: exp/sql/check
+.PHONY: exp/proxy/check
 
-@go_include@ exp/ssh.lo.dep
-exp/ssh.lo.dep: $(go_exp_ssh_files)
+@go_include@ exp/signal.lo.dep
+exp/signal.lo.dep: $(go_exp_signal_files)
        $(BUILDDEPS)
-exp/ssh.lo: $(go_exp_ssh_files)
+exp/signal.lo: $(go_exp_signal_files)
        $(BUILDPACKAGE)
-exp/ssh/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/ssh
+exp/signal/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/signal
        @$(CHECK)
-.PHONY: exp/ssh/check
+.PHONY: exp/signal/check
 
 @go_include@ exp/terminal.lo.dep
 exp/terminal.lo.dep: $(go_exp_terminal_files)
@@ -5419,6 +5191,16 @@ exp/types/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: exp/types/check
 
+@go_include@ exp/utf8string.lo.dep
+exp/utf8string.lo.dep: $(go_exp_utf8string_files)
+       $(BUILDDEPS)
+exp/utf8string.lo: $(go_exp_utf8string_files)
+       $(BUILDPACKAGE)
+exp/utf8string/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/utf8string
+       @$(CHECK)
+.PHONY: exp/utf8string/check
+
 @go_include@ exp/inotify.lo.dep
 exp/inotify.lo.dep: $(go_exp_inotify_files)
        $(BUILDDEPS)
@@ -5429,16 +5211,6 @@ exp/inotify/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: exp/inotify/check
 
-@go_include@ exp/sql/driver.lo.dep
-exp/sql/driver.lo.dep: $(go_exp_sql_driver_files)
-       $(BUILDDEPS)
-exp/sql/driver.lo: $(go_exp_sql_driver_files)
-       $(BUILDPACKAGE)
-exp/sql/driver/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/sql/driver
-       @$(CHECK)
-.PHONY: exp/sql/driver/check
-
 @go_include@ html/template.lo.dep
 html/template.lo.dep: $(go_html_template_files)
        $(BUILDDEPS)
@@ -5568,16 +5340,6 @@ hash/fnv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: hash/fnv/check
 
-@go_include@ image/bmp.lo.dep
-image/bmp.lo.dep: $(go_image_bmp_files)
-       $(BUILDDEPS)
-image/bmp.lo: $(go_image_bmp_files)
-       $(BUILDPACKAGE)
-image/bmp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/bmp
-       @$(CHECK)
-.PHONY: image/bmp/check
-
 @go_include@ image/color.lo.dep
 image/color.lo.dep: $(go_image_color_files)
        $(BUILDDEPS)
@@ -5628,26 +5390,6 @@ image/png/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: image/png/check
 
-@go_include@ image/tiff.lo.dep
-image/tiff.lo.dep: $(go_image_tiff_files)
-       $(BUILDDEPS)
-image/tiff.lo: $(go_image_tiff_files)
-       $(BUILDPACKAGE)
-image/tiff/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/tiff
-       @$(CHECK)
-.PHONY: image/tiff/check
-
-@go_include@ image/ycbcr.lo.dep
-image/ycbcr.lo.dep: $(go_image_ycbcr_files)
-       $(BUILDDEPS)
-image/ycbcr.lo: $(go_image_ycbcr_files)
-       $(BUILDPACKAGE)
-image/ycbcr/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/ycbcr
-       @$(CHECK)
-.PHONY: image/ycbcr/check
-
 @go_include@ index/suffixarray.lo.dep
 index/suffixarray.lo.dep: $(go_index_suffixarray_files)
        $(BUILDDEPS)
@@ -5720,12 +5462,6 @@ mime/multipart/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: mime/multipart/check
 
-@go_include@ net/dict.lo.dep
-net/dict.lo.dep: $(go_net_dict_files)
-       $(BUILDDEPS)
-net/dict.lo: $(go_net_dict_files)
-       $(BUILDPACKAGE)
-
 @go_include@ net/http.lo.dep
 net/http.lo.dep: $(go_net_http_files)
        $(BUILDDEPS)
@@ -5896,16 +5632,6 @@ os/user/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: os/user/check
 
-@go_include@ os/signal.lo.dep
-os/signal.lo.dep: $(go_os_signal_files)
-       $(BUILDDEPS)
-os/signal.lo: $(go_os_signal_files)
-       $(BUILDPACKAGE)
-os/signal/check: $(CHECK_DEPS)
-       @$(MKDIR_P) os/signal
-       @$(CHECK)
-.PHONY: os/signal/check
-
 @go_include@ path/filepath.lo.dep
 path/filepath.lo.dep: $(go_path_filepath_files)
        $(BUILDDEPS)
@@ -6079,8 +5805,6 @@ net.gox: net/net.lo
        $(BUILDGOX)
 os.gox: os/os.lo
        $(BUILDGOX)
-patch.gox: patch/patch.lo
-       $(BUILDGOX)
 path.gox: path/path.lo
        $(BUILDGOX)
 reflect.gox: reflect/reflect.lo
@@ -6105,8 +5829,6 @@ time.gox: time/time.lo
        $(BUILDGOX)
 unicode.gox: unicode/unicode.lo
        $(BUILDGOX)
-websocket.gox: websocket/websocket.lo
-       $(BUILDGOX)
 
 archive/tar.gox: archive/tar.lo
        $(BUILDGOX)
@@ -6133,12 +5855,6 @@ container/ring.gox: container/ring.lo
 
 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
-       $(BUILDGOX)
 crypto/cipher.gox: crypto/cipher.lo
        $(BUILDGOX)
 crypto/des.gox: crypto/des.lo
@@ -6151,20 +5867,12 @@ crypto/elliptic.gox: crypto/elliptic.lo
        $(BUILDGOX)
 crypto/hmac.gox: crypto/hmac.lo
        $(BUILDGOX)
-crypto/md4.gox: crypto/md4.lo
-       $(BUILDGOX)
 crypto/md5.gox: crypto/md5.lo
        $(BUILDGOX)
-crypto/ocsp.gox: crypto/ocsp.lo
-       $(BUILDGOX)
-crypto/openpgp.gox: crypto/openpgp.lo
-       $(BUILDGOX)
 crypto/rand.gox: crypto/rand.lo
        $(BUILDGOX)
 crypto/rc4.gox: crypto/rc4.lo
        $(BUILDGOX)
-crypto/ripemd160.gox: crypto/ripemd160.lo
-       $(BUILDGOX)
 crypto/rsa.gox: crypto/rsa.lo
        $(BUILDGOX)
 crypto/sha1.gox: crypto/sha1.lo
@@ -6177,25 +5885,16 @@ crypto/subtle.gox: crypto/subtle.lo
        $(BUILDGOX)
 crypto/tls.gox: crypto/tls.lo
        $(BUILDGOX)
-crypto/twofish.gox: crypto/twofish.lo
-       $(BUILDGOX)
 crypto/x509.gox: crypto/x509.lo
        $(BUILDGOX)
-crypto/xtea.gox: crypto/xtea.lo
-       $(BUILDGOX)
 
-crypto/openpgp/armor.gox: crypto/openpgp/armor.lo
-       $(BUILDGOX)
-crypto/openpgp/elgamal.gox: crypto/openpgp/elgamal.lo
-       $(BUILDGOX)
-crypto/openpgp/error.gox: crypto/openpgp/error.lo
-       $(BUILDGOX)
-crypto/openpgp/packet.gox: crypto/openpgp/packet.lo
+crypto/x509/pkix.gox: crypto/x509/pkix.lo
        $(BUILDGOX)
-crypto/openpgp/s2k.gox: crypto/openpgp/s2k.lo
+
+database/sql.gox: database/sql.lo
        $(BUILDGOX)
 
-crypto/x509/pkix.gox: crypto/x509/pkix.lo
+database/sql/driver.gox: database/sql/driver.lo
        $(BUILDGOX)
 
 debug/dwarf.gox: debug/dwarf.lo
@@ -6221,8 +5920,6 @@ encoding/binary.gox: encoding/binary.lo
        $(BUILDGOX)
 encoding/csv.gox: encoding/csv.lo
        $(BUILDGOX)
-encoding/git85.gox: encoding/git85.lo
-       $(BUILDGOX)
 encoding/gob.gox: encoding/gob.lo
        $(BUILDGOX)
 encoding/hex.gox: encoding/hex.lo
@@ -6236,22 +5933,21 @@ encoding/xml.gox: encoding/xml.lo
 
 exp/ebnf.gox: exp/ebnf.lo
        $(BUILDGOX)
+exp/html.gox: exp/html.lo
+       $(BUILDGOX)
 exp/inotify.gox: exp/inotify.lo
        $(BUILDGOX)
 exp/norm.gox: exp/norm.lo
        $(BUILDGOX)
-exp/spdy.gox: exp/spdy.lo
-       $(BUILDGOX)
-exp/sql.gox: exp/sql.lo
+exp/proxy.gox: exp/proxy.lo
        $(BUILDGOX)
-exp/ssh.gox: exp/ssh.lo
+exp/signal.gox: exp/signal.lo
        $(BUILDGOX)
 exp/terminal.gox: exp/terminal.lo
        $(BUILDGOX)
 exp/types.gox: exp/types.lo
        $(BUILDGOX)
-
-exp/sql/driver.gox: exp/sql/driver.lo
+exp/utf8string.gox: exp/utf8string.lo  
        $(BUILDGOX)
 
 html/template.gox: html/template.lo
@@ -6281,8 +5977,6 @@ hash/crc64.gox: hash/crc64.lo
 hash/fnv.gox: hash/fnv.lo
        $(BUILDGOX)
 
-image/bmp.gox: image/bmp.lo
-       $(BUILDGOX)
 image/color.gox: image/color.lo
        $(BUILDGOX)
 image/draw.gox: image/draw.lo
@@ -6293,10 +5987,6 @@ image/jpeg.gox: image/jpeg.lo
        $(BUILDGOX)
 image/png.gox: image/png.lo
        $(BUILDGOX)
-image/tiff.gox: image/tiff.lo
-       $(BUILDGOX)
-image/ycbcr.gox: image/ycbcr.lo
-       $(BUILDGOX)
 
 index/suffixarray.gox: index/suffixarray.lo
        $(BUILDGOX)
@@ -6317,8 +6007,6 @@ math/rand.gox: math/rand.lo
 mime/multipart.gox: mime/multipart.lo
        $(BUILDGOX)
 
-net/dict.gox: net/dict.lo
-       $(BUILDGOX)
 net/http.gox: net/http.lo
        $(BUILDGOX)
 net/mail.gox: net/mail.lo
@@ -6357,8 +6045,6 @@ os/exec.gox: os/exec.lo
        $(BUILDGOX)
 os/user.gox: os/user.lo
        $(BUILDGOX)
-os/signal.gox: os/signal.lo
-       $(BUILDGOX)
 
 path/filepath.gox: path/filepath.lo
        $(BUILDGOX)