gotest: Fix finding functions on PPC.

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

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 31c58d9..f790205 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -97,7 +97,6 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
        "$(DESTDIR)$(toolexeclibgocompressdir)" \
        "$(DESTDIR)$(toolexeclibgocontainerdir)" \
        "$(DESTDIR)$(toolexeclibgocryptodir)" \
-       "$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)" \
        "$(DESTDIR)$(toolexeclibgocryptox509dir)" \
        "$(DESTDIR)$(toolexeclibgodatabasedir)" \
        "$(DESTDIR)$(toolexeclibgodatabasesqldir)" \
@@ -138,71 +137,64 @@ am__DEPENDENCIES_2 = bufio/bufio.lo bytes/bytes.lo bytes/index.lo \
        crypto/crypto.lo errors/errors.lo expvar/expvar.lo \
        flag/flag.lo fmt/fmt.lo hash/hash.lo html/html.lo \
        image/image.lo io/io.lo log/log.lo math/math.lo net/net.lo \
-       os/exec.lo os/os.lo patch/patch.lo path/path.lo \
-       reflect/reflect.lo regexp/regexp.lo runtime/runtime.lo \
-       sort/sort.lo strconv/strconv.lo strings/strings.lo \
-       sync/sync.lo time/time.lo unicode/unicode.lo \
-       websocket/websocket.lo archive/tar.lo archive/zip.lo \
+       os/exec.lo os/os.lo path/path.lo reflect/reflect.lo \
+       regexp/regexp.lo runtime/runtime.lo sort/sort.lo \
+       strconv/strconv.lo strings/strings.lo sync/sync.lo \
+       time/time.lo unicode/unicode.lo archive/tar.lo archive/zip.lo \
        compress/bzip2.lo compress/flate.lo compress/gzip.lo \
        compress/lzw.lo compress/zlib.lo container/heap.lo \
        container/list.lo container/ring.lo crypto/aes.lo \
-       crypto/bcrypt.lo crypto/blowfish.lo crypto/cast5.lo \
        crypto/cipher.lo crypto/des.lo crypto/dsa.lo crypto/ecdsa.lo \
-       crypto/elliptic.lo crypto/hmac.lo crypto/md4.lo crypto/md5.lo \
-       crypto/ocsp.lo crypto/openpgp.lo crypto/rand.lo crypto/rc4.lo \
-       crypto/ripemd160.lo crypto/rsa.lo crypto/sha1.lo \
-       crypto/sha256.lo crypto/sha512.lo crypto/subtle.lo \
-       crypto/tls.lo crypto/twofish.lo crypto/x509.lo crypto/xtea.lo \
-       crypto/openpgp/armor.lo crypto/openpgp/elgamal.lo \
-       crypto/openpgp/errors.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 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 encoding/json.lo \
-       encoding/pem.lo encoding/xml.lo exp/ebnf.lo exp/norm.lo \
-       exp/proxy.lo exp/spdy.lo exp/ssh.lo exp/terminal.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/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/bmp.lo image/color.lo image/draw.lo image/gif.lo \
-       image/jpeg.lo image/png.lo image/tiff.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 \
+       image/color.lo image/draw.lo image/gif.lo image/jpeg.lo \
+       image/png.lo index/suffixarray.lo io/ioutil.lo log/syslog.lo \
+       log/syslog/syslog_c.lo math/big.lo math/cmplx.lo math/rand.lo \
+       mime/mime.lo mime/multipart.lo net/http.lo net/mail.lo \
+       net/rpc.lo net/smtp.lo net/textproto.lo net/url.lo \
+       old/netchan.lo old/regexp.lo old/template.lo \
+       $(am__DEPENDENCIES_1) os/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 \
+       syscall/syscall.lo syscall/errno.lo syscall/signame.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
+       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-caller.c runtime/go-callers.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-now.c runtime/go-new-map.c \
-       runtime/go-new.c runtime/go-panic.c runtime/go-print.c \
-       runtime/go-recover.c runtime/go-reflect.c \
+       runtime/go-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-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 \
@@ -213,15 +205,15 @@ am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.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 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/go-typestring.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/signal_unix.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
@@ -231,29 +223,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-now.lo go-new-map.lo go-new.lo go-panic.lo go-print.lo \
-       go-recover.lo go-reflect.lo go-reflect-call.lo \
+       go-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-trampoline.lo go-type-complex.lo go-type-eface.lo \
        go-type-error.lo go-type-float.lo go-type-identity.lo \
        go-type-interface.lo go-type-string.lo go-typedesc-equal.lo \
-       go-typestring.lo go-unreflect.lo go-unsafe-new.lo \
-       go-unsafe-newarray.lo go-unsafe-pointer.lo go-unwind.lo \
-       chan.lo cpuprof.lo $(am__objects_1) mcache.lo mcentral.lo \
-       $(am__objects_2) mfinal.lo mfixalloc.lo mgc0.lo mheap.lo \
-       msize.lo proc.lo runtime.lo thread.lo yield.lo \
-       $(am__objects_3) iface.lo malloc.lo map.lo mprof.lo reflect.lo \
-       runtime1.lo sema.lo sigqueue.lo string.lo time.lo
+       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 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) \
@@ -289,21 +282,21 @@ 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) $(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)
+       $(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=) \
@@ -398,6 +391,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@
@@ -456,7 +450,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@
@@ -477,6 +470,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@
@@ -506,6 +500,7 @@ 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.
@@ -569,7 +564,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 \
@@ -587,7 +581,6 @@ toolexeclibgo_DATA = \
        mime.gox \
        net.gox \
        os.gox \
-       patch.gox \
        path.gox \
        reflect.gox \
        regexp.gox \
@@ -599,8 +592,7 @@ toolexeclibgo_DATA = \
        syscall.gox \
        testing.gox \
        time.gox \
-       unicode.gox \
-       websocket.gox
+       unicode.gox
 
 toolexeclibgoarchivedir = $(toolexeclibgodir)/archive
 toolexeclibgoarchive_DATA = \
@@ -624,39 +616,22 @@ 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/errors.gox \
-       crypto/openpgp/packet.gox \
-       crypto/openpgp/s2k.gox
+       crypto/x509.gox
 
 toolexeclibgocryptox509dir = $(toolexeclibgocryptodir)/x509
 toolexeclibgocryptox509_DATA = \
@@ -686,7 +661,6 @@ toolexeclibgoencoding_DATA = \
        encoding/base64.gox \
        encoding/binary.gox \
        encoding/csv.gox \
-       encoding/git85.gox \
        encoding/gob.gox \
        encoding/hex.gox \
        encoding/json.gox \
@@ -700,11 +674,10 @@ toolexeclibgoencoding_DATA = \
 toolexeclibgoexpdir = $(toolexeclibgodir)/exp
 toolexeclibgoexp_DATA = \
        exp/ebnf.gox \
+       exp/html.gox \
        $(exp_inotify_gox) \
        exp/norm.gox \
        exp/proxy.gox \
-       exp/spdy.gox \
-       exp/ssh.gox \
        exp/terminal.gox \
        exp/types.gox \
        exp/utf8string.gox
@@ -732,13 +705,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/png.gox
 
 toolexeclibgoindexdir = $(toolexeclibgodir)/index
 toolexeclibgoindex_DATA = \
@@ -764,7 +735,6 @@ toolexeclibgomime_DATA = \
 
 toolexeclibgonetdir = $(toolexeclibgodir)/net
 toolexeclibgonet_DATA = \
-       net/dict.gox \
        net/http.gox \
        net/mail.gox \
        net/rpc.gox \
@@ -793,8 +763,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 = \
@@ -816,8 +786,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 = \
@@ -847,6 +816,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 \
@@ -868,14 +838,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 \
@@ -897,7 +868,6 @@ runtime_files = \
        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 \
@@ -915,6 +885,7 @@ runtime_files = \
        runtime/msize.c \
        runtime/proc.c \
        runtime/runtime.c \
+       runtime/signal_unix.c \
        runtime/thread.c \
        runtime/yield.c \
        $(rtems_task_variable_add_file) \
@@ -935,7 +906,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
@@ -962,16 +934,8 @@ go_hash_files = \
        go/hash/hash.go
 
 go_html_files = \
-       go/html/const.go \
-       go/html/doc.go \
-       go/html/doctype.go \
        go/html/entity.go \
-       go/html/escape.go \
-       go/html/foreign.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 \
@@ -1048,19 +1012,23 @@ go_mime_files = \
 @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_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_linux.go
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sock_file = go/net/sock_linux.go
 @LIBGO_IS_LINUX_TRUE@go_net_sock_file = go/net/sock_linux.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockopt_file = go/net/sockopt_bsd.go
+@LIBGO_IS_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_linux.go
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sockopt_file = go/net/sockopt_linux.go
 @LIBGO_IS_LINUX_TRUE@go_net_sockopt_file = go/net/sockopt_linux.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockoptip_file = go/net/sockoptip_bsd.go
+@LIBGO_IS_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_linux.go
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sockoptip_file = go/net/sockoptip_linux.go
 @LIBGO_IS_LINUX_TRUE@go_net_sockoptip_file = go/net/sockoptip_linux.go
@@ -1091,6 +1059,7 @@ 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/parse.go \
        go/net/pipe.go \
@@ -1141,15 +1110,7 @@ go_os_files = \
        $(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 \
@@ -1170,11 +1131,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
@@ -1190,6 +1151,7 @@ go_strconv_files = \
        go/strconv/decimal.go \
        go/strconv/extfloat.go \
        go/strconv/ftoa.go \
+       go/strconv/isprint.go \
        go/strconv/itoa.go \
        go/strconv/quote.go
 
@@ -1202,6 +1164,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
 
@@ -1227,6 +1190,7 @@ go_time_files = \
        go/time/tick.go \
        go/time/time.go \
        go/time/zoneinfo.go \
+       go/time/zoneinfo_read.go \
        go/time/zoneinfo_unix.go
 
 go_unicode_files = \
@@ -1236,13 +1200,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 \
@@ -1265,8 +1222,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 \
@@ -1294,25 +1250,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 = \
@@ -1333,23 +1276,10 @@ go_crypto_elliptic_files = \
 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 \
@@ -1358,10 +1288,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
@@ -1391,50 +1317,17 @@ 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_errors_files = \
-       go/crypto/openpgp/errors/errors.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
 
@@ -1450,13 +1343,15 @@ 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 \
@@ -1492,9 +1387,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 \
@@ -1528,6 +1420,18 @@ go_exp_ebnf_files = \
        go/exp/ebnf/ebnf.go \
        go/exp/ebnf/parser.go
 
+go_exp_html_files = \
+       go/exp/html/const.go \
+       go/exp/html/doc.go \
+       go/exp/html/doctype.go \
+       go/exp/html/entity.go \
+       go/exp/html/escape.go \
+       go/exp/html/foreign.go \
+       go/exp/html/node.go \
+       go/exp/html/parse.go \
+       go/exp/html/render.go \
+       go/exp/html/token.go
+
 go_exp_inotify_files = \
        go/exp/inotify/inotify_linux.go
 
@@ -1535,6 +1439,7 @@ 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 \
@@ -1546,25 +1451,6 @@ go_exp_proxy_files = \
        go/exp/proxy/proxy.go \
        go/exp/proxy/socks5.go
 
-go_exp_spdy_files = \
-       go/exp/spdy/read.go \
-       go/exp/spdy/types.go \
-       go/exp/spdy/write.go
-
-go_exp_ssh_files = \
-       go/exp/ssh/channel.go \
-       go/exp/ssh/cipher.go \
-       go/exp/ssh/client.go \
-       go/exp/ssh/client_auth.go \
-       go/exp/ssh/common.go \
-       go/exp/ssh/doc.go \
-       go/exp/ssh/messages.go \
-       go/exp/ssh/server.go \
-       go/exp/ssh/server_terminal.go \
-       go/exp/ssh/session.go \
-       go/exp/ssh/tcpip.go \
-       go/exp/ssh/transport.go
-
 go_exp_terminal_files = \
        go/exp/terminal/terminal.go \
        go/exp/terminal/util.go
@@ -1591,8 +1477,7 @@ 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 = \
@@ -1601,7 +1486,8 @@ go_go_doc_files = \
        go/go/doc/example.go \
        go/go/doc/exports.go \
        go/go/doc/filter.go \
-       go/go/doc/reader.go
+       go/go/doc/reader.go \
+       go/go/doc/synopsis.go
 
 go_go_parser_files = \
        go/go/parser/interface.go \
@@ -1635,7 +1521,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 \
@@ -1648,9 +1533,6 @@ 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/ycbcr.go
@@ -1672,12 +1554,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_index_suffixarray_files = \
        go/index/suffixarray/qsufsort.go \
        go/index/suffixarray/suffixarray.go
@@ -1720,9 +1596,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 \
@@ -1796,17 +1669,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 \
@@ -1855,9 +1730,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
 
@@ -1922,18 +1794,28 @@ 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) \
@@ -1944,6 +1826,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) \
@@ -1957,6 +1840,7 @@ go_syscall_files = \
 
 go_syscall_c_files = \
        go/syscall/errno.c \
+       go/syscall/signame.c \
        $(syscall_wait_c_file)
 
 @LIBGO_IS_LINUX_FALSE@os_lib_inotify_lo = 
@@ -1981,7 +1865,6 @@ libgo_go_objs = \
        net/net.lo \
        os/exec.lo \
        os/os.lo \
-       patch/patch.lo \
        path/path.lo \
        reflect/reflect.lo \
        regexp/regexp.lo \
@@ -1992,7 +1875,6 @@ libgo_go_objs = \
        sync/sync.lo \
        time/time.lo \
        unicode/unicode.lo \
-       websocket/websocket.lo \
        archive/tar.lo \
        archive/zip.lo \
        compress/bzip2.lo \
@@ -2004,36 +1886,22 @@ 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/errors.lo \
-       crypto/openpgp/packet.lo \
-       crypto/openpgp/s2k.lo \
        crypto/x509/pkix.lo \
        database/sql.lo \
        database/sql/driver.lo \
@@ -2048,17 +1916,15 @@ libgo_go_objs = \
        encoding/base64.lo \
        encoding/binary.lo \
        encoding/csv.lo \
-       encoding/git85.lo \
        encoding/gob.lo \
        encoding/hex.lo \
        encoding/json.lo \
        encoding/pem.lo \
        encoding/xml.lo \
        exp/ebnf.lo \
+       exp/html.lo \
        exp/norm.lo \
        exp/proxy.lo \
-       exp/spdy.lo \
-       exp/ssh.lo \
        exp/terminal.lo \
        exp/types.lo \
        exp/utf8string.lo \
@@ -2079,13 +1945,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 \
        index/suffixarray.lo \
        io/ioutil.lo \
        log/syslog.lo \
@@ -2095,7 +1959,6 @@ libgo_go_objs = \
        math/rand.lo \
        mime/mime.lo \
        mime/multipart.lo \
-       net/dict.lo \
        net/http.lo \
        net/mail.lo \
        net/rpc.lo \
@@ -2106,8 +1969,8 @@ libgo_go_objs = \
        old/regexp.lo \
        old/template.lo \
        $(os_lib_inotify_lo) \
-       os/user.lo \
        os/signal.lo \
+       os/user.lo \
        path/filepath.lo \
        regexp/syntax.lo \
        net/rpc/jsonrpc.lo \
@@ -2117,6 +1980,7 @@ libgo_go_objs = \
        sync/atomic_c.lo \
        syscall/syscall.lo \
        syscall/errno.lo \
+       syscall/signame.lo \
        syscall/wait.lo \
        text/scanner.lo \
        text/tabwriter.lo \
@@ -2125,7 +1989,6 @@ libgo_go_objs = \
        testing/testing.lo \
        testing/iotest.lo \
        testing/quick.lo \
-       testing/script.lo \
        unicode/utf16.lo \
        unicode/utf8.lo
 
@@ -2182,9 +2045,9 @@ CHECK = \
        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) --prefix="libgo_$${prefix}" --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) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --goarch="$(GOARCH)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
            echo "PASS: $(@D)" >> $@-testlog; \
            echo "PASS: $(@D)"; \
            echo "PASS: $(@D)" > $@-testsum; \
@@ -2204,7 +2067,6 @@ CHECK_DEPS = libgo.la libgobegin.a \
        $(toolexeclibgocompress_DATA) \
        $(toolexeclibgocontainer_DATA) \
        $(toolexeclibgocrypto_DATA) \
-       $(toolexeclibgocryptoopenpgp_DATA) \
        $(toolexeclibgodebug_DATA) \
        $(toolexeclibgoencoding_DATA) \
        $(toolexeclibgoexp_DATA) \
@@ -2253,7 +2115,6 @@ TEST_PACKAGES = \
        mime/check \
        net/check \
        os/check \
-       patch/check \
        path/check \
        reflect/check \
        regexp/check \
@@ -2264,7 +2125,6 @@ TEST_PACKAGES = \
        sync/check \
        time/check \
        unicode/check \
-       websocket/check \
        archive/tar/check \
        archive/zip/check \
        compress/bzip2/check \
@@ -2276,35 +2136,22 @@ 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 \
@@ -2317,18 +2164,16 @@ 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/proxy/check \
-       exp/spdy/check \
-       exp/ssh/check \
        exp/terminal/check \
        exp/utf8string/check \
        html/template/check \
@@ -2348,7 +2193,6 @@ TEST_PACKAGES = \
        image/draw/check \
        image/jpeg/check \
        image/png/check \
-       image/tiff/check \
        index/suffixarray/check \
        io/ioutil/check \
        log/syslog/check \
@@ -2359,6 +2203,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 \
@@ -2370,8 +2215,8 @@ 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 \
        sync/atomic/check \
@@ -2380,7 +2225,6 @@ TEST_PACKAGES = \
        text/template/check \
        text/template/parse/check \
        testing/quick/check \
-       testing/script/check \
        unicode/utf16/check \
        unicode/utf8/check
 
@@ -2526,6 +2370,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@
@@ -2548,16 +2393,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@
@@ -2577,7 +2423,6 @@ distclean-compile:
 @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@
@@ -2603,6 +2448,7 @@ distclean-compile:
 @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@
@@ -2688,6 +2534,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
@@ -2835,6 +2688,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
@@ -2863,6 +2723,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
@@ -2884,13 +2751,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
@@ -3038,13 +2898,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
@@ -3192,6 +3045,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
@@ -3338,26 +3198,6 @@ uninstall-toolexeclibgocryptoDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgocryptodir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgocryptodir)" && rm -f $$files
-install-toolexeclibgocryptoopenpgpDATA: $(toolexeclibgocryptoopenpgp_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibgocryptoopenpgpdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)"
-       @list='$(toolexeclibgocryptoopenpgp_DATA)'; test -n "$(toolexeclibgocryptoopenpgpdir)" || 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 $$?; \
-       done
-
-uninstall-toolexeclibgocryptoopenpgpDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(toolexeclibgocryptoopenpgp_DATA)'; test -n "$(toolexeclibgocryptoopenpgpdir)" || 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)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibgocryptox509dir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgocryptox509dir)"
@@ -4235,7 +4075,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) all-multi $(DATA) \
                config.h
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibgodir)" "$(DESTDIR)$(toolexeclibgoarchivedir)" "$(DESTDIR)$(toolexeclibgocompressdir)" "$(DESTDIR)$(toolexeclibgocontainerdir)" "$(DESTDIR)$(toolexeclibgocryptodir)" "$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)" "$(DESTDIR)$(toolexeclibgocryptox509dir)" "$(DESTDIR)$(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 \
+       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
@@ -4301,7 +4141,6 @@ install-exec-am: install-multi install-toolexeclibLIBRARIES \
        install-toolexeclibgocompressDATA \
        install-toolexeclibgocontainerDATA \
        install-toolexeclibgocryptoDATA \
-       install-toolexeclibgocryptoopenpgpDATA \
        install-toolexeclibgocryptox509DATA \
        install-toolexeclibgodatabaseDATA \
        install-toolexeclibgodatabasesqlDATA \
@@ -4367,7 +4206,6 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        uninstall-toolexeclibgocompressDATA \
        uninstall-toolexeclibgocontainerDATA \
        uninstall-toolexeclibgocryptoDATA \
-       uninstall-toolexeclibgocryptoopenpgpDATA \
        uninstall-toolexeclibgocryptox509DATA \
        uninstall-toolexeclibgodatabaseDATA \
        uninstall-toolexeclibgodatabasesqlDATA \
@@ -4416,7 +4254,6 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        install-toolexeclibgocompressDATA \
        install-toolexeclibgocontainerDATA \
        install-toolexeclibgocryptoDATA \
-       install-toolexeclibgocryptoopenpgpDATA \
        install-toolexeclibgocryptox509DATA \
        install-toolexeclibgodatabaseDATA \
        install-toolexeclibgodatabasesqlDATA \
@@ -4446,7 +4283,6 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        uninstall-toolexeclibgocompressDATA \
        uninstall-toolexeclibgocontainerDATA \
        uninstall-toolexeclibgocryptoDATA \
-       uninstall-toolexeclibgocryptoopenpgpDATA \
        uninstall-toolexeclibgocryptox509DATA \
        uninstall-toolexeclibgodatabaseDATA \
        uninstall-toolexeclibgodatabasesqlDATA \
@@ -4495,11 +4331,11 @@ runtime1.c: $(srcdir)/runtime/runtime1.goc goc2c
        mv -f $@.tmp $@
 
 sema.c: $(srcdir)/runtime/sema.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc --go-prefix libgo_sync $< > $@.tmp
        mv -f $@.tmp $@
 
 sigqueue.c: $(srcdir)/runtime/sigqueue.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc --go-prefix libgo_os $< > $@.tmp
        mv -f $@.tmp $@
 
 time.c: $(srcdir)/runtime/time.goc goc2c
@@ -4686,7 +4522,9 @@ log/check: $(CHECK_DEPS)
 math/math.lo.dep: $(go_math_files)
        $(BUILDDEPS)
 math/math.lo: $(go_math_files)
-       $(BUILDPACKAGE)
+       $(MKDIR_P) $(@D)
+       files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \
+       $(LTGOCOMPILE) $(MATH_FLAG) -I . -c -fgo-prefix="libgo_$(@D)" -o $@ $$files
 math/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: math/check
@@ -4718,19 +4556,6 @@ 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)
-       $(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)
@@ -4840,15 +4665,6 @@ unicode/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: unicode/check
 
-@go_include@ websocket/websocket.lo.dep
-websocket/websocket.lo.dep: $(go_websocket_files)
-       $(BUILDDEPS)
-websocket/websocket.lo: $(go_websocket_files)
-       $(BUILDPACKAGE)
-websocket/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: websocket/check
-
 @go_include@ archive/tar.lo.dep
 archive/tar.lo.dep: $(go_archive_tar_files)
        $(BUILDDEPS)
@@ -4959,36 +4775,6 @@ crypto/aes/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/aes/check
 
-@go_include@ crypto/bcrypt.lo.dep
-crypto/bcrypt.lo.dep: $(go_crypto_bcrypt_files)
-       $(BUILDDEPS)
-crypto/bcrypt.lo: $(go_crypto_bcrypt_files)
-       $(BUILDPACKAGE)
-crypto/bcrypt/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/bcrypt
-       @$(CHECK)
-.PHONY: crypto/bcrypt/check
-
-@go_include@ crypto/blowfish.lo.dep
-crypto/blowfish.lo.dep: $(go_crypto_blowfish_files)
-       $(BUILDDEPS)
-crypto/blowfish.lo: $(go_crypto_blowfish_files)
-       $(BUILDPACKAGE)
-crypto/blowfish/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/blowfish
-       @$(CHECK)
-.PHONY: crypto/blowfish/check
-
-@go_include@ crypto/cast5.lo.dep
-crypto/cast5.lo.dep: $(go_crypto_cast5_files)
-       $(BUILDDEPS)
-crypto/cast5.lo: $(go_crypto_cast5_files)
-       $(BUILDPACKAGE)
-crypto/cast5/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/cast5
-       @$(CHECK)
-.PHONY: crypto/cast5/check
-
 @go_include@ crypto/cipher.lo.dep
 crypto/cipher.lo.dep: $(go_crypto_cipher_files)
        $(BUILDDEPS)
@@ -5049,16 +4835,6 @@ crypto/hmac/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/hmac/check
 
-@go_include@ crypto/md4.lo.dep
-crypto/md4.lo.dep: $(go_crypto_md4_files)
-       $(BUILDDEPS)
-crypto/md4.lo: $(go_crypto_md4_files)
-       $(BUILDPACKAGE)
-crypto/md4/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/md4
-       @$(CHECK)
-.PHONY: crypto/md4/check
-
 @go_include@ crypto/md5.lo.dep
 crypto/md5.lo.dep: $(go_crypto_md5_files)
        $(BUILDDEPS)
@@ -5069,26 +4845,6 @@ crypto/md5/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/md5/check
 
-@go_include@ crypto/ocsp.lo.dep
-crypto/ocsp.lo.dep: $(go_crypto_ocsp_files)
-       $(BUILDDEPS)
-crypto/ocsp.lo: $(go_crypto_ocsp_files)
-       $(BUILDPACKAGE)
-crypto/ocsp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/ocsp
-       @$(CHECK)
-.PHONY: crypto/ocsp/check
-
-@go_include@ crypto/openpgp.lo.dep
-crypto/openpgp.lo.dep: $(go_crypto_openpgp_files)
-       $(BUILDDEPS)
-crypto/openpgp.lo: $(go_crypto_openpgp_files)
-       $(BUILDPACKAGE)
-crypto/openpgp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp
-       @$(CHECK)
-.PHONY: crypto/openpgp/check
-
 @go_include@ crypto/rand.lo.dep
 crypto/rand.lo.dep: $(go_crypto_rand_files)
        $(BUILDDEPS)
@@ -5109,16 +4865,6 @@ crypto/rc4/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/rc4/check
 
-@go_include@ crypto/ripemd160.lo.dep
-crypto/ripemd160.lo.dep: $(go_crypto_ripemd160_files)
-       $(BUILDDEPS)
-crypto/ripemd160.lo: $(go_crypto_ripemd160_files)
-       $(BUILDPACKAGE)
-crypto/ripemd160/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/ripemd160
-       @$(CHECK)
-.PHONY: crypto/ripemd160/check
-
 @go_include@ crypto/rsa.lo.dep
 crypto/rsa.lo.dep: $(go_crypto_rsa_files)
        $(BUILDDEPS)
@@ -5179,16 +4925,6 @@ crypto/tls/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/tls/check
 
-@go_include@ crypto/twofish.lo.dep
-crypto/twofish.lo.dep: $(go_crypto_twofish_files)
-       $(BUILDDEPS)
-crypto/twofish.lo: $(go_crypto_twofish_files)
-       $(BUILDPACKAGE)
-crypto/twofish/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/twofish
-       @$(CHECK)
-.PHONY: crypto/twofish/check
-
 @go_include@ crypto/x509.lo.dep
 crypto/x509.lo.dep: $(go_crypto_x509_files)
        $(BUILDDEPS)
@@ -5199,66 +4935,6 @@ crypto/x509/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/x509/check
 
-@go_include@ crypto/xtea.lo.dep
-crypto/xtea.lo.dep: $(go_crypto_xtea_files)
-       $(BUILDDEPS)
-crypto/xtea.lo: $(go_crypto_xtea_files)
-       $(BUILDPACKAGE)
-crypto/xtea/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/xtea
-       @$(CHECK)
-.PHONY: crypto/xtea/check
-
-@go_include@ crypto/openpgp/armor.lo.dep
-crypto/openpgp/armor.lo.dep: $(go_crypto_openpgp_armor_files)
-       $(BUILDDEPS)
-crypto/openpgp/armor.lo: $(go_crypto_openpgp_armor_files)
-       $(BUILDPACKAGE)
-crypto/openpgp/armor/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/armor
-       @$(CHECK)
-.PHONY: crypto/openpgp/armor/check
-
-@go_include@ crypto/openpgp/elgamal.lo.dep
-crypto/openpgp/elgamal.lo.dep: $(go_crypto_openpgp_elgamal_files)
-       $(BUILDDEPS)
-crypto/openpgp/elgamal.lo: $(go_crypto_openpgp_elgamal_files)
-       $(BUILDPACKAGE)
-crypto/openpgp/elgamal/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/elgamal
-       @$(CHECK)
-.PHONY: crypto/openpgp/elgamal/check
-
-@go_include@ crypto/openpgp/errors.lo.dep
-crypto/openpgp/errors.lo.dep: $(go_crypto_openpgp_errors_files)
-       $(BUILDDEPS)
-crypto/openpgp/errors.lo: $(go_crypto_openpgp_errors_files)
-       $(BUILDPACKAGE)
-crypto/openpgp/errors/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/errors
-       @$(CHECK)
-.PHONY: crypto/openpgp/errors/check
-
-@go_include@ crypto/openpgp/packet.lo.dep
-crypto/openpgp/packet.lo.dep: $(go_crypto_openpgp_packet_files)
-       $(BUILDDEPS)
-crypto/openpgp/packet.lo: $(go_crypto_openpgp_packet_files)
-       $(BUILDPACKAGE)
-crypto/openpgp/packet/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/packet
-       @$(CHECK)
-.PHONY: crypto/openpgp/packet/check
-
-@go_include@ crypto/openpgp/s2k.lo.dep
-crypto/openpgp/s2k.lo.dep: $(go_crypto_openpgp_s2k_files)
-       $(BUILDDEPS)
-crypto/openpgp/s2k.lo: $(go_crypto_openpgp_s2k_files)
-       $(BUILDPACKAGE)
-crypto/openpgp/s2k/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/openpgp/s2k
-       @$(CHECK)
-.PHONY: crypto/openpgp/s2k/check
-
 @go_include@ crypto/x509/pkix.lo.dep
 crypto/x509/pkix.lo.dep: $(go_crypto_x509_pkix_files)
        $(BUILDDEPS)
@@ -5399,16 +5075,6 @@ encoding/csv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: encoding/csv/check
 
-@go_include@ encoding/git85.lo.dep
-encoding/git85.lo.dep: $(go_encoding_git85_files)
-       $(BUILDDEPS)
-encoding/git85.lo: $(go_encoding_git85_files)
-       $(BUILDPACKAGE)
-encoding/git85/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/git85
-       @$(CHECK)
-.PHONY: encoding/git85/check
-
 @go_include@ encoding/gob.lo.dep
 encoding/gob.lo.dep: $(go_encoding_gob_files)
        $(BUILDDEPS)
@@ -5469,6 +5135,16 @@ exp/ebnf/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: exp/ebnf/check
 
+@go_include@ exp/html.lo.dep
+exp/html.lo.dep: $(go_exp_html_files)
+       $(BUILDDEPS)
+exp/html.lo: $(go_exp_html_files)
+       $(BUILDPACKAGE)
+exp/html/check: $(CHECK_DEPS)
+       @$(MKDIR_P) exp/html
+       @$(CHECK)
+.PHONY: exp/html/check
+
 @go_include@ exp/norm.lo.dep
 exp/norm.lo.dep: $(go_exp_norm_files)
        $(BUILDDEPS)
@@ -5489,26 +5165,6 @@ exp/proxy/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: exp/proxy/check
 
-@go_include@ exp/spdy.lo.dep
-exp/spdy.lo.dep: $(go_exp_spdy_files)
-       $(BUILDDEPS)
-exp/spdy.lo: $(go_exp_spdy_files)
-       $(BUILDPACKAGE)
-exp/spdy/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/spdy
-       @$(CHECK)
-.PHONY: exp/spdy/check
-
-@go_include@ exp/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
-
 @go_include@ exp/terminal.lo.dep
 exp/terminal.lo.dep: $(go_exp_terminal_files)
        $(BUILDDEPS)
@@ -5678,16 +5334,6 @@ hash/fnv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: hash/fnv/check
 
-@go_include@ image/bmp.lo.dep
-image/bmp.lo.dep: $(go_image_bmp_files)
-       $(BUILDDEPS)
-image/bmp.lo: $(go_image_bmp_files)
-       $(BUILDPACKAGE)
-image/bmp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/bmp
-       @$(CHECK)
-.PHONY: image/bmp/check
-
 @go_include@ image/color.lo.dep
 image/color.lo.dep: $(go_image_color_files)
        $(BUILDDEPS)
@@ -5738,16 +5384,6 @@ image/png/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: image/png/check
 
-@go_include@ image/tiff.lo.dep
-image/tiff.lo.dep: $(go_image_tiff_files)
-       $(BUILDDEPS)
-image/tiff.lo: $(go_image_tiff_files)
-       $(BUILDPACKAGE)
-image/tiff/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/tiff
-       @$(CHECK)
-.PHONY: image/tiff/check
-
 @go_include@ index/suffixarray.lo.dep
 index/suffixarray.lo.dep: $(go_index_suffixarray_files)
        $(BUILDDEPS)
@@ -5820,12 +5456,6 @@ mime/multipart/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: mime/multipart/check
 
-@go_include@ net/dict.lo.dep
-net/dict.lo.dep: $(go_net_dict_files)
-       $(BUILDDEPS)
-net/dict.lo: $(go_net_dict_files)
-       $(BUILDPACKAGE)
-
 @go_include@ net/http.lo.dep
 net/http.lo.dep: $(go_net_http_files)
        $(BUILDDEPS)
@@ -5986,16 +5616,6 @@ os/exec/check: $(CHECK_DEPS)
        @$(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)
@@ -6006,6 +5626,16 @@ os/signal/check: $(CHECK_DEPS)
        @$(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)
+       @$(MKDIR_P) os/user
+       @$(CHECK)
+.PHONY: os/user/check
+
 @go_include@ path/filepath.lo.dep
 path/filepath.lo.dep: $(go_path_filepath_files)
        $(BUILDDEPS)
@@ -6107,16 +5737,6 @@ testing/quick/check: $(CHECK_DEPS)
        @$(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)
@@ -6144,6 +5764,8 @@ syscall/syscall.lo: $(go_syscall_files)
        $(BUILDPACKAGE)
 syscall/errno.lo: go/syscall/errno.c
        $(LTCOMPILE) -c -o $@ $<
+syscall/signame.lo: go/syscall/signame.c
+       $(LTCOMPILE) -c -o $@ $<
 syscall/wait.lo: go/syscall/wait.c
        $(LTCOMPILE) -c -o $@ $<
 
@@ -6179,8 +5801,6 @@ net.gox: net/net.lo
        $(BUILDGOX)
 os.gox: os/os.lo
        $(BUILDGOX)
-patch.gox: patch/patch.lo
-       $(BUILDGOX)
 path.gox: path/path.lo
        $(BUILDGOX)
 reflect.gox: reflect/reflect.lo
@@ -6205,8 +5825,6 @@ time.gox: time/time.lo
        $(BUILDGOX)
 unicode.gox: unicode/unicode.lo
        $(BUILDGOX)
-websocket.gox: websocket/websocket.lo
-       $(BUILDGOX)
 
 archive/tar.gox: archive/tar.lo
        $(BUILDGOX)
@@ -6233,12 +5851,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
@@ -6251,20 +5863,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
@@ -6277,23 +5881,8 @@ 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/errors.gox: crypto/openpgp/errors.lo
-       $(BUILDGOX)
-crypto/openpgp/packet.gox: crypto/openpgp/packet.lo
-       $(BUILDGOX)
-crypto/openpgp/s2k.gox: crypto/openpgp/s2k.lo
-       $(BUILDGOX)
 
 crypto/x509/pkix.gox: crypto/x509/pkix.lo
        $(BUILDGOX)
@@ -6327,8 +5916,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
@@ -6342,16 +5929,14 @@ encoding/xml.gox: encoding/xml.lo
 
 exp/ebnf.gox: exp/ebnf.lo
        $(BUILDGOX)
+exp/html.gox: exp/html.lo
+       $(BUILDGOX)
 exp/inotify.gox: exp/inotify.lo
        $(BUILDGOX)
 exp/norm.gox: exp/norm.lo
        $(BUILDGOX)
 exp/proxy.gox: exp/proxy.lo
        $(BUILDGOX)
-exp/spdy.gox: exp/spdy.lo
-       $(BUILDGOX)
-exp/ssh.gox: exp/ssh.lo
-       $(BUILDGOX)
 exp/terminal.gox: exp/terminal.lo
        $(BUILDGOX)
 exp/types.gox: exp/types.lo
@@ -6386,8 +5971,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
@@ -6398,8 +5981,6 @@ image/jpeg.gox: image/jpeg.lo
        $(BUILDGOX)
 image/png.gox: image/png.lo
        $(BUILDGOX)
-image/tiff.gox: image/tiff.lo
-       $(BUILDGOX)
 
 index/suffixarray.gox: index/suffixarray.lo
        $(BUILDGOX)
@@ -6420,8 +6001,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
@@ -6458,10 +6037,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)
@@ -6490,8 +6069,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)