OSDN Git Service

Daily bump.
[pf3gnuchains/gcc-fork.git] / libgo / Makefile.in
index 11b8650..30f9274 100644 (file)
@@ -46,12 +46,10 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \
-       $(srcdir)/../config.sub $(srcdir)/../depcomp \
-       $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \
-       $(srcdir)/../missing $(srcdir)/../mkinstalldirs \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(srcdir)/config.h.in $(top_srcdir)/configure
+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+       $(top_srcdir)/configure $(am__configure_deps) \
+       $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \
+       $(srcdir)/../depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/../config/lead-dot.m4 \
@@ -97,13 +95,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)$(toolexeclibgoexpguidir)" \
-       "$(DESTDIR)$(toolexeclibgoexpsqldir)" \
        "$(DESTDIR)$(toolexeclibgogodir)" \
        "$(DESTDIR)$(toolexeclibgohashdir)" \
        "$(DESTDIR)$(toolexeclibgohtmldir)" \
@@ -134,95 +131,47 @@ am_libgobegin_a_OBJECTS = go-main.$(OBJEXT)
 libgobegin_a_OBJECTS = $(am_libgobegin_a_OBJECTS)
 LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-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 \
-       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 \
+am__DEPENDENCIES_2 = bufio.lo bytes.lo bytes/index.lo crypto.lo \
+       errors.lo expvar.lo flag.lo fmt.lo hash.lo html.lo image.lo \
+       io.lo log.lo math.lo mime.lo net.lo os.lo path.lo \
+       reflect-go.lo regexp.lo runtime-go.lo sort.lo strconv.lo \
+       strings.lo sync.lo syscall.lo syscall/errno.lo \
+       syscall/signame.lo syscall/wait.lo testing.lo time-go.lo \
+       unicode.lo archive/tar.lo archive/zip.lo compress/bzip2.lo \
+       compress/flate.lo compress/gzip.lo compress/lzw.lo \
+       compress/zlib.lo container/heap.lo container/list.lo \
+       container/ring.lo crypto/aes.lo crypto/cipher.lo crypto/des.lo \
+       crypto/dsa.lo crypto/ecdsa.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/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 \
-       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 \
+       exp/html.lo exp/norm.lo exp/proxy.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/dict.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 \
-       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 \
-       text/scanner.lo text/tabwriter.lo text/template.lo \
-       text/template/parse.lo testing/testing.lo testing/iotest.lo \
-       testing/quick.lo testing/script.lo unicode/utf16.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 os/exec.lo $(am__DEPENDENCIES_1) \
+       os/signal.lo os/user.lo path/filepath.lo regexp/syntax.lo \
+       net/rpc/jsonrpc.lo runtime/debug.lo runtime/pprof.lo \
+       sync/atomic.lo sync/atomic_c.lo text/scanner.lo \
+       text/tabwriter.lo text/template.lo text/template/parse.lo \
+       testing/iotest.lo testing/quick.lo unicode/utf16.lo \
        unicode/utf8.lo
 libgo_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
-am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
-       runtime/go-assert-interface.c \
-       runtime/go-byte-array-to-string.c runtime/go-breakpoint.c \
-       runtime/go-caller.c runtime/go-can-convert-interface.c \
-       runtime/go-cgo.c runtime/go-check-interface.c \
-       runtime/go-construct-map.c runtime/go-convert-interface.c \
-       runtime/go-copy.c runtime/go-defer.c \
-       runtime/go-deferred-recover.c runtime/go-eface-compare.c \
-       runtime/go-eface-val-compare.c runtime/go-getgoroot.c \
-       runtime/go-int-array-to-string.c runtime/go-int-to-string.c \
-       runtime/go-interface-compare.c \
-       runtime/go-interface-eface-compare.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-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-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-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 \
-       runtime/go-unsafe-new.c runtime/go-unsafe-newarray.c \
-       runtime/go-unsafe-pointer.c runtime/go-unwind.c runtime/chan.c \
-       runtime/cpuprof.c runtime/lock_sema.c runtime/thread-sema.c \
-       runtime/lock_futex.c runtime/thread-linux.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/runtime.c runtime/thread.c runtime/yield.c \
-       runtime/rtems-task-variable-add.c iface.c malloc.c map.c \
-       mprof.c reflect.c runtime1.c sema.c sigqueue.c string.c time.c
 @LIBGO_IS_LINUX_FALSE@am__objects_1 = lock_sema.lo thread-sema.lo
 @LIBGO_IS_LINUX_TRUE@am__objects_1 = lock_futex.lo thread-linux.lo
 @HAVE_SYS_MMAN_H_FALSE@am__objects_2 = mem_posix_memalign.lo
@@ -230,28 +179,30 @@ am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
 @LIBGO_IS_RTEMS_TRUE@am__objects_3 = rtems-task-variable-add.lo
 am__objects_4 = go-append.lo go-assert.lo go-assert-interface.lo \
        go-byte-array-to-string.lo go-breakpoint.lo go-caller.lo \
-       go-can-convert-interface.lo go-cgo.lo go-check-interface.lo \
-       go-construct-map.lo go-convert-interface.lo go-copy.lo \
-       go-defer.lo go-deferred-recover.lo go-eface-compare.lo \
+       go-callers.lo go-can-convert-interface.lo go-cgo.lo \
+       go-check-interface.lo go-construct-map.lo \
+       go-convert-interface.lo go-copy.lo go-defer.lo \
+       go-deferred-recover.lo go-eface-compare.lo \
        go-eface-val-compare.lo go-getgoroot.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-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-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-traceback.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-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 print.lo proc.lo runtime.lo signal_unix.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) \
@@ -271,7 +222,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
 SOURCES = $(libgobegin_a_SOURCES) $(libgo_la_SOURCES)
-DIST_SOURCES = $(libgobegin_a_SOURCES) $(am__libgo_la_SOURCES_DIST)
 MULTISRCTOP = 
 MULTIBUILDTOP = 
 MULTIDIRS = 
@@ -287,65 +237,28 @@ 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) \
-       $(toolexeclibgoexpgui_DATA) $(toolexeclibgoexpsql_DATA) \
-       $(toolexeclibgogo_DATA) $(toolexeclibgohash_DATA) \
-       $(toolexeclibgohtml_DATA) $(toolexeclibgoimage_DATA) \
-       $(toolexeclibgoindex_DATA) $(toolexeclibgoio_DATA) \
-       $(toolexeclibgolog_DATA) $(toolexeclibgomath_DATA) \
-       $(toolexeclibgomime_DATA) $(toolexeclibgonet_DATA) \
-       $(toolexeclibgonethttp_DATA) $(toolexeclibgonetrpc_DATA) \
-       $(toolexeclibgoold_DATA) $(toolexeclibgoos_DATA) \
-       $(toolexeclibgopath_DATA) $(toolexeclibgoregexp_DATA) \
-       $(toolexeclibgoruntime_DATA) $(toolexeclibgosync_DATA) \
-       $(toolexeclibgotesting_DATA) $(toolexeclibgotext_DATA) \
-       $(toolexeclibgotexttemplate_DATA) $(toolexeclibgounicode_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) \
+       $(toolexeclibgomath_DATA) $(toolexeclibgomime_DATA) \
+       $(toolexeclibgonet_DATA) $(toolexeclibgonethttp_DATA) \
+       $(toolexeclibgonetrpc_DATA) $(toolexeclibgoold_DATA) \
+       $(toolexeclibgoos_DATA) $(toolexeclibgopath_DATA) \
+       $(toolexeclibgoregexp_DATA) $(toolexeclibgoruntime_DATA) \
+       $(toolexeclibgosync_DATA) $(toolexeclibgotesting_DATA) \
+       $(toolexeclibgotext_DATA) $(toolexeclibgotexttemplate_DATA) \
+       $(toolexeclibgounicode_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-       distdir dist dist-all distcheck
+       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = testsuite
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
@@ -396,6 +309,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@
@@ -454,7 +368,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@
@@ -475,6 +388,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@
@@ -504,13 +418,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)
@@ -567,7 +482,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 \
@@ -585,7 +499,6 @@ toolexeclibgo_DATA = \
        mime.gox \
        net.gox \
        os.gox \
-       patch.gox \
        path.gox \
        reflect.gox \
        regexp.gox \
@@ -597,8 +510,7 @@ toolexeclibgo_DATA = \
        syscall.gox \
        testing.gox \
        time.gox \
-       unicode.gox \
-       websocket.gox
+       unicode.gox
 
 toolexeclibgoarchivedir = $(toolexeclibgodir)/archive
 toolexeclibgoarchive_DATA = \
@@ -622,44 +534,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 \
@@ -676,7 +579,6 @@ toolexeclibgoencoding_DATA = \
        encoding/base64.gox \
        encoding/binary.gox \
        encoding/csv.gox \
-       encoding/git85.gox \
        encoding/gob.gox \
        encoding/hex.gox \
        encoding/json.gox \
@@ -690,22 +592,13 @@ toolexeclibgoencoding_DATA = \
 toolexeclibgoexpdir = $(toolexeclibgodir)/exp
 toolexeclibgoexp_DATA = \
        exp/ebnf.gox \
-       exp/gui.gox \
+       exp/html.gox \
        $(exp_inotify_gox) \
        exp/norm.gox \
-       exp/spdy.gox \
-       exp/sql.gox \
-       exp/ssh.gox \
+       exp/proxy.gox \
        exp/terminal.gox \
-       exp/types.gox
-
-toolexeclibgoexpguidir = $(toolexeclibgoexpdir)/gui
-toolexeclibgoexpgui_DATA = \
-       exp/gui/x11.gox
-
-toolexeclibgoexpsqldir = $(toolexeclibgoexpdir)/sql
-toolexeclibgoexpsql_DATA = \
-       exp/sql/driver.gox
+       exp/types.gox \
+       exp/utf8string.gox
 
 toolexeclibgogodir = $(toolexeclibgodir)/go
 toolexeclibgogo_DATA = \
@@ -730,14 +623,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 = \
@@ -763,7 +653,6 @@ toolexeclibgomime_DATA = \
 
 toolexeclibgonetdir = $(toolexeclibgodir)/net
 toolexeclibgonet_DATA = \
-       net/dict.gox \
        net/http.gox \
        net/mail.gox \
        net/rpc.gox \
@@ -792,8 +681,8 @@ toolexeclibgoold_DATA = \
 toolexeclibgoosdir = $(toolexeclibgodir)/os
 toolexeclibgoos_DATA = \
        os/exec.gox \
-       os/user.gox \
-       os/signal.gox
+       os/signal.gox \
+       os/user.gox
 
 toolexeclibgopathdir = $(toolexeclibgodir)/path
 toolexeclibgopath_DATA = \
@@ -815,8 +704,7 @@ toolexeclibgosync_DATA = \
 toolexeclibgotestingdir = $(toolexeclibgodir)/testing
 toolexeclibgotesting_DATA = \
        testing/iotest.gox \
-       testing/quick.gox \
-       testing/script.gox
+       testing/quick.gox
 
 toolexeclibgotextdir = $(toolexeclibgodir)/text
 toolexeclibgotext_DATA = \
@@ -846,6 +734,7 @@ runtime_files = \
        runtime/go-byte-array-to-string.c \
        runtime/go-breakpoint.c \
        runtime/go-caller.c \
+       runtime/go-callers.c \
        runtime/go-can-convert-interface.c \
        runtime/go-cgo.c \
        runtime/go-check-interface.c \
@@ -867,13 +756,15 @@ 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 \
-       runtime/go-reflect.c \
        runtime/go-reflect-call.c \
        runtime/go-reflect-map.c \
        runtime/go-rune.c \
@@ -885,15 +776,17 @@ runtime_files = \
        runtime/go-string-to-int-array.c \
        runtime/go-strplus.c \
        runtime/go-strslice.c \
+       runtime/go-traceback.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 \
        runtime/go-typedesc-equal.c \
        runtime/go-typestring.c \
-       runtime/go-unreflect.c \
        runtime/go-unsafe-new.c \
        runtime/go-unsafe-newarray.c \
        runtime/go-unsafe-pointer.c \
@@ -909,8 +802,10 @@ runtime_files = \
        runtime/mgc0.c \
        runtime/mheap.c \
        runtime/msize.c \
+       runtime/print.c \
        runtime/proc.c \
        runtime/runtime.c \
+       runtime/signal_unix.c \
        runtime/thread.c \
        runtime/yield.c \
        $(rtems_task_variable_add_file) \
@@ -931,7 +826,8 @@ go_bufio_files = \
 go_bytes_files = \
        go/bytes/buffer.go \
        go/bytes/bytes.go \
-       go/bytes/bytes_decl.go
+       go/bytes/bytes_decl.go \
+       go/bytes/reader.go
 
 go_bytes_c_files = \
        go/bytes/indexbyte.c
@@ -958,20 +854,15 @@ go_hash_files = \
        go/hash/hash.go
 
 go_html_files = \
-       go/html/const.go \
-       go/html/doc.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 \
@@ -996,14 +887,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 \
@@ -1024,7 +912,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
@@ -1032,27 +919,43 @@ go_math_files = \
 go_mime_files = \
        go/mime/grammar.go \
        go/mime/mediatype.go \
-       go/mime/type.go
+       go/mime/type.go \
+       go/mime/type_unix.go
 
 # 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
+@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_cgo_file = go/net/cgo_bsd.go
+@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_cgo_file = go/net/cgo_bsd.go
 @LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_cgo_file = go/net/cgo_linux.go
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_cgo_file = go/net/cgo_linux.go
 @LIBGO_IS_LINUX_TRUE@go_net_cgo_file = go/net/cgo_linux.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sock_file = go/net/sock_bsd.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sock_file = go/net/sock_linux.go
+@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sock_file = go/net/sock_bsd.go
+@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sock_file = go/net/sock_bsd.go
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sock_file = go/net/sock_solaris.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_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockopt_file = go/net/sockopt_bsd.go
+@LIBGO_IS_FREEBSD_TRUE@@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_bsd.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_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockoptip_file = go/net/sockoptip_bsd.go go/net/sockoptip_netbsd.go
+@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockoptip_file = go/net/sockoptip_bsd.go go/net/sockoptip_freebsd.go
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sockoptip_file = go/net/sockoptip_bsd.go go/net/sockoptip_solaris.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 \
@@ -1062,6 +965,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) \
@@ -1075,13 +979,19 @@ go_net_files = \
        go/net/ipsock.go \
        go/net/ipsock_posix.go \
        go/net/lookup_unix.go \
+       go/net/mac.go \
        go/net/net.go \
+       go/net/net_posix.go \
        go/net/parse.go \
        go/net/pipe.go \
        go/net/port.go \
        $(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 \
@@ -1099,11 +1009,13 @@ 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/env_unix.go \
        go/os/error.go \
        go/os/error_posix.go \
        go/os/exec.go \
@@ -1116,18 +1028,10 @@ 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/os/types.go
 
 go_path_files = \
        go/path/match.go \
@@ -1148,11 +1052,11 @@ go_net_rpc_files = \
        go/net/rpc/server.go
 
 go_runtime_files = \
+       go/runtime/compiler.go \
        go/runtime/debug.go \
        go/runtime/error.go \
        go/runtime/extern.go \
        go/runtime/mem.go \
-       go/runtime/sig.go \
        go/runtime/softfloat64.go \
        go/runtime/type.go \
        version.go
@@ -1166,7 +1070,9 @@ 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/isprint.go \
        go/strconv/itoa.go \
        go/strconv/quote.go
 
@@ -1179,6 +1085,7 @@ go_sync_files = \
        go/sync/cond.go \
        go/sync/mutex.go \
        go/sync/once.go \
+       go/sync/runtime.go \
        go/sync/rwmutex.go \
        go/sync/waitgroup.go
 
@@ -1200,11 +1107,11 @@ 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 \
-       go/time/zoneinfo_posix.go \
+       go/time/zoneinfo.go \
+       go/time/zoneinfo_read.go \
        go/time/zoneinfo_unix.go
 
 go_unicode_files = \
@@ -1214,13 +1121,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 \
@@ -1243,8 +1143,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 \
@@ -1272,25 +1171,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 = \
@@ -1305,28 +1191,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 \
@@ -1335,10 +1209,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
@@ -1368,63 +1238,41 @@ 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 = \
-       go/crypto/twofish/twofish.go
-
 go_crypto_x509_files = \
        go/crypto/x509/cert_pool.go \
        go/crypto/x509/pkcs1.go \
+       go/crypto/x509/pkcs8.go \
+       go/crypto/x509/root.go \
+       go/crypto/x509/root_unix.go \
        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 \
        go/debug/dwarf/entry.go \
+       go/debug/dwarf/line.go \
        go/debug/dwarf/open.go \
        go/debug/dwarf/type.go \
        go/debug/dwarf/unit.go
 
 go_debug_elf_files = \
        go/debug/elf/elf.go \
-       go/debug/elf/file.go
+       go/debug/elf/file.go \
+       go/debug/elf/runtime.go
 
 go_debug_gosym_files = \
        go/debug/gosym/pclntab.go \
@@ -1460,9 +1308,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 \
@@ -1489,14 +1334,24 @@ 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_gui_files = \
-       go/exp/gui/gui.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
@@ -1505,35 +1360,21 @@ go_exp_norm_files = \
        go/exp/norm/composition.go \
        go/exp/norm/forminfo.go \
        go/exp/norm/input.go \
+       go/exp/norm/iter.go \
        go/exp/norm/normalize.go \
        go/exp/norm/readwriter.go \
        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/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/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_terminal_files = \
-       go/exp/terminal/shell.go \
-       go/exp/terminal/terminal.go
+       go/exp/terminal/terminal.go \
+       go/exp/terminal/util.go
 
 go_exp_types_files = \
        go/exp/types/check.go \
@@ -1543,13 +1384,8 @@ go_exp_types_files = \
        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_utf8string_files = \
+       go/exp/utf8string/string.go
 
 go_go_ast_files = \
        go/go/ast/ast.go \
@@ -1562,14 +1398,17 @@ go_go_ast_files = \
 
 go_go_build_files = \
        go/go/build/build.go \
-       go/go/build/dir.go \
-       go/go/build/path.go \
+       go/go/build/doc.go \
        syslist.go
 
 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/doc/synopsis.go
 
 go_go_parser_files = \
        go/go/parser/interface.go \
@@ -1603,7 +1442,6 @@ go_hash_fnv_files = \
 
 go_html_template_files = \
        go/html/template/attr.go \
-       go/html/template/clone.go \
        go/html/template/content.go \
        go/html/template/context.go \
        go/html/template/css.go \
@@ -1616,11 +1454,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
@@ -1639,15 +1475,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
@@ -1690,9 +1517,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 \
@@ -1700,6 +1524,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 \
@@ -1765,17 +1590,19 @@ go_os_exec_files = \
        go/os/exec/exec.go \
        go/os/exec/lp_unix.go
 
+go_os_signal_files = \
+       go/os/signal/signal.go \
+       go/os/signal/signal_unix.go
+
 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 \
-       go/path/filepath/path_unix.go
+       go/path/filepath/path_unix.go \
+       go/path/filepath/symlink.go
 
 go_regexp_syntax_files = \
        go/regexp/syntax/compile.go \
@@ -1803,14 +1630,12 @@ go_text_template_files = \
        go/text/template/exec.go \
        go/text/template/funcs.go \
        go/text/template/helper.go \
-       go/text/template/parse.go \
-       go/text/template/set.go
+       go/text/template/template.go
 
 go_text_template_parse_files = \
        go/text/template/parse/lex.go \
        go/text/template/parse/node.go \
-       go/text/template/parse/parse.go \
-       go/text/template/parse/set.go
+       go/text/template/parse/parse.go
 
 go_sync_atomic_files = \
        go/sync/atomic/doc.go
@@ -1826,9 +1651,6 @@ go_testing_iotest_files = \
 go_testing_quick_files = \
        go/testing/quick/quick.go
 
-go_testing_script_files = \
-       go/testing/script/script.go
-
 go_text_scanner_files = \
        go/text/scanner/scanner.go
 
@@ -1836,21 +1658,29 @@ 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
-@HAVE_WAIT4_FALSE@syscall_wait_file = go/syscall/libcall_waitpid.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
 
 # Define Wait4.
-@HAVE_WAIT4_TRUE@syscall_wait_file = go/syscall/libcall_wait4.go
+@LIBGO_IS_RTEMS_TRUE@syscall_wait_file = 
+@LIBGO_IS_RTEMS_FALSE@syscall_wait_c_file = go/syscall/wait.c
+
+# Support for pulling apart wait status.
+@LIBGO_IS_RTEMS_TRUE@syscall_wait_c_file = 
 @LIBGO_IS_RTEMS_FALSE@syscall_sleep_file = go/syscall/sleep_select.go
 
 # Define Sleep.
@@ -1885,18 +1715,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) \
@@ -1904,6 +1747,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) \
@@ -1917,42 +1761,46 @@ go_syscall_files = \
 
 go_syscall_c_files = \
        go/syscall/errno.c \
-       go/syscall/wait.c
+       go/syscall/signame.c \
+       $(syscall_wait_c_file)
 
 @LIBGO_IS_LINUX_FALSE@os_lib_inotify_lo = 
 
 # os_lib_inotify_lo = os/inotify.lo
 @LIBGO_IS_LINUX_TRUE@os_lib_inotify_lo = 
 libgo_go_objs = \
-       bufio/bufio.lo \
-       bytes/bytes.lo \
+       bufio.lo \
+       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 \
+       crypto.lo \
+       errors.lo \
+       expvar.lo \
+       flag.lo \
+       fmt.lo \
+       hash.lo \
+       html.lo \
+       image.lo \
+       io.lo \
+       log.lo \
+       math.lo \
+       mime.lo \
+       net.lo \
+       os.lo \
+       path.lo \
+       reflect-go.lo \
+       regexp.lo \
+       runtime-go.lo \
+       sort.lo \
+       strconv.lo \
+       strings.lo \
+       sync.lo \
+       syscall.lo \
+       syscall/errno.lo \
+       syscall/signame.lo \
+       syscall/wait.lo \
+       testing.lo \
+       time-go.lo \
+       unicode.lo \
        archive/tar.lo \
        archive/zip.lo \
        compress/bzip2.lo \
@@ -1964,37 +1812,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 \
@@ -2006,22 +1842,18 @@ 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/gui.lo \
+       exp/html.lo \
        exp/norm.lo \
-       exp/spdy.lo \
-       exp/sql.lo \
-       exp/ssh.lo \
+       exp/proxy.lo \
        exp/terminal.lo \
        exp/types.lo \
-       exp/gui/x11.lo \
-       exp/sql/driver.lo \
+       exp/utf8string.lo \
        html/template.lo \
        go/ast.lo \
        go/build.lo \
@@ -2039,14 +1871,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 \
@@ -2054,9 +1883,7 @@ libgo_go_objs = \
        math/big.lo \
        math/cmplx.lo \
        math/rand.lo \
-       mime/mime.lo \
        mime/multipart.lo \
-       net/dict.lo \
        net/http.lo \
        net/mail.lo \
        net/rpc.lo \
@@ -2066,9 +1893,10 @@ libgo_go_objs = \
        old/netchan.lo \
        old/regexp.lo \
        old/template.lo \
+       os/exec.lo \
        $(os_lib_inotify_lo) \
-       os/user.lo \
        os/signal.lo \
+       os/user.lo \
        path/filepath.lo \
        regexp/syntax.lo \
        net/rpc/jsonrpc.lo \
@@ -2076,17 +1904,12 @@ libgo_go_objs = \
        runtime/pprof.lo \
        sync/atomic.lo \
        sync/atomic_c.lo \
-       syscall/syscall.lo \
-       syscall/errno.lo \
-       syscall/wait.lo \
        text/scanner.lo \
        text/tabwriter.lo \
        text/template.lo \
        text/template/parse.lo \
-       testing/testing.lo \
        testing/iotest.lo \
        testing/quick.lo \
-       testing/script.lo \
        unicode/utf16.lo \
        unicode/utf8.lo
 
@@ -2119,7 +1942,7 @@ BUILDDEPS = \
 BUILDPACKAGE = \
        $(MKDIR_P) $(@D); \
        files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \
-       $(LTGOCOMPILE) -I . -c -fgo-prefix="libgo_$(@D)" -o $@ $$files
+       $(LTGOCOMPILE) -I . -c -fgo-pkgpath=`echo $@ | sed -e 's/.lo$$//' -e 's/-go$$//'` -o $@ $$files
 
 @LIBGO_IS_RTEMS_FALSE@use_dejagnu = no
 @LIBGO_IS_RTEMS_TRUE@use_dejagnu = yes
@@ -2127,7 +1950,7 @@ GOTESTFLAGS =
 
 # Check a package.
 CHECK = \
-       GC="$(GOC) $(GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \
+       GC="$(GOC) $(GOCFLAGS) $($(subst /,_,$@)_GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \
        export GC; \
        GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \
        export GOLIBS; \
@@ -2139,13 +1962,12 @@ CHECK = \
        LD_LIBRARY_PATH="`${PWD_COMMAND}`/.libs:$${libgccdir}:${LD_LIBRARY_PATH}"; \
        LD_LIBRARY_PATH=`echo $${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \
        export LD_LIBRARY_PATH; \
+       $(MKDIR_P) $(@D); \
        rm -f $@-testsum $@-testlog; \
-       prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \
-       test "$${prefix}" != "." || prefix="$(@D)"; \
        if test "$(use_dejagnu)" = "yes"; then \
-         $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" $(GOTESTFLAGS); \
+         $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" --goarch="$(GOARCH)" $(GOTESTFLAGS); \
        else \
-         if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
+         if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --goarch="$(GOARCH)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
            echo "PASS: $(@D)" >> $@-testlog; \
            echo "PASS: $(@D)"; \
            echo "PASS: $(@D)" > $@-testsum; \
@@ -2165,7 +1987,6 @@ CHECK_DEPS = libgo.la libgobegin.a \
        $(toolexeclibgocompress_DATA) \
        $(toolexeclibgocontainer_DATA) \
        $(toolexeclibgocrypto_DATA) \
-       $(toolexeclibgocryptoopenpgp_DATA) \
        $(toolexeclibgodebug_DATA) \
        $(toolexeclibgoencoding_DATA) \
        $(toolexeclibgoexp_DATA) \
@@ -2189,6 +2010,9 @@ CHECK_DEPS = libgo.la libgobegin.a \
        $(toolexeclibgotexttemplate_DATA) \
        $(toolexeclibgounicode_DATA)
 
+# At least for now, we need -static-libgo for this test, because
+# otherwise we can't get the line numbers.
+runtime_pprof_check_GOCFLAGS = -static-libgo
 
 # How to build a .gox file from a .lo file.
 BUILDGOX = \
@@ -2214,7 +2038,6 @@ TEST_PACKAGES = \
        mime/check \
        net/check \
        os/check \
-       patch/check \
        path/check \
        reflect/check \
        regexp/check \
@@ -2225,7 +2048,6 @@ TEST_PACKAGES = \
        sync/check \
        time/check \
        unicode/check \
-       websocket/check \
        archive/tar/check \
        archive/zip/check \
        compress/bzip2/check \
@@ -2237,35 +2059,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 \
@@ -2276,22 +2087,22 @@ 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/terminal/check \
+       exp/utf8string/check \
        html/template/check \
        go/ast/check \
        $(go_build_check_omitted_since_it_calls_6g) \
+       go/doc/check \
        go/parser/check \
        go/printer/check \
        go/scanner/check \
@@ -2301,11 +2112,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 \
@@ -2316,6 +2126,7 @@ TEST_PACKAGES = \
        net/http/check \
        net/http/cgi/check \
        net/http/fcgi/check \
+       net/http/httptest/check \
        net/http/httputil/check \
        net/mail/check \
        net/rpc/check \
@@ -2327,17 +2138,17 @@ TEST_PACKAGES = \
        old/regexp/check \
        old/template/check \
        os/exec/check \
-       os/user/check \
        os/signal/check \
+       os/user/check \
        path/filepath/check \
        regexp/syntax/check \
+       runtime/pprof/check \
        sync/atomic/check \
        text/scanner/check \
        text/tabwriter/check \
        text/template/check \
        text/template/parse/check \
        testing/quick/check \
-       testing/script/check \
        unicode/utf16/check \
        unicode/utf8/check
 
@@ -2483,6 +2294,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-breakpoint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-byte-array-to-string.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-caller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-callers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-can-convert-interface.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-cgo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-check-interface.Plo@am__quote@
@@ -2505,15 +2317,17 @@ 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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-recover.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-reflect-call.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-reflect-map.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-reflect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-rune.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-runtime-error.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-setenv.Plo@am__quote@
@@ -2523,15 +2337,17 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-string-to-int-array.Plo@am__quote@
 @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-traceback.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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-typedesc-equal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-typestring.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-unreflect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-unsafe-new.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-unsafe-newarray.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-unsafe-pointer.Plo@am__quote@
@@ -2551,12 +2367,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mheap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mprof.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Plo@am__quote@
 @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)/runtime1.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sema.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal_unix.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-linux.Plo@am__quote@
@@ -2642,6 +2460,13 @@ go-caller.lo: runtime/go-caller.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-caller.lo `test -f 'runtime/go-caller.c' || echo '$(srcdir)/'`runtime/go-caller.c
 
+go-callers.lo: runtime/go-callers.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-callers.lo -MD -MP -MF $(DEPDIR)/go-callers.Tpo -c -o go-callers.lo `test -f 'runtime/go-callers.c' || echo '$(srcdir)/'`runtime/go-callers.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-callers.Tpo $(DEPDIR)/go-callers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-callers.c' object='go-callers.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-callers.lo `test -f 'runtime/go-callers.c' || echo '$(srcdir)/'`runtime/go-callers.c
+
 go-can-convert-interface.lo: runtime/go-can-convert-interface.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-can-convert-interface.lo -MD -MP -MF $(DEPDIR)/go-can-convert-interface.Tpo -c -o go-can-convert-interface.lo `test -f 'runtime/go-can-convert-interface.c' || echo '$(srcdir)/'`runtime/go-can-convert-interface.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-can-convert-interface.Tpo $(DEPDIR)/go-can-convert-interface.Plo
@@ -2789,6 +2614,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
@@ -2796,6 +2628,13 @@ go-nanotime.lo: runtime/go-nanotime.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-nanotime.lo `test -f 'runtime/go-nanotime.c' || echo '$(srcdir)/'`runtime/go-nanotime.c
 
+go-now.lo: runtime/go-now.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-now.lo -MD -MP -MF $(DEPDIR)/go-now.Tpo -c -o go-now.lo `test -f 'runtime/go-now.c' || echo '$(srcdir)/'`runtime/go-now.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-now.Tpo $(DEPDIR)/go-now.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-now.c' object='go-now.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-now.lo `test -f 'runtime/go-now.c' || echo '$(srcdir)/'`runtime/go-now.c
+
 go-new-map.lo: runtime/go-new-map.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-new-map.lo -MD -MP -MF $(DEPDIR)/go-new-map.Tpo -c -o go-new-map.lo `test -f 'runtime/go-new-map.c' || echo '$(srcdir)/'`runtime/go-new-map.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-new-map.Tpo $(DEPDIR)/go-new-map.Plo
@@ -2810,6 +2649,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
@@ -2831,13 +2677,6 @@ go-recover.lo: runtime/go-recover.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-recover.lo `test -f 'runtime/go-recover.c' || echo '$(srcdir)/'`runtime/go-recover.c
 
-go-reflect.lo: runtime/go-reflect.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-reflect.lo -MD -MP -MF $(DEPDIR)/go-reflect.Tpo -c -o go-reflect.lo `test -f 'runtime/go-reflect.c' || echo '$(srcdir)/'`runtime/go-reflect.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-reflect.Tpo $(DEPDIR)/go-reflect.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-reflect.c' object='go-reflect.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-reflect.lo `test -f 'runtime/go-reflect.c' || echo '$(srcdir)/'`runtime/go-reflect.c
-
 go-reflect-call.lo: runtime/go-reflect-call.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-reflect-call.lo -MD -MP -MF $(DEPDIR)/go-reflect-call.Tpo -c -o go-reflect-call.lo `test -f 'runtime/go-reflect-call.c' || echo '$(srcdir)/'`runtime/go-reflect-call.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-reflect-call.Tpo $(DEPDIR)/go-reflect-call.Plo
@@ -2915,6 +2754,13 @@ go-strslice.lo: runtime/go-strslice.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-strslice.lo `test -f 'runtime/go-strslice.c' || echo '$(srcdir)/'`runtime/go-strslice.c
 
+go-traceback.lo: runtime/go-traceback.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-traceback.lo -MD -MP -MF $(DEPDIR)/go-traceback.Tpo -c -o go-traceback.lo `test -f 'runtime/go-traceback.c' || echo '$(srcdir)/'`runtime/go-traceback.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-traceback.Tpo $(DEPDIR)/go-traceback.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-traceback.c' object='go-traceback.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-traceback.lo `test -f 'runtime/go-traceback.c' || echo '$(srcdir)/'`runtime/go-traceback.c
+
 go-trampoline.lo: runtime/go-trampoline.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-trampoline.lo -MD -MP -MF $(DEPDIR)/go-trampoline.Tpo -c -o go-trampoline.lo `test -f 'runtime/go-trampoline.c' || echo '$(srcdir)/'`runtime/go-trampoline.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-trampoline.Tpo $(DEPDIR)/go-trampoline.Plo
@@ -2922,6 +2768,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
@@ -2936,6 +2789,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
@@ -2971,13 +2831,6 @@ go-typestring.lo: runtime/go-typestring.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-typestring.lo `test -f 'runtime/go-typestring.c' || echo '$(srcdir)/'`runtime/go-typestring.c
 
-go-unreflect.lo: runtime/go-unreflect.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-unreflect.lo -MD -MP -MF $(DEPDIR)/go-unreflect.Tpo -c -o go-unreflect.lo `test -f 'runtime/go-unreflect.c' || echo '$(srcdir)/'`runtime/go-unreflect.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-unreflect.Tpo $(DEPDIR)/go-unreflect.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-unreflect.c' object='go-unreflect.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-unreflect.lo `test -f 'runtime/go-unreflect.c' || echo '$(srcdir)/'`runtime/go-unreflect.c
-
 go-unsafe-new.lo: runtime/go-unsafe-new.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-unsafe-new.lo -MD -MP -MF $(DEPDIR)/go-unsafe-new.Tpo -c -o go-unsafe-new.lo `test -f 'runtime/go-unsafe-new.c' || echo '$(srcdir)/'`runtime/go-unsafe-new.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-unsafe-new.Tpo $(DEPDIR)/go-unsafe-new.Plo
@@ -3111,6 +2964,13 @@ msize.lo: runtime/msize.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 msize.lo `test -f 'runtime/msize.c' || echo '$(srcdir)/'`runtime/msize.c
 
+print.lo: runtime/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 print.lo -MD -MP -MF $(DEPDIR)/print.Tpo -c -o print.lo `test -f 'runtime/print.c' || echo '$(srcdir)/'`runtime/print.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/print.Tpo $(DEPDIR)/print.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/print.c' object='print.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 print.lo `test -f 'runtime/print.c' || echo '$(srcdir)/'`runtime/print.c
+
 proc.lo: runtime/proc.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT proc.lo -MD -MP -MF $(DEPDIR)/proc.Tpo -c -o proc.lo `test -f 'runtime/proc.c' || echo '$(srcdir)/'`runtime/proc.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/proc.Tpo $(DEPDIR)/proc.Plo
@@ -3125,6 +2985,13 @@ runtime.lo: runtime/runtime.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 runtime.lo `test -f 'runtime/runtime.c' || echo '$(srcdir)/'`runtime/runtime.c
 
+signal_unix.lo: runtime/signal_unix.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT signal_unix.lo -MD -MP -MF $(DEPDIR)/signal_unix.Tpo -c -o signal_unix.lo `test -f 'runtime/signal_unix.c' || echo '$(srcdir)/'`runtime/signal_unix.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/signal_unix.Tpo $(DEPDIR)/signal_unix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/signal_unix.c' object='signal_unix.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 signal_unix.lo `test -f 'runtime/signal_unix.c' || echo '$(srcdir)/'`runtime/signal_unix.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
@@ -3271,46 +3138,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)"
@@ -3371,46 +3258,6 @@ uninstall-toolexeclibgoexpDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgoexpdir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgoexpdir)" && rm -f $$files
-install-toolexeclibgoexpguiDATA: $(toolexeclibgoexpgui_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibgoexpguidir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgoexpguidir)"
-       @list='$(toolexeclibgoexpgui_DATA)'; test -n "$(toolexeclibgoexpguidir)" || 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)$(toolexeclibgoexpguidir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgoexpguidir)" || exit $$?; \
-       done
-
-uninstall-toolexeclibgoexpguiDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(toolexeclibgoexpgui_DATA)'; test -n "$(toolexeclibgoexpguidir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(toolexeclibgoexpguidir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(toolexeclibgoexpguidir)" && 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)"
@@ -3986,189 +3833,13 @@ GTAGS:
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       $(am__remove_distdir)
-       test -d "$(distdir)" || mkdir "$(distdir)"
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           test -d "$(distdir)/$$subdir" \
-           || $(MKDIR_P) "$(distdir)/$$subdir" \
-           || exit 1; \
-         fi; \
-       done
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-           $(am__relativize); \
-           new_distdir=$$reldir; \
-           dir1=$$subdir; dir2="$(top_distdir)"; \
-           $(am__relativize); \
-           new_top_distdir=$$reldir; \
-           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-           ($(am__cd) $$subdir && \
-             $(MAKE) $(AM_MAKEFLAGS) \
-               top_distdir="$$new_top_distdir" \
-               distdir="$$new_distdir" \
-               am__remove_distdir=: \
-               am__skip_length_check=: \
-               am__skip_mode_fix=: \
-               distdir) \
-             || exit 1; \
-         fi; \
-       done
-       -test -n "$(am__skip_mode_fix)" \
-       || find "$(distdir)" -type d ! -perm -755 \
-               -exec chmod u+rwx,go+rx {} \; -o \
-         ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-         ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-         ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-       || chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-       $(am__remove_distdir)
-
-dist-bzip2: distdir
-       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-       $(am__remove_distdir)
-
-dist-lzma: distdir
-       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-       $(am__remove_distdir)
-
-dist-xz: distdir
-       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-       $(am__remove_distdir)
-
-dist-tarZ: distdir
-       tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-       $(am__remove_distdir)
-
-dist-shar: distdir
-       shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-       $(am__remove_distdir)
-
-dist-zip: distdir
-       -rm -f $(distdir).zip
-       zip -rq $(distdir).zip $(distdir)
-       $(am__remove_distdir)
-
-dist dist-all: distdir
-       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-       $(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-       case '$(DIST_ARCHIVES)' in \
-       *.tar.gz*) \
-         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-       *.tar.bz2*) \
-         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-       *.tar.lzma*) \
-         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-       *.tar.xz*) \
-         xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-       *.tar.Z*) \
-         uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-       *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-       *.zip*) \
-         unzip $(distdir).zip ;;\
-       esac
-       chmod -R a-w $(distdir); chmod a+w $(distdir)
-       mkdir $(distdir)/_build
-       mkdir $(distdir)/_inst
-       chmod a-w $(distdir)
-       test -d $(distdir)/_build || exit 0; \
-       dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-         && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-         && am__cwd=`pwd` \
-         && $(am__cd) $(distdir)/_build \
-         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-           $(DISTCHECK_CONFIGURE_FLAGS) \
-         && $(MAKE) $(AM_MAKEFLAGS) \
-         && $(MAKE) $(AM_MAKEFLAGS) dvi \
-         && $(MAKE) $(AM_MAKEFLAGS) check \
-         && $(MAKE) $(AM_MAKEFLAGS) install \
-         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-         && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-         && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-               distuninstallcheck \
-         && chmod -R a-w "$$dc_install_base" \
-         && ({ \
-              (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-                   distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-             } || { rm -rf "$$dc_destdir"; exit 1; }) \
-         && rm -rf "$$dc_destdir" \
-         && $(MAKE) $(AM_MAKEFLAGS) dist \
-         && rm -rf $(DIST_ARCHIVES) \
-         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-         && cd "$$am__cwd" \
-         || exit 1
-       $(am__remove_distdir)
-       @(echo "$(distdir) archives ready for distribution: "; \
-         list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-         sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-       @$(am__cd) '$(distuninstallcheck_dir)' \
-       && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-          || { echo "ERROR: files left after uninstall:" ; \
-               if test -n "$(DESTDIR)"; then \
-                 echo "  (check DESTDIR support)"; \
-               fi ; \
-               $(distuninstallcheck_listfiles) ; \
-               exit 1; } >&2
-distcleancheck: distclean
-       @if test '$(srcdir)' = . ; then \
-         echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-         exit 1 ; \
-       fi
-       @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-         || { echo "ERROR: files left in build directory after distclean:" ; \
-              $(distcleancheck_listfiles) ; \
-              exit 1; } >&2
 check-am: all-am
 check: check-recursive
 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)$(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
@@ -4234,17 +3905,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-toolexeclibgoexpguiDATA \
-       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 \
@@ -4299,14 +3970,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-toolexeclibgoexpguiDATA \
-       uninstall-toolexeclibgoexpsqlDATA \
-       uninstall-toolexeclibgogoDATA uninstall-toolexeclibgohashDATA \
+       uninstall-toolexeclibgoexpDATA uninstall-toolexeclibgogoDATA \
+       uninstall-toolexeclibgohashDATA \
        uninstall-toolexeclibgohtmlDATA \
        uninstall-toolexeclibgoimageDATA \
        uninstall-toolexeclibgoindexDATA uninstall-toolexeclibgoioDATA \
@@ -4333,32 +4003,30 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        all all-am all-multi am--refresh check check-am clean \
        clean-generic clean-libtool clean-local clean-multi \
        clean-toolexeclibLIBRARIES clean-toolexeclibLTLIBRARIES ctags \
-       ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \
-       dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
-       distclean-compile distclean-generic distclean-hdr \
-       distclean-libtool distclean-multi distclean-tags \
-       distcleancheck distdir distuninstallcheck dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-multi install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       install-toolexeclibLIBRARIES install-toolexeclibLTLIBRARIES \
-       install-toolexeclibgoDATA install-toolexeclibgoarchiveDATA \
+       ctags-recursive distclean distclean-compile distclean-generic \
+       distclean-hdr distclean-libtool distclean-multi distclean-tags \
+       dvi dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-multi \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip install-toolexeclibLIBRARIES \
+       install-toolexeclibLTLIBRARIES install-toolexeclibgoDATA \
+       install-toolexeclibgoarchiveDATA \
        install-toolexeclibgocompressDATA \
        install-toolexeclibgocontainerDATA \
        install-toolexeclibgocryptoDATA \
-       install-toolexeclibgocryptoopenpgpDATA \
        install-toolexeclibgocryptox509DATA \
+       install-toolexeclibgodatabaseDATA \
+       install-toolexeclibgodatabasesqlDATA \
        install-toolexeclibgodebugDATA \
        install-toolexeclibgoencodingDATA install-toolexeclibgoexpDATA \
-       install-toolexeclibgoexpguiDATA \
-       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 \
@@ -4377,14 +4045,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-toolexeclibgoexpguiDATA \
-       uninstall-toolexeclibgoexpsqlDATA \
-       uninstall-toolexeclibgogoDATA uninstall-toolexeclibgohashDATA \
+       uninstall-toolexeclibgoexpDATA uninstall-toolexeclibgogoDATA \
+       uninstall-toolexeclibgohashDATA \
        uninstall-toolexeclibgohtmlDATA \
        uninstall-toolexeclibgoimageDATA \
        uninstall-toolexeclibgoindexDATA uninstall-toolexeclibgoioDATA \
@@ -4410,31 +4077,31 @@ goc2c: goc2c.$(OBJEXT)
        $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $<
 
 malloc.c: $(srcdir)/runtime/malloc.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 mprof.c: $(srcdir)/runtime/mprof.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 reflect.c: $(srcdir)/runtime/reflect.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_reflect $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 runtime1.c: $(srcdir)/runtime/runtime1.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 sema.c: $(srcdir)/runtime/sema.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 sigqueue.c: $(srcdir)/runtime/sigqueue.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc --go-pkgpath os_signal $< > $@.tmp
        mv -f $@.tmp $@
 
 time.c: $(srcdir)/runtime/time.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_time $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 %.c: $(srcdir)/runtime/%.goc goc2c
@@ -4503,290 +4170,260 @@ s-epoll: Makefile
        $(SHELL) $(srcdir)/../move-if-change epoll.go.tmp epoll.go
        $(STAMP) $@
 
-@go_include@ bufio/bufio.lo.dep
-bufio/bufio.lo.dep: $(go_bufio_files)
+@go_include@ bufio.lo.dep
+bufio.lo.dep: $(go_bufio_files)
        $(BUILDDEPS)
-bufio/bufio.lo: $(go_bufio_files)
+bufio.lo: $(go_bufio_files)
        $(BUILDPACKAGE)
 bufio/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: bufio/check
 
-@go_include@ bytes/bytes.lo.dep
-bytes/bytes.lo.dep: $(go_bytes_files)
+@go_include@ bytes.lo.dep
+bytes.lo.dep: $(go_bytes_files)
        $(BUILDDEPS)
-bytes/bytes.lo: $(go_bytes_files)
+bytes.lo: $(go_bytes_files)
        $(BUILDPACKAGE)
-bytes/index.lo: $(go_bytes_c_files) bytes/bytes.lo
+bytes/index.lo: $(go_bytes_c_files)
+       @$(MKDIR_P) bytes
        $(LTCOMPILE) -c -o bytes/index.lo $(srcdir)/go/bytes/indexbyte.c
 bytes/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: bytes/check
 
-@go_include@ crypto/crypto.lo.dep
-crypto/crypto.lo.dep: $(go_crypto_files)
+@go_include@ crypto.lo.dep
+crypto.lo.dep: $(go_crypto_files)
        $(BUILDDEPS)
-crypto/crypto.lo: $(go_crypto_files)
+crypto.lo: $(go_crypto_files)
        $(BUILDPACKAGE)
 crypto/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/check
 
-@go_include@ errors/errors.lo.dep
-errors/errors.lo.dep: $(go_errors_files)
+@go_include@ errors.lo.dep
+errors.lo.dep: $(go_errors_files)
        $(BUILDDEPS)
-errors/errors.lo: $(go_errors_files)
+errors.lo: $(go_errors_files)
        $(BUILDPACKAGE)
 errors/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: errors/check
 
-@go_include@ expvar/expvar.lo.dep
-expvar/expvar.lo.dep: $(go_expvar_files)
+@go_include@ expvar.lo.dep
+expvar.lo.dep: $(go_expvar_files)
        $(BUILDDEPS)
-expvar/expvar.lo: $(go_expvar_files)
+expvar.lo: $(go_expvar_files)
        $(BUILDPACKAGE)
 expvar/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: expvar/check
 
-@go_include@ flag/flag.lo.dep
-flag/flag.lo.dep: $(go_flag_files)
+@go_include@ flag.lo.dep
+flag.lo.dep: $(go_flag_files)
        $(BUILDDEPS)
-flag/flag.lo: $(go_flag_files)
+flag.lo: $(go_flag_files)
        $(BUILDPACKAGE)
 flag/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: flag/check
 
-@go_include@ fmt/fmt.lo.dep
-fmt/fmt.lo.dep: $(go_fmt_files)
+@go_include@ fmt.lo.dep
+fmt.lo.dep: $(go_fmt_files)
        $(BUILDDEPS)
-fmt/fmt.lo: $(go_fmt_files)
+fmt.lo: $(go_fmt_files)
        $(BUILDPACKAGE)
 fmt/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: fmt/check
 
-@go_include@ hash/hash.lo.dep
-hash/hash.lo.dep: $(go_hash_files)
+@go_include@ hash.lo.dep
+hash.lo.dep: $(go_hash_files)
        $(BUILDDEPS)
-hash/hash.lo: $(go_hash_files)
+hash.lo: $(go_hash_files)
        $(BUILDPACKAGE)
 hash/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: hash/check
 
-@go_include@ html/html.lo.dep
-html/html.lo.dep: $(go_html_files)
+@go_include@ html.lo.dep
+html.lo.dep: $(go_html_files)
        $(BUILDDEPS)
-html/html.lo: $(go_html_files)
+html.lo: $(go_html_files)
        $(BUILDPACKAGE)
 html/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: html/check
 
-@go_include@ image/image.lo.dep
-image/image.lo.dep: $(go_image_files)
+@go_include@ image.lo.dep
+image.lo.dep: $(go_image_files)
        $(BUILDDEPS)
-image/image.lo: $(go_image_files)
+image.lo: $(go_image_files)
        $(BUILDPACKAGE)
 image/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: image/check
 
-@go_include@ io/io.lo.dep
-io/io.lo.dep: $(go_io_files)
+@go_include@ io.lo.dep
+io.lo.dep: $(go_io_files)
        $(BUILDDEPS)
-io/io.lo: $(go_io_files)
+io.lo: $(go_io_files)
        $(BUILDPACKAGE)
 io/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: io/check
 
-@go_include@ log/log.lo.dep
-log/log.lo.dep: $(go_log_files)
+@go_include@ log.lo.dep
+log.lo.dep: $(go_log_files)
        $(BUILDDEPS)
-log/log.lo: $(go_log_files)
+log.lo: $(go_log_files)
        $(BUILDPACKAGE)
 log/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: log/check
 
-@go_include@ math/math.lo.dep
-math/math.lo.dep: $(go_math_files)
+@go_include@ math.lo.dep
+math.lo.dep: $(go_math_files)
        $(BUILDDEPS)
-math/math.lo: $(go_math_files)
-       $(BUILDPACKAGE)
+math.lo: $(go_math_files)
+       $(MKDIR_P) $(@D)
+       files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \
+       $(LTGOCOMPILE) $(MATH_FLAG) -I . -c -fgo-pkgpath=math -o $@ $$files
 math/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: math/check
 
-@go_include@ mime/mime.lo.dep
-mime/mime.lo.dep: $(go_mime_files)
+@go_include@ mime.lo.dep
+mime.lo.dep: $(go_mime_files)
        $(BUILDDEPS)
-mime/mime.lo: $(go_mime_files)
+mime.lo: $(go_mime_files)
        $(BUILDPACKAGE)
 mime/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: mime/check
 
-@go_include@ net/net.lo.dep
-net/net.lo.dep: $(go_net_files)
+@go_include@ net.lo.dep
+net.lo.dep: $(go_net_files)
        $(BUILDDEPS)
-net/net.lo: $(go_net_files)
+net.lo: $(go_net_files)
        $(BUILDPACKAGE)
 net/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: net/check
 
-@go_include@ os/os.lo.dep
-os/os.lo.dep: $(go_os_files)
+@go_include@ os.lo.dep
+os.lo.dep: $(go_os_files)
        $(BUILDDEPS)
-os/os.lo: $(go_os_files)
+os.lo: $(go_os_files)
        $(BUILDPACKAGE)
 os/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: os/check
 
-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)
+@go_include@ path.lo.dep
+path.lo.dep: $(go_path_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)
-path/path.lo: $(go_path_files)
+path.lo: $(go_path_files)
        $(BUILDPACKAGE)
 path/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: path/check
 
-@go_include@ reflect/reflect.lo.dep
-reflect/reflect.lo.dep: $(go_reflect_files)
+@go_include@ reflect-go.lo.dep
+reflect-go.lo.dep: $(go_reflect_files)
        $(BUILDDEPS)
-reflect/reflect.lo: $(go_reflect_files)
+reflect-go.lo: $(go_reflect_files)
        $(BUILDPACKAGE)
 reflect/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: reflect/check
 
-@go_include@ regexp/regexp.lo.dep
-regexp/regexp.lo.dep: $(go_regexp_files)
+@go_include@ regexp.lo.dep
+regexp.lo.dep: $(go_regexp_files)
        $(BUILDDEPS)
-regexp/regexp.lo: $(go_regexp_files)
+regexp.lo: $(go_regexp_files)
        $(BUILDPACKAGE)
 regexp/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: regexp/check
 
-@go_include@ runtime/runtime.lo.dep
-runtime/runtime.lo.dep: $(go_runtime_files)
+@go_include@ runtime-go.lo.dep
+runtime-go.lo.dep: $(go_runtime_files)
        $(BUILDDEPS)
-runtime/runtime.lo: $(go_runtime_files)
+runtime-go.lo: $(go_runtime_files)
        $(BUILDPACKAGE)
 runtime/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: runtime/check
 
-@go_include@ text/scanner.lo.dep
-text/scanner.lo.dep: $(go_text_scanner_files)
+@go_include@ sort.lo.dep
+sort.lo.dep: $(go_sort_files)
        $(BUILDDEPS)
-text/scanner.lo: $(go_text_scanner_files)
-       $(BUILDPACKAGE)
-text/scanner/check: $(CHECK_DEPS)
-       @$(MKDIR_P) text/scanner
-       @$(CHECK)
-.PHONY: text/scanner/check
-
-@go_include@ sort/sort.lo.dep
-sort/sort.lo.dep: $(go_sort_files)
-       $(BUILDDEPS)
-sort/sort.lo: $(go_sort_files)
+sort.lo: $(go_sort_files)
        $(BUILDPACKAGE)
 sort/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: sort/check
 
-@go_include@ strconv/strconv.lo.dep
-strconv/strconv.lo.dep: $(go_strconv_files)
+@go_include@ strconv.lo.dep
+strconv.lo.dep: $(go_strconv_files)
        $(BUILDDEPS)
-strconv/strconv.lo: $(go_strconv_files)
+strconv.lo: $(go_strconv_files)
        $(BUILDPACKAGE)
 strconv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: strconv/check
 
-@go_include@ strings/strings.lo.dep
-strings/strings.lo.dep: $(go_strings_files)
+@go_include@ strings.lo.dep
+strings.lo.dep: $(go_strings_files)
        $(BUILDDEPS)
-strings/strings.lo: $(go_strings_files)
+strings.lo: $(go_strings_files)
        $(BUILDPACKAGE)
 strings/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: strings/check
 
-@go_include@ sync/sync.lo.dep
-sync/sync.lo.dep: $(go_sync_files)
+@go_include@ sync.lo.dep
+sync.lo.dep: $(go_sync_files)
        $(BUILDDEPS)
-sync/sync.lo: $(go_sync_files)
+sync.lo: $(go_sync_files)
        $(BUILDPACKAGE)
 sync/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: sync/check
 
-@go_include@ testing/testing.lo.dep
-testing/testing.lo.dep: $(go_testing_files)
+@go_include@ testing.lo.dep
+testing.lo.dep: $(go_testing_files)
        $(BUILDDEPS)
-testing/testing.lo: $(go_testing_files)
+testing.lo: $(go_testing_files)
        $(BUILDPACKAGE)
 testing/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: testing/check
 
-@go_include@ time/time.lo.dep
-time/time.lo.dep: $(go_time_files)
+@go_include@ time-go.lo.dep
+time-go.lo.dep: $(go_time_files)
        $(BUILDDEPS)
-time/time.lo: $(go_time_files)
+time-go.lo: $(go_time_files)
        $(BUILDPACKAGE)
 time/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: time/check
 
-@go_include@ unicode/unicode.lo.dep
-unicode/unicode.lo.dep: $(go_unicode_files)
+@go_include@ unicode.lo.dep
+unicode.lo.dep: $(go_unicode_files)
        $(BUILDDEPS)
-unicode/unicode.lo: $(go_unicode_files)
+unicode.lo: $(go_unicode_files)
        $(BUILDPACKAGE)
 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)
 archive/tar.lo: $(go_archive_tar_files)
        $(BUILDPACKAGE)
 archive/tar/check: $(CHECK_DEPS)
-       @$(MKDIR_P) archive/tar
        @$(CHECK)
 .PHONY: archive/tar/check
 
@@ -4796,7 +4433,6 @@ archive/zip.lo.dep: $(go_archive_zip_files)
 archive/zip.lo: $(go_archive_zip_files)
        $(BUILDPACKAGE)
 archive/zip/check: $(CHECK_DEPS)
-       @$(MKDIR_P) archive/zip
        @$(CHECK)
 .PHONY: archive/zip/check
 
@@ -4806,7 +4442,6 @@ compress/bzip2.lo.dep: $(go_compress_bzip2_files)
 compress/bzip2.lo: $(go_compress_bzip2_files)
        $(BUILDPACKAGE)
 compress/bzip2/check: $(CHECK_DEPS)
-       @$(MKDIR_P) compress/bzip2
        @$(CHECK)
 .PHONY: compress/bzip2/check
 
@@ -4816,7 +4451,6 @@ compress/flate.lo.dep: $(go_compress_flate_files)
 compress/flate.lo: $(go_compress_flate_files)
        $(BUILDPACKAGE)
 compress/flate/check: $(CHECK_DEPS)
-       @$(MKDIR_P) compress/flate
        @$(CHECK)
 .PHONY: compress/flate/check
 
@@ -4826,7 +4460,6 @@ compress/gzip.lo.dep: $(go_compress_gzip_files)
 compress/gzip.lo: $(go_compress_gzip_files)
        $(BUILDPACKAGE)
 compress/gzip/check: $(CHECK_DEPS)
-       @$(MKDIR_P) compress/gzip
        @$(CHECK)
 .PHONY: compress/gzip/check
 
@@ -4836,7 +4469,6 @@ compress/lzw.lo.dep: $(go_compress_lzw_files)
 compress/lzw.lo: $(go_compress_lzw_files)
        $(BUILDPACKAGE)
 compress/lzw/check: $(CHECK_DEPS)
-       @$(MKDIR_P) compress/lzw
        @$(CHECK)
 .PHONY: compress/lzw/check
 
@@ -4846,7 +4478,6 @@ compress/zlib.lo.dep: $(go_compress_zlib_files)
 compress/zlib.lo: $(go_compress_zlib_files)
        $(BUILDPACKAGE)
 compress/zlib/check: $(CHECK_DEPS)
-       @$(MKDIR_P) compress/zlib
        @$(CHECK)
 .PHONY: compress/zlib/check
 
@@ -4856,7 +4487,6 @@ container/heap.lo.dep: $(go_container_heap_files)
 container/heap.lo: $(go_container_heap_files)
        $(BUILDPACKAGE)
 container/heap/check: $(CHECK_DEPS)
-       @$(MKDIR_P) container/heap
        @$(CHECK)
 .PHONY: container/heap/check
 
@@ -4866,7 +4496,6 @@ container/list.lo.dep: $(go_container_list_files)
 container/list.lo: $(go_container_list_files)
        $(BUILDPACKAGE)
 container/list/check: $(CHECK_DEPS)
-       @$(MKDIR_P) container/list
        @$(CHECK)
 .PHONY: container/list/check
 
@@ -4876,7 +4505,6 @@ container/ring.lo.dep: $(go_container_ring_files)
 container/ring.lo: $(go_container_ring_files)
        $(BUILDPACKAGE)
 container/ring/check: $(CHECK_DEPS)
-       @$(MKDIR_P) container/ring
        @$(CHECK)
 .PHONY: container/ring/check
 
@@ -4886,47 +4514,15 @@ crypto/aes.lo.dep: $(go_crypto_aes_files)
 crypto/aes.lo: $(go_crypto_aes_files)
        $(BUILDPACKAGE)
 crypto/aes/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/aes
        @$(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)
 crypto/cipher.lo: $(go_crypto_cipher_files)
        $(BUILDPACKAGE)
 crypto/cipher/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/cipher
        @$(CHECK)
 .PHONY: crypto/cipher/check
 
@@ -4936,7 +4532,6 @@ crypto/des.lo.dep: $(go_crypto_des_files)
 crypto/des.lo: $(go_crypto_des_files)
        $(BUILDPACKAGE)
 crypto/des/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/des
        @$(CHECK)
 .PHONY: crypto/des/check
 
@@ -4946,7 +4541,6 @@ crypto/dsa.lo.dep: $(go_crypto_dsa_files)
 crypto/dsa.lo: $(go_crypto_dsa_files)
        $(BUILDPACKAGE)
 crypto/dsa/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/dsa
        @$(CHECK)
 .PHONY: crypto/dsa/check
 
@@ -4956,7 +4550,6 @@ crypto/ecdsa.lo.dep: $(go_crypto_ecdsa_files)
 crypto/ecdsa.lo: $(go_crypto_ecdsa_files)
        $(BUILDPACKAGE)
 crypto/ecdsa/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/ecdsa
        @$(CHECK)
 .PHONY: crypto/ecdsa/check
 
@@ -4966,7 +4559,6 @@ crypto/elliptic.lo.dep: $(go_crypto_elliptic_files)
 crypto/elliptic.lo: $(go_crypto_elliptic_files)
        $(BUILDPACKAGE)
 crypto/elliptic/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/elliptic
        @$(CHECK)
 .PHONY: crypto/elliptic/check
 
@@ -4976,57 +4568,24 @@ crypto/hmac.lo.dep: $(go_crypto_hmac_files)
 crypto/hmac.lo: $(go_crypto_hmac_files)
        $(BUILDPACKAGE)
 crypto/hmac/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/hmac
        @$(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)
 crypto/md5.lo: $(go_crypto_md5_files)
        $(BUILDPACKAGE)
 crypto/md5/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/md5
        @$(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)
 crypto/rand.lo: $(go_crypto_rand_files)
        $(BUILDPACKAGE)
 crypto/rand/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/rand
        @$(CHECK)
 .PHONY: crypto/rand/check
 
@@ -5036,27 +4595,15 @@ crypto/rc4.lo.dep: $(go_crypto_rc4_files)
 crypto/rc4.lo: $(go_crypto_rc4_files)
        $(BUILDPACKAGE)
 crypto/rc4/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/rc4
        @$(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)
 crypto/rsa.lo: $(go_crypto_rsa_files)
        $(BUILDPACKAGE)
 crypto/rsa/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/rsa
        @$(CHECK)
 .PHONY: crypto/rsa/check
 
@@ -5066,7 +4613,6 @@ crypto/sha1.lo.dep: $(go_crypto_sha1_files)
 crypto/sha1.lo: $(go_crypto_sha1_files)
        $(BUILDPACKAGE)
 crypto/sha1/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/sha1
        @$(CHECK)
 .PHONY: crypto/sha1/check
 
@@ -5076,7 +4622,6 @@ crypto/sha256.lo.dep: $(go_crypto_sha256_files)
 crypto/sha256.lo: $(go_crypto_sha256_files)
        $(BUILDPACKAGE)
 crypto/sha256/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/sha256
        @$(CHECK)
 .PHONY: crypto/sha256/check
 
@@ -5086,7 +4631,6 @@ crypto/sha512.lo.dep: $(go_crypto_sha512_files)
 crypto/sha512.lo: $(go_crypto_sha512_files)
        $(BUILDPACKAGE)
 crypto/sha512/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/sha512
        @$(CHECK)
 .PHONY: crypto/sha512/check
 
@@ -5096,7 +4640,6 @@ crypto/subtle.lo.dep: $(go_crypto_subtle_files)
 crypto/subtle.lo: $(go_crypto_subtle_files)
        $(BUILDPACKAGE)
 crypto/subtle/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/subtle
        @$(CHECK)
 .PHONY: crypto/subtle/check
 
@@ -5106,99 +4649,44 @@ crypto/tls.lo.dep: $(go_crypto_tls_files)
 crypto/tls.lo: $(go_crypto_tls_files)
        $(BUILDPACKAGE)
 crypto/tls/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/tls
        @$(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)
 crypto/x509.lo: $(go_crypto_x509_files)
        $(BUILDPACKAGE)
 crypto/x509/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/x509
        @$(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)
+@go_include@ crypto/x509/pkix.lo.dep
+crypto/x509/pkix.lo.dep: $(go_crypto_x509_pkix_files)
        $(BUILDDEPS)
-crypto/openpgp/error.lo: $(go_crypto_openpgp_error_files)
+crypto/x509/pkix.lo: $(go_crypto_x509_pkix_files)
        $(BUILDPACKAGE)
-crypto/openpgp/error/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/error
+crypto/x509/pkix/check: $(CHECK_DEPS)
        @$(CHECK)
-.PHONY: crypto/openpgp/error/check
+.PHONY: crypto/x509/pkix/check
 
-@go_include@ crypto/openpgp/packet.lo.dep
-crypto/openpgp/packet.lo.dep: $(go_crypto_openpgp_packet_files)
+@go_include@ database/sql.lo.dep
+database/sql.lo.dep: $(go_database_sql_files)
        $(BUILDDEPS)
-crypto/openpgp/packet.lo: $(go_crypto_openpgp_packet_files)
+database/sql.lo: $(go_database_sql_files)
        $(BUILDPACKAGE)
-crypto/openpgp/packet/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/packet
+database/sql/check: $(CHECK_DEPS)
        @$(CHECK)
-.PHONY: crypto/openpgp/packet/check
+.PHONY: database/sql/check
 
-@go_include@ crypto/openpgp/s2k.lo.dep
-crypto/openpgp/s2k.lo.dep: $(go_crypto_openpgp_s2k_files)
+@go_include@ database/sql/driver.lo.dep
+database/sql/driver.lo.dep: $(go_database_sql_driver_files)
        $(BUILDDEPS)
-crypto/openpgp/s2k.lo: $(go_crypto_openpgp_s2k_files)
+database/sql/driver.lo: $(go_database_sql_driver_files)
        $(BUILDPACKAGE)
-crypto/openpgp/s2k/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/s2k
+database/sql/driver/check: $(CHECK_DEPS)
        @$(CHECK)
-.PHONY: crypto/openpgp/s2k/check
-
-@go_include@ crypto/x509/pkix.lo.dep
-crypto/x509/pkix.lo.dep: $(go_crypto_x509_pkix_files)
-       $(BUILDDEPS)
-crypto/x509/pkix.lo: $(go_crypto_x509_pkix_files)
-       $(BUILDPACKAGE)
-crypto/x509/pkix/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/x509/pkix
-       @$(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)
@@ -5206,7 +4694,6 @@ debug/dwarf.lo.dep: $(go_debug_dwarf_files)
 debug/dwarf.lo: $(go_debug_dwarf_files)
        $(BUILDPACKAGE)
 debug/dwarf/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/dwarf
        @$(CHECK)
 .PHONY: debug/dwarf/check
 
@@ -5216,7 +4703,6 @@ debug/elf.lo.dep: $(go_debug_elf_files)
 debug/elf.lo: $(go_debug_elf_files)
        $(BUILDPACKAGE)
 debug/elf/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/elf
        @$(CHECK)
 .PHONY: debug/elf/check
 
@@ -5226,7 +4712,6 @@ debug/gosym.lo.dep: $(go_debug_gosym_files)
 debug/gosym.lo: $(go_debug_gosym_files)
        $(BUILDPACKAGE)
 debug/gosym/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/gosym
        @$(CHECK)
 .PHONY: debug/gosym/check
 
@@ -5236,7 +4721,6 @@ debug/macho.lo.dep: $(go_debug_macho_files)
 debug/macho.lo: $(go_debug_macho_files)
        $(BUILDPACKAGE)
 debug/macho/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/macho
        @$(CHECK)
 .PHONY: debug/macho/check
 
@@ -5246,7 +4730,6 @@ debug/pe.lo.dep: $(go_debug_pe_files)
 debug/pe.lo: $(go_debug_pe_files)
        $(BUILDPACKAGE)
 debug/pe/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/pe
        @$(CHECK)
 .PHONY: debug/pe/check
 
@@ -5256,7 +4739,6 @@ encoding/asn1.lo.dep: $(go_encoding_asn1_files)
 encoding/asn1.lo: $(go_encoding_asn1_files)
        $(BUILDPACKAGE)
 encoding/asn1/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/asn1
        @$(CHECK)
 .PHONY: encoding/asn1/check
 
@@ -5266,7 +4748,6 @@ encoding/ascii85.lo.dep: $(go_encoding_ascii85_files)
 encoding/ascii85.lo: $(go_encoding_ascii85_files)
        $(BUILDPACKAGE)
 encoding/ascii85/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/ascii85
        @$(CHECK)
 .PHONY: encoding/ascii85/check
 
@@ -5276,7 +4757,6 @@ encoding/base32.lo.dep: $(go_encoding_base32_files)
 encoding/base32.lo: $(go_encoding_base32_files)
        $(BUILDPACKAGE)
 encoding/base32/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/base32
        @$(CHECK)
 .PHONY: encoding/base32/check
 
@@ -5286,7 +4766,6 @@ encoding/base64.lo.dep: $(go_encoding_base64_files)
 encoding/base64.lo: $(go_encoding_base64_files)
        $(BUILDPACKAGE)
 encoding/base64/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/base64
        @$(CHECK)
 .PHONY: encoding/base64/check
 
@@ -5296,7 +4775,6 @@ encoding/binary.lo.dep: $(go_encoding_binary_files)
 encoding/binary.lo: $(go_encoding_binary_files)
        $(BUILDPACKAGE)
 encoding/binary/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/binary
        @$(CHECK)
 .PHONY: encoding/binary/check
 
@@ -5306,27 +4784,15 @@ encoding/csv.lo.dep: $(go_encoding_csv_files)
 encoding/csv.lo: $(go_encoding_csv_files)
        $(BUILDPACKAGE)
 encoding/csv/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/csv
        @$(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)
 encoding/gob.lo: $(go_encoding_gob_files)
        $(BUILDPACKAGE)
 encoding/gob/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/gob
        @$(CHECK)
 .PHONY: encoding/gob/check
 
@@ -5336,7 +4802,6 @@ encoding/hex.lo.dep: $(go_encoding_hex_files)
 encoding/hex.lo: $(go_encoding_hex_files)
        $(BUILDPACKAGE)
 encoding/hex/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/hex
        @$(CHECK)
 .PHONY: encoding/hex/check
 
@@ -5346,7 +4811,6 @@ encoding/json.lo.dep: $(go_encoding_json_files)
 encoding/json.lo: $(go_encoding_json_files)
        $(BUILDPACKAGE)
 encoding/json/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/json
        @$(CHECK)
 .PHONY: encoding/json/check
 
@@ -5356,7 +4820,6 @@ encoding/pem.lo.dep: $(go_encoding_pem_files)
 encoding/pem.lo: $(go_encoding_pem_files)
        $(BUILDPACKAGE)
 encoding/pem/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/pem
        @$(CHECK)
 .PHONY: encoding/pem/check
 
@@ -5366,7 +4829,6 @@ encoding/xml.lo.dep: $(go_encoding_xml_files)
 encoding/xml.lo: $(go_encoding_xml_files)
        $(BUILDPACKAGE)
 encoding/xml/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/xml
        @$(CHECK)
 .PHONY: encoding/xml/check
 
@@ -5376,19 +4838,17 @@ exp/ebnf.lo.dep: $(go_exp_ebnf_files)
 exp/ebnf.lo: $(go_exp_ebnf_files)
        $(BUILDPACKAGE)
 exp/ebnf/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/ebnf
        @$(CHECK)
 .PHONY: exp/ebnf/check
 
-@go_include@ exp/gui.lo.dep
-exp/gui.lo.dep: $(go_exp_gui_files)
+@go_include@ exp/html.lo.dep
+exp/html.lo.dep: $(go_exp_html_files)
        $(BUILDDEPS)
-exp/gui.lo: $(go_exp_gui_files)
+exp/html.lo: $(go_exp_html_files)
        $(BUILDPACKAGE)
-exp/gui/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/gui
+exp/html/check: $(CHECK_DEPS)
        @$(CHECK)
-.PHONY: exp/gui/check
+.PHONY: exp/html/check
 
 @go_include@ exp/norm.lo.dep
 exp/norm.lo.dep: $(go_exp_norm_files)
@@ -5396,39 +4856,17 @@ exp/norm.lo.dep: $(go_exp_norm_files)
 exp/norm.lo: $(go_exp_norm_files)
        $(BUILDPACKAGE)
 exp/norm/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/norm
        @$(CHECK)
 .PHONY: exp/norm/check
 
-@go_include@ exp/spdy.lo.dep
-exp/spdy.lo.dep: $(go_exp_spdy_files)
+@go_include@ exp/proxy.lo.dep
+exp/proxy.lo.dep: $(go_exp_proxy_files)
        $(BUILDDEPS)
-exp/spdy.lo: $(go_exp_spdy_files)
+exp/proxy.lo: $(go_exp_proxy_files)
        $(BUILDPACKAGE)
-exp/spdy/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/spdy
+exp/proxy/check: $(CHECK_DEPS)
        @$(CHECK)
-.PHONY: exp/spdy/check
-
-@go_include@ exp/sql.lo.dep
-exp/sql.lo.dep: $(go_exp_sql_files)
-       $(BUILDDEPS)
-exp/sql.lo: $(go_exp_sql_files)
-       $(BUILDPACKAGE)
-exp/sql/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/sql
-       @$(CHECK)
-.PHONY: exp/sql/check
-
-@go_include@ exp/ssh.lo.dep
-exp/ssh.lo.dep: $(go_exp_ssh_files)
-       $(BUILDDEPS)
-exp/ssh.lo: $(go_exp_ssh_files)
-       $(BUILDPACKAGE)
-exp/ssh/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/ssh
-       @$(CHECK)
-.PHONY: exp/ssh/check
+.PHONY: exp/proxy/check
 
 @go_include@ exp/terminal.lo.dep
 exp/terminal.lo.dep: $(go_exp_terminal_files)
@@ -5436,7 +4874,6 @@ exp/terminal.lo.dep: $(go_exp_terminal_files)
 exp/terminal.lo: $(go_exp_terminal_files)
        $(BUILDPACKAGE)
 exp/terminal/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/terminal
        @$(CHECK)
 .PHONY: exp/terminal/check
 
@@ -5446,19 +4883,17 @@ exp/types.lo.dep: $(go_exp_types_files)
 exp/types.lo: $(go_exp_types_files)
        $(BUILDPACKAGE)
 exp/types/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/types
        @$(CHECK)
 .PHONY: exp/types/check
 
-@go_include@ exp/gui/x11.lo.dep
-exp/gui/x11.lo.dep: $(go_exp_gui_x11_files)
+@go_include@ exp/utf8string.lo.dep
+exp/utf8string.lo.dep: $(go_exp_utf8string_files)
        $(BUILDDEPS)
-exp/gui/x11.lo: $(go_exp_gui_x11_files)
+exp/utf8string.lo: $(go_exp_utf8string_files)
        $(BUILDPACKAGE)
-exp/gui/x11/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/gui/x11
+exp/utf8string/check: $(CHECK_DEPS)
        @$(CHECK)
-.PHONY: exp/gui/x11/check
+.PHONY: exp/utf8string/check
 
 @go_include@ exp/inotify.lo.dep
 exp/inotify.lo.dep: $(go_exp_inotify_files)
@@ -5466,27 +4901,15 @@ exp/inotify.lo.dep: $(go_exp_inotify_files)
 exp/inotify.lo: $(go_exp_inotify_files)
        $(BUILDPACKAGE)
 exp/inotify/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/inotify
        @$(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)
 html/template.lo: $(go_html_template_files)
        $(BUILDPACKAGE)
 html/template/check: $(CHECK_DEPS)
-       @$(MKDIR_P) html/template
        @$(CHECK)
 .PHONY: html/template/check
 
@@ -5496,7 +4919,6 @@ go/ast.lo.dep: $(go_go_ast_files)
 go/ast.lo: $(go_go_ast_files)
        $(BUILDPACKAGE)
 go/ast/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/ast
        @$(CHECK)
 .PHONY: go/ast/check
 
@@ -5506,7 +4928,6 @@ go/build.lo.dep: $(go_go_build_files)
 go/build.lo: $(go_go_build_files)
        $(BUILDPACKAGE)
 go/build/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/build
        @$(CHECK)
 .PHONY: go/build/check
 
@@ -5525,7 +4946,6 @@ go/doc.lo.dep: $(go_go_doc_files)
 go/doc.lo: $(go_go_doc_files)
        $(BUILDPACKAGE)
 go/doc/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/doc
        @$(CHECK)
 .PHONY: go/doc/check
 
@@ -5535,7 +4955,6 @@ go/parser.lo.dep: $(go_go_parser_files)
 go/parser.lo: $(go_go_parser_files)
        $(BUILDPACKAGE)
 go/parser/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/parser
        @$(CHECK)
 .PHONY: go/parser/check
 
@@ -5545,7 +4964,6 @@ go/printer.lo.dep: $(go_go_printer_files)
 go/printer.lo: $(go_go_printer_files)
        $(BUILDPACKAGE)
 go/printer/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/printer
        @$(CHECK)
 .PHONY: go/printer/check
 
@@ -5555,7 +4973,6 @@ go/scanner.lo.dep: $(go_go_scanner_files)
 go/scanner.lo: $(go_go_scanner_files)
        $(BUILDPACKAGE)
 go/scanner/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/scanner
        @$(CHECK)
 .PHONY: go/scanner/check
 
@@ -5565,7 +4982,6 @@ go/token.lo.dep: $(go_go_token_files)
 go/token.lo: $(go_go_token_files)
        $(BUILDPACKAGE)
 go/token/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/token
        @$(CHECK)
 .PHONY: go/token/check
 
@@ -5575,7 +4991,6 @@ hash/adler32.lo.dep: $(go_hash_adler32_files)
 hash/adler32.lo: $(go_hash_adler32_files)
        $(BUILDPACKAGE)
 hash/adler32/check: $(CHECK_DEPS)
-       @$(MKDIR_P) hash/adler32
        @$(CHECK)
 .PHONY: hash/adler32/check
 
@@ -5585,7 +5000,6 @@ hash/crc32.lo.dep: $(go_hash_crc32_files)
 hash/crc32.lo: $(go_hash_crc32_files)
        $(BUILDPACKAGE)
 hash/crc32/check: $(CHECK_DEPS)
-       @$(MKDIR_P) hash/crc32
        @$(CHECK)
 .PHONY: hash/crc32/check
 
@@ -5595,7 +5009,6 @@ hash/crc64.lo.dep: $(go_hash_crc64_files)
 hash/crc64.lo: $(go_hash_crc64_files)
        $(BUILDPACKAGE)
 hash/crc64/check: $(CHECK_DEPS)
-       @$(MKDIR_P) hash/crc64
        @$(CHECK)
 .PHONY: hash/crc64/check
 
@@ -5605,27 +5018,15 @@ hash/fnv.lo.dep: $(go_hash_fnv_files)
 hash/fnv.lo: $(go_hash_fnv_files)
        $(BUILDPACKAGE)
 hash/fnv/check: $(CHECK_DEPS)
-       @$(MKDIR_P) hash/fnv
        @$(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)
 image/color.lo: $(go_image_color_files)
        $(BUILDPACKAGE)
 image/color/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/color
        @$(CHECK)
 .PHONY: image/color/check
 
@@ -5635,7 +5036,6 @@ image/draw.lo.dep: $(go_image_draw_files)
 image/draw.lo: $(go_image_draw_files)
        $(BUILDPACKAGE)
 image/draw/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/draw
        @$(CHECK)
 .PHONY: image/draw/check
 
@@ -5645,7 +5045,6 @@ image/gif.lo.dep: $(go_image_gif_files)
 image/gif.lo: $(go_image_gif_files)
        $(BUILDPACKAGE)
 image/gif/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/gif
        @$(CHECK)
 .PHONY: image/gif/check
 
@@ -5655,7 +5054,6 @@ image/jpeg.lo.dep: $(go_image_jpeg_files)
 image/jpeg.lo: $(go_image_jpeg_files)
        $(BUILDPACKAGE)
 image/jpeg/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/jpeg
        @$(CHECK)
 .PHONY: image/jpeg/check
 
@@ -5665,37 +5063,15 @@ image/png.lo.dep: $(go_image_png_files)
 image/png.lo: $(go_image_png_files)
        $(BUILDPACKAGE)
 image/png/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/png
        @$(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)
 index/suffixarray.lo: $(go_index_suffixarray_files)
        $(BUILDPACKAGE)
 index/suffixarray/check: $(CHECK_DEPS)
-       @$(MKDIR_P) index/suffixarray
        @$(CHECK)
 .PHONY: index/suffixarray/check
 
@@ -5705,7 +5081,6 @@ io/ioutil.lo.dep: $(go_io_ioutil_files)
 io/ioutil.lo: $(go_io_ioutil_files)
        $(BUILDPACKAGE)
 io/ioutil/check: $(CHECK_DEPS)
-       @$(MKDIR_P) io/ioutil
        @$(CHECK)
 .PHONY: io/ioutil/check
 
@@ -5715,9 +5090,9 @@ log/syslog.lo.dep: $(go_log_syslog_files)
 log/syslog.lo: $(go_log_syslog_files)
        $(BUILDPACKAGE)
 log/syslog/syslog_c.lo: $(go_syslog_c_files) log/syslog.lo
+       @$(MKDIR_P) log/syslog
        $(LTCOMPILE) -c -o $@ $(srcdir)/go/log/syslog/syslog_c.c
 log/syslog/check: $(CHECK_DEPS)
-       @$(MKDIR_P) log/syslog
        @$(CHECK)
 .PHONY: log/syslog/check
 
@@ -5727,7 +5102,6 @@ math/big.lo.dep: $(go_math_big_files)
 math/big.lo: $(go_math_big_files)
        $(BUILDPACKAGE)
 math/big/check: $(CHECK_DEPS)
-       @$(MKDIR_P) math/big
        @$(CHECK)
 .PHONY: math/big/check
 
@@ -5737,7 +5111,6 @@ math/cmplx.lo.dep: $(go_math_cmplx_files)
 math/cmplx.lo: $(go_math_cmplx_files)
        $(BUILDPACKAGE)
 math/cmplx/check: $(CHECK_DEPS)
-       @$(MKDIR_P) math/cmplx
        @$(CHECK)
 .PHONY: math/cmplx/check
 
@@ -5747,7 +5120,6 @@ math/rand.lo.dep: $(go_math_rand_files)
 math/rand.lo: $(go_math_rand_files)
        $(BUILDPACKAGE)
 math/rand/check: $(CHECK_DEPS)
-       @$(MKDIR_P) math/rand
        @$(CHECK)
 .PHONY: math/rand/check
 
@@ -5757,23 +5129,15 @@ mime/multipart.lo.dep: $(go_mime_multipart_files)
 mime/multipart.lo: $(go_mime_multipart_files)
        $(BUILDPACKAGE)
 mime/multipart/check: $(CHECK_DEPS)
-       @$(MKDIR_P) mime/multipart
        @$(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)
 net/http.lo: $(go_net_http_files)
        $(BUILDPACKAGE)
 net/http/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/http
        @$(CHECK)
 .PHONY: net/http/check
 
@@ -5783,7 +5147,6 @@ net/mail.lo.dep: $(go_net_mail_files)
 net/mail.lo: $(go_net_mail_files)
        $(BUILDPACKAGE)
 net/mail/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/mail
        @$(CHECK)
 .PHONY: net/mail/check
 
@@ -5793,7 +5156,6 @@ net/rpc.lo.dep: $(go_net_rpc_files)
 net/rpc.lo: $(go_net_rpc_files)
        $(BUILDPACKAGE)
 net/rpc/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/rpc
        @$(CHECK)
 .PHONY: net/rpc/check
 
@@ -5803,7 +5165,6 @@ net/smtp.lo.dep: $(go_net_smtp_files)
 net/smtp.lo: $(go_net_smtp_files)
        $(BUILDPACKAGE)
 net/smtp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/smtp
        @$(CHECK)
 .PHONY: net/smtp/check
 
@@ -5813,7 +5174,6 @@ net/url.lo.dep: $(go_net_url_files)
 net/url.lo: $(go_net_url_files)
        $(BUILDPACKAGE)
 net/url/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/url
        @$(CHECK)
 .PHONY: net/url/check
 
@@ -5823,7 +5183,6 @@ net/textproto.lo.dep: $(go_net_textproto_files)
 net/textproto.lo: $(go_net_textproto_files)
        $(BUILDPACKAGE)
 net/textproto/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/textproto
        @$(CHECK)
 .PHONY: net/textproto/check
 
@@ -5833,7 +5192,6 @@ net/http/cgi.lo.dep: $(go_net_http_cgi_files)
 net/http/cgi.lo: $(go_net_http_cgi_files)
        $(BUILDPACKAGE)
 net/http/cgi/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/http/cgi
        @$(CHECK)
 .PHONY: net/http/cgi/check
 
@@ -5843,7 +5201,6 @@ net/http/fcgi.lo.dep: $(go_net_http_fcgi_files)
 net/http/fcgi.lo: $(go_net_http_fcgi_files)
        $(BUILDPACKAGE)
 net/http/fcgi/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/http/fcgi
        @$(CHECK)
 .PHONY: net/http/fcgi/check
 
@@ -5853,7 +5210,6 @@ net/http/httptest.lo.dep: $(go_net_http_httptest_files)
 net/http/httptest.lo: $(go_net_http_httptest_files)
        $(BUILDPACKAGE)
 net/http/httptest/check: $(check_deps)
-       @$(MKDIR_P) net/http/httptest
        @$(CHECK)
 .PHONY: net/http/httptest/check
 
@@ -5863,7 +5219,6 @@ net/http/httputil.lo.dep: $(go_net_http_httputil_files)
 net/http/httputil.lo: $(go_net_http_httputil_files)
        $(BUILDPACKAGE)
 net/http/httputil/check: $(check_deps)
-       @$(MKDIR_P) net/http/httputil
        @$(CHECK)
 .PHONY: net/http/httputil/check
 
@@ -5873,7 +5228,6 @@ net/http/pprof.lo.dep: $(go_net_http_pprof_files)
 net/http/pprof.lo: $(go_net_http_pprof_files)
        $(BUILDPACKAGE)
 net/http/pprof/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/http/pprof
        @$(CHECK)
 .PHONY: net/http/pprof/check
 
@@ -5883,7 +5237,6 @@ net/rpc/jsonrpc.lo.dep: $(go_net_rpc_jsonrpc_files)
 net/rpc/jsonrpc.lo: $(go_net_rpc_jsonrpc_files)
        $(BUILDPACKAGE)
 net/rpc/jsonrpc/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/rpc/jsonrpc
        @$(CHECK)
 .PHONY: net/rpc/jsonrpc/check
 
@@ -5893,7 +5246,6 @@ old/netchan.lo.dep: $(go_old_netchan_files)
 old/netchan.lo: $(go_old_netchan_files)
        $(BUILDPACKAGE)
 old/netchan/check: $(CHECK_DEPS)
-       @$(MKDIR_P) old/netchan
        @$(CHECK)
 .PHONY: old/netchan/check
 
@@ -5903,7 +5255,6 @@ old/regexp.lo.dep: $(go_old_regexp_files)
 old/regexp.lo: $(go_old_regexp_files)
        $(BUILDPACKAGE)
 old/regexp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) old/regexp
        @$(CHECK)
 .PHONY: old/regexp/check
 
@@ -5913,7 +5264,6 @@ old/template.lo.dep: $(go_old_template_files)
 old/template.lo: $(go_old_template_files)
        $(BUILDPACKAGE)
 old/template/check: $(CHECK_DEPS)
-       @$(MKDIR_P) old/template
        @$(CHECK)
 .PHONY: old/template/check
 
@@ -5923,37 +5273,33 @@ os/exec.lo.dep: $(go_os_exec_files)
 os/exec.lo: $(go_os_exec_files)
        $(BUILDPACKAGE)
 os/exec/check: $(CHECK_DEPS)
-       @$(MKDIR_P) os/exec
        @$(CHECK)
 .PHONY: os/exec/check
 
-@go_include@ os/user.lo.dep
-os/user.lo.dep: $(go_os_user_files)
-       $(BUILDDEPS)
-os/user.lo: $(go_os_user_files)
-       $(BUILDPACKAGE)
-os/user/check: $(CHECK_DEPS)
-       @$(MKDIR_P) os/user
-       @$(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@ os/user.lo.dep
+os/user.lo.dep: $(go_os_user_files)
+       $(BUILDDEPS)
+os/user.lo: $(go_os_user_files)
+       $(BUILDPACKAGE)
+os/user/check: $(CHECK_DEPS)
+       @$(CHECK)
+.PHONY: os/user/check
+
 @go_include@ path/filepath.lo.dep
 path/filepath.lo.dep: $(go_path_filepath_files)
        $(BUILDDEPS)
 path/filepath.lo: $(go_path_filepath_files)
        $(BUILDPACKAGE)
 path/filepath/check: $(CHECK_DEPS)
-       @$(MKDIR_P) path/filepath
        @$(CHECK)
 .PHONY: path/filepath/check
 
@@ -5963,7 +5309,6 @@ regexp/syntax.lo.dep: $(go_regexp_syntax_files)
 regexp/syntax.lo: $(go_regexp_syntax_files)
        $(BUILDPACKAGE)
 regexp/syntax/check: $(CHECK_DEPS)
-       @$(MKDIR_P) regexp/syntax
        @$(CHECK)
 .PHONY: regexp/syntax/check
 
@@ -5973,7 +5318,6 @@ runtime/debug.lo.dep: $(go_runtime_debug_files)
 runtime/debug.lo: $(go_runtime_debug_files)
        $(BUILDPACKAGE)
 runtime/debug/check: $(CHECK_DEPS)
-       @$(MKDIR_P) runtime/debug
        @$(CHECK)
 .PHONY: runtime/debug/check
 
@@ -5983,7 +5327,6 @@ runtime/pprof.lo.dep: $(go_runtime_pprof_files)
 runtime/pprof.lo: $(go_runtime_pprof_files)
        $(BUILDPACKAGE)
 runtime/pprof/check: $(CHECK_DEPS)
-       @$(MKDIR_P) runtime/pprof
        @$(CHECK)
 .PHONY: runtime/pprof/check
 
@@ -5995,17 +5338,24 @@ sync/atomic.lo: $(go_sync_atomic_files)
 sync/atomic_c.lo: $(go_sync_atomic_c_files) sync/atomic.lo
        $(LTCOMPILE) -c -o $@ $(srcdir)/go/sync/atomic/atomic.c
 sync/atomic/check: $(CHECK_DEPS)
-       @$(MKDIR_P) sync/atomic
        @$(CHECK)
 .PHONY: sync/atomic/check
 
+@go_include@ text/scanner.lo.dep
+text/scanner.lo.dep: $(go_text_scanner_files)
+       $(BUILDDEPS)
+text/scanner.lo: $(go_text_scanner_files)
+       $(BUILDPACKAGE)
+text/scanner/check: $(CHECK_DEPS)
+       @$(CHECK)
+.PHONY: text/scanner/check
+
 @go_include@ text/tabwriter.lo.dep
 text/tabwriter.lo.dep: $(go_text_tabwriter_files)
        $(BUILDDEPS)
 text/tabwriter.lo: $(go_text_tabwriter_files)
        $(BUILDPACKAGE)
 text/tabwriter/check: $(CHECK_DEPS)
-       @$(MKDIR_P) text/tabwriter
        @$(CHECK)
 .PHONY: text/tabwriter/check
 
@@ -6024,7 +5374,6 @@ text/template/parse.lo.dep: $(go_text_template_parse_files)
 text/template/parse.lo: $(go_text_template_parse_files)
        $(BUILDPACKAGE)
 text/template/parse/check: $(CHECK_DEPS)
-       @$(MKDIR_P) text/template/parse
        @$(CHECK)
 .PHONY: text/template/parse/check
 
@@ -6034,7 +5383,6 @@ testing/iotest.lo.dep: $(go_testing_iotest_files)
 testing/iotest.lo: $(go_testing_iotest_files)
        $(BUILDPACKAGE)
 testing/iotest/check: $(CHECK_DEPS)
-       @$(MKDIR_P) testing/iotest
        @$(CHECK)
 .PHONY: testing/iotest/check
 
@@ -6044,27 +5392,15 @@ testing/quick.lo.dep: $(go_testing_quick_files)
 testing/quick.lo: $(go_testing_quick_files)
        $(BUILDPACKAGE)
 testing/quick/check: $(CHECK_DEPS)
-       @$(MKDIR_P) testing/quick
        @$(CHECK)
 .PHONY: testing/quick/check
 
-@go_include@ testing/script.lo.dep
-testing/script.lo.dep: $(go_testing_script_files)
-       $(BUILDDEPS)
-testing/script.lo: $(go_testing_script_files)
-       $(BUILDPACKAGE)
-testing/script/check: $(CHECK_DEPS)
-       @$(MKDIR_P) testing/script
-       @$(CHECK)
-.PHONY: testing/script/check
-
 @go_include@ unicode/utf16.lo.dep
 unicode/utf16.lo.dep: $(go_unicode_utf16_files)
        $(BUILDDEPS)
 unicode/utf16.lo: $(go_unicode_utf16_files)
        $(BUILDPACKAGE)
 unicode/utf16/check: $(CHECK_DEPS)
-       @$(MKDIR_P) unicode/utf16
        @$(CHECK)
 .PHONY: unicode/utf16/check
 
@@ -6074,79 +5410,79 @@ unicode/utf8.lo.dep: $(go_unicode_utf8_files)
 unicode/utf8.lo: $(go_unicode_utf8_files)
        $(BUILDPACKAGE)
 unicode/utf8/check: $(CHECK_DEPS)
-       @$(MKDIR_P) unicode/utf8
        @$(CHECK)
 .PHONY: unicode/utf8/check
 
-@go_include@ syscall/syscall.lo.dep
-syscall/syscall.lo.dep: $(go_syscall_files)
+@go_include@ syscall.lo.dep
+syscall.lo.dep: $(go_syscall_files)
        $(BUILDDEPS)
-syscall/syscall.lo: $(go_syscall_files)
+syscall.lo: $(go_syscall_files)
        $(BUILDPACKAGE)
 syscall/errno.lo: go/syscall/errno.c
+       @$(MKDIR_P) syscall
+       $(LTCOMPILE) -c -o $@ $<
+syscall/signame.lo: go/syscall/signame.c
+       @$(MKDIR_P) syscall
        $(LTCOMPILE) -c -o $@ $<
 syscall/wait.lo: go/syscall/wait.c
+       @$(MKDIR_P) syscall
        $(LTCOMPILE) -c -o $@ $<
 
-bufio.gox: bufio/bufio.lo
-       $(BUILDGOX)
-bytes.gox: bytes/bytes.lo
+bufio.gox: bufio.lo
        $(BUILDGOX)
-crypto.gox: crypto/crypto.lo
+bytes.gox: bytes.lo
        $(BUILDGOX)
-errors.gox: errors/errors.lo
+crypto.gox: crypto.lo
        $(BUILDGOX)
-expvar.gox: expvar/expvar.lo
+errors.gox: errors.lo
        $(BUILDGOX)
-flag.gox: flag/flag.lo
+expvar.gox: expvar.lo
        $(BUILDGOX)
-fmt.gox: fmt/fmt.lo
+flag.gox: flag.lo
        $(BUILDGOX)
-hash.gox: hash/hash.lo
+fmt.gox: fmt.lo
        $(BUILDGOX)
-html.gox: html/html.lo
+hash.gox: hash.lo
        $(BUILDGOX)
-image.gox: image/image.lo
+html.gox: html.lo
        $(BUILDGOX)
-io.gox: io/io.lo
+image.gox: image.lo
        $(BUILDGOX)
-log.gox: log/log.lo
+io.gox: io.lo
        $(BUILDGOX)
-math.gox: math/math.lo
+log.gox: log.lo
        $(BUILDGOX)
-mime.gox: mime/mime.lo
+math.gox: math.lo
        $(BUILDGOX)
-net.gox: net/net.lo
+mime.gox: mime.lo
        $(BUILDGOX)
-os.gox: os/os.lo
+net.gox: net.lo
        $(BUILDGOX)
-patch.gox: patch/patch.lo
+os.gox: os.lo
        $(BUILDGOX)
-path.gox: path/path.lo
+path.gox: path.lo
        $(BUILDGOX)
-reflect.gox: reflect/reflect.lo
+reflect.gox: reflect-go.lo
        $(BUILDGOX)
-regexp.gox: regexp/regexp.lo
+regexp.gox: regexp.lo
        $(BUILDGOX)
-runtime.gox: runtime/runtime.lo
+runtime.gox: runtime-go.lo
        $(BUILDGOX)
-sort.gox: sort/sort.lo
+sort.gox: sort.lo
        $(BUILDGOX)
-strconv.gox: strconv/strconv.lo
+strconv.gox: strconv.lo
        $(BUILDGOX)
-strings.gox: strings/strings.lo
+strings.gox: strings.lo
        $(BUILDGOX)
-sync.gox: sync/sync.lo
+sync.gox: sync.lo
        $(BUILDGOX)
-syscall.gox: syscall/syscall.lo
+syscall.gox: syscall.lo
        $(BUILDGOX)
-testing.gox: testing/testing.lo
+testing.gox: testing.lo
        $(BUILDGOX)
-time.gox: time/time.lo
+time.gox: time-go.lo
        $(BUILDGOX)
-unicode.gox: unicode/unicode.lo
-       $(BUILDGOX)
-websocket.gox: websocket/websocket.lo
+unicode.gox: unicode.lo
        $(BUILDGOX)
 
 archive/tar.gox: archive/tar.lo
@@ -6174,12 +5510,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
@@ -6192,20 +5522,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
@@ -6218,25 +5540,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
@@ -6262,8 +5575,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
@@ -6277,27 +5588,19 @@ encoding/xml.gox: encoding/xml.lo
 
 exp/ebnf.gox: exp/ebnf.lo
        $(BUILDGOX)
-exp/gui.gox: exp/gui.lo
+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
-       $(BUILDGOX)
-exp/ssh.gox: exp/ssh.lo
+exp/proxy.gox: exp/proxy.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/sql/driver.gox: exp/sql/driver.lo
+exp/utf8string.gox: exp/utf8string.lo  
        $(BUILDGOX)
 
 html/template.gox: html/template.lo
@@ -6327,8 +5630,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
@@ -6339,10 +5640,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)
@@ -6363,8 +5660,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
@@ -6401,10 +5696,10 @@ old/template.gox: old/template.lo
 
 os/exec.gox: os/exec.lo
        $(BUILDGOX)
-os/user.gox: os/user.lo
-       $(BUILDGOX)
 os/signal.gox: os/signal.lo
        $(BUILDGOX)
+os/user.gox: os/user.lo
+       $(BUILDGOX)
 
 path/filepath.gox: path/filepath.lo
        $(BUILDGOX)
@@ -6433,8 +5728,6 @@ testing/iotest.gox: testing/iotest.lo
        $(BUILDGOX)
 testing/quick.gox: testing/quick.lo
        $(BUILDGOX)
-testing/script.gox: testing/script.lo
-       $(BUILDGOX)
 
 unicode/utf16.gox: unicode/utf16.lo
        $(BUILDGOX)