OSDN Git Service

libgo: Update to weekly 2011-11-09.
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 7 Dec 2011 01:11:29 +0000 (01:11 +0000)
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 7 Dec 2011 01:11:29 +0000 (01:11 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182073 138bc75d-0d04-0410-961f-82ee72b054a4

386 files changed:
gcc/testsuite/go.test/test/chan/select5.go
gcc/testsuite/go.test/test/cmplxdivide.go
gcc/testsuite/go.test/test/fixedbugs/bug358.go
gcc/testsuite/go.test/test/ken/divconst.go
gcc/testsuite/go.test/test/ken/modconst.go
gcc/testsuite/go.test/test/mallocrand.go
gcc/testsuite/go.test/test/stringrange.go
gcc/testsuite/go.test/test/utf.go
libgo/MERGE
libgo/Makefile.am
libgo/Makefile.in
libgo/go/archive/tar/reader.go
libgo/go/archive/zip/reader.go
libgo/go/archive/zip/reader_test.go
libgo/go/archive/zip/writer_test.go
libgo/go/bufio/bufio.go
libgo/go/bufio/bufio_test.go
libgo/go/builtin/builtin.go
libgo/go/bytes/buffer.go
libgo/go/bytes/buffer_test.go
libgo/go/bytes/bytes.go
libgo/go/bytes/bytes_test.go
libgo/go/compress/bzip2/bit_reader.go
libgo/go/compress/bzip2/bzip2.go
libgo/go/compress/zlib/testdata/e.txt [deleted file]
libgo/go/compress/zlib/testdata/pi.txt [deleted file]
libgo/go/container/heap/heap.go
libgo/go/container/heap/heap_test.go
libgo/go/crypto/dsa/dsa.go
libgo/go/crypto/dsa/dsa_test.go
libgo/go/crypto/ecdsa/ecdsa.go
libgo/go/crypto/ecdsa/ecdsa_test.go
libgo/go/crypto/elliptic/elliptic.go
libgo/go/crypto/elliptic/elliptic_test.go
libgo/go/crypto/hmac/hmac_test.go
libgo/go/crypto/ocsp/ocsp.go
libgo/go/crypto/openpgp/armor/armor.go
libgo/go/crypto/openpgp/elgamal/elgamal.go
libgo/go/crypto/openpgp/elgamal/elgamal_test.go
libgo/go/crypto/openpgp/packet/encrypted_key.go
libgo/go/crypto/openpgp/packet/encrypted_key_test.go
libgo/go/crypto/openpgp/packet/packet.go
libgo/go/crypto/openpgp/packet/private_key.go
libgo/go/crypto/openpgp/packet/public_key.go
libgo/go/crypto/openpgp/s2k/s2k_test.go
libgo/go/crypto/rand/util.go
libgo/go/crypto/rsa/pkcs1v15.go
libgo/go/crypto/rsa/pkcs1v15_test.go
libgo/go/crypto/rsa/rsa.go
libgo/go/crypto/rsa/rsa_test.go
libgo/go/crypto/tls/conn.go
libgo/go/crypto/tls/generate_cert.go
libgo/go/crypto/tls/handshake_messages_test.go
libgo/go/crypto/tls/handshake_server_test.go
libgo/go/crypto/tls/key_agreement.go
libgo/go/crypto/x509/pkcs1.go
libgo/go/crypto/x509/pkix/pkix.go
libgo/go/crypto/x509/x509.go
libgo/go/crypto/x509/x509_test.go
libgo/go/debug/gosym/pclntab_test.go
libgo/go/encoding/asn1/asn1.go [moved from libgo/go/asn1/asn1.go with 99% similarity]
libgo/go/encoding/asn1/asn1_test.go [moved from libgo/go/asn1/asn1_test.go with 100% similarity]
libgo/go/encoding/asn1/common.go [moved from libgo/go/asn1/common.go with 100% similarity]
libgo/go/encoding/asn1/marshal.go [moved from libgo/go/asn1/marshal.go with 99% similarity]
libgo/go/encoding/asn1/marshal_test.go [moved from libgo/go/asn1/marshal_test.go with 100% similarity]
libgo/go/encoding/binary/binary.go
libgo/go/encoding/binary/binary_test.go
libgo/go/encoding/csv/reader.go [moved from libgo/go/csv/reader.go with 100% similarity]
libgo/go/encoding/csv/reader_test.go [moved from libgo/go/csv/reader_test.go with 100% similarity]
libgo/go/encoding/csv/writer.go [moved from libgo/go/csv/writer.go with 99% similarity]
libgo/go/encoding/csv/writer_test.go [moved from libgo/go/csv/writer_test.go with 100% similarity]
libgo/go/encoding/gob/codec_test.go [moved from libgo/go/gob/codec_test.go with 100% similarity]
libgo/go/encoding/gob/debug.go [new file with mode: 0644]
libgo/go/encoding/gob/decode.go [moved from libgo/go/gob/decode.go with 100% similarity]
libgo/go/encoding/gob/decoder.go [moved from libgo/go/gob/decoder.go with 100% similarity]
libgo/go/encoding/gob/doc.go [moved from libgo/go/gob/doc.go with 100% similarity]
libgo/go/encoding/gob/dump.go [new file with mode: 0644]
libgo/go/encoding/gob/encode.go [moved from libgo/go/gob/encode.go with 100% similarity]
libgo/go/encoding/gob/encoder.go [moved from libgo/go/gob/encoder.go with 100% similarity]
libgo/go/encoding/gob/encoder_test.go [moved from libgo/go/gob/encoder_test.go with 100% similarity]
libgo/go/encoding/gob/error.go [moved from libgo/go/gob/error.go with 100% similarity]
libgo/go/encoding/gob/gobencdec_test.go [moved from libgo/go/gob/gobencdec_test.go with 100% similarity]
libgo/go/encoding/gob/timing_test.go [moved from libgo/go/gob/timing_test.go with 100% similarity]
libgo/go/encoding/gob/type.go [moved from libgo/go/gob/type.go with 97% similarity]
libgo/go/encoding/gob/type_test.go [moved from libgo/go/gob/type_test.go with 95% similarity]
libgo/go/encoding/json/decode.go [moved from libgo/go/json/decode.go with 99% similarity]
libgo/go/encoding/json/decode_test.go [moved from libgo/go/json/decode_test.go with 100% similarity]
libgo/go/encoding/json/encode.go [moved from libgo/go/json/encode.go with 99% similarity]
libgo/go/encoding/json/encode_test.go [moved from libgo/go/json/encode_test.go with 100% similarity]
libgo/go/encoding/json/indent.go [moved from libgo/go/json/indent.go with 100% similarity]
libgo/go/encoding/json/scanner.go [moved from libgo/go/json/scanner.go with 100% similarity]
libgo/go/encoding/json/scanner_test.go [moved from libgo/go/json/scanner_test.go with 99% similarity]
libgo/go/encoding/json/stream.go [moved from libgo/go/json/stream.go with 100% similarity]
libgo/go/encoding/json/stream_test.go [moved from libgo/go/json/stream_test.go with 100% similarity]
libgo/go/encoding/json/tagkey_test.go [moved from libgo/go/json/tagkey_test.go with 100% similarity]
libgo/go/encoding/json/tags.go [moved from libgo/go/json/tags.go with 100% similarity]
libgo/go/encoding/json/tags_test.go [moved from libgo/go/json/tags_test.go with 100% similarity]
libgo/go/encoding/xml/atom_test.go [moved from libgo/go/xml/atom_test.go with 100% similarity]
libgo/go/encoding/xml/embed_test.go [moved from libgo/go/xml/embed_test.go with 100% similarity]
libgo/go/encoding/xml/marshal.go [moved from libgo/go/xml/marshal.go with 100% similarity]
libgo/go/encoding/xml/marshal_test.go [moved from libgo/go/xml/marshal_test.go with 100% similarity]
libgo/go/encoding/xml/read.go [moved from libgo/go/xml/read.go with 99% similarity]
libgo/go/encoding/xml/read_test.go [moved from libgo/go/xml/read_test.go with 98% similarity]
libgo/go/encoding/xml/xml.go [moved from libgo/go/xml/xml.go with 99% similarity]
libgo/go/encoding/xml/xml_test.go [moved from libgo/go/xml/xml_test.go with 98% similarity]
libgo/go/exp/ebnf/ebnf.go
libgo/go/exp/ebnf/parser.go
libgo/go/exp/norm/composition.go
libgo/go/exp/norm/input.go
libgo/go/exp/norm/maketables.go
libgo/go/exp/norm/normalize.go
libgo/go/exp/norm/normregtest.go
libgo/go/exp/norm/trie_test.go
libgo/go/exp/norm/triegen.go
libgo/go/exp/spdy/read.go
libgo/go/exp/spdy/spdy_test.go
libgo/go/exp/spdy/types.go
libgo/go/exp/spdy/write.go
libgo/go/exp/sql/convert.go
libgo/go/exp/sql/convert_test.go
libgo/go/exp/sql/driver/driver.go
libgo/go/exp/sql/driver/types.go
libgo/go/exp/sql/driver/types_test.go [new file with mode: 0644]
libgo/go/exp/sql/fakedb_test.go
libgo/go/exp/sql/sql.go
libgo/go/exp/ssh/client.go
libgo/go/exp/ssh/client_auth.go [new file with mode: 0644]
libgo/go/exp/ssh/common.go
libgo/go/exp/ssh/doc.go
libgo/go/exp/ssh/messages.go
libgo/go/exp/ssh/messages_test.go
libgo/go/exp/ssh/server.go
libgo/go/exp/types/const.go
libgo/go/exp/types/gcimporter.go
libgo/go/exp/types/gcimporter_test.go
libgo/go/exp/wingui/gui.go
libgo/go/exp/wingui/winapi.go
libgo/go/expvar/expvar.go
libgo/go/expvar/expvar_test.go
libgo/go/fmt/format.go
libgo/go/fmt/print.go
libgo/go/fmt/scan.go
libgo/go/fmt/scan_test.go
libgo/go/go/ast/ast.go
libgo/go/go/ast/import.go [new file with mode: 0644]
libgo/go/go/build/build.go
libgo/go/go/build/build_test.go
libgo/go/go/doc/comment.go
libgo/go/go/doc/example.go
libgo/go/go/parser/parser.go
libgo/go/go/printer/printer.go
libgo/go/go/scanner/scanner.go
libgo/go/go/token/serialize.go
libgo/go/html/doc.go
libgo/go/html/entity_test.go
libgo/go/html/escape.go
libgo/go/html/parse.go
libgo/go/html/parse_test.go
libgo/go/html/template/attr.go [moved from libgo/go/exp/template/html/attr.go with 99% similarity]
libgo/go/html/template/clone.go [moved from libgo/go/exp/template/html/clone.go with 98% similarity]
libgo/go/html/template/clone_test.go [moved from libgo/go/exp/template/html/clone_test.go with 96% similarity]
libgo/go/html/template/content.go [moved from libgo/go/exp/template/html/content.go with 99% similarity]
libgo/go/html/template/content_test.go [moved from libgo/go/exp/template/html/content_test.go with 98% similarity]
libgo/go/html/template/context.go [moved from libgo/go/exp/template/html/context.go with 99% similarity]
libgo/go/html/template/css.go [moved from libgo/go/exp/template/html/css.go with 99% similarity]
libgo/go/html/template/css_test.go [moved from libgo/go/exp/template/html/css_test.go with 99% similarity]
libgo/go/html/template/doc.go [moved from libgo/go/exp/template/html/doc.go with 71% similarity]
libgo/go/html/template/error.go [moved from libgo/go/exp/template/html/error.go with 75% similarity]
libgo/go/html/template/escape.go [moved from libgo/go/exp/template/html/escape.go with 96% similarity]
libgo/go/html/template/escape_test.go [moved from libgo/go/exp/template/html/escape_test.go with 96% similarity]
libgo/go/html/template/html.go [moved from libgo/go/exp/template/html/html.go with 99% similarity]
libgo/go/html/template/html_test.go [moved from libgo/go/exp/template/html/html_test.go with 99% similarity]
libgo/go/html/template/js.go [moved from libgo/go/exp/template/html/js.go with 99% similarity]
libgo/go/html/template/js_test.go [moved from libgo/go/exp/template/html/js_test.go with 99% similarity]
libgo/go/html/template/template.go [new file with mode: 0644]
libgo/go/html/template/transition.go [moved from libgo/go/exp/template/html/transition.go with 99% similarity]
libgo/go/html/template/url.go [moved from libgo/go/exp/template/html/url.go with 99% similarity]
libgo/go/html/template/url_test.go [moved from libgo/go/exp/template/html/url_test.go with 99% similarity]
libgo/go/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat [new file with mode: 0644]
libgo/go/html/token.go
libgo/go/html/token_test.go
libgo/go/http/dump.go [deleted file]
libgo/go/image/bmp/reader.go
libgo/go/image/jpeg/writer_test.go
libgo/go/index/suffixarray/suffixarray_test.go
libgo/go/io/multi_test.go
libgo/go/log/log.go
libgo/go/log/syslog/syslog.go [moved from libgo/go/syslog/syslog.go with 100% similarity]
libgo/go/log/syslog/syslog_c.c [moved from libgo/go/syslog/syslog_c.c with 100% similarity]
libgo/go/log/syslog/syslog_libc.go [moved from libgo/go/syslog/syslog_libc.go with 100% similarity]
libgo/go/log/syslog/syslog_test.go [moved from libgo/go/syslog/syslog_test.go with 100% similarity]
libgo/go/log/syslog/syslog_unix.go [moved from libgo/go/syslog/syslog_unix.go with 100% similarity]
libgo/go/math/all_test.go
libgo/go/math/big/arith.go [moved from libgo/go/big/arith.go with 100% similarity]
libgo/go/math/big/arith_decl.go [moved from libgo/go/big/arith_decl.go with 100% similarity]
libgo/go/math/big/arith_test.go [moved from libgo/go/big/arith_test.go with 100% similarity]
libgo/go/math/big/calibrate_test.go [moved from libgo/go/big/calibrate_test.go with 100% similarity]
libgo/go/math/big/hilbert_test.go [moved from libgo/go/big/hilbert_test.go with 100% similarity]
libgo/go/math/big/int.go [moved from libgo/go/big/int.go with 99% similarity]
libgo/go/math/big/int_test.go [moved from libgo/go/big/int_test.go with 99% similarity]
libgo/go/math/big/nat.go [moved from libgo/go/big/nat.go with 99% similarity]
libgo/go/math/big/nat_test.go [moved from libgo/go/big/nat_test.go with 100% similarity]
libgo/go/math/big/rat.go [moved from libgo/go/big/rat.go with 100% similarity]
libgo/go/math/big/rat_test.go [moved from libgo/go/big/rat_test.go with 99% similarity]
libgo/go/math/cmplx/abs.go [moved from libgo/go/cmath/abs.go with 81% similarity]
libgo/go/math/cmplx/asin.go [moved from libgo/go/cmath/asin.go with 99% similarity]
libgo/go/math/cmplx/cmath_test.go [moved from libgo/go/cmath/cmath_test.go with 99% similarity]
libgo/go/math/cmplx/conj.go [moved from libgo/go/cmath/conj.go with 95% similarity]
libgo/go/math/cmplx/exp.go [moved from libgo/go/cmath/exp.go with 99% similarity]
libgo/go/math/cmplx/isinf.go [moved from libgo/go/cmath/isinf.go with 97% similarity]
libgo/go/math/cmplx/isnan.go [moved from libgo/go/cmath/isnan.go with 97% similarity]
libgo/go/math/cmplx/log.go [moved from libgo/go/cmath/log.go with 99% similarity]
libgo/go/math/cmplx/phase.go [moved from libgo/go/cmath/phase.go with 96% similarity]
libgo/go/math/cmplx/polar.go [moved from libgo/go/cmath/polar.go with 96% similarity]
libgo/go/math/cmplx/pow.go [moved from libgo/go/cmath/pow.go with 99% similarity]
libgo/go/math/cmplx/rect.go [moved from libgo/go/cmath/rect.go with 95% similarity]
libgo/go/math/cmplx/sin.go [moved from libgo/go/cmath/sin.go with 99% similarity]
libgo/go/math/cmplx/sqrt.go [moved from libgo/go/cmath/sqrt.go with 99% similarity]
libgo/go/math/cmplx/tan.go [moved from libgo/go/cmath/tan.go with 99% similarity]
libgo/go/math/gamma.go
libgo/go/math/rand/exp.go [moved from libgo/go/rand/exp.go with 100% similarity]
libgo/go/math/rand/normal.go [moved from libgo/go/rand/normal.go with 100% similarity]
libgo/go/math/rand/rand.go [moved from libgo/go/rand/rand.go with 100% similarity]
libgo/go/math/rand/rand_test.go [moved from libgo/go/rand/rand_test.go with 100% similarity]
libgo/go/math/rand/rng.go [moved from libgo/go/rand/rng.go with 100% similarity]
libgo/go/math/rand/zipf.go [moved from libgo/go/rand/zipf.go with 100% similarity]
libgo/go/math/tan.go
libgo/go/mime/multipart/multipart.go
libgo/go/mime/multipart/multipart_test.go
libgo/go/net/dnsclient.go
libgo/go/net/dnsclient_unix.go
libgo/go/net/http/cgi/child.go [moved from libgo/go/http/cgi/child.go with 99% similarity]
libgo/go/net/http/cgi/child_test.go [moved from libgo/go/http/cgi/child_test.go with 100% similarity]
libgo/go/net/http/cgi/host.go [moved from libgo/go/http/cgi/host.go with 99% similarity]
libgo/go/net/http/cgi/host_test.go [moved from libgo/go/http/cgi/host_test.go with 99% similarity]
libgo/go/net/http/cgi/matryoshka_test.go [moved from libgo/go/http/cgi/matryoshka_test.go with 99% similarity]
libgo/go/net/http/cgi/testdata/test.cgi [moved from libgo/go/http/cgi/testdata/test.cgi with 100% similarity, mode: 0644]
libgo/go/net/http/chunked.go [new file with mode: 0644]
libgo/go/net/http/client.go [moved from libgo/go/http/client.go with 99% similarity]
libgo/go/net/http/client_test.go [moved from libgo/go/http/client_test.go with 99% similarity]
libgo/go/net/http/cookie.go [moved from libgo/go/http/cookie.go with 100% similarity]
libgo/go/net/http/cookie_test.go [moved from libgo/go/http/cookie_test.go with 99% similarity]
libgo/go/net/http/doc.go [moved from libgo/go/http/doc.go with 100% similarity]
libgo/go/net/http/export_test.go [moved from libgo/go/http/export_test.go with 100% similarity]
libgo/go/net/http/fcgi/child.go [moved from libgo/go/http/fcgi/child.go with 99% similarity]
libgo/go/net/http/fcgi/fcgi.go [moved from libgo/go/http/fcgi/fcgi.go with 100% similarity]
libgo/go/net/http/fcgi/fcgi_test.go [moved from libgo/go/http/fcgi/fcgi_test.go with 100% similarity]
libgo/go/net/http/filetransport.go [moved from libgo/go/http/filetransport.go with 100% similarity]
libgo/go/net/http/filetransport_test.go [moved from libgo/go/http/filetransport_test.go with 99% similarity]
libgo/go/net/http/fs.go [moved from libgo/go/http/fs.go with 99% similarity]
libgo/go/net/http/fs_test.go [moved from libgo/go/http/fs_test.go with 99% similarity]
libgo/go/net/http/header.go [moved from libgo/go/http/header.go with 96% similarity]
libgo/go/net/http/header_test.go [moved from libgo/go/http/header_test.go with 100% similarity]
libgo/go/net/http/httptest/recorder.go [moved from libgo/go/http/httptest/recorder.go with 99% similarity]
libgo/go/net/http/httptest/server.go [moved from libgo/go/http/httptest/server.go with 99% similarity]
libgo/go/net/http/httputil/chunked.go [moved from libgo/go/http/chunked.go with 78% similarity]
libgo/go/net/http/httputil/chunked_test.go [new file with mode: 0644]
libgo/go/net/http/httputil/dump.go [new file with mode: 0644]
libgo/go/net/http/httputil/dump_test.go [new file with mode: 0644]
libgo/go/net/http/httputil/persist.go [moved from libgo/go/http/persist.go with 90% similarity]
libgo/go/net/http/httputil/reverseproxy.go [moved from libgo/go/http/reverseproxy.go with 87% similarity]
libgo/go/net/http/httputil/reverseproxy_test.go [moved from libgo/go/http/reverseproxy_test.go with 84% similarity]
libgo/go/net/http/lex.go [moved from libgo/go/http/lex.go with 100% similarity]
libgo/go/net/http/lex_test.go [moved from libgo/go/http/lex_test.go with 100% similarity]
libgo/go/net/http/pprof/pprof.go [moved from libgo/go/http/pprof/pprof.go with 99% similarity]
libgo/go/net/http/proxy_test.go [moved from libgo/go/http/proxy_test.go with 100% similarity]
libgo/go/net/http/range_test.go [moved from libgo/go/http/range_test.go with 100% similarity]
libgo/go/net/http/readrequest_test.go [moved from libgo/go/http/readrequest_test.go with 78% similarity]
libgo/go/net/http/request.go [moved from libgo/go/http/request.go with 92% similarity]
libgo/go/net/http/request_test.go [moved from libgo/go/http/request_test.go with 93% similarity]
libgo/go/net/http/requestwrite_test.go [moved from libgo/go/http/requestwrite_test.go with 93% similarity]
libgo/go/net/http/response.go [moved from libgo/go/http/response.go with 99% similarity]
libgo/go/net/http/response_test.go [moved from libgo/go/http/response_test.go with 99% similarity]
libgo/go/net/http/responsewrite_test.go [moved from libgo/go/http/responsewrite_test.go with 100% similarity]
libgo/go/net/http/serve_test.go [moved from libgo/go/http/serve_test.go with 99% similarity]
libgo/go/net/http/server.go [moved from libgo/go/http/server.go with 99% similarity]
libgo/go/net/http/sniff.go [moved from libgo/go/http/sniff.go with 97% similarity]
libgo/go/net/http/sniff_test.go [moved from libgo/go/http/sniff_test.go with 95% similarity]
libgo/go/net/http/status.go [moved from libgo/go/http/status.go with 100% similarity]
libgo/go/net/http/testdata/file [moved from libgo/go/http/testdata/file with 100% similarity]
libgo/go/net/http/testdata/index.html [moved from libgo/go/http/testdata/index.html with 100% similarity]
libgo/go/net/http/testdata/style.css [moved from libgo/go/http/testdata/style.css with 100% similarity]
libgo/go/net/http/transfer.go [moved from libgo/go/http/transfer.go with 89% similarity]
libgo/go/net/http/transport.go [moved from libgo/go/http/transport.go with 95% similarity]
libgo/go/net/http/transport_test.go [moved from libgo/go/http/transport_test.go with 99% similarity]
libgo/go/net/http/transport_windows.go [moved from libgo/go/http/transport_windows.go with 100% similarity]
libgo/go/net/http/triv.go [new file with mode: 0644]
libgo/go/net/ip_test.go
libgo/go/net/lookup_test.go
libgo/go/net/lookup_windows.go
libgo/go/net/mail/message.go [moved from libgo/go/mail/message.go with 100% similarity]
libgo/go/net/mail/message_test.go [moved from libgo/go/mail/message_test.go with 100% similarity]
libgo/go/net/net_test.go
libgo/go/net/parse_test.go
libgo/go/net/rpc/client.go [moved from libgo/go/rpc/client.go with 99% similarity]
libgo/go/net/rpc/debug.go [moved from libgo/go/rpc/debug.go with 98% similarity]
libgo/go/net/rpc/jsonrpc/all_test.go [moved from libgo/go/rpc/jsonrpc/all_test.go with 99% similarity]
libgo/go/net/rpc/jsonrpc/client.go [moved from libgo/go/rpc/jsonrpc/client.go with 99% similarity]
libgo/go/net/rpc/jsonrpc/server.go [moved from libgo/go/rpc/jsonrpc/server.go with 99% similarity]
libgo/go/net/rpc/server.go [moved from libgo/go/rpc/server.go with 99% similarity]
libgo/go/net/rpc/server_test.go [moved from libgo/go/rpc/server_test.go with 99% similarity]
libgo/go/net/server_test.go
libgo/go/net/smtp/auth.go [moved from libgo/go/smtp/auth.go with 100% similarity]
libgo/go/net/smtp/smtp.go [moved from libgo/go/smtp/smtp.go with 100% similarity]
libgo/go/net/smtp/smtp_test.go [moved from libgo/go/smtp/smtp_test.go with 100% similarity]
libgo/go/net/sock_bsd.go
libgo/go/net/textproto/reader.go
libgo/go/net/url/url.go [moved from libgo/go/url/url.go with 100% similarity]
libgo/go/net/url/url_test.go [moved from libgo/go/url/url_test.go with 100% similarity]
libgo/go/old/netchan/common.go
libgo/go/old/netchan/export.go
libgo/go/old/regexp/regexp.go
libgo/go/old/template/parse.go
libgo/go/old/template/template_test.go
libgo/go/os/dir_unix.go
libgo/go/os/env_plan9.go
libgo/go/os/env_windows.go
libgo/go/os/error_plan9.go
libgo/go/os/exec/exec.go [moved from libgo/go/exec/exec.go with 100% similarity]
libgo/go/os/exec/exec_test.go [moved from libgo/go/exec/exec_test.go with 100% similarity]
libgo/go/os/exec/lp_plan9.go [moved from libgo/go/exec/lp_plan9.go with 100% similarity]
libgo/go/os/exec/lp_test.go [moved from libgo/go/exec/lp_test.go with 100% similarity]
libgo/go/os/exec/lp_unix.go [moved from libgo/go/exec/lp_unix.go with 100% similarity]
libgo/go/os/exec/lp_windows.go [moved from libgo/go/exec/lp_windows.go with 100% similarity]
libgo/go/os/exec_plan9.go
libgo/go/os/file_unix.go
libgo/go/os/path_test.go
libgo/go/path/filepath/match.go
libgo/go/path/filepath/match_test.go
libgo/go/path/match.go
libgo/go/regexp/exec_test.go
libgo/go/regexp/regexp.go
libgo/go/regexp/syntax/parse.go
libgo/go/regexp/testdata/re2-exhaustive.txt.bz2 [new file with mode: 0644]
libgo/go/runtime/export_test.go
libgo/go/runtime/softfloat64_test.go
libgo/go/sort/sort_test.go
libgo/go/strconv/quote.go
libgo/go/strings/reader.go
libgo/go/strings/strings.go
libgo/go/strings/strings_test.go
libgo/go/sync/once_test.go
libgo/go/testing/quick/quick.go
libgo/go/testing/quick/quick_test.go
libgo/go/testing/script/script.go
libgo/go/text/scanner/scanner.go [moved from libgo/go/scanner/scanner.go with 99% similarity]
libgo/go/text/scanner/scanner_test.go [moved from libgo/go/scanner/scanner_test.go with 99% similarity]
libgo/go/text/tabwriter/tabwriter.go [moved from libgo/go/tabwriter/tabwriter.go with 99% similarity]
libgo/go/text/tabwriter/tabwriter_test.go [moved from libgo/go/tabwriter/tabwriter_test.go with 100% similarity]
libgo/go/text/template/doc.go [moved from libgo/go/template/doc.go with 100% similarity]
libgo/go/text/template/exec.go [moved from libgo/go/template/exec.go with 98% similarity]
libgo/go/text/template/exec_test.go [moved from libgo/go/template/exec_test.go with 97% similarity]
libgo/go/text/template/funcs.go [moved from libgo/go/template/funcs.go with 99% similarity]
libgo/go/text/template/helper.go [moved from libgo/go/template/helper.go with 100% similarity]
libgo/go/text/template/parse.go [moved from libgo/go/template/parse.go with 88% similarity]
libgo/go/text/template/parse/lex.go [moved from libgo/go/template/parse/lex.go with 99% similarity]
libgo/go/text/template/parse/lex_test.go [moved from libgo/go/template/parse/lex_test.go with 100% similarity]
libgo/go/text/template/parse/node.go [moved from libgo/go/template/parse/node.go with 100% similarity]
libgo/go/text/template/parse/parse.go [moved from libgo/go/template/parse/parse.go with 100% similarity]
libgo/go/text/template/parse/parse_test.go [moved from libgo/go/template/parse/parse_test.go with 100% similarity]
libgo/go/text/template/parse/set.go [moved from libgo/go/template/parse/set.go with 100% similarity]
libgo/go/text/template/set.go [moved from libgo/go/template/set.go with 94% similarity]
libgo/go/text/template/set_test.go [moved from libgo/go/template/set_test.go with 100% similarity]
libgo/go/text/template/testdata/file1.tmpl [moved from libgo/go/template/testdata/file1.tmpl with 100% similarity]
libgo/go/text/template/testdata/file2.tmpl [moved from libgo/go/template/testdata/file2.tmpl with 100% similarity]
libgo/go/text/template/testdata/tmpl1.tmpl [moved from libgo/go/template/testdata/tmpl1.tmpl with 100% similarity]
libgo/go/text/template/testdata/tmpl2.tmpl [moved from libgo/go/template/testdata/tmpl2.tmpl with 100% similarity]
libgo/go/time/sleep_test.go
libgo/go/time/sys.go
libgo/go/time/zoneinfo_windows.go
libgo/go/unicode/utf16/utf16.go [moved from libgo/go/utf16/utf16.go with 100% similarity]
libgo/go/unicode/utf16/utf16_test.go [moved from libgo/go/utf16/utf16_test.go with 99% similarity]
libgo/go/unicode/utf8/string.go [moved from libgo/go/utf8/string.go with 100% similarity]
libgo/go/unicode/utf8/string_test.go [moved from libgo/go/utf8/string_test.go with 98% similarity]
libgo/go/unicode/utf8/utf8.go [moved from libgo/go/utf8/utf8.go with 100% similarity]
libgo/go/unicode/utf8/utf8_test.go [moved from libgo/go/utf8/utf8_test.go with 99% similarity]
libgo/go/websocket/client.go
libgo/go/websocket/hixie.go
libgo/go/websocket/hixie_test.go
libgo/go/websocket/hybi.go
libgo/go/websocket/hybi_test.go
libgo/go/websocket/server.go
libgo/go/websocket/websocket.go
libgo/go/websocket/websocket_test.go
libgo/merge.sh
libgo/runtime/time.goc [new file with mode: 0644]

index 6071821..cc2cc71 100644 (file)
@@ -18,7 +18,7 @@ import (
        "fmt"
        "io"
        "os"
-       "template"
+       "text/template"
 )
 
 func main() {
index 6a67b17..461ee97 100644 (file)
@@ -9,14 +9,14 @@
 package main
 
 import (
-       "cmath"
        "fmt"
        "math"
+       "math/cmplx"
 )
 
-type Test struct{
-       f, g    complex128
-       out     complex128
+type Test struct {
+       f, g complex128
+       out  complex128
 }
 
 var nan = math.NaN()
@@ -25,9 +25,9 @@ var negzero = math.Copysign(0, -1)
 
 func calike(a, b complex128) bool {
        switch {
-       case cmath.IsInf(a) && cmath.IsInf(b):
+       case cmplx.IsInf(a) && cmplx.IsInf(b):
                return true
-       case cmath.IsNaN(a) && cmath.IsNaN(b):
+       case cmplx.IsNaN(a) && cmplx.IsNaN(b):
                return true
        }
        return a == b
@@ -36,7 +36,7 @@ func calike(a, b complex128) bool {
 func main() {
        bad := false
        for _, t := range tests {
-               x := t.f/t.g
+               x := t.f / t.g
                if !calike(x, t.out) {
                        if !bad {
                                fmt.Printf("BUG\n")
index f43709b..82fbf7f 100644 (file)
@@ -10,8 +10,8 @@
 package main
 
 import (
-       "http"
        "io/ioutil"     // GCCGO_ERROR "imported and not used"
+       "net/http"
        "os"
 )
 
index c3b9092..5a64d16 100644 (file)
@@ -6,7 +6,7 @@
 
 package main
 
-import "rand"
+import "math/rand"
 
 const Count = 1e5
 
index acb8831..c2603a0 100644 (file)
@@ -6,7 +6,7 @@
 
 package main
 
-import "rand"
+import "math/rand"
 
 const Count = 1e5
 
index f014b44..726e367 100644 (file)
@@ -10,7 +10,7 @@ package main
 
 import (
        "flag"
-       "rand"
+       "math/rand"
        "runtime"
        "unsafe"
 )
index d5ada26..6a7063e 100644 (file)
@@ -9,28 +9,29 @@ package main
 import (
        "fmt"
        "os"
-       "utf8"
+       "unicode/utf8"
 )
 
 func main() {
        s := "\000\123\x00\xca\xFE\u0123\ubabe\U0000babe\U0010FFFFx"
-       expect := []int{ 0, 0123, 0, 0xFFFD, 0xFFFD, 0x123, 0xbabe, 0xbabe, 0x10FFFF, 'x' }
+       expect := []rune{0, 0123, 0, 0xFFFD, 0xFFFD, 0x123, 0xbabe, 0xbabe, 0x10FFFF, 'x'}
        offset := 0
-       var i, c int
+       var i int
+       var c rune
        ok := true
        cnum := 0
        for i, c = range s {
-               rune, size := utf8.DecodeRuneInString(s[i:len(s)])  // check it another way
+               r, size := utf8.DecodeRuneInString(s[i:len(s)]) // check it another way
                if i != offset {
                        fmt.Printf("unexpected offset %d not %d\n", i, offset)
                        ok = false
                }
-               if rune != expect[cnum] {
-                       fmt.Printf("unexpected rune %d from DecodeRuneInString: %x not %x\n", i, rune, expect[cnum])
+               if r != expect[cnum] {
+                       fmt.Printf("unexpected rune %d from DecodeRuneInString: %x not %x\n", i, r, expect[cnum])
                        ok = false
                }
                if c != expect[cnum] {
-                       fmt.Printf("unexpected rune %d from range: %x not %x\n", i, rune, expect[cnum])
+                       fmt.Printf("unexpected rune %d from range: %x not %x\n", i, r, expect[cnum])
                        ok = false
                }
                offset += size
index a93fc29..9fba581 100644 (file)
@@ -6,10 +6,10 @@
 
 package main
 
-import "utf8"
+import "unicode/utf8"
 
 func main() {
-       var chars [6] int
+       var chars [6]rune
        chars[0] = 'a'
        chars[1] = 'b'
        chars[2] = 'c'
@@ -21,16 +21,22 @@ func main() {
                s += string(chars[i])
        }
        var l = len(s)
-       for w, i, j := 0,0,0; i < l; i += w {
-               var r int
+       for w, i, j := 0, 0, 0; i < l; i += w {
+               var r rune
                r, w = utf8.DecodeRuneInString(s[i:len(s)])
-               if w == 0 { panic("zero width in string") }
-               if r != chars[j] { panic("wrong value from string") }
+               if w == 0 {
+                       panic("zero width in string")
+               }
+               if r != chars[j] {
+                       panic("wrong value from string")
+               }
                j++
        }
        // encoded as bytes:  'a' 'b' 'c' e6 97 a5 e6 9c ac e8 aa 9e
        const L = 12
-       if L != l { panic("wrong length constructing array") }
+       if L != l {
+               panic("wrong length constructing array")
+       }
        a := make([]byte, L)
        a[0] = 'a'
        a[1] = 'b'
@@ -44,11 +50,15 @@ func main() {
        a[9] = 0xe8
        a[10] = 0xaa
        a[11] = 0x9e
-       for w, i, j := 0,0,0; i < L; i += w {
-               var r int
+       for w, i, j := 0, 0, 0; i < L; i += w {
+               var r rune
                r, w = utf8.DecodeRune(a[i:L])
-               if w == 0 { panic("zero width in bytes") }
-               if r != chars[j] { panic("wrong value from bytes") }
+               if w == 0 {
+                       panic("zero width in bytes")
+               }
+               if r != chars[j] {
+                       panic("wrong value from bytes")
+               }
                j++
        }
 }
index f55d80b..5e896c0 100644 (file)
@@ -1,4 +1,4 @@
-780c85032b17
+2f4482b89a6b
 
 The first line of this file holds the Mercurial revision number of the
 last merge done from the master library sources.
index 9a4588e..cd264e3 100644 (file)
@@ -100,56 +100,36 @@ toolexeclib_LIBRARIES = libgobegin.a
 toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias)
 
 toolexeclibgo_DATA = \
-       asn1.gox \
-       big.gox \
        bufio.gox \
        bytes.gox \
-       cmath.gox \
        crypto.gox \
-       csv.gox \
        errors.gox \
-       exec.gox \
        expvar.gox \
        flag.gox \
        fmt.gox \
-       gob.gox \
        hash.gox \
        html.gox \
-       http.gox \
        image.gox \
        io.gox \
-       json.gox \
        log.gox \
        math.gox \
-       mail.gox \
        mime.gox \
        net.gox \
        os.gox \
        patch.gox \
        path.gox \
-       rand.gox \
        reflect.gox \
        regexp.gox \
-       rpc.gox \
        runtime.gox \
-       scanner.gox \
-       smtp.gox \
        sort.gox \
        strconv.gox \
        strings.gox \
        sync.gox \
        syscall.gox \
-       syslog.gox \
-       tabwriter.gox \
-       template.gox \
        testing.gox \
        time.gox \
        unicode.gox \
-       url.gox \
-       utf16.gox \
-       utf8.gox \
-       websocket.gox \
-       xml.gox
+       websocket.gox
 
 toolexeclibgoarchivedir = $(toolexeclibgodir)/archive
 
@@ -230,12 +210,17 @@ toolexeclibgoencodingdir = $(toolexeclibgodir)/encoding
 
 toolexeclibgoencoding_DATA = \
        encoding/ascii85.gox \
+       encoding/asn1.gox \
        encoding/base32.gox \
        encoding/base64.gox \
        encoding/binary.gox \
+       encoding/csv.gox \
        encoding/git85.gox \
+       encoding/gob.gox \
        encoding/hex.gox \
-       encoding/pem.gox
+       encoding/json.gox \
+       encoding/pem.gox \
+       encoding/xml.gox
 
 if LIBGO_IS_LINUX
 # exp_inotify_gox = exp/inotify.gox
@@ -267,11 +252,6 @@ toolexeclibgoexpsqldir = $(toolexeclibgoexpdir)/sql
 toolexeclibgoexpsql_DATA = \
        exp/sql/driver.gox
 
-toolexeclibgoexptemplatedir = $(toolexeclibgoexpdir)/template
-
-toolexeclibgoexptemplate_DATA = \
-       exp/template/html.gox
-
 toolexeclibgogodir = $(toolexeclibgodir)/go
 
 toolexeclibgogo_DATA = \
@@ -291,13 +271,10 @@ toolexeclibgohash_DATA = \
        hash/crc64.gox \
        hash/fnv.gox
 
-toolexeclibgohttpdir = $(toolexeclibgodir)/http
+toolexeclibgohtmldir = $(toolexeclibgodir)/html
 
-toolexeclibgohttp_DATA = \
-       http/cgi.gox \
-       http/fcgi.gox \
-       http/httptest.gox \
-       http/pprof.gox
+toolexeclibgohtml_DATA = \
+       html/template.gox
 
 toolexeclibgoimagedir = $(toolexeclibgodir)/image
 
@@ -321,6 +298,18 @@ toolexeclibgoiodir = $(toolexeclibgodir)/io
 toolexeclibgoio_DATA = \
        io/ioutil.gox
 
+toolexeclibgologdir = $(toolexeclibgodir)/log
+
+toolexeclibgolog_DATA = \
+       log/syslog.gox
+
+toolexeclibgomathdir = $(toolexeclibgodir)/math
+
+toolexeclibgomath_DATA = \
+       math/big.gox \
+       math/cmplx.gox \
+       math/rand.gox
+
 toolexeclibgomimedir = $(toolexeclibgodir)/mime
 
 toolexeclibgomime_DATA = \
@@ -330,7 +319,26 @@ toolexeclibgonetdir = $(toolexeclibgodir)/net
 
 toolexeclibgonet_DATA = \
        net/dict.gox \
-       net/textproto.gox
+       net/http.gox \
+       net/mail.gox \
+       net/rpc.gox \
+       net/smtp.gox \
+       net/textproto.gox \
+       net/url.gox
+
+toolexeclibgonethttpdir = $(toolexeclibgonetdir)/http
+
+toolexeclibgonethttp_DATA = \
+       net/http/cgi.gox \
+       net/http/fcgi.gox \
+       net/http/httptest.gox \
+       net/http/httputil.gox \
+       net/http/pprof.gox
+
+toolexeclibgonetrpcdir = $(toolexeclibgonetdir)/rpc
+
+toolexeclibgonetrpc_DATA = \
+       net/rpc/jsonrpc.gox
 
 toolexeclibgoolddir = $(toolexeclibgodir)/old
 
@@ -342,6 +350,7 @@ toolexeclibgoold_DATA = \
 toolexeclibgoosdir = $(toolexeclibgodir)/os
 
 toolexeclibgoos_DATA = \
+       os/exec.gox \
        os/user.gox \
        os/signal.gox
 
@@ -355,22 +364,12 @@ toolexeclibgoregexpdir = $(toolexeclibgodir)/regexp
 toolexeclibgoregexp_DATA = \
        regexp/syntax.gox
 
-toolexeclibgorpcdir = $(toolexeclibgodir)/rpc
-
-toolexeclibgorpc_DATA = \
-       rpc/jsonrpc.gox
-
 toolexeclibgoruntimedir = $(toolexeclibgodir)/runtime
 
 toolexeclibgoruntime_DATA = \
        runtime/debug.gox \
        runtime/pprof.gox
 
-toolexeclibgotemplatedir = $(toolexeclibgodir)/template
-
-toolexeclibgotemplate_DATA = \
-       template/parse.gox
-
 toolexeclibgosyncdir = $(toolexeclibgodir)/sync
 
 toolexeclibgosync_DATA = \
@@ -383,6 +382,24 @@ toolexeclibgotesting_DATA = \
        testing/quick.gox \
        testing/script.gox
 
+toolexeclibgotextdir = $(toolexeclibgodir)/text
+
+toolexeclibgotext_DATA = \
+       text/scanner.gox \
+       text/tabwriter.gox \
+       text/template.gox
+
+toolexeclibgotexttemplatedir = $(toolexeclibgotextdir)/template
+
+toolexeclibgotexttemplate_DATA = \
+       text/template/parse.gox
+
+toolexeclibgounicodedir = $(toolexeclibgodir)/unicode
+
+toolexeclibgounicode_DATA = \
+       unicode/utf16.gox \
+       unicode/utf8.gox
+
 if HAVE_SYS_MMAN_H
 runtime_mem_file = runtime/mem.c
 else
@@ -484,7 +501,8 @@ runtime_files = \
        runtime1.c \
        sema.c \
        sigqueue.c \
-       string.c
+       string.c \
+       time.c
 
 goc2c.$(OBJEXT): runtime/goc2c.c
        $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) $<
@@ -516,21 +534,14 @@ sigqueue.c: $(srcdir)/runtime/sigqueue.goc goc2c
        ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
        mv -f $@.tmp $@
 
+time.c: $(srcdir)/runtime/time.goc goc2c
+       ./goc2c --gcc --go-prefix libgo_time $< > $@.tmp
+       mv -f $@.tmp $@
+
 %.c: $(srcdir)/runtime/%.goc goc2c
        ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
-go_asn1_files = \
-       go/asn1/asn1.go \
-       go/asn1/common.go \
-       go/asn1/marshal.go
-
-go_big_files = \
-       go/big/arith.go \
-       go/big/int.go \
-       go/big/nat.go \
-       go/big/rat.go
-
 go_bufio_files = \
        go/bufio/bufio.go
 
@@ -541,36 +552,12 @@ go_bytes_files = \
 go_bytes_c_files = \
        go/bytes/indexbyte.c
 
-go_cmath_files = \
-       go/cmath/abs.go \
-       go/cmath/asin.go \
-       go/cmath/conj.go \
-       go/cmath/exp.go \
-       go/cmath/isinf.go \
-       go/cmath/isnan.go \
-       go/cmath/log.go \
-       go/cmath/phase.go \
-       go/cmath/polar.go \
-       go/cmath/pow.go \
-       go/cmath/rect.go \
-       go/cmath/sin.go \
-       go/cmath/sqrt.go \
-       go/cmath/tan.go
-
 go_crypto_files = \
        go/crypto/crypto.go
 
-go_csv_files = \
-       go/csv/reader.go \
-       go/csv/writer.go
-
 go_errors_files = \
        go/errors/errors.go
 
-go_exec_files = \
-       go/exec/exec.go \
-       go/exec/lp_unix.go
-
 go_expvar_files = \
        go/expvar/expvar.go
 
@@ -583,15 +570,6 @@ go_fmt_files = \
        go/fmt/print.go \
        go/fmt/scan.go
 
-go_gob_files = \
-       go/gob/decode.go \
-       go/gob/decoder.go \
-       go/gob/doc.go \
-       go/gob/encode.go \
-       go/gob/encoder.go \
-       go/gob/error.go \
-       go/gob/type.go
-
 go_hash_files = \
        go/hash/hash.go
 
@@ -605,25 +583,6 @@ go_html_files = \
        go/html/render.go \
        go/html/token.go
 
-go_http_files = \
-       go/http/chunked.go \
-       go/http/client.go \
-       go/http/cookie.go \
-       go/http/dump.go \
-       go/http/filetransport.go \
-       go/http/fs.go \
-       go/http/header.go \
-       go/http/lex.go \
-       go/http/persist.go \
-       go/http/request.go \
-       go/http/response.go \
-       go/http/reverseproxy.go \
-       go/http/server.go \
-       go/http/sniff.go \
-       go/http/status.go \
-       go/http/transfer.go \
-       go/http/transport.go
-
 go_image_files = \
        go/image/format.go \
        go/image/geom.go \
@@ -635,14 +594,6 @@ go_io_files = \
        go/io/io.go \
        go/io/pipe.go
 
-go_json_files = \
-       go/json/decode.go \
-       go/json/encode.go \
-       go/json/indent.go \
-       go/json/scanner.go \
-       go/json/stream.go \
-       go/json/tags.go
-
 go_log_files = \
        go/log/log.go
 
@@ -694,9 +645,6 @@ go_math_files = \
        go/math/tanh.go \
        go/math/unsafe.go
 
-go_mail_files = \
-       go/mail/message.go
-
 go_mime_files = \
        go/mime/grammar.go \
        go/mime/mediatype.go \
@@ -852,13 +800,6 @@ go_path_files = \
        go/path/match.go \
        go/path/path.go
 
-go_rand_files = \
-       go/rand/exp.go \
-       go/rand/normal.go \
-       go/rand/rand.go \
-       go/rand/rng.go \
-       go/rand/zipf.go
-
 go_reflect_files = \
        go/reflect/deepequal.go \
        go/reflect/type.go \
@@ -868,10 +809,10 @@ go_regexp_files = \
        go/regexp/exec.go \
        go/regexp/regexp.go
 
-go_rpc_files = \
-       go/rpc/client.go \
-       go/rpc/debug.go \
-       go/rpc/server.go
+go_net_rpc_files = \
+       go/net/rpc/client.go \
+       go/net/rpc/debug.go \
+       go/net/rpc/server.go
 
 go_runtime_files = \
        go/runtime/debug.go \
@@ -894,13 +835,6 @@ s-version: Makefile
        $(SHELL) $(srcdir)/../move-if-change version.go.tmp version.go
        $(STAMP) $@
 
-go_scanner_files = \
-       go/scanner/scanner.go
-
-go_smtp_files = \
-       go/smtp/auth.go \
-       go/smtp/smtp.go
-
 go_sort_files = \
        go/sort/search.go \
        go/sort/sort.go
@@ -927,31 +861,20 @@ go_sync_files = \
        go/sync/waitgroup.go
 
 if LIBGO_IS_SOLARIS
-go_syslog_file = go/syslog/syslog_libc.go
+go_syslog_file = go/log/syslog/syslog_libc.go
 else
 if LIBGO_IS_IRIX
-go_syslog_file = go/syslog/syslog_libc.go
+go_syslog_file = go/log/syslog/syslog_libc.go
 else
-go_syslog_file = go/syslog/syslog_unix.go
+go_syslog_file = go/log/syslog/syslog_unix.go
 endif
 endif
 
-go_syslog_files = \
-       go/syslog/syslog.go \
+go_log_syslog_files = \
+       go/log/syslog/syslog.go \
        $(go_syslog_file)
 go_syslog_c_files = \
-       go/syslog/syslog_c.c
-
-go_tabwriter_files = \
-       go/tabwriter/tabwriter.go
-
-go_template_files = \
-       go/template/doc.go \
-       go/template/exec.go \
-       go/template/funcs.go \
-       go/template/helper.go \
-       go/template/parse.go \
-       go/template/set.go
+       go/log/syslog/syslog_c.c
 
 go_testing_files = \
        go/testing/benchmark.go \
@@ -975,16 +898,6 @@ go_unicode_files = \
        go/unicode/letter.go \
        go/unicode/tables.go
 
-go_url_files = \
-       go/url/url.go
-
-go_utf16_files = \
-       go/utf16/utf16.go
-
-go_utf8_files = \
-       go/utf8/string.go \
-       go/utf8/utf8.go
-
 go_websocket_files = \
        go/websocket/client.go \
        go/websocket/hixie.go \
@@ -992,10 +905,6 @@ go_websocket_files = \
        go/websocket/server.go \
        go/websocket/websocket.go
 
-go_xml_files = \
-       go/xml/marshal.go \
-       go/xml/read.go \
-       go/xml/xml.go
 
 go_archive_tar_files = \
        go/archive/tar/common.go \
@@ -1183,6 +1092,10 @@ go_debug_pe_files = \
 
 go_encoding_ascii85_files = \
        go/encoding/ascii85/ascii85.go
+go_encoding_asn1_files = \
+       go/encoding/asn1/asn1.go \
+       go/encoding/asn1/common.go \
+       go/encoding/asn1/marshal.go
 go_encoding_base32_files = \
        go/encoding/base32/base32.go
 go_encoding_base64_files = \
@@ -1190,12 +1103,34 @@ go_encoding_base64_files = \
 go_encoding_binary_files = \
        go/encoding/binary/binary.go \
        go/encoding/binary/varint.go
+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 \
+       go/encoding/gob/doc.go \
+       go/encoding/gob/encode.go \
+       go/encoding/gob/encoder.go \
+       go/encoding/gob/error.go \
+       go/encoding/gob/type.go
 go_encoding_hex_files = \
        go/encoding/hex/hex.go
+go_encoding_json_files = \
+       go/encoding/json/decode.go \
+       go/encoding/json/encode.go \
+       go/encoding/json/indent.go \
+       go/encoding/json/scanner.go \
+       go/encoding/json/stream.go \
+       go/encoding/json/tags.go
 go_encoding_pem_files = \
        go/encoding/pem/pem.go
+go_encoding_xml_files = \
+       go/encoding/xml/marshal.go \
+       go/encoding/xml/read.go \
+       go/encoding/xml/xml.go
 
 go_exp_ebnf_files = \
        go/exp/ebnf/ebnf.go \
@@ -1222,6 +1157,7 @@ go_exp_sql_files = \
 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 \
@@ -1248,23 +1184,10 @@ go_exp_sql_driver_files = \
        go/exp/sql/driver/driver.go \
        go/exp/sql/driver/types.go
 
-go_exp_template_html_files = \
-       go/exp/template/html/attr.go \
-       go/exp/template/html/clone.go \
-       go/exp/template/html/content.go \
-       go/exp/template/html/context.go \
-       go/exp/template/html/css.go \
-       go/exp/template/html/doc.go \
-       go/exp/template/html/error.go \
-       go/exp/template/html/escape.go \
-       go/exp/template/html/html.go \
-       go/exp/template/html/js.go \
-       go/exp/template/html/transition.go \
-       go/exp/template/html/url.go
-
 go_go_ast_files = \
        go/go/ast/ast.go \
        go/go/ast/filter.go \
+       go/go/ast/import.go \
        go/go/ast/print.go \
        go/go/ast/resolve.go \
        go/go/ast/scope.go \
@@ -1302,17 +1225,20 @@ go_hash_crc64_files = \
 go_hash_fnv_files = \
        go/hash/fnv/fnv.go
 
-go_http_cgi_files = \
-       go/http/cgi/child.go \
-       go/http/cgi/host.go
-go_http_fcgi_files = \
-       go/http/fcgi/child.go \
-       go/http/fcgi/fcgi.go
-go_http_httptest_files = \
-       go/http/httptest/recorder.go \
-       go/http/httptest/server.go
-go_http_pprof_files = \
-       go/http/pprof/pprof.go
+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 \
+       go/html/template/doc.go \
+       go/html/template/error.go \
+       go/html/template/escape.go \
+       go/html/template/html.go \
+       go/html/template/js.go \
+       go/html/template/template.go \
+       go/html/template/transition.go \
+       go/html/template/url.go
 
 go_image_bmp_files = \
        go/image/bmp/reader.go
@@ -1354,6 +1280,33 @@ go_io_ioutil_files = \
        go/io/ioutil/ioutil.go \
        go/io/ioutil/tempfile.go
 
+go_math_big_files = \
+       go/math/big/arith.go \
+       go/math/big/int.go \
+       go/math/big/nat.go \
+       go/math/big/rat.go
+go_math_cmplx_files = \
+       go/math/cmplx/abs.go \
+       go/math/cmplx/asin.go \
+       go/math/cmplx/conj.go \
+       go/math/cmplx/exp.go \
+       go/math/cmplx/isinf.go \
+       go/math/cmplx/isnan.go \
+       go/math/cmplx/log.go \
+       go/math/cmplx/phase.go \
+       go/math/cmplx/polar.go \
+       go/math/cmplx/pow.go \
+       go/math/cmplx/rect.go \
+       go/math/cmplx/sin.go \
+       go/math/cmplx/sqrt.go \
+       go/math/cmplx/tan.go
+go_math_rand_files = \
+       go/math/rand/exp.go \
+       go/math/rand/normal.go \
+       go/math/rand/rand.go \
+       go/math/rand/rng.go \
+       go/math/rand/zipf.go
+
 go_mime_multipart_files = \
        go/mime/multipart/formdata.go \
        go/mime/multipart/multipart.go \
@@ -1361,13 +1314,52 @@ go_mime_multipart_files = \
 
 go_net_dict_files = \
        go/net/dict/dict.go
-
+go_net_http_files = \
+       go/net/http/chunked.go \
+       go/net/http/client.go \
+       go/net/http/cookie.go \
+       go/net/http/filetransport.go \
+       go/net/http/fs.go \
+       go/net/http/header.go \
+       go/net/http/lex.go \
+       go/net/http/request.go \
+       go/net/http/response.go \
+       go/net/http/server.go \
+       go/net/http/sniff.go \
+       go/net/http/status.go \
+       go/net/http/transfer.go \
+       go/net/http/transport.go
+go_net_mail_files = \
+       go/net/mail/message.go
+go_net_smtp_files = \
+       go/net/smtp/auth.go \
+       go/net/smtp/smtp.go
 go_net_textproto_files = \
        go/net/textproto/header.go \
        go/net/textproto/pipeline.go \
        go/net/textproto/reader.go \
        go/net/textproto/textproto.go \
        go/net/textproto/writer.go
+go_net_url_files = \
+       go/net/url/url.go
+
+go_net_http_cgi_files = \
+       go/net/http/cgi/child.go \
+       go/net/http/cgi/host.go
+go_net_http_fcgi_files = \
+       go/net/http/fcgi/child.go \
+       go/net/http/fcgi/fcgi.go
+go_net_http_httptest_files = \
+       go/net/http/httptest/recorder.go \
+       go/net/http/httptest/server.go
+go_net_http_pprof_files = \
+       go/net/http/pprof/pprof.go
+go_net_http_httputil_files = \
+       go/net/http/httputil/chunked.go \
+       go/net/http/httputil/dump.go \
+       go/net/http/httputil/persist.go \
+       go/net/http/httputil/reverseproxy.go
+
 
 go_old_netchan_files = \
        go/old/netchan/common.go \
@@ -1381,6 +1373,10 @@ go_old_template_files = \
        go/old/template/format.go \
        go/old/template/parse.go
 
+go_os_exec_files = \
+       go/os/exec/exec.go \
+       go/os/exec/lp_unix.go
+
 go_os_user_files = \
        go/os/user/user.go \
        go/os/user/lookup_unix.go
@@ -1401,20 +1397,29 @@ go_regexp_syntax_files = \
        go/regexp/syntax/regexp.go \
        go/regexp/syntax/simplify.go
 
-go_rpc_jsonrpc_files = \
-       go/rpc/jsonrpc/client.go \
-       go/rpc/jsonrpc/server.go
+go_net_rpc_jsonrpc_files = \
+       go/net/rpc/jsonrpc/client.go \
+       go/net/rpc/jsonrpc/server.go
 
 go_runtime_debug_files = \
        go/runtime/debug/stack.go
 go_runtime_pprof_files = \
        go/runtime/pprof/pprof.go
 
-go_template_parse_files = \
-       go/template/parse/lex.go \
-       go/template/parse/node.go \
-       go/template/parse/parse.go \
-       go/template/parse/set.go
+go_text_tabwriter_files = \
+       go/text/tabwriter/tabwriter.go
+go_text_template_files = \
+       go/text/template/doc.go \
+       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_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_sync_atomic_files = \
        go/sync/atomic/doc.go
@@ -1430,6 +1435,15 @@ go_testing_quick_files = \
 go_testing_script_files = \
        go/testing/script/script.go
 
+go_text_scanner_files = \
+       go/text/scanner/scanner.go
+
+go_unicode_utf16_files = \
+       go/unicode/utf16/utf16.go
+go_unicode_utf8_files = \
+       go/unicode/utf8/string.go \
+       go/unicode/utf8/utf8.go
+
 # Define Syscall and Syscall6.
 if LIBGO_IS_RTEMS
 syscall_syscall_file = go/syscall/syscall_stubs.go
@@ -1619,56 +1633,35 @@ os_lib_inotify_lo =
 endif
 
 libgo_go_objs = \
-       asn1/asn1.lo \
-       big/big.lo \
        bufio/bufio.lo \
        bytes/bytes.lo \
        bytes/index.lo \
-       cmath/cmath.lo \
        crypto/crypto.lo \
-       csv/csv.lo \
        errors/errors.lo \
-       exec/exec.lo \
        expvar/expvar.lo \
        flag/flag.lo \
        fmt/fmt.lo \
-       gob/gob.lo \
        hash/hash.lo \
        html/html.lo \
-       http/http.lo \
        image/image.lo \
        io/io.lo \
-       json/json.lo \
        log/log.lo \
        math/math.lo \
-       mail/mail.lo \
-       mime/mime.lo \
        net/net.lo \
+       os/exec.lo \
        os/os.lo \
        patch/patch.lo \
        path/path.lo \
-       rand/rand.lo \
        reflect/reflect.lo \
        regexp/regexp.lo \
-       rpc/rpc.lo \
        runtime/runtime.lo \
-       scanner/scanner.lo \
-       smtp/smtp.lo \
        sort/sort.lo \
        strconv/strconv.lo \
        strings/strings.lo \
        sync/sync.lo \
-       syslog/syslog.lo \
-       syslog/syslog_c.lo \
-       tabwriter/tabwriter.lo \
-       template/template.lo \
        time/time.lo \
        unicode/unicode.lo \
-       url/url.lo \
-       utf16/utf16.lo \
-       utf8/utf8.lo \
        websocket/websocket.lo \
-       xml/xml.lo \
        archive/tar.lo \
        archive/zip.lo \
        compress/bzip2.lo \
@@ -1717,12 +1710,17 @@ libgo_go_objs = \
        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/gui.lo \
        exp/norm.lo \
@@ -1733,7 +1731,7 @@ libgo_go_objs = \
        exp/types.lo \
        exp/gui/x11.lo \
        exp/sql/driver.lo \
-       exp/template/html.lo \
+       html/template.lo \
        go/ast.lo \
        go/build.lo \
        go/doc.lo \
@@ -1745,10 +1743,11 @@ libgo_go_objs = \
        hash/crc32.lo \
        hash/crc64.lo \
        hash/fnv.lo \
-       http/cgi.lo \
-       http/fcgi.lo \
-       http/httptest.lo \
-       http/pprof.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 \
@@ -1759,9 +1758,20 @@ libgo_go_objs = \
        image/ycbcr.lo \
        index/suffixarray.lo \
        io/ioutil.lo \
+       log/syslog.lo \
+       log/syslog/syslog_c.lo \
+       math/big.lo \
+       math/cmplx.lo \
+       math/rand.lo \
+       mime/mime.lo \
        mime/multipart.lo \
        net/dict.lo \
+       net/http.lo \
+       net/mail.lo \
+       net/rpc.lo \
+       net/smtp.lo \
        net/textproto.lo \
+       net/url.lo \
        old/netchan.lo \
        old/regexp.lo \
        old/template.lo \
@@ -1770,7 +1780,7 @@ libgo_go_objs = \
        os/signal.lo \
        path/filepath.lo \
        regexp/syntax.lo \
-       rpc/jsonrpc.lo \
+       net/rpc/jsonrpc.lo \
        runtime/debug.lo \
        runtime/pprof.lo \
        sync/atomic.lo \
@@ -1778,11 +1788,16 @@ libgo_go_objs = \
        syscall/syscall.lo \
        syscall/errno.lo \
        syscall/wait.lo \
-       template/parse.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
+       testing/script.lo \
+       unicode/utf16.lo \
+       unicode/utf8.lo
 
 libgo_la_SOURCES = $(runtime_files)
 
@@ -1871,36 +1886,23 @@ CHECK_DEPS = libgo.la libgobegin.a \
        $(toolexeclibgoexp_DATA) \
        $(toolexeclibgogo_DATA) \
        $(toolexeclibgohash_DATA) \
-       $(toolexeclibgohttp_DATA) \
        $(toolexeclibgoimage_DATA) \
        $(toolexeclibgoindex_DATA) \
        $(toolexeclibgoio_DATA) \
+       $(toolexeclibgolog_DATA) \
+       $(toolexeclibgomath_DATA) \
        $(toolexeclibgomime_DATA) \
        $(toolexeclibgonet_DATA) \
+       $(toolexeclibgonethttp_DATA) \
        $(toolexeclibgoos_DATA) \
        $(toolexeclibgopath_DATA) \
        $(toolexeclibgorpc_DATA) \
        $(toolexeclibgoruntime_DATA) \
        $(toolexeclibgosync_DATA) \
-       $(toolexeclibgotesting_DATA)
-
-@go_include@ asn1/asn1.lo.dep
-asn1/asn1.lo.dep: $(go_asn1_files)
-       $(BUILDDEPS)
-asn1/asn1.lo: $(go_asn1_files)
-       $(BUILDPACKAGE)
-asn1/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: asn1/check
-
-@go_include@ big/big.lo.dep
-big/big.lo.dep: $(go_big_files)
-       $(BUILDDEPS)
-big/big.lo: $(go_big_files)
-       $(BUILDPACKAGE)
-big/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: big/check
+       $(toolexeclibgotesting_DATA) \
+       $(toolexeclibgotext_DATA) \
+       $(toolexeclibgotexttemplate_DATA) \
+       $(toolexeclibgounicode_DATA)
 
 @go_include@ bufio/bufio.lo.dep
 bufio/bufio.lo.dep: $(go_bufio_files)
@@ -1922,15 +1924,6 @@ bytes/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: bytes/check
 
-@go_include@ cmath/cmath.lo.dep
-cmath/cmath.lo.dep: $(go_cmath_files)
-       $(BUILDDEPS)
-cmath/cmath.lo: $(go_cmath_files)
-       $(BUILDPACKAGE)
-cmath/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: cmath/check
-
 @go_include@ crypto/crypto.lo.dep
 crypto/crypto.lo.dep: $(go_crypto_files)
        $(BUILDDEPS)
@@ -1940,15 +1933,6 @@ crypto/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/check
 
-@go_include@ csv/csv.lo.dep
-csv/csv.lo.dep: $(go_csv_files)
-       $(BUILDDEPS)
-csv/csv.lo: $(go_csv_files)
-       $(BUILDPACKAGE)
-csv/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: csv/check
-
 @go_include@ errors/errors.lo.dep
 errors/errors.lo.dep: $(go_errors_files)
        $(BUILDDEPS)
@@ -1958,15 +1942,6 @@ errors/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: errors/check
 
-@go_include@ exec/exec.lo.dep
-exec/exec.lo.dep: $(go_exec_files)
-       $(BUILDDEPS)
-exec/exec.lo: $(go_exec_files)
-       $(BUILDPACKAGE)
-exec/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: exec/check
-
 @go_include@ expvar/expvar.lo.dep
 expvar/expvar.lo.dep: $(go_expvar_files)
        $(BUILDDEPS)
@@ -1994,15 +1969,6 @@ fmt/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: fmt/check
 
-@go_include@ gob/gob.lo.dep
-gob/gob.lo.dep: $(go_gob_files)
-       $(BUILDDEPS)
-gob/gob.lo: $(go_gob_files)
-       $(BUILDPACKAGE)
-gob/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: gob/check
-
 @go_include@ hash/hash.lo.dep
 hash/hash.lo.dep: $(go_hash_files)
        $(BUILDDEPS)
@@ -2021,15 +1987,6 @@ html/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: html/check
 
-@go_include@ http/http.lo.dep
-http/http.lo.dep: $(go_http_files)
-       $(BUILDDEPS)
-http/http.lo: $(go_http_files)
-       $(BUILDPACKAGE)
-http/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: http/check
-
 @go_include@ image/image.lo.dep
 image/image.lo.dep: $(go_image_files)
        $(BUILDDEPS)
@@ -2048,15 +2005,6 @@ io/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: io/check
 
-@go_include@ json/json.lo.dep
-json/json.lo.dep: $(go_json_files)
-       $(BUILDDEPS)
-json/json.lo: $(go_json_files)
-       $(BUILDPACKAGE)
-json/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: json/check
-
 @go_include@ log/log.lo.dep
 log/log.lo.dep: $(go_log_files)
        $(BUILDDEPS)
@@ -2075,15 +2023,6 @@ math/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: math/check
 
-@go_include@ mail/mail.lo.dep
-mail/mail.lo.dep: $(go_mail_files)
-       $(BUILDDEPS)
-mail/mail.lo: $(go_mail_files)
-       $(BUILDPACKAGE)
-mail/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: mail/check
-
 @go_include@ mime/mime.lo.dep
 mime/mime.lo.dep: $(go_mime_files)
        $(BUILDDEPS)
@@ -2133,15 +2072,6 @@ path/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: path/check
 
-@go_include@ rand/rand.lo.dep
-rand/rand.lo.dep: $(go_rand_files)
-       $(BUILDDEPS)
-rand/rand.lo: $(go_rand_files)
-       $(BUILDPACKAGE)
-rand/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: rand/check
-
 @go_include@ reflect/reflect.lo.dep
 reflect/reflect.lo.dep: $(go_reflect_files)
        $(BUILDDEPS)
@@ -2160,15 +2090,6 @@ regexp/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: regexp/check
 
-@go_include@ rpc/rpc.lo.dep
-rpc/rpc.lo.dep: $(go_rpc_files)
-       $(BUILDDEPS)
-rpc/rpc.lo: $(go_rpc_files)
-       $(BUILDPACKAGE)
-rpc/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: rpc/check
-
 @go_include@ runtime/runtime.lo.dep
 runtime/runtime.lo.dep: $(go_runtime_files)
        $(BUILDDEPS)
@@ -2178,23 +2099,15 @@ runtime/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: runtime/check
 
-@go_include@ scanner/scanner.lo.dep
-scanner/scanner.lo.dep: $(go_scanner_files)
-       $(BUILDDEPS)
-scanner/scanner.lo: $(go_scanner_files)
-       $(BUILDPACKAGE)
-scanner/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: scanner/check
-
-@go_include@ smtp/smtp.lo.dep
-smtp/smtp.lo.dep: $(go_smtp_files)
+@go_include@ text/scanner.lo.dep
+text/scanner.lo.dep: $(go_text_scanner_files)
        $(BUILDDEPS)
-smtp/smtp.lo: $(go_smtp_files)
+text/scanner.lo: $(go_text_scanner_files)
        $(BUILDPACKAGE)
-smtp/check: $(CHECK_DEPS)
+text/scanner/check: $(CHECK_DEPS)
+       @$(MKDIR_P) text/scanner
        @$(CHECK)
-.PHONY: smtp/check
+.PHONY: text/scanner/check
 
 @go_include@ sort/sort.lo.dep
 sort/sort.lo.dep: $(go_sort_files)
@@ -2232,35 +2145,6 @@ sync/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: sync/check
 
-@go_include@ syslog/syslog.lo.dep
-syslog/syslog.lo.dep: $(go_syslog_files)
-       $(BUILDDEPS)
-syslog/syslog.lo: $(go_syslog_files)
-       $(BUILDPACKAGE)
-syslog/syslog_c.lo: $(go_syslog_c_files) syslog/syslog.lo
-       $(LTCOMPILE) -c -o $@ $(srcdir)/go/syslog/syslog_c.c
-syslog/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: syslog/check
-
-@go_include@ tabwriter/tabwriter.lo.dep
-tabwriter/tabwriter.lo.dep: $(go_tabwriter_files)
-       $(BUILDDEPS)
-tabwriter/tabwriter.lo: $(go_tabwriter_files)
-       $(BUILDPACKAGE)
-tabwriter/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: tabwriter/check
-
-@go_include@ template/template.lo.dep
-template/template.lo.dep: $(go_template_files)
-       $(BUILDDEPS)
-template/template.lo: $(go_template_files)
-       $(BUILDPACKAGE)
-template/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: template/check
-
 @go_include@ testing/testing.lo.dep
 testing/testing.lo.dep: $(go_testing_files)
        $(BUILDDEPS)
@@ -2288,33 +2172,6 @@ unicode/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: unicode/check
 
-@go_include@ url/url.lo.dep
-url/url.lo.dep: $(go_url_files)
-       $(BUILDDEPS)
-url/url.lo: $(go_url_files)
-       $(BUILDPACKAGE)
-url/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: url/check
-
-@go_include@ utf16/utf16.lo.dep
-utf16/utf16.lo.dep: $(go_utf16_files)
-       $(BUILDDEPS)
-utf16/utf16.lo: $(go_utf16_files)
-       $(BUILDPACKAGE)
-utf16/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: utf16/check
-
-@go_include@ utf8/utf8.lo.dep
-utf8/utf8.lo.dep: $(go_utf8_files)
-       $(BUILDDEPS)
-utf8/utf8.lo: $(go_utf8_files)
-       $(BUILDPACKAGE)
-utf8/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: utf8/check
-
 @go_include@ websocket/websocket.lo.dep
 websocket/websocket.lo.dep: $(go_websocket_files)
        $(BUILDDEPS)
@@ -2324,15 +2181,6 @@ websocket/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: websocket/check
 
-@go_include@ xml/xml.lo.dep
-xml/xml.lo.dep: $(go_xml_files)
-       $(BUILDDEPS)
-xml/xml.lo: $(go_xml_files)
-       $(BUILDPACKAGE)
-xml/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: xml/check
-
 @go_include@ archive/tar.lo.dep
 archive/tar.lo.dep: $(go_archive_tar_files)
        $(BUILDDEPS)
@@ -2803,6 +2651,16 @@ debug/pe/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: debug/pe/check
 
+@go_include@ encoding/asn1.lo.dep
+encoding/asn1.lo.dep: $(go_encoding_asn1_files)
+       $(BUILDDEPS)
+encoding/asn1.lo: $(go_encoding_asn1_files)
+       $(BUILDPACKAGE)
+encoding/asn1/check: $(CHECK_DEPS)
+       @$(MKDIR_P) encoding/asn1
+       @$(CHECK)
+.PHONY: encoding/asn1/check
+
 @go_include@ encoding/ascii85.lo.dep
 encoding/ascii85.lo.dep: $(go_encoding_ascii85_files)
        $(BUILDDEPS)
@@ -2843,6 +2701,16 @@ encoding/binary/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: encoding/binary/check
 
+@go_include@ encoding/csv.lo.dep
+encoding/csv.lo.dep: $(go_encoding_csv_files)
+       $(BUILDDEPS)
+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)
@@ -2853,6 +2721,16 @@ encoding/git85/check: $(CHECK_DEPS)
        @$(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
+
 @go_include@ encoding/hex.lo.dep
 encoding/hex.lo.dep: $(go_encoding_hex_files)
        $(BUILDDEPS)
@@ -2863,6 +2741,16 @@ encoding/hex/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: encoding/hex/check
 
+@go_include@ encoding/json.lo.dep
+encoding/json.lo.dep: $(go_encoding_json_files)
+       $(BUILDDEPS)
+encoding/json.lo: $(go_encoding_json_files)
+       $(BUILDPACKAGE)
+encoding/json/check: $(CHECK_DEPS)
+       @$(MKDIR_P) encoding/json
+       @$(CHECK)
+.PHONY: encoding/json/check
+
 @go_include@ encoding/pem.lo.dep
 encoding/pem.lo.dep: $(go_encoding_pem_files)
        $(BUILDDEPS)
@@ -2873,6 +2761,16 @@ encoding/pem/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: encoding/pem/check
 
+@go_include@ encoding/xml.lo.dep
+encoding/xml.lo.dep: $(go_encoding_xml_files)
+       $(BUILDDEPS)
+encoding/xml.lo: $(go_encoding_xml_files)
+       $(BUILDPACKAGE)
+encoding/xml/check: $(CHECK_DEPS)
+       @$(MKDIR_P) encoding/xml
+       @$(CHECK)
+.PHONY: encoding/xml/check
+
 @go_include@ exp/ebnf.lo.dep
 exp/ebnf.lo.dep: $(go_exp_ebnf_files)
        $(BUILDDEPS)
@@ -2983,15 +2881,15 @@ exp/sql/driver/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: exp/sql/driver/check
 
-@go_include@ exp/template/html.lo.dep
-exp/template/html.lo.dep: $(go_exp_template_html_files)
+@go_include@ html/template.lo.dep
+html/template.lo.dep: $(go_html_template_files)
        $(BUILDDEPS)
-exp/template/html.lo: $(go_exp_template_html_files)
+html/template.lo: $(go_html_template_files)
        $(BUILDPACKAGE)
-exp/template/html/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/template/html
+html/template/check: $(CHECK_DEPS)
+       @$(MKDIR_P) html/template
        @$(CHECK)
-.PHONY: exp/template/html/check
+.PHONY: html/template/check
 
 @go_include@ go/ast.lo.dep
 go/ast.lo.dep: $(go_go_ast_files)
@@ -3112,46 +3010,6 @@ hash/fnv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: hash/fnv/check
 
-@go_include@ http/cgi.lo.dep
-http/cgi.lo.dep: $(go_http_cgi_files)
-       $(BUILDDEPS)
-http/cgi.lo: $(go_http_cgi_files)
-       $(BUILDPACKAGE)
-http/cgi/check: $(CHECK_DEPS)
-       @$(MKDIR_P) http/cgi
-       @$(CHECK)
-.PHONY: http/cgi/check
-
-@go_include@ http/fcgi.lo.dep
-http/fcgi.lo.dep: $(go_http_fcgi_files)
-       $(BUILDDEPS)
-http/fcgi.lo: $(go_http_fcgi_files)
-       $(BUILDPACKAGE)
-http/fcgi/check: $(CHECK_DEPS)
-       @$(MKDIR_P) http/fcgi
-       @$(CHECK)
-.PHONY: http/fcgi/check
-
-@go_include@ http/httptest.lo.dep
-http/httptest.lo.dep: $(go_http_httptest_files)
-       $(BUILDDEPS)
-http/httptest.lo: $(go_http_httptest_files)
-       $(BUILDPACKAGE)
-http/httptest/check: $(CHECK_DEPS)
-       @$(MKDIR_P) http/httptest
-       @$(CHECK)
-.PHONY: http/httptest/check
-
-@go_include@ http/pprof.lo.dep
-http/pprof.lo.dep: $(go_http_pprof_files)
-       $(BUILDDEPS)
-http/pprof.lo: $(go_http_pprof_files)
-       $(BUILDPACKAGE)
-http/pprof/check: $(CHECK_DEPS)
-       @$(MKDIR_P) http/pprof
-       @$(CHECK)
-.PHONY: http/pprof/check
-
 @go_include@ image/bmp.lo.dep
 image/bmp.lo.dep: $(go_image_bmp_files)
        $(BUILDDEPS)
@@ -3252,6 +3110,48 @@ io/ioutil/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: io/ioutil/check
 
+@go_include@ log/syslog.lo.dep
+log/syslog.lo.dep: $(go_log_syslog_files)
+       $(BUILDDEPS)
+log/syslog.lo: $(go_log_syslog_files)
+       $(BUILDPACKAGE)
+log/syslog/syslog_c.lo: $(go_syslog_c_files) log/syslog.lo
+       $(LTCOMPILE) -c -o $@ $(srcdir)/go/log/syslog/syslog_c.c
+log/syslog/check: $(CHECK_DEPS)
+       @$(MKDIR_P) log/syslog
+       @$(CHECK)
+.PHONY: log/syslog/check
+
+@go_include@ math/big.lo.dep
+math/big.lo.dep: $(go_math_big_files)
+       $(BUILDDEPS)
+math/big.lo: $(go_math_big_files)
+       $(BUILDPACKAGE)
+math/big/check: $(CHECK_DEPS)
+       @$(MKDIR_P) math/big
+       @$(CHECK)
+.PHONY: math/big/check
+
+@go_include@ math/cmplx.lo.dep
+math/cmplx.lo.dep: $(go_math_cmplx_files)
+       $(BUILDDEPS)
+math/cmplx.lo: $(go_math_cmplx_files)
+       $(BUILDPACKAGE)
+math/cmplx/check: $(CHECK_DEPS)
+       @$(MKDIR_P) math/cmplx
+       @$(CHECK)
+.PHONY: math/cmplx/check
+
+@go_include@ math/rand.lo.dep
+math/rand.lo.dep: $(go_math_rand_files)
+       $(BUILDDEPS)
+math/rand.lo: $(go_math_rand_files)
+       $(BUILDPACKAGE)
+math/rand/check: $(CHECK_DEPS)
+       @$(MKDIR_P) math/rand
+       @$(CHECK)
+.PHONY: math/rand/check
+
 @go_include@ mime/multipart.lo.dep
 mime/multipart.lo.dep: $(go_mime_multipart_files)
        $(BUILDDEPS)
@@ -3268,6 +3168,56 @@ net/dict.lo.dep: $(go_net_dict_files)
 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
+
+@go_include@ net/mail.lo.dep
+net/mail.lo.dep: $(go_net_mail_files)
+       $(BUILDDEPS)
+net/mail.lo: $(go_net_mail_files)
+       $(BUILDPACKAGE)
+net/mail/check: $(CHECK_DEPS)
+       @$(MKDIR_P) net/mail
+       @$(CHECK)
+.PHONY: net/mail/check
+
+@go_include@ net/rpc.lo.dep
+net/rpc.lo.dep: $(go_net_rpc_files)
+       $(BUILDDEPS)
+net/rpc.lo: $(go_net_rpc_files)
+       $(BUILDPACKAGE)
+net/rpc/check: $(CHECK_DEPS)
+       @$(MKDIR_P) net/rpc
+       @$(CHECK)
+.PHONY: net/rpc/check
+
+@go_include@ net/smtp.lo.dep
+net/smtp.lo.dep: $(go_net_smtp_files)
+       $(BUILDDEPS)
+net/smtp.lo: $(go_net_smtp_files)
+       $(BUILDPACKAGE)
+net/smtp/check: $(CHECK_DEPS)
+       @$(MKDIR_P) net/smtp
+       @$(CHECK)
+.PHONY: net/smtp/check
+
+@go_include@ net/url.lo.dep
+net/url.lo.dep: $(go_net_url_files)
+       $(BUILDDEPS)
+net/url.lo: $(go_net_url_files)
+       $(BUILDPACKAGE)
+net/url/check: $(CHECK_DEPS)
+       @$(MKDIR_P) net/url
+       @$(CHECK)
+.PHONY: net/url/check
+
 @go_include@ net/textproto.lo.dep
 net/textproto.lo.dep: $(go_net_textproto_files)
        $(BUILDDEPS)
@@ -3278,6 +3228,66 @@ net/textproto/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: net/textproto/check
 
+@go_include@ net/http/cgi.lo.dep
+net/http/cgi.lo.dep: $(go_net_http_cgi_files)
+       $(BUILDDEPS)
+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
+
+@go_include@ net/http/fcgi.lo.dep
+net/http/fcgi.lo.dep: $(go_net_http_fcgi_files)
+       $(BUILDDEPS)
+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
+
+@go_include@ net/http/httptest.lo.dep
+net/http/httptest.lo.dep: $(go_net_http_httptest_files)
+       $(BUILDDEPS)
+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
+
+@go_include@ net/http/httputil.lo.dep
+net/http/httputil.lo.dep: $(go_net_http_httputil_files)
+       $(BUILDDEPS)
+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
+
+@go_include@ net/http/pprof.lo.dep
+net/http/pprof.lo.dep: $(go_net_http_pprof_files)
+       $(BUILDDEPS)
+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
+
+@go_include@ net/rpc/jsonrpc.lo.dep
+net/rpc/jsonrpc.lo.dep: $(go_net_rpc_jsonrpc_files)
+       $(BUILDDEPS)
+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
+
 @go_include@ old/netchan.lo.dep
 old/netchan.lo.dep: $(go_old_netchan_files)
        $(BUILDDEPS)
@@ -3308,6 +3318,16 @@ old/template/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: old/template/check
 
+@go_include@ os/exec.lo.dep
+os/exec.lo.dep: $(go_os_exec_files)
+       $(BUILDDEPS)
+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)
@@ -3348,16 +3368,6 @@ regexp/syntax/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: regexp/syntax/check
 
-@go_include@ rpc/jsonrpc.lo.dep
-rpc/jsonrpc.lo.dep: $(go_rpc_jsonrpc_files)
-       $(BUILDDEPS)
-rpc/jsonrpc.lo: $(go_rpc_jsonrpc_files)
-       $(BUILDPACKAGE)
-rpc/jsonrpc/check: $(CHECK_DEPS)
-       @$(MKDIR_P) rpc/jsonrpc
-       @$(CHECK)
-.PHONY: rpc/jsonrpc/check
-
 @go_include@ runtime/debug.lo.dep
 runtime/debug.lo.dep: $(go_runtime_debug_files)
        $(BUILDDEPS)
@@ -3390,15 +3400,34 @@ sync/atomic/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: sync/atomic/check
 
-@go_include@ template/parse.lo.dep
-template/parse.lo.dep: $(go_template_parse_files)
+@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
+
+@go_include@ text/template.lo.dep
+text/template.lo.dep: $(go_text_template_files)
        $(BUILDDEPS)
-template/parse.lo: $(go_template_parse_files)
+text/template.lo: $(go_text_template_files)
        $(BUILDPACKAGE)
-template/parse/check: $(CHECK_DEPS)
-       @$(MKDIR_P) template/parse
+text/template/check: $(CHECK_DEPS)
        @$(CHECK)
-.PHONY: template/parse/check
+.PHONY: text/template/check
+
+@go_include@ text/template/parse.lo.dep
+text/template/parse.lo.dep: $(go_text_template_parse_files)
+       $(BUILDDEPS)
+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
 
 @go_include@ testing/iotest.lo.dep
 testing/iotest.lo.dep: $(go_testing_iotest_files)
@@ -3430,6 +3459,26 @@ testing/script/check: $(CHECK_DEPS)
        @$(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
+
+@go_include@ unicode/utf8.lo.dep
+unicode/utf8.lo.dep: $(go_unicode_utf8_files)
+       $(BUILDDEPS)
+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)
        $(BUILDDEPS)
@@ -3445,50 +3494,32 @@ BUILDGOX = \
        f=`echo $< | sed -e 's/.lo$$/.o/'`; \
        $(OBJCOPY) -j .go_export $$f $@.tmp && mv -f $@.tmp $@
 
-asn1.gox: asn1/asn1.lo
-       $(BUILDGOX)
-big.gox: big/big.lo
-       $(BUILDGOX)
 bufio.gox: bufio/bufio.lo
        $(BUILDGOX)
 bytes.gox: bytes/bytes.lo
        $(BUILDGOX)
-cmath.gox: cmath/cmath.lo
-       $(BUILDGOX)
 crypto.gox: crypto/crypto.lo
        $(BUILDGOX)
-csv.gox: csv/csv.lo
-       $(BUILDGOX)
 errors.gox: errors/errors.lo
        $(BUILDGOX)
-exec.gox: exec/exec.lo
-       $(BUILDGOX)
 expvar.gox: expvar/expvar.lo
        $(BUILDGOX)
 flag.gox: flag/flag.lo
        $(BUILDGOX)
 fmt.gox: fmt/fmt.lo
        $(BUILDGOX)
-gob.gox: gob/gob.lo
-       $(BUILDGOX)
 hash.gox: hash/hash.lo
        $(BUILDGOX)
 html.gox: html/html.lo
        $(BUILDGOX)
-http.gox: http/http.lo
-       $(BUILDGOX)
 image.gox: image/image.lo
        $(BUILDGOX)
 io.gox: io/io.lo
        $(BUILDGOX)
-json.gox: json/json.lo
-       $(BUILDGOX)
 log.gox: log/log.lo
        $(BUILDGOX)
 math.gox: math/math.lo
        $(BUILDGOX)
-mail.gox: mail/mail.lo
-       $(BUILDGOX)
 mime.gox: mime/mime.lo
        $(BUILDGOX)
 net.gox: net/net.lo
@@ -3499,20 +3530,12 @@ patch.gox: patch/patch.lo
        $(BUILDGOX)
 path.gox: path/path.lo
        $(BUILDGOX)
-rand.gox: rand/rand.lo
-       $(BUILDGOX)
 reflect.gox: reflect/reflect.lo
        $(BUILDGOX)
 regexp.gox: regexp/regexp.lo
        $(BUILDGOX)
-rpc.gox: rpc/rpc.lo
-       $(BUILDGOX)
 runtime.gox: runtime/runtime.lo
        $(BUILDGOX)
-scanner.gox: scanner/scanner.lo
-       $(BUILDGOX)
-smtp.gox: smtp/smtp.lo
-       $(BUILDGOX)
 sort.gox: sort/sort.lo
        $(BUILDGOX)
 strconv.gox: strconv/strconv.lo
@@ -3521,30 +3544,16 @@ strings.gox: strings/strings.lo
        $(BUILDGOX)
 sync.gox: sync/sync.lo
        $(BUILDGOX)
-syslog.gox: syslog/syslog.lo
-       $(BUILDGOX)
 syscall.gox: syscall/syscall.lo
        $(BUILDGOX)
-tabwriter.gox: tabwriter/tabwriter.lo
-       $(BUILDGOX)
-template.gox: template/template.lo
-       $(BUILDGOX)
 testing.gox: testing/testing.lo
        $(BUILDGOX)
 time.gox: time/time.lo
        $(BUILDGOX)
 unicode.gox: unicode/unicode.lo
        $(BUILDGOX)
-url.gox: url/url.lo
-       $(BUILDGOX)
-utf16.gox: utf16/utf16.lo
-       $(BUILDGOX)
-utf8.gox: utf8/utf8.lo
-       $(BUILDGOX)
 websocket.gox: websocket/websocket.lo
        $(BUILDGOX)
-xml.gox: xml/xml.lo
-       $(BUILDGOX)
 
 archive/tar.gox: archive/tar.lo
        $(BUILDGOX)
@@ -3649,18 +3658,28 @@ debug/pe.gox: debug/pe.lo
 
 encoding/ascii85.gox: encoding/ascii85.lo
        $(BUILDGOX)
+encoding/asn1.gox: encoding/asn1.lo
+       $(BUILDGOX)
 encoding/base32.gox: encoding/base32.lo
        $(BUILDGOX)
 encoding/base64.gox: encoding/base64.lo
        $(BUILDGOX)
 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
        $(BUILDGOX)
+encoding/json.gox: encoding/json.lo
+       $(BUILDGOX)
 encoding/pem.gox: encoding/pem.lo
        $(BUILDGOX)
+encoding/xml.gox: encoding/xml.lo
+       $(BUILDGOX)
 
 exp/ebnf.gox: exp/ebnf.lo
        $(BUILDGOX)
@@ -3687,7 +3706,7 @@ exp/gui/x11.gox: exp/gui/x11.lo
 exp/sql/driver.gox: exp/sql/driver.lo
        $(BUILDGOX)
 
-exp/template/html.gox: exp/template/html.lo
+html/template.gox: html/template.lo
        $(BUILDGOX)
 
 go/ast.gox: go/ast.lo
@@ -3714,15 +3733,6 @@ hash/crc64.gox: hash/crc64.lo
 hash/fnv.gox: hash/fnv.lo
        $(BUILDGOX)
 
-http/cgi.gox: http/cgi.lo
-       $(BUILDGOX)
-http/fcgi.gox: http/fcgi.lo
-       $(BUILDGOX)
-http/httptest.gox: http/httptest.lo
-       $(BUILDGOX)
-http/pprof.gox: http/pprof.lo
-       $(BUILDGOX)
-
 image/bmp.gox: image/bmp.lo
        $(BUILDGOX)
 image/color.gox: image/color.lo
@@ -3746,13 +3756,47 @@ index/suffixarray.gox: index/suffixarray.lo
 io/ioutil.gox: io/ioutil.lo
        $(BUILDGOX)
 
+log/syslog.gox: log/syslog.lo
+       $(BUILDGOX)
+
+math/big.gox: math/big.lo
+       $(BUILDGOX)
+math/cmplx.gox: math/cmplx.lo
+       $(BUILDGOX)
+math/rand.gox: math/rand.lo
+       $(BUILDGOX)
+
 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
+       $(BUILDGOX)
+net/rpc.gox: net/rpc.lo
+       $(BUILDGOX)
+net/smtp.gox: net/smtp.lo
+       $(BUILDGOX)
 net/textproto.gox: net/textproto.lo
        $(BUILDGOX)
+net/url.gox: net/url.lo
+       $(BUILDGOX)
+
+net/http/cgi.gox: net/http/cgi.lo
+       $(BUILDGOX)
+net/http/fcgi.gox: net/http/fcgi.lo
+       $(BUILDGOX)
+net/http/httptest.gox: net/http/httptest.lo
+       $(BUILDGOX)
+net/http/httputil.gox: net/http/httputil.lo
+       $(BUILDGOX)
+net/http/pprof.gox: net/http/pprof.lo
+       $(BUILDGOX)
+
+net/rpc/jsonrpc.gox: net/rpc/jsonrpc.lo
+       $(BUILDGOX)
 
 old/netchan.gox: old/netchan.lo
        $(BUILDGOX)
@@ -3761,6 +3805,8 @@ old/regexp.gox: old/regexp.lo
 old/template.gox: old/template.lo
        $(BUILDGOX)
 
+os/exec.gox: os/exec.lo
+       $(BUILDGOX)
 os/user.gox: os/user.lo
        $(BUILDGOX)
 os/signal.gox: os/signal.lo
@@ -3772,9 +3818,6 @@ path/filepath.gox: path/filepath.lo
 regexp/syntax.gox: regexp/syntax.lo
        $(BUILDGOX)
 
-rpc/jsonrpc.gox: rpc/jsonrpc.lo
-       $(BUILDGOX)
-
 runtime/debug.gox: runtime/debug.lo
        $(BUILDGOX)
 runtime/pprof.gox: runtime/pprof.lo
@@ -3783,7 +3826,13 @@ runtime/pprof.gox: runtime/pprof.lo
 sync/atomic.gox: sync/atomic.lo
        $(BUILDGOX)
 
-template/parse.gox: template/parse.lo
+text/scanner.gox: text/scanner.lo
+       $(BUILDGOX)
+text/tabwriter.gox: text/tabwriter.lo
+       $(BUILDGOX)
+text/template.gox: text/template.lo
+       $(BUILDGOX)
+text/template/parse.gox: text/template/parse.lo
        $(BUILDGOX)
 
 testing/iotest.gox: testing/iotest.lo
@@ -3793,6 +3842,11 @@ testing/quick.gox: testing/quick.lo
 testing/script.gox: testing/script.lo
        $(BUILDGOX)
 
+unicode/utf16.gox: unicode/utf16.lo
+       $(BUILDGOX)
+unicode/utf8.gox: unicode/utf8.lo
+       $(BUILDGOX)
+
 if LIBGO_IS_LINUX
 # exp_inotify_check = exp/inotify/check
 exp_inotify_check =
@@ -3801,52 +3855,32 @@ exp_inotify_check =
 endif
 
 TEST_PACKAGES = \
-       asn1/check \
-       big/check \
        bufio/check \
        bytes/check \
-       cmath/check \
-       csv/check \
        errors/check \
-       exec/check \
        expvar/check \
        flag/check \
        fmt/check \
-       gob/check \
        html/check \
-       http/check \
        image/check \
        io/check \
-       json/check \
        log/check \
        math/check \
-       mail/check \
        mime/check \
        net/check \
        os/check \
        patch/check \
        path/check \
-       rand/check \
        reflect/check \
        regexp/check \
-       rpc/check \
        runtime/check \
-       scanner/check \
-       smtp/check \
        sort/check \
        strconv/check \
        strings/check \
        sync/check \
-       syslog/check \
-       tabwriter/check \
-       template/check \
        time/check \
        unicode/check \
-       url/check \
-       utf16/check \
-       utf8/check \
        websocket/check \
-       xml/check \
        archive/tar/check \
        archive/zip/check \
        compress/bzip2/check \
@@ -3892,12 +3926,17 @@ TEST_PACKAGES = \
        debug/macho/check \
        debug/pe/check \
        encoding/ascii85/check \
+       encoding/asn1/check \
        encoding/base32/check \
        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_inotify_check) \
        exp/norm/check \
@@ -3905,7 +3944,7 @@ TEST_PACKAGES = \
        exp/sql/check \
        exp/ssh/check \
        exp/terminal/check \
-       exp/template/html/check \
+       html/template/check \
        go/ast/check \
        $(go_build_check_omitted_since_it_calls_6g) \
        go/parser/check \
@@ -3917,8 +3956,6 @@ TEST_PACKAGES = \
        hash/crc32/check \
        hash/crc64/check \
        hash/fnv/check \
-       http/cgi/check \
-       http/fcgi/check \
        image/draw/check \
        image/jpeg/check \
        image/png/check \
@@ -3926,20 +3963,38 @@ TEST_PACKAGES = \
        image/ycbcr/check \
        index/suffixarray/check \
        io/ioutil/check \
+       log/syslog/check \
+       math/big/check \
+       math/cmplx/check \
+       math/rand/check \
        mime/multipart/check \
+       net/http/check \
+       net/http/cgi/check \
+       net/http/fcgi/check \
+       net/http/httputil/check \
+       net/mail/check \
+       net/rpc/check \
+       net/smtp/check \
        net/textproto/check \
+       net/url/check \
+       net/rpc/jsonrpc/check \
        old/netchan/check \
        old/regexp/check \
        old/template/check \
+       os/exec/check \
        os/user/check \
        os/signal/check \
        path/filepath/check \
        regexp/syntax/check \
-       rpc/jsonrpc/check \
        sync/atomic/check \
-       template/parse/check \
+       text/scanner/check \
+       text/tabwriter/check \
+       text/template/check \
+       text/template/parse/check \
        testing/quick/check \
-       testing/script/check
+       testing/script/check \
+       unicode/utf16/check \
+       unicode/utf8/check
 
 check: check-tail
 check-recursive: check-head
index 4cb4b5f..11b8650 100644 (file)
@@ -104,24 +104,28 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
        "$(DESTDIR)$(toolexeclibgoexpdir)" \
        "$(DESTDIR)$(toolexeclibgoexpguidir)" \
        "$(DESTDIR)$(toolexeclibgoexpsqldir)" \
-       "$(DESTDIR)$(toolexeclibgoexptemplatedir)" \
        "$(DESTDIR)$(toolexeclibgogodir)" \
        "$(DESTDIR)$(toolexeclibgohashdir)" \
-       "$(DESTDIR)$(toolexeclibgohttpdir)" \
+       "$(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)$(toolexeclibgorpcdir)" \
        "$(DESTDIR)$(toolexeclibgoruntimedir)" \
        "$(DESTDIR)$(toolexeclibgosyncdir)" \
-       "$(DESTDIR)$(toolexeclibgotemplatedir)" \
-       "$(DESTDIR)$(toolexeclibgotestingdir)"
+       "$(DESTDIR)$(toolexeclibgotestingdir)" \
+       "$(DESTDIR)$(toolexeclibgotextdir)" \
+       "$(DESTDIR)$(toolexeclibgotexttemplatedir)" \
+       "$(DESTDIR)$(toolexeclibgounicodedir)"
 LIBRARIES = $(toolexeclib_LIBRARIES)
 ARFLAGS = cru
 libgobegin_a_AR = $(AR) $(ARFLAGS)
@@ -130,27 +134,22 @@ am_libgobegin_a_OBJECTS = go-main.$(OBJEXT)
 libgobegin_a_OBJECTS = $(am_libgobegin_a_OBJECTS)
 LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = asn1/asn1.lo big/big.lo bufio/bufio.lo \
-       bytes/bytes.lo bytes/index.lo cmath/cmath.lo crypto/crypto.lo \
-       csv/csv.lo errors/errors.lo exec/exec.lo expvar/expvar.lo \
-       flag/flag.lo fmt/fmt.lo gob/gob.lo hash/hash.lo html/html.lo \
-       http/http.lo image/image.lo io/io.lo json/json.lo log/log.lo \
-       math/math.lo mail/mail.lo mime/mime.lo net/net.lo os/os.lo \
-       patch/patch.lo path/path.lo rand/rand.lo reflect/reflect.lo \
-       regexp/regexp.lo rpc/rpc.lo runtime/runtime.lo \
-       scanner/scanner.lo smtp/smtp.lo sort/sort.lo \
-       strconv/strconv.lo strings/strings.lo sync/sync.lo \
-       syslog/syslog.lo syslog/syslog_c.lo tabwriter/tabwriter.lo \
-       template/template.lo time/time.lo unicode/unicode.lo \
-       url/url.lo utf16/utf16.lo utf8/utf8.lo websocket/websocket.lo \
-       xml/xml.lo archive/tar.lo archive/zip.lo compress/bzip2.lo \
-       compress/flate.lo compress/gzip.lo compress/lzw.lo \
-       compress/zlib.lo container/heap.lo container/list.lo \
-       container/ring.lo 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 \
+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 \
@@ -158,24 +157,31 @@ am__DEPENDENCIES_2 = asn1/asn1.lo big/big.lo bufio/bufio.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/base32.lo encoding/base64.lo \
-       encoding/binary.lo encoding/git85.lo encoding/hex.lo \
-       encoding/pem.lo exp/ebnf.lo exp/gui.lo exp/norm.lo exp/spdy.lo \
-       exp/sql.lo exp/ssh.lo exp/terminal.lo exp/types.lo \
-       exp/gui/x11.lo exp/sql/driver.lo exp/template/html.lo \
-       go/ast.lo go/build.lo go/doc.lo go/parser.lo go/printer.lo \
-       go/scanner.lo go/token.lo hash/adler32.lo hash/crc32.lo \
-       hash/crc64.lo hash/fnv.lo http/cgi.lo http/fcgi.lo \
-       http/httptest.lo http/pprof.lo image/bmp.lo image/color.lo \
-       image/draw.lo image/gif.lo image/jpeg.lo image/png.lo \
-       image/tiff.lo image/ycbcr.lo index/suffixarray.lo io/ioutil.lo \
-       mime/multipart.lo net/dict.lo net/textproto.lo old/netchan.lo \
-       old/regexp.lo old/template.lo $(am__DEPENDENCIES_1) os/user.lo \
-       os/signal.lo path/filepath.lo regexp/syntax.lo rpc/jsonrpc.lo \
-       runtime/debug.lo runtime/pprof.lo sync/atomic.lo \
-       sync/atomic_c.lo syscall/syscall.lo syscall/errno.lo \
-       syscall/wait.lo template/parse.lo testing/testing.lo \
-       testing/iotest.lo testing/quick.lo testing/script.lo
+       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/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 \
+       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 \
+       unicode/utf8.lo
 libgo_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
@@ -216,7 +222,7 @@ am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.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
+       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
@@ -245,7 +251,7 @@ am__objects_4 = go-append.lo go-assert.lo go-assert-interface.lo \
        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
+       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) \
@@ -285,15 +291,17 @@ DATA = $(toolexeclibgo_DATA) $(toolexeclibgoarchive_DATA) \
        $(toolexeclibgocryptox509_DATA) $(toolexeclibgodebug_DATA) \
        $(toolexeclibgoencoding_DATA) $(toolexeclibgoexp_DATA) \
        $(toolexeclibgoexpgui_DATA) $(toolexeclibgoexpsql_DATA) \
-       $(toolexeclibgoexptemplate_DATA) $(toolexeclibgogo_DATA) \
-       $(toolexeclibgohash_DATA) $(toolexeclibgohttp_DATA) \
-       $(toolexeclibgoimage_DATA) $(toolexeclibgoindex_DATA) \
-       $(toolexeclibgoio_DATA) $(toolexeclibgomime_DATA) \
-       $(toolexeclibgonet_DATA) $(toolexeclibgoold_DATA) \
-       $(toolexeclibgoos_DATA) $(toolexeclibgopath_DATA) \
-       $(toolexeclibgoregexp_DATA) $(toolexeclibgorpc_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) \
-       $(toolexeclibgotemplate_DATA) $(toolexeclibgotesting_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=) \
@@ -561,56 +569,36 @@ toolexeclib_LTLIBRARIES = libgo.la
 toolexeclib_LIBRARIES = libgobegin.a
 toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias)
 toolexeclibgo_DATA = \
-       asn1.gox \
-       big.gox \
        bufio.gox \
        bytes.gox \
-       cmath.gox \
        crypto.gox \
-       csv.gox \
        errors.gox \
-       exec.gox \
        expvar.gox \
        flag.gox \
        fmt.gox \
-       gob.gox \
        hash.gox \
        html.gox \
-       http.gox \
        image.gox \
        io.gox \
-       json.gox \
        log.gox \
        math.gox \
-       mail.gox \
        mime.gox \
        net.gox \
        os.gox \
        patch.gox \
        path.gox \
-       rand.gox \
        reflect.gox \
        regexp.gox \
-       rpc.gox \
        runtime.gox \
-       scanner.gox \
-       smtp.gox \
        sort.gox \
        strconv.gox \
        strings.gox \
        sync.gox \
        syscall.gox \
-       syslog.gox \
-       tabwriter.gox \
-       template.gox \
        testing.gox \
        time.gox \
        unicode.gox \
-       url.gox \
-       utf16.gox \
-       utf8.gox \
-       websocket.gox \
-       xml.gox
+       websocket.gox
 
 toolexeclibgoarchivedir = $(toolexeclibgodir)/archive
 toolexeclibgoarchive_DATA = \
@@ -683,12 +671,17 @@ toolexeclibgodebug_DATA = \
 toolexeclibgoencodingdir = $(toolexeclibgodir)/encoding
 toolexeclibgoencoding_DATA = \
        encoding/ascii85.gox \
+       encoding/asn1.gox \
        encoding/base32.gox \
        encoding/base64.gox \
        encoding/binary.gox \
+       encoding/csv.gox \
        encoding/git85.gox \
+       encoding/gob.gox \
        encoding/hex.gox \
-       encoding/pem.gox
+       encoding/json.gox \
+       encoding/pem.gox \
+       encoding/xml.gox
 
 @LIBGO_IS_LINUX_FALSE@exp_inotify_gox = 
 
@@ -714,10 +707,6 @@ toolexeclibgoexpsqldir = $(toolexeclibgoexpdir)/sql
 toolexeclibgoexpsql_DATA = \
        exp/sql/driver.gox
 
-toolexeclibgoexptemplatedir = $(toolexeclibgoexpdir)/template
-toolexeclibgoexptemplate_DATA = \
-       exp/template/html.gox
-
 toolexeclibgogodir = $(toolexeclibgodir)/go
 toolexeclibgogo_DATA = \
        go/ast.gox \
@@ -735,12 +724,9 @@ toolexeclibgohash_DATA = \
        hash/crc64.gox \
        hash/fnv.gox
 
-toolexeclibgohttpdir = $(toolexeclibgodir)/http
-toolexeclibgohttp_DATA = \
-       http/cgi.gox \
-       http/fcgi.gox \
-       http/httptest.gox \
-       http/pprof.gox
+toolexeclibgohtmldir = $(toolexeclibgodir)/html
+toolexeclibgohtml_DATA = \
+       html/template.gox
 
 toolexeclibgoimagedir = $(toolexeclibgodir)/image
 toolexeclibgoimage_DATA = \
@@ -761,6 +747,16 @@ toolexeclibgoiodir = $(toolexeclibgodir)/io
 toolexeclibgoio_DATA = \
        io/ioutil.gox
 
+toolexeclibgologdir = $(toolexeclibgodir)/log
+toolexeclibgolog_DATA = \
+       log/syslog.gox
+
+toolexeclibgomathdir = $(toolexeclibgodir)/math
+toolexeclibgomath_DATA = \
+       math/big.gox \
+       math/cmplx.gox \
+       math/rand.gox
+
 toolexeclibgomimedir = $(toolexeclibgodir)/mime
 toolexeclibgomime_DATA = \
        mime/multipart.gox
@@ -768,7 +764,24 @@ toolexeclibgomime_DATA = \
 toolexeclibgonetdir = $(toolexeclibgodir)/net
 toolexeclibgonet_DATA = \
        net/dict.gox \
-       net/textproto.gox
+       net/http.gox \
+       net/mail.gox \
+       net/rpc.gox \
+       net/smtp.gox \
+       net/textproto.gox \
+       net/url.gox
+
+toolexeclibgonethttpdir = $(toolexeclibgonetdir)/http
+toolexeclibgonethttp_DATA = \
+       net/http/cgi.gox \
+       net/http/fcgi.gox \
+       net/http/httptest.gox \
+       net/http/httputil.gox \
+       net/http/pprof.gox
+
+toolexeclibgonetrpcdir = $(toolexeclibgonetdir)/rpc
+toolexeclibgonetrpc_DATA = \
+       net/rpc/jsonrpc.gox
 
 toolexeclibgoolddir = $(toolexeclibgodir)/old
 toolexeclibgoold_DATA = \
@@ -778,6 +791,7 @@ toolexeclibgoold_DATA = \
 
 toolexeclibgoosdir = $(toolexeclibgodir)/os
 toolexeclibgoos_DATA = \
+       os/exec.gox \
        os/user.gox \
        os/signal.gox
 
@@ -789,19 +803,11 @@ toolexeclibgoregexpdir = $(toolexeclibgodir)/regexp
 toolexeclibgoregexp_DATA = \
        regexp/syntax.gox
 
-toolexeclibgorpcdir = $(toolexeclibgodir)/rpc
-toolexeclibgorpc_DATA = \
-       rpc/jsonrpc.gox
-
 toolexeclibgoruntimedir = $(toolexeclibgodir)/runtime
 toolexeclibgoruntime_DATA = \
        runtime/debug.gox \
        runtime/pprof.gox
 
-toolexeclibgotemplatedir = $(toolexeclibgodir)/template
-toolexeclibgotemplate_DATA = \
-       template/parse.gox
-
 toolexeclibgosyncdir = $(toolexeclibgodir)/sync
 toolexeclibgosync_DATA = \
        sync/atomic.gox
@@ -812,6 +818,21 @@ toolexeclibgotesting_DATA = \
        testing/quick.gox \
        testing/script.gox
 
+toolexeclibgotextdir = $(toolexeclibgodir)/text
+toolexeclibgotext_DATA = \
+       text/scanner.gox \
+       text/tabwriter.gox \
+       text/template.gox
+
+toolexeclibgotexttemplatedir = $(toolexeclibgotextdir)/template
+toolexeclibgotexttemplate_DATA = \
+       text/template/parse.gox
+
+toolexeclibgounicodedir = $(toolexeclibgodir)/unicode
+toolexeclibgounicode_DATA = \
+       unicode/utf16.gox \
+       unicode/utf8.gox
+
 @HAVE_SYS_MMAN_H_FALSE@runtime_mem_file = runtime/mem_posix_memalign.c
 @HAVE_SYS_MMAN_H_TRUE@runtime_mem_file = runtime/mem.c
 @LIBGO_IS_RTEMS_FALSE@rtems_task_variable_add_file = 
@@ -901,18 +922,8 @@ runtime_files = \
        runtime1.c \
        sema.c \
        sigqueue.c \
-       string.c
-
-go_asn1_files = \
-       go/asn1/asn1.go \
-       go/asn1/common.go \
-       go/asn1/marshal.go
-
-go_big_files = \
-       go/big/arith.go \
-       go/big/int.go \
-       go/big/nat.go \
-       go/big/rat.go
+       string.c \
+       time.c
 
 go_bufio_files = \
        go/bufio/bufio.go
@@ -925,36 +936,12 @@ go_bytes_files = \
 go_bytes_c_files = \
        go/bytes/indexbyte.c
 
-go_cmath_files = \
-       go/cmath/abs.go \
-       go/cmath/asin.go \
-       go/cmath/conj.go \
-       go/cmath/exp.go \
-       go/cmath/isinf.go \
-       go/cmath/isnan.go \
-       go/cmath/log.go \
-       go/cmath/phase.go \
-       go/cmath/polar.go \
-       go/cmath/pow.go \
-       go/cmath/rect.go \
-       go/cmath/sin.go \
-       go/cmath/sqrt.go \
-       go/cmath/tan.go
-
 go_crypto_files = \
        go/crypto/crypto.go
 
-go_csv_files = \
-       go/csv/reader.go \
-       go/csv/writer.go
-
 go_errors_files = \
        go/errors/errors.go
 
-go_exec_files = \
-       go/exec/exec.go \
-       go/exec/lp_unix.go
-
 go_expvar_files = \
        go/expvar/expvar.go
 
@@ -967,15 +954,6 @@ go_fmt_files = \
        go/fmt/print.go \
        go/fmt/scan.go
 
-go_gob_files = \
-       go/gob/decode.go \
-       go/gob/decoder.go \
-       go/gob/doc.go \
-       go/gob/encode.go \
-       go/gob/encoder.go \
-       go/gob/error.go \
-       go/gob/type.go
-
 go_hash_files = \
        go/hash/hash.go
 
@@ -989,25 +967,6 @@ go_html_files = \
        go/html/render.go \
        go/html/token.go
 
-go_http_files = \
-       go/http/chunked.go \
-       go/http/client.go \
-       go/http/cookie.go \
-       go/http/dump.go \
-       go/http/filetransport.go \
-       go/http/fs.go \
-       go/http/header.go \
-       go/http/lex.go \
-       go/http/persist.go \
-       go/http/request.go \
-       go/http/response.go \
-       go/http/reverseproxy.go \
-       go/http/server.go \
-       go/http/sniff.go \
-       go/http/status.go \
-       go/http/transfer.go \
-       go/http/transport.go
-
 go_image_files = \
        go/image/format.go \
        go/image/geom.go \
@@ -1019,14 +978,6 @@ go_io_files = \
        go/io/io.go \
        go/io/pipe.go
 
-go_json_files = \
-       go/json/decode.go \
-       go/json/encode.go \
-       go/json/indent.go \
-       go/json/scanner.go \
-       go/json/stream.go \
-       go/json/tags.go
-
 go_log_files = \
        go/log/log.go
 
@@ -1078,9 +1029,6 @@ go_math_files = \
        go/math/tanh.go \
        go/math/unsafe.go
 
-go_mail_files = \
-       go/mail/message.go
-
 go_mime_files = \
        go/mime/grammar.go \
        go/mime/mediatype.go \
@@ -1185,13 +1133,6 @@ go_path_files = \
        go/path/match.go \
        go/path/path.go
 
-go_rand_files = \
-       go/rand/exp.go \
-       go/rand/normal.go \
-       go/rand/rand.go \
-       go/rand/rng.go \
-       go/rand/zipf.go
-
 go_reflect_files = \
        go/reflect/deepequal.go \
        go/reflect/type.go \
@@ -1201,10 +1142,10 @@ go_regexp_files = \
        go/regexp/exec.go \
        go/regexp/regexp.go
 
-go_rpc_files = \
-       go/rpc/client.go \
-       go/rpc/debug.go \
-       go/rpc/server.go
+go_net_rpc_files = \
+       go/net/rpc/client.go \
+       go/net/rpc/debug.go \
+       go/net/rpc/server.go
 
 go_runtime_files = \
        go/runtime/debug.go \
@@ -1216,13 +1157,6 @@ go_runtime_files = \
        go/runtime/type.go \
        version.go
 
-go_scanner_files = \
-       go/scanner/scanner.go
-
-go_smtp_files = \
-       go/smtp/auth.go \
-       go/smtp/smtp.go
-
 go_sort_files = \
        go/sort/search.go \
        go/sort/sort.go
@@ -1248,26 +1182,15 @@ go_sync_files = \
        go/sync/rwmutex.go \
        go/sync/waitgroup.go
 
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_syslog_file = go/syslog/syslog_unix.go
-@LIBGO_IS_IRIX_TRUE@@LIBGO_IS_SOLARIS_FALSE@go_syslog_file = go/syslog/syslog_libc.go
-@LIBGO_IS_SOLARIS_TRUE@go_syslog_file = go/syslog/syslog_libc.go
-go_syslog_files = \
-       go/syslog/syslog.go \
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_syslog_file = go/log/syslog/syslog_unix.go
+@LIBGO_IS_IRIX_TRUE@@LIBGO_IS_SOLARIS_FALSE@go_syslog_file = go/log/syslog/syslog_libc.go
+@LIBGO_IS_SOLARIS_TRUE@go_syslog_file = go/log/syslog/syslog_libc.go
+go_log_syslog_files = \
+       go/log/syslog/syslog.go \
        $(go_syslog_file)
 
 go_syslog_c_files = \
-       go/syslog/syslog_c.c
-
-go_tabwriter_files = \
-       go/tabwriter/tabwriter.go
-
-go_template_files = \
-       go/template/doc.go \
-       go/template/exec.go \
-       go/template/funcs.go \
-       go/template/helper.go \
-       go/template/parse.go \
-       go/template/set.go
+       go/log/syslog/syslog_c.c
 
 go_testing_files = \
        go/testing/benchmark.go \
@@ -1291,16 +1214,6 @@ go_unicode_files = \
        go/unicode/letter.go \
        go/unicode/tables.go
 
-go_url_files = \
-       go/url/url.go
-
-go_utf16_files = \
-       go/utf16/utf16.go
-
-go_utf8_files = \
-       go/utf8/string.go \
-       go/utf8/utf8.go
-
 go_websocket_files = \
        go/websocket/client.go \
        go/websocket/hixie.go \
@@ -1308,11 +1221,6 @@ go_websocket_files = \
        go/websocket/server.go \
        go/websocket/websocket.go
 
-go_xml_files = \
-       go/xml/marshal.go \
-       go/xml/read.go \
-       go/xml/xml.go
-
 go_archive_tar_files = \
        go/archive/tar/common.go \
        go/archive/tar/reader.go \
@@ -1533,6 +1441,11 @@ go_debug_pe_files = \
 go_encoding_ascii85_files = \
        go/encoding/ascii85/ascii85.go
 
+go_encoding_asn1_files = \
+       go/encoding/asn1/asn1.go \
+       go/encoding/asn1/common.go \
+       go/encoding/asn1/marshal.go
+
 go_encoding_base32_files = \
        go/encoding/base32/base32.go
 
@@ -1543,15 +1456,41 @@ go_encoding_binary_files = \
        go/encoding/binary/binary.go \
        go/encoding/binary/varint.go
 
+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 \
+       go/encoding/gob/doc.go \
+       go/encoding/gob/encode.go \
+       go/encoding/gob/encoder.go \
+       go/encoding/gob/error.go \
+       go/encoding/gob/type.go
+
 go_encoding_hex_files = \
        go/encoding/hex/hex.go
 
+go_encoding_json_files = \
+       go/encoding/json/decode.go \
+       go/encoding/json/encode.go \
+       go/encoding/json/indent.go \
+       go/encoding/json/scanner.go \
+       go/encoding/json/stream.go \
+       go/encoding/json/tags.go
+
 go_encoding_pem_files = \
        go/encoding/pem/pem.go
 
+go_encoding_xml_files = \
+       go/encoding/xml/marshal.go \
+       go/encoding/xml/read.go \
+       go/encoding/xml/xml.go
+
 go_exp_ebnf_files = \
        go/exp/ebnf/ebnf.go \
        go/exp/ebnf/parser.go
@@ -1583,6 +1522,7 @@ go_exp_sql_files = \
 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 \
@@ -1611,23 +1551,10 @@ go_exp_sql_driver_files = \
        go/exp/sql/driver/driver.go \
        go/exp/sql/driver/types.go
 
-go_exp_template_html_files = \
-       go/exp/template/html/attr.go \
-       go/exp/template/html/clone.go \
-       go/exp/template/html/content.go \
-       go/exp/template/html/context.go \
-       go/exp/template/html/css.go \
-       go/exp/template/html/doc.go \
-       go/exp/template/html/error.go \
-       go/exp/template/html/escape.go \
-       go/exp/template/html/html.go \
-       go/exp/template/html/js.go \
-       go/exp/template/html/transition.go \
-       go/exp/template/html/url.go
-
 go_go_ast_files = \
        go/go/ast/ast.go \
        go/go/ast/filter.go \
+       go/go/ast/import.go \
        go/go/ast/print.go \
        go/go/ast/resolve.go \
        go/go/ast/scope.go \
@@ -1674,20 +1601,20 @@ go_hash_crc64_files = \
 go_hash_fnv_files = \
        go/hash/fnv/fnv.go
 
-go_http_cgi_files = \
-       go/http/cgi/child.go \
-       go/http/cgi/host.go
-
-go_http_fcgi_files = \
-       go/http/fcgi/child.go \
-       go/http/fcgi/fcgi.go
-
-go_http_httptest_files = \
-       go/http/httptest/recorder.go \
-       go/http/httptest/server.go
-
-go_http_pprof_files = \
-       go/http/pprof/pprof.go
+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 \
+       go/html/template/doc.go \
+       go/html/template/error.go \
+       go/html/template/escape.go \
+       go/html/template/html.go \
+       go/html/template/js.go \
+       go/html/template/template.go \
+       go/html/template/transition.go \
+       go/html/template/url.go
 
 go_image_bmp_files = \
        go/image/bmp/reader.go
@@ -1729,6 +1656,35 @@ go_io_ioutil_files = \
        go/io/ioutil/ioutil.go \
        go/io/ioutil/tempfile.go
 
+go_math_big_files = \
+       go/math/big/arith.go \
+       go/math/big/int.go \
+       go/math/big/nat.go \
+       go/math/big/rat.go
+
+go_math_cmplx_files = \
+       go/math/cmplx/abs.go \
+       go/math/cmplx/asin.go \
+       go/math/cmplx/conj.go \
+       go/math/cmplx/exp.go \
+       go/math/cmplx/isinf.go \
+       go/math/cmplx/isnan.go \
+       go/math/cmplx/log.go \
+       go/math/cmplx/phase.go \
+       go/math/cmplx/polar.go \
+       go/math/cmplx/pow.go \
+       go/math/cmplx/rect.go \
+       go/math/cmplx/sin.go \
+       go/math/cmplx/sqrt.go \
+       go/math/cmplx/tan.go
+
+go_math_rand_files = \
+       go/math/rand/exp.go \
+       go/math/rand/normal.go \
+       go/math/rand/rand.go \
+       go/math/rand/rng.go \
+       go/math/rand/zipf.go
+
 go_mime_multipart_files = \
        go/mime/multipart/formdata.go \
        go/mime/multipart/multipart.go \
@@ -1737,6 +1693,29 @@ go_mime_multipart_files = \
 go_net_dict_files = \
        go/net/dict/dict.go
 
+go_net_http_files = \
+       go/net/http/chunked.go \
+       go/net/http/client.go \
+       go/net/http/cookie.go \
+       go/net/http/filetransport.go \
+       go/net/http/fs.go \
+       go/net/http/header.go \
+       go/net/http/lex.go \
+       go/net/http/request.go \
+       go/net/http/response.go \
+       go/net/http/server.go \
+       go/net/http/sniff.go \
+       go/net/http/status.go \
+       go/net/http/transfer.go \
+       go/net/http/transport.go
+
+go_net_mail_files = \
+       go/net/mail/message.go
+
+go_net_smtp_files = \
+       go/net/smtp/auth.go \
+       go/net/smtp/smtp.go
+
 go_net_textproto_files = \
        go/net/textproto/header.go \
        go/net/textproto/pipeline.go \
@@ -1744,6 +1723,30 @@ go_net_textproto_files = \
        go/net/textproto/textproto.go \
        go/net/textproto/writer.go
 
+go_net_url_files = \
+       go/net/url/url.go
+
+go_net_http_cgi_files = \
+       go/net/http/cgi/child.go \
+       go/net/http/cgi/host.go
+
+go_net_http_fcgi_files = \
+       go/net/http/fcgi/child.go \
+       go/net/http/fcgi/fcgi.go
+
+go_net_http_httptest_files = \
+       go/net/http/httptest/recorder.go \
+       go/net/http/httptest/server.go
+
+go_net_http_pprof_files = \
+       go/net/http/pprof/pprof.go
+
+go_net_http_httputil_files = \
+       go/net/http/httputil/chunked.go \
+       go/net/http/httputil/dump.go \
+       go/net/http/httputil/persist.go \
+       go/net/http/httputil/reverseproxy.go
+
 go_old_netchan_files = \
        go/old/netchan/common.go \
        go/old/netchan/export.go \
@@ -1758,6 +1761,10 @@ go_old_template_files = \
        go/old/template/format.go \
        go/old/template/parse.go
 
+go_os_exec_files = \
+       go/os/exec/exec.go \
+       go/os/exec/lp_unix.go
+
 go_os_user_files = \
        go/os/user/user.go \
        go/os/user/lookup_unix.go
@@ -1778,9 +1785,9 @@ go_regexp_syntax_files = \
        go/regexp/syntax/regexp.go \
        go/regexp/syntax/simplify.go
 
-go_rpc_jsonrpc_files = \
-       go/rpc/jsonrpc/client.go \
-       go/rpc/jsonrpc/server.go
+go_net_rpc_jsonrpc_files = \
+       go/net/rpc/jsonrpc/client.go \
+       go/net/rpc/jsonrpc/server.go
 
 go_runtime_debug_files = \
        go/runtime/debug/stack.go
@@ -1788,11 +1795,22 @@ go_runtime_debug_files = \
 go_runtime_pprof_files = \
        go/runtime/pprof/pprof.go
 
-go_template_parse_files = \
-       go/template/parse/lex.go \
-       go/template/parse/node.go \
-       go/template/parse/parse.go \
-       go/template/parse/set.go
+go_text_tabwriter_files = \
+       go/text/tabwriter/tabwriter.go
+
+go_text_template_files = \
+       go/text/template/doc.go \
+       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_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_sync_atomic_files = \
        go/sync/atomic/doc.go
@@ -1811,6 +1829,16 @@ go_testing_quick_files = \
 go_testing_script_files = \
        go/testing/script/script.go
 
+go_text_scanner_files = \
+       go/text/scanner/scanner.go
+
+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.
@@ -1896,56 +1924,35 @@ go_syscall_c_files = \
 # os_lib_inotify_lo = os/inotify.lo
 @LIBGO_IS_LINUX_TRUE@os_lib_inotify_lo = 
 libgo_go_objs = \
-       asn1/asn1.lo \
-       big/big.lo \
        bufio/bufio.lo \
        bytes/bytes.lo \
        bytes/index.lo \
-       cmath/cmath.lo \
        crypto/crypto.lo \
-       csv/csv.lo \
        errors/errors.lo \
-       exec/exec.lo \
        expvar/expvar.lo \
        flag/flag.lo \
        fmt/fmt.lo \
-       gob/gob.lo \
        hash/hash.lo \
        html/html.lo \
-       http/http.lo \
        image/image.lo \
        io/io.lo \
-       json/json.lo \
        log/log.lo \
        math/math.lo \
-       mail/mail.lo \
-       mime/mime.lo \
        net/net.lo \
+       os/exec.lo \
        os/os.lo \
        patch/patch.lo \
        path/path.lo \
-       rand/rand.lo \
        reflect/reflect.lo \
        regexp/regexp.lo \
-       rpc/rpc.lo \
        runtime/runtime.lo \
-       scanner/scanner.lo \
-       smtp/smtp.lo \
        sort/sort.lo \
        strconv/strconv.lo \
        strings/strings.lo \
        sync/sync.lo \
-       syslog/syslog.lo \
-       syslog/syslog_c.lo \
-       tabwriter/tabwriter.lo \
-       template/template.lo \
        time/time.lo \
        unicode/unicode.lo \
-       url/url.lo \
-       utf16/utf16.lo \
-       utf8/utf8.lo \
        websocket/websocket.lo \
-       xml/xml.lo \
        archive/tar.lo \
        archive/zip.lo \
        compress/bzip2.lo \
@@ -1994,12 +2001,17 @@ libgo_go_objs = \
        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/gui.lo \
        exp/norm.lo \
@@ -2010,7 +2022,7 @@ libgo_go_objs = \
        exp/types.lo \
        exp/gui/x11.lo \
        exp/sql/driver.lo \
-       exp/template/html.lo \
+       html/template.lo \
        go/ast.lo \
        go/build.lo \
        go/doc.lo \
@@ -2022,10 +2034,11 @@ libgo_go_objs = \
        hash/crc32.lo \
        hash/crc64.lo \
        hash/fnv.lo \
-       http/cgi.lo \
-       http/fcgi.lo \
-       http/httptest.lo \
-       http/pprof.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 \
@@ -2036,9 +2049,20 @@ libgo_go_objs = \
        image/ycbcr.lo \
        index/suffixarray.lo \
        io/ioutil.lo \
+       log/syslog.lo \
+       log/syslog/syslog_c.lo \
+       math/big.lo \
+       math/cmplx.lo \
+       math/rand.lo \
+       mime/mime.lo \
        mime/multipart.lo \
        net/dict.lo \
+       net/http.lo \
+       net/mail.lo \
+       net/rpc.lo \
+       net/smtp.lo \
        net/textproto.lo \
+       net/url.lo \
        old/netchan.lo \
        old/regexp.lo \
        old/template.lo \
@@ -2047,7 +2071,7 @@ libgo_go_objs = \
        os/signal.lo \
        path/filepath.lo \
        regexp/syntax.lo \
-       rpc/jsonrpc.lo \
+       net/rpc/jsonrpc.lo \
        runtime/debug.lo \
        runtime/pprof.lo \
        sync/atomic.lo \
@@ -2055,11 +2079,16 @@ libgo_go_objs = \
        syscall/syscall.lo \
        syscall/errno.lo \
        syscall/wait.lo \
-       template/parse.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
+       testing/script.lo \
+       unicode/utf16.lo \
+       unicode/utf8.lo
 
 libgo_la_SOURCES = $(runtime_files)
 libgo_la_LDFLAGS = $(PTHREAD_CFLAGS) $(AM_LDFLAGS)
@@ -2142,18 +2171,23 @@ CHECK_DEPS = libgo.la libgobegin.a \
        $(toolexeclibgoexp_DATA) \
        $(toolexeclibgogo_DATA) \
        $(toolexeclibgohash_DATA) \
-       $(toolexeclibgohttp_DATA) \
        $(toolexeclibgoimage_DATA) \
        $(toolexeclibgoindex_DATA) \
        $(toolexeclibgoio_DATA) \
+       $(toolexeclibgolog_DATA) \
+       $(toolexeclibgomath_DATA) \
        $(toolexeclibgomime_DATA) \
        $(toolexeclibgonet_DATA) \
+       $(toolexeclibgonethttp_DATA) \
        $(toolexeclibgoos_DATA) \
        $(toolexeclibgopath_DATA) \
        $(toolexeclibgorpc_DATA) \
        $(toolexeclibgoruntime_DATA) \
        $(toolexeclibgosync_DATA) \
-       $(toolexeclibgotesting_DATA)
+       $(toolexeclibgotesting_DATA) \
+       $(toolexeclibgotext_DATA) \
+       $(toolexeclibgotexttemplate_DATA) \
+       $(toolexeclibgounicode_DATA)
 
 
 # How to build a .gox file from a .lo file.
@@ -2166,52 +2200,32 @@ BUILDGOX = \
 # exp_inotify_check = exp/inotify/check
 @LIBGO_IS_LINUX_TRUE@exp_inotify_check = 
 TEST_PACKAGES = \
-       asn1/check \
-       big/check \
        bufio/check \
        bytes/check \
-       cmath/check \
-       csv/check \
        errors/check \
-       exec/check \
        expvar/check \
        flag/check \
        fmt/check \
-       gob/check \
        html/check \
-       http/check \
        image/check \
        io/check \
-       json/check \
        log/check \
        math/check \
-       mail/check \
        mime/check \
        net/check \
        os/check \
        patch/check \
        path/check \
-       rand/check \
        reflect/check \
        regexp/check \
-       rpc/check \
        runtime/check \
-       scanner/check \
-       smtp/check \
        sort/check \
        strconv/check \
        strings/check \
        sync/check \
-       syslog/check \
-       tabwriter/check \
-       template/check \
        time/check \
        unicode/check \
-       url/check \
-       utf16/check \
-       utf8/check \
        websocket/check \
-       xml/check \
        archive/tar/check \
        archive/zip/check \
        compress/bzip2/check \
@@ -2257,12 +2271,17 @@ TEST_PACKAGES = \
        debug/macho/check \
        debug/pe/check \
        encoding/ascii85/check \
+       encoding/asn1/check \
        encoding/base32/check \
        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_inotify_check) \
        exp/norm/check \
@@ -2270,7 +2289,7 @@ TEST_PACKAGES = \
        exp/sql/check \
        exp/ssh/check \
        exp/terminal/check \
-       exp/template/html/check \
+       html/template/check \
        go/ast/check \
        $(go_build_check_omitted_since_it_calls_6g) \
        go/parser/check \
@@ -2282,8 +2301,6 @@ TEST_PACKAGES = \
        hash/crc32/check \
        hash/crc64/check \
        hash/fnv/check \
-       http/cgi/check \
-       http/fcgi/check \
        image/draw/check \
        image/jpeg/check \
        image/png/check \
@@ -2291,20 +2308,38 @@ TEST_PACKAGES = \
        image/ycbcr/check \
        index/suffixarray/check \
        io/ioutil/check \
+       log/syslog/check \
+       math/big/check \
+       math/cmplx/check \
+       math/rand/check \
        mime/multipart/check \
+       net/http/check \
+       net/http/cgi/check \
+       net/http/fcgi/check \
+       net/http/httputil/check \
+       net/mail/check \
+       net/rpc/check \
+       net/smtp/check \
        net/textproto/check \
+       net/url/check \
+       net/rpc/jsonrpc/check \
        old/netchan/check \
        old/regexp/check \
        old/template/check \
+       os/exec/check \
        os/user/check \
        os/signal/check \
        path/filepath/check \
        regexp/syntax/check \
-       rpc/jsonrpc/check \
        sync/atomic/check \
-       template/parse/check \
+       text/scanner/check \
+       text/tabwriter/check \
+       text/template/check \
+       text/template/parse/check \
        testing/quick/check \
-       testing/script/check
+       testing/script/check \
+       unicode/utf16/check \
+       unicode/utf8/check
 
 MOSTLYCLEAN_FILES = libgo.head libgo.sum.sep libgo.log.sep
 CLEANFILES = *.go *.gox goc2c *.c s-version libgo.sum libgo.log
@@ -2527,6 +2562,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread-linux.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread-sema.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yield.Plo@am__quote@
 
 .c.o:
@@ -3375,26 +3411,6 @@ uninstall-toolexeclibgoexpsqlDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgoexpsqldir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgoexpsqldir)" && rm -f $$files
-install-toolexeclibgoexptemplateDATA: $(toolexeclibgoexptemplate_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibgoexptemplatedir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgoexptemplatedir)"
-       @list='$(toolexeclibgoexptemplate_DATA)'; test -n "$(toolexeclibgoexptemplatedir)" || 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)$(toolexeclibgoexptemplatedir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgoexptemplatedir)" || exit $$?; \
-       done
-
-uninstall-toolexeclibgoexptemplateDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(toolexeclibgoexptemplate_DATA)'; test -n "$(toolexeclibgoexptemplatedir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(toolexeclibgoexptemplatedir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(toolexeclibgoexptemplatedir)" && rm -f $$files
 install-toolexeclibgogoDATA: $(toolexeclibgogo_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibgogodir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgogodir)"
@@ -3435,26 +3451,26 @@ uninstall-toolexeclibgohashDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgohashdir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgohashdir)" && rm -f $$files
-install-toolexeclibgohttpDATA: $(toolexeclibgohttp_DATA)
+install-toolexeclibgohtmlDATA: $(toolexeclibgohtml_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibgohttpdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgohttpdir)"
-       @list='$(toolexeclibgohttp_DATA)'; test -n "$(toolexeclibgohttpdir)" || list=; \
+       test -z "$(toolexeclibgohtmldir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgohtmldir)"
+       @list='$(toolexeclibgohtml_DATA)'; test -n "$(toolexeclibgohtmldir)" || 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)$(toolexeclibgohttpdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgohttpdir)" || exit $$?; \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolexeclibgohtmldir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgohtmldir)" || exit $$?; \
        done
 
-uninstall-toolexeclibgohttpDATA:
+uninstall-toolexeclibgohtmlDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(toolexeclibgohttp_DATA)'; test -n "$(toolexeclibgohttpdir)" || list=; \
+       @list='$(toolexeclibgohtml_DATA)'; test -n "$(toolexeclibgohtmldir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(toolexeclibgohttpdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(toolexeclibgohttpdir)" && rm -f $$files
+       echo " ( cd '$(DESTDIR)$(toolexeclibgohtmldir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgohtmldir)" && rm -f $$files
 install-toolexeclibgoimageDATA: $(toolexeclibgoimage_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibgoimagedir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgoimagedir)"
@@ -3515,6 +3531,46 @@ uninstall-toolexeclibgoioDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgoiodir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgoiodir)" && rm -f $$files
+install-toolexeclibgologDATA: $(toolexeclibgolog_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(toolexeclibgologdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgologdir)"
+       @list='$(toolexeclibgolog_DATA)'; test -n "$(toolexeclibgologdir)" || 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)$(toolexeclibgologdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgologdir)" || exit $$?; \
+       done
+
+uninstall-toolexeclibgologDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(toolexeclibgolog_DATA)'; test -n "$(toolexeclibgologdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(toolexeclibgologdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgologdir)" && rm -f $$files
+install-toolexeclibgomathDATA: $(toolexeclibgomath_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(toolexeclibgomathdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgomathdir)"
+       @list='$(toolexeclibgomath_DATA)'; test -n "$(toolexeclibgomathdir)" || 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)$(toolexeclibgomathdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgomathdir)" || exit $$?; \
+       done
+
+uninstall-toolexeclibgomathDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(toolexeclibgomath_DATA)'; test -n "$(toolexeclibgomathdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(toolexeclibgomathdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgomathdir)" && rm -f $$files
 install-toolexeclibgomimeDATA: $(toolexeclibgomime_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibgomimedir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgomimedir)"
@@ -3555,6 +3611,46 @@ uninstall-toolexeclibgonetDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgonetdir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgonetdir)" && rm -f $$files
+install-toolexeclibgonethttpDATA: $(toolexeclibgonethttp_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(toolexeclibgonethttpdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgonethttpdir)"
+       @list='$(toolexeclibgonethttp_DATA)'; test -n "$(toolexeclibgonethttpdir)" || 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)$(toolexeclibgonethttpdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgonethttpdir)" || exit $$?; \
+       done
+
+uninstall-toolexeclibgonethttpDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(toolexeclibgonethttp_DATA)'; test -n "$(toolexeclibgonethttpdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(toolexeclibgonethttpdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgonethttpdir)" && rm -f $$files
+install-toolexeclibgonetrpcDATA: $(toolexeclibgonetrpc_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(toolexeclibgonetrpcdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgonetrpcdir)"
+       @list='$(toolexeclibgonetrpc_DATA)'; test -n "$(toolexeclibgonetrpcdir)" || 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)$(toolexeclibgonetrpcdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgonetrpcdir)" || exit $$?; \
+       done
+
+uninstall-toolexeclibgonetrpcDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(toolexeclibgonetrpc_DATA)'; test -n "$(toolexeclibgonetrpcdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(toolexeclibgonetrpcdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgonetrpcdir)" && rm -f $$files
 install-toolexeclibgooldDATA: $(toolexeclibgoold_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibgoolddir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgoolddir)"
@@ -3635,26 +3731,6 @@ uninstall-toolexeclibgoregexpDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgoregexpdir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgoregexpdir)" && rm -f $$files
-install-toolexeclibgorpcDATA: $(toolexeclibgorpc_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibgorpcdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgorpcdir)"
-       @list='$(toolexeclibgorpc_DATA)'; test -n "$(toolexeclibgorpcdir)" || 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)$(toolexeclibgorpcdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgorpcdir)" || exit $$?; \
-       done
-
-uninstall-toolexeclibgorpcDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(toolexeclibgorpc_DATA)'; test -n "$(toolexeclibgorpcdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(toolexeclibgorpcdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(toolexeclibgorpcdir)" && rm -f $$files
 install-toolexeclibgoruntimeDATA: $(toolexeclibgoruntime_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(toolexeclibgoruntimedir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgoruntimedir)"
@@ -3695,46 +3771,86 @@ uninstall-toolexeclibgosyncDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(toolexeclibgosyncdir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(toolexeclibgosyncdir)" && rm -f $$files
-install-toolexeclibgotemplateDATA: $(toolexeclibgotemplate_DATA)
+install-toolexeclibgotestingDATA: $(toolexeclibgotesting_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibgotemplatedir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgotemplatedir)"
-       @list='$(toolexeclibgotemplate_DATA)'; test -n "$(toolexeclibgotemplatedir)" || list=; \
+       test -z "$(toolexeclibgotestingdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgotestingdir)"
+       @list='$(toolexeclibgotesting_DATA)'; test -n "$(toolexeclibgotestingdir)" || 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)$(toolexeclibgotemplatedir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgotemplatedir)" || exit $$?; \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolexeclibgotestingdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgotestingdir)" || exit $$?; \
        done
 
-uninstall-toolexeclibgotemplateDATA:
+uninstall-toolexeclibgotestingDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(toolexeclibgotemplate_DATA)'; test -n "$(toolexeclibgotemplatedir)" || list=; \
+       @list='$(toolexeclibgotesting_DATA)'; test -n "$(toolexeclibgotestingdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(toolexeclibgotemplatedir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(toolexeclibgotemplatedir)" && rm -f $$files
-install-toolexeclibgotestingDATA: $(toolexeclibgotesting_DATA)
+       echo " ( cd '$(DESTDIR)$(toolexeclibgotestingdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgotestingdir)" && rm -f $$files
+install-toolexeclibgotextDATA: $(toolexeclibgotext_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(toolexeclibgotestingdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgotestingdir)"
-       @list='$(toolexeclibgotesting_DATA)'; test -n "$(toolexeclibgotestingdir)" || list=; \
+       test -z "$(toolexeclibgotextdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgotextdir)"
+       @list='$(toolexeclibgotext_DATA)'; test -n "$(toolexeclibgotextdir)" || 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)$(toolexeclibgotestingdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgotestingdir)" || exit $$?; \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolexeclibgotextdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgotextdir)" || exit $$?; \
        done
 
-uninstall-toolexeclibgotestingDATA:
+uninstall-toolexeclibgotextDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(toolexeclibgotesting_DATA)'; test -n "$(toolexeclibgotestingdir)" || list=; \
+       @list='$(toolexeclibgotext_DATA)'; test -n "$(toolexeclibgotextdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(toolexeclibgotestingdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(toolexeclibgotestingdir)" && rm -f $$files
+       echo " ( cd '$(DESTDIR)$(toolexeclibgotextdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgotextdir)" && rm -f $$files
+install-toolexeclibgotexttemplateDATA: $(toolexeclibgotexttemplate_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(toolexeclibgotexttemplatedir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgotexttemplatedir)"
+       @list='$(toolexeclibgotexttemplate_DATA)'; test -n "$(toolexeclibgotexttemplatedir)" || 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)$(toolexeclibgotexttemplatedir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgotexttemplatedir)" || exit $$?; \
+       done
+
+uninstall-toolexeclibgotexttemplateDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(toolexeclibgotexttemplate_DATA)'; test -n "$(toolexeclibgotexttemplatedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(toolexeclibgotexttemplatedir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgotexttemplatedir)" && rm -f $$files
+install-toolexeclibgounicodeDATA: $(toolexeclibgounicode_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(toolexeclibgounicodedir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibgounicodedir)"
+       @list='$(toolexeclibgounicode_DATA)'; test -n "$(toolexeclibgounicodedir)" || 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)$(toolexeclibgounicodedir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgounicodedir)" || exit $$?; \
+       done
+
+uninstall-toolexeclibgounicodeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(toolexeclibgounicode_DATA)'; test -n "$(toolexeclibgounicodedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(toolexeclibgounicodedir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(toolexeclibgounicodedir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -4052,7 +4168,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) all-multi $(DATA) \
                config.h
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibgodir)" "$(DESTDIR)$(toolexeclibgoarchivedir)" "$(DESTDIR)$(toolexeclibgocompressdir)" "$(DESTDIR)$(toolexeclibgocontainerdir)" "$(DESTDIR)$(toolexeclibgocryptodir)" "$(DESTDIR)$(toolexeclibgocryptoopenpgpdir)" "$(DESTDIR)$(toolexeclibgocryptox509dir)" "$(DESTDIR)$(toolexeclibgodebugdir)" "$(DESTDIR)$(toolexeclibgoencodingdir)" "$(DESTDIR)$(toolexeclibgoexpdir)" "$(DESTDIR)$(toolexeclibgoexpguidir)" "$(DESTDIR)$(toolexeclibgoexpsqldir)" "$(DESTDIR)$(toolexeclibgoexptemplatedir)" "$(DESTDIR)$(toolexeclibgogodir)" "$(DESTDIR)$(toolexeclibgohashdir)" "$(DESTDIR)$(toolexeclibgohttpdir)" "$(DESTDIR)$(toolexeclibgoimagedir)" "$(DESTDIR)$(toolexeclibgoindexdir)" "$(DESTDIR)$(toolexeclibgoiodir)" "$(DESTDIR)$(toolexeclibgomimedir)" "$(DESTDIR)$(toolexeclibgonetdir)" "$(DESTDIR)$(toolexeclibgoolddir)" "$(DESTDIR)$(toolexeclibgoosdir)" "$(DESTDIR)$(toolexeclibgopathdir)" "$(DESTDIR)$(toolexeclibgoregexpdir)" "$(DESTDIR)$(toolexeclibgorpcdir)" "$(DESTDIR)$(toolexeclibgoruntimedir)" "$(DESTDIR)$(toolexeclibgosyncdir)" "$(DESTDIR)$(toolexeclibgotemplatedir)" "$(DESTDIR)$(toolexeclibgotestingdir)"; do \
+       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 \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
@@ -4123,18 +4239,19 @@ install-exec-am: install-multi install-toolexeclibLIBRARIES \
        install-toolexeclibgodebugDATA \
        install-toolexeclibgoencodingDATA install-toolexeclibgoexpDATA \
        install-toolexeclibgoexpguiDATA \
-       install-toolexeclibgoexpsqlDATA \
-       install-toolexeclibgoexptemplateDATA \
-       install-toolexeclibgogoDATA install-toolexeclibgohashDATA \
-       install-toolexeclibgohttpDATA install-toolexeclibgoimageDATA \
-       install-toolexeclibgoindexDATA install-toolexeclibgoioDATA \
-       install-toolexeclibgomimeDATA install-toolexeclibgonetDATA \
-       install-toolexeclibgooldDATA install-toolexeclibgoosDATA \
-       install-toolexeclibgopathDATA install-toolexeclibgoregexpDATA \
-       install-toolexeclibgorpcDATA install-toolexeclibgoruntimeDATA \
-       install-toolexeclibgosyncDATA \
-       install-toolexeclibgotemplateDATA \
-       install-toolexeclibgotestingDATA
+       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-toolexeclibgonetrpcDATA install-toolexeclibgooldDATA \
+       install-toolexeclibgoosDATA install-toolexeclibgopathDATA \
+       install-toolexeclibgoregexpDATA \
+       install-toolexeclibgoruntimeDATA install-toolexeclibgosyncDATA \
+       install-toolexeclibgotestingDATA install-toolexeclibgotextDATA \
+       install-toolexeclibgotexttemplateDATA \
+       install-toolexeclibgounicodeDATA
 
 install-html: install-html-recursive
 
@@ -4189,20 +4306,23 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        uninstall-toolexeclibgoexpDATA \
        uninstall-toolexeclibgoexpguiDATA \
        uninstall-toolexeclibgoexpsqlDATA \
-       uninstall-toolexeclibgoexptemplateDATA \
        uninstall-toolexeclibgogoDATA uninstall-toolexeclibgohashDATA \
-       uninstall-toolexeclibgohttpDATA \
+       uninstall-toolexeclibgohtmlDATA \
        uninstall-toolexeclibgoimageDATA \
        uninstall-toolexeclibgoindexDATA uninstall-toolexeclibgoioDATA \
+       uninstall-toolexeclibgologDATA uninstall-toolexeclibgomathDATA \
        uninstall-toolexeclibgomimeDATA uninstall-toolexeclibgonetDATA \
+       uninstall-toolexeclibgonethttpDATA \
+       uninstall-toolexeclibgonetrpcDATA \
        uninstall-toolexeclibgooldDATA uninstall-toolexeclibgoosDATA \
        uninstall-toolexeclibgopathDATA \
        uninstall-toolexeclibgoregexpDATA \
-       uninstall-toolexeclibgorpcDATA \
        uninstall-toolexeclibgoruntimeDATA \
        uninstall-toolexeclibgosyncDATA \
-       uninstall-toolexeclibgotemplateDATA \
-       uninstall-toolexeclibgotestingDATA
+       uninstall-toolexeclibgotestingDATA \
+       uninstall-toolexeclibgotextDATA \
+       uninstall-toolexeclibgotexttemplateDATA \
+       uninstall-toolexeclibgounicodeDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all all-multi \
        clean-multi ctags-recursive distclean-multi install-am \
@@ -4233,18 +4353,19 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        install-toolexeclibgodebugDATA \
        install-toolexeclibgoencodingDATA install-toolexeclibgoexpDATA \
        install-toolexeclibgoexpguiDATA \
-       install-toolexeclibgoexpsqlDATA \
-       install-toolexeclibgoexptemplateDATA \
-       install-toolexeclibgogoDATA install-toolexeclibgohashDATA \
-       install-toolexeclibgohttpDATA install-toolexeclibgoimageDATA \
-       install-toolexeclibgoindexDATA install-toolexeclibgoioDATA \
-       install-toolexeclibgomimeDATA install-toolexeclibgonetDATA \
-       install-toolexeclibgooldDATA install-toolexeclibgoosDATA \
-       install-toolexeclibgopathDATA install-toolexeclibgoregexpDATA \
-       install-toolexeclibgorpcDATA install-toolexeclibgoruntimeDATA \
-       install-toolexeclibgosyncDATA \
-       install-toolexeclibgotemplateDATA \
-       install-toolexeclibgotestingDATA installcheck installcheck-am \
+       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-toolexeclibgonetrpcDATA install-toolexeclibgooldDATA \
+       install-toolexeclibgoosDATA install-toolexeclibgopathDATA \
+       install-toolexeclibgoregexpDATA \
+       install-toolexeclibgoruntimeDATA install-toolexeclibgosyncDATA \
+       install-toolexeclibgotestingDATA install-toolexeclibgotextDATA \
+       install-toolexeclibgotexttemplateDATA \
+       install-toolexeclibgounicodeDATA installcheck installcheck-am \
        installdirs installdirs-am maintainer-clean \
        maintainer-clean-generic maintainer-clean-multi mostlyclean \
        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
@@ -4263,20 +4384,23 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
        uninstall-toolexeclibgoexpDATA \
        uninstall-toolexeclibgoexpguiDATA \
        uninstall-toolexeclibgoexpsqlDATA \
-       uninstall-toolexeclibgoexptemplateDATA \
        uninstall-toolexeclibgogoDATA uninstall-toolexeclibgohashDATA \
-       uninstall-toolexeclibgohttpDATA \
+       uninstall-toolexeclibgohtmlDATA \
        uninstall-toolexeclibgoimageDATA \
        uninstall-toolexeclibgoindexDATA uninstall-toolexeclibgoioDATA \
+       uninstall-toolexeclibgologDATA uninstall-toolexeclibgomathDATA \
        uninstall-toolexeclibgomimeDATA uninstall-toolexeclibgonetDATA \
+       uninstall-toolexeclibgonethttpDATA \
+       uninstall-toolexeclibgonetrpcDATA \
        uninstall-toolexeclibgooldDATA uninstall-toolexeclibgoosDATA \
        uninstall-toolexeclibgopathDATA \
        uninstall-toolexeclibgoregexpDATA \
-       uninstall-toolexeclibgorpcDATA \
        uninstall-toolexeclibgoruntimeDATA \
        uninstall-toolexeclibgosyncDATA \
-       uninstall-toolexeclibgotemplateDATA \
-       uninstall-toolexeclibgotestingDATA
+       uninstall-toolexeclibgotestingDATA \
+       uninstall-toolexeclibgotextDATA \
+       uninstall-toolexeclibgotexttemplateDATA \
+       uninstall-toolexeclibgounicodeDATA
 
 
 goc2c.$(OBJEXT): runtime/goc2c.c
@@ -4309,6 +4433,10 @@ sigqueue.c: $(srcdir)/runtime/sigqueue.goc goc2c
        ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
        mv -f $@.tmp $@
 
+time.c: $(srcdir)/runtime/time.goc goc2c
+       ./goc2c --gcc --go-prefix libgo_time $< > $@.tmp
+       mv -f $@.tmp $@
+
 %.c: $(srcdir)/runtime/%.goc goc2c
        ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
@@ -4375,24 +4503,6 @@ s-epoll: Makefile
        $(SHELL) $(srcdir)/../move-if-change epoll.go.tmp epoll.go
        $(STAMP) $@
 
-@go_include@ asn1/asn1.lo.dep
-asn1/asn1.lo.dep: $(go_asn1_files)
-       $(BUILDDEPS)
-asn1/asn1.lo: $(go_asn1_files)
-       $(BUILDPACKAGE)
-asn1/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: asn1/check
-
-@go_include@ big/big.lo.dep
-big/big.lo.dep: $(go_big_files)
-       $(BUILDDEPS)
-big/big.lo: $(go_big_files)
-       $(BUILDPACKAGE)
-big/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: big/check
-
 @go_include@ bufio/bufio.lo.dep
 bufio/bufio.lo.dep: $(go_bufio_files)
        $(BUILDDEPS)
@@ -4413,15 +4523,6 @@ bytes/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: bytes/check
 
-@go_include@ cmath/cmath.lo.dep
-cmath/cmath.lo.dep: $(go_cmath_files)
-       $(BUILDDEPS)
-cmath/cmath.lo: $(go_cmath_files)
-       $(BUILDPACKAGE)
-cmath/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: cmath/check
-
 @go_include@ crypto/crypto.lo.dep
 crypto/crypto.lo.dep: $(go_crypto_files)
        $(BUILDDEPS)
@@ -4431,15 +4532,6 @@ crypto/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/check
 
-@go_include@ csv/csv.lo.dep
-csv/csv.lo.dep: $(go_csv_files)
-       $(BUILDDEPS)
-csv/csv.lo: $(go_csv_files)
-       $(BUILDPACKAGE)
-csv/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: csv/check
-
 @go_include@ errors/errors.lo.dep
 errors/errors.lo.dep: $(go_errors_files)
        $(BUILDDEPS)
@@ -4449,15 +4541,6 @@ errors/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: errors/check
 
-@go_include@ exec/exec.lo.dep
-exec/exec.lo.dep: $(go_exec_files)
-       $(BUILDDEPS)
-exec/exec.lo: $(go_exec_files)
-       $(BUILDPACKAGE)
-exec/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: exec/check
-
 @go_include@ expvar/expvar.lo.dep
 expvar/expvar.lo.dep: $(go_expvar_files)
        $(BUILDDEPS)
@@ -4485,15 +4568,6 @@ fmt/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: fmt/check
 
-@go_include@ gob/gob.lo.dep
-gob/gob.lo.dep: $(go_gob_files)
-       $(BUILDDEPS)
-gob/gob.lo: $(go_gob_files)
-       $(BUILDPACKAGE)
-gob/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: gob/check
-
 @go_include@ hash/hash.lo.dep
 hash/hash.lo.dep: $(go_hash_files)
        $(BUILDDEPS)
@@ -4512,15 +4586,6 @@ html/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: html/check
 
-@go_include@ http/http.lo.dep
-http/http.lo.dep: $(go_http_files)
-       $(BUILDDEPS)
-http/http.lo: $(go_http_files)
-       $(BUILDPACKAGE)
-http/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: http/check
-
 @go_include@ image/image.lo.dep
 image/image.lo.dep: $(go_image_files)
        $(BUILDDEPS)
@@ -4539,15 +4604,6 @@ io/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: io/check
 
-@go_include@ json/json.lo.dep
-json/json.lo.dep: $(go_json_files)
-       $(BUILDDEPS)
-json/json.lo: $(go_json_files)
-       $(BUILDPACKAGE)
-json/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: json/check
-
 @go_include@ log/log.lo.dep
 log/log.lo.dep: $(go_log_files)
        $(BUILDDEPS)
@@ -4566,15 +4622,6 @@ math/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: math/check
 
-@go_include@ mail/mail.lo.dep
-mail/mail.lo.dep: $(go_mail_files)
-       $(BUILDDEPS)
-mail/mail.lo: $(go_mail_files)
-       $(BUILDPACKAGE)
-mail/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: mail/check
-
 @go_include@ mime/mime.lo.dep
 mime/mime.lo.dep: $(go_mime_files)
        $(BUILDDEPS)
@@ -4624,15 +4671,6 @@ path/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: path/check
 
-@go_include@ rand/rand.lo.dep
-rand/rand.lo.dep: $(go_rand_files)
-       $(BUILDDEPS)
-rand/rand.lo: $(go_rand_files)
-       $(BUILDPACKAGE)
-rand/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: rand/check
-
 @go_include@ reflect/reflect.lo.dep
 reflect/reflect.lo.dep: $(go_reflect_files)
        $(BUILDDEPS)
@@ -4651,15 +4689,6 @@ regexp/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: regexp/check
 
-@go_include@ rpc/rpc.lo.dep
-rpc/rpc.lo.dep: $(go_rpc_files)
-       $(BUILDDEPS)
-rpc/rpc.lo: $(go_rpc_files)
-       $(BUILDPACKAGE)
-rpc/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: rpc/check
-
 @go_include@ runtime/runtime.lo.dep
 runtime/runtime.lo.dep: $(go_runtime_files)
        $(BUILDDEPS)
@@ -4669,23 +4698,15 @@ runtime/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: runtime/check
 
-@go_include@ scanner/scanner.lo.dep
-scanner/scanner.lo.dep: $(go_scanner_files)
-       $(BUILDDEPS)
-scanner/scanner.lo: $(go_scanner_files)
-       $(BUILDPACKAGE)
-scanner/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: scanner/check
-
-@go_include@ smtp/smtp.lo.dep
-smtp/smtp.lo.dep: $(go_smtp_files)
+@go_include@ text/scanner.lo.dep
+text/scanner.lo.dep: $(go_text_scanner_files)
        $(BUILDDEPS)
-smtp/smtp.lo: $(go_smtp_files)
+text/scanner.lo: $(go_text_scanner_files)
        $(BUILDPACKAGE)
-smtp/check: $(CHECK_DEPS)
+text/scanner/check: $(CHECK_DEPS)
+       @$(MKDIR_P) text/scanner
        @$(CHECK)
-.PHONY: smtp/check
+.PHONY: text/scanner/check
 
 @go_include@ sort/sort.lo.dep
 sort/sort.lo.dep: $(go_sort_files)
@@ -4723,35 +4744,6 @@ sync/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: sync/check
 
-@go_include@ syslog/syslog.lo.dep
-syslog/syslog.lo.dep: $(go_syslog_files)
-       $(BUILDDEPS)
-syslog/syslog.lo: $(go_syslog_files)
-       $(BUILDPACKAGE)
-syslog/syslog_c.lo: $(go_syslog_c_files) syslog/syslog.lo
-       $(LTCOMPILE) -c -o $@ $(srcdir)/go/syslog/syslog_c.c
-syslog/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: syslog/check
-
-@go_include@ tabwriter/tabwriter.lo.dep
-tabwriter/tabwriter.lo.dep: $(go_tabwriter_files)
-       $(BUILDDEPS)
-tabwriter/tabwriter.lo: $(go_tabwriter_files)
-       $(BUILDPACKAGE)
-tabwriter/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: tabwriter/check
-
-@go_include@ template/template.lo.dep
-template/template.lo.dep: $(go_template_files)
-       $(BUILDDEPS)
-template/template.lo: $(go_template_files)
-       $(BUILDPACKAGE)
-template/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: template/check
-
 @go_include@ testing/testing.lo.dep
 testing/testing.lo.dep: $(go_testing_files)
        $(BUILDDEPS)
@@ -4779,33 +4771,6 @@ unicode/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: unicode/check
 
-@go_include@ url/url.lo.dep
-url/url.lo.dep: $(go_url_files)
-       $(BUILDDEPS)
-url/url.lo: $(go_url_files)
-       $(BUILDPACKAGE)
-url/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: url/check
-
-@go_include@ utf16/utf16.lo.dep
-utf16/utf16.lo.dep: $(go_utf16_files)
-       $(BUILDDEPS)
-utf16/utf16.lo: $(go_utf16_files)
-       $(BUILDPACKAGE)
-utf16/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: utf16/check
-
-@go_include@ utf8/utf8.lo.dep
-utf8/utf8.lo.dep: $(go_utf8_files)
-       $(BUILDDEPS)
-utf8/utf8.lo: $(go_utf8_files)
-       $(BUILDPACKAGE)
-utf8/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: utf8/check
-
 @go_include@ websocket/websocket.lo.dep
 websocket/websocket.lo.dep: $(go_websocket_files)
        $(BUILDDEPS)
@@ -4815,15 +4780,6 @@ websocket/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: websocket/check
 
-@go_include@ xml/xml.lo.dep
-xml/xml.lo.dep: $(go_xml_files)
-       $(BUILDDEPS)
-xml/xml.lo: $(go_xml_files)
-       $(BUILDPACKAGE)
-xml/check: $(CHECK_DEPS)
-       @$(CHECK)
-.PHONY: xml/check
-
 @go_include@ archive/tar.lo.dep
 archive/tar.lo.dep: $(go_archive_tar_files)
        $(BUILDDEPS)
@@ -5294,6 +5250,16 @@ debug/pe/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: debug/pe/check
 
+@go_include@ encoding/asn1.lo.dep
+encoding/asn1.lo.dep: $(go_encoding_asn1_files)
+       $(BUILDDEPS)
+encoding/asn1.lo: $(go_encoding_asn1_files)
+       $(BUILDPACKAGE)
+encoding/asn1/check: $(CHECK_DEPS)
+       @$(MKDIR_P) encoding/asn1
+       @$(CHECK)
+.PHONY: encoding/asn1/check
+
 @go_include@ encoding/ascii85.lo.dep
 encoding/ascii85.lo.dep: $(go_encoding_ascii85_files)
        $(BUILDDEPS)
@@ -5334,6 +5300,16 @@ encoding/binary/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: encoding/binary/check
 
+@go_include@ encoding/csv.lo.dep
+encoding/csv.lo.dep: $(go_encoding_csv_files)
+       $(BUILDDEPS)
+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)
@@ -5344,6 +5320,16 @@ encoding/git85/check: $(CHECK_DEPS)
        @$(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
+
 @go_include@ encoding/hex.lo.dep
 encoding/hex.lo.dep: $(go_encoding_hex_files)
        $(BUILDDEPS)
@@ -5354,6 +5340,16 @@ encoding/hex/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: encoding/hex/check
 
+@go_include@ encoding/json.lo.dep
+encoding/json.lo.dep: $(go_encoding_json_files)
+       $(BUILDDEPS)
+encoding/json.lo: $(go_encoding_json_files)
+       $(BUILDPACKAGE)
+encoding/json/check: $(CHECK_DEPS)
+       @$(MKDIR_P) encoding/json
+       @$(CHECK)
+.PHONY: encoding/json/check
+
 @go_include@ encoding/pem.lo.dep
 encoding/pem.lo.dep: $(go_encoding_pem_files)
        $(BUILDDEPS)
@@ -5364,6 +5360,16 @@ encoding/pem/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: encoding/pem/check
 
+@go_include@ encoding/xml.lo.dep
+encoding/xml.lo.dep: $(go_encoding_xml_files)
+       $(BUILDDEPS)
+encoding/xml.lo: $(go_encoding_xml_files)
+       $(BUILDPACKAGE)
+encoding/xml/check: $(CHECK_DEPS)
+       @$(MKDIR_P) encoding/xml
+       @$(CHECK)
+.PHONY: encoding/xml/check
+
 @go_include@ exp/ebnf.lo.dep
 exp/ebnf.lo.dep: $(go_exp_ebnf_files)
        $(BUILDDEPS)
@@ -5474,15 +5480,15 @@ exp/sql/driver/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: exp/sql/driver/check
 
-@go_include@ exp/template/html.lo.dep
-exp/template/html.lo.dep: $(go_exp_template_html_files)
+@go_include@ html/template.lo.dep
+html/template.lo.dep: $(go_html_template_files)
        $(BUILDDEPS)
-exp/template/html.lo: $(go_exp_template_html_files)
+html/template.lo: $(go_html_template_files)
        $(BUILDPACKAGE)
-exp/template/html/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/template/html
+html/template/check: $(CHECK_DEPS)
+       @$(MKDIR_P) html/template
        @$(CHECK)
-.PHONY: exp/template/html/check
+.PHONY: html/template/check
 
 @go_include@ go/ast.lo.dep
 go/ast.lo.dep: $(go_go_ast_files)
@@ -5603,46 +5609,6 @@ hash/fnv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: hash/fnv/check
 
-@go_include@ http/cgi.lo.dep
-http/cgi.lo.dep: $(go_http_cgi_files)
-       $(BUILDDEPS)
-http/cgi.lo: $(go_http_cgi_files)
-       $(BUILDPACKAGE)
-http/cgi/check: $(CHECK_DEPS)
-       @$(MKDIR_P) http/cgi
-       @$(CHECK)
-.PHONY: http/cgi/check
-
-@go_include@ http/fcgi.lo.dep
-http/fcgi.lo.dep: $(go_http_fcgi_files)
-       $(BUILDDEPS)
-http/fcgi.lo: $(go_http_fcgi_files)
-       $(BUILDPACKAGE)
-http/fcgi/check: $(CHECK_DEPS)
-       @$(MKDIR_P) http/fcgi
-       @$(CHECK)
-.PHONY: http/fcgi/check
-
-@go_include@ http/httptest.lo.dep
-http/httptest.lo.dep: $(go_http_httptest_files)
-       $(BUILDDEPS)
-http/httptest.lo: $(go_http_httptest_files)
-       $(BUILDPACKAGE)
-http/httptest/check: $(CHECK_DEPS)
-       @$(MKDIR_P) http/httptest
-       @$(CHECK)
-.PHONY: http/httptest/check
-
-@go_include@ http/pprof.lo.dep
-http/pprof.lo.dep: $(go_http_pprof_files)
-       $(BUILDDEPS)
-http/pprof.lo: $(go_http_pprof_files)
-       $(BUILDPACKAGE)
-http/pprof/check: $(CHECK_DEPS)
-       @$(MKDIR_P) http/pprof
-       @$(CHECK)
-.PHONY: http/pprof/check
-
 @go_include@ image/bmp.lo.dep
 image/bmp.lo.dep: $(go_image_bmp_files)
        $(BUILDDEPS)
@@ -5743,6 +5709,48 @@ io/ioutil/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: io/ioutil/check
 
+@go_include@ log/syslog.lo.dep
+log/syslog.lo.dep: $(go_log_syslog_files)
+       $(BUILDDEPS)
+log/syslog.lo: $(go_log_syslog_files)
+       $(BUILDPACKAGE)
+log/syslog/syslog_c.lo: $(go_syslog_c_files) log/syslog.lo
+       $(LTCOMPILE) -c -o $@ $(srcdir)/go/log/syslog/syslog_c.c
+log/syslog/check: $(CHECK_DEPS)
+       @$(MKDIR_P) log/syslog
+       @$(CHECK)
+.PHONY: log/syslog/check
+
+@go_include@ math/big.lo.dep
+math/big.lo.dep: $(go_math_big_files)
+       $(BUILDDEPS)
+math/big.lo: $(go_math_big_files)
+       $(BUILDPACKAGE)
+math/big/check: $(CHECK_DEPS)
+       @$(MKDIR_P) math/big
+       @$(CHECK)
+.PHONY: math/big/check
+
+@go_include@ math/cmplx.lo.dep
+math/cmplx.lo.dep: $(go_math_cmplx_files)
+       $(BUILDDEPS)
+math/cmplx.lo: $(go_math_cmplx_files)
+       $(BUILDPACKAGE)
+math/cmplx/check: $(CHECK_DEPS)
+       @$(MKDIR_P) math/cmplx
+       @$(CHECK)
+.PHONY: math/cmplx/check
+
+@go_include@ math/rand.lo.dep
+math/rand.lo.dep: $(go_math_rand_files)
+       $(BUILDDEPS)
+math/rand.lo: $(go_math_rand_files)
+       $(BUILDPACKAGE)
+math/rand/check: $(CHECK_DEPS)
+       @$(MKDIR_P) math/rand
+       @$(CHECK)
+.PHONY: math/rand/check
+
 @go_include@ mime/multipart.lo.dep
 mime/multipart.lo.dep: $(go_mime_multipart_files)
        $(BUILDDEPS)
@@ -5759,6 +5767,56 @@ net/dict.lo.dep: $(go_net_dict_files)
 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
+
+@go_include@ net/mail.lo.dep
+net/mail.lo.dep: $(go_net_mail_files)
+       $(BUILDDEPS)
+net/mail.lo: $(go_net_mail_files)
+       $(BUILDPACKAGE)
+net/mail/check: $(CHECK_DEPS)
+       @$(MKDIR_P) net/mail
+       @$(CHECK)
+.PHONY: net/mail/check
+
+@go_include@ net/rpc.lo.dep
+net/rpc.lo.dep: $(go_net_rpc_files)
+       $(BUILDDEPS)
+net/rpc.lo: $(go_net_rpc_files)
+       $(BUILDPACKAGE)
+net/rpc/check: $(CHECK_DEPS)
+       @$(MKDIR_P) net/rpc
+       @$(CHECK)
+.PHONY: net/rpc/check
+
+@go_include@ net/smtp.lo.dep
+net/smtp.lo.dep: $(go_net_smtp_files)
+       $(BUILDDEPS)
+net/smtp.lo: $(go_net_smtp_files)
+       $(BUILDPACKAGE)
+net/smtp/check: $(CHECK_DEPS)
+       @$(MKDIR_P) net/smtp
+       @$(CHECK)
+.PHONY: net/smtp/check
+
+@go_include@ net/url.lo.dep
+net/url.lo.dep: $(go_net_url_files)
+       $(BUILDDEPS)
+net/url.lo: $(go_net_url_files)
+       $(BUILDPACKAGE)
+net/url/check: $(CHECK_DEPS)
+       @$(MKDIR_P) net/url
+       @$(CHECK)
+.PHONY: net/url/check
+
 @go_include@ net/textproto.lo.dep
 net/textproto.lo.dep: $(go_net_textproto_files)
        $(BUILDDEPS)
@@ -5769,6 +5827,66 @@ net/textproto/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: net/textproto/check
 
+@go_include@ net/http/cgi.lo.dep
+net/http/cgi.lo.dep: $(go_net_http_cgi_files)
+       $(BUILDDEPS)
+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
+
+@go_include@ net/http/fcgi.lo.dep
+net/http/fcgi.lo.dep: $(go_net_http_fcgi_files)
+       $(BUILDDEPS)
+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
+
+@go_include@ net/http/httptest.lo.dep
+net/http/httptest.lo.dep: $(go_net_http_httptest_files)
+       $(BUILDDEPS)
+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
+
+@go_include@ net/http/httputil.lo.dep
+net/http/httputil.lo.dep: $(go_net_http_httputil_files)
+       $(BUILDDEPS)
+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
+
+@go_include@ net/http/pprof.lo.dep
+net/http/pprof.lo.dep: $(go_net_http_pprof_files)
+       $(BUILDDEPS)
+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
+
+@go_include@ net/rpc/jsonrpc.lo.dep
+net/rpc/jsonrpc.lo.dep: $(go_net_rpc_jsonrpc_files)
+       $(BUILDDEPS)
+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
+
 @go_include@ old/netchan.lo.dep
 old/netchan.lo.dep: $(go_old_netchan_files)
        $(BUILDDEPS)
@@ -5799,6 +5917,16 @@ old/template/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: old/template/check
 
+@go_include@ os/exec.lo.dep
+os/exec.lo.dep: $(go_os_exec_files)
+       $(BUILDDEPS)
+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)
@@ -5839,16 +5967,6 @@ regexp/syntax/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: regexp/syntax/check
 
-@go_include@ rpc/jsonrpc.lo.dep
-rpc/jsonrpc.lo.dep: $(go_rpc_jsonrpc_files)
-       $(BUILDDEPS)
-rpc/jsonrpc.lo: $(go_rpc_jsonrpc_files)
-       $(BUILDPACKAGE)
-rpc/jsonrpc/check: $(CHECK_DEPS)
-       @$(MKDIR_P) rpc/jsonrpc
-       @$(CHECK)
-.PHONY: rpc/jsonrpc/check
-
 @go_include@ runtime/debug.lo.dep
 runtime/debug.lo.dep: $(go_runtime_debug_files)
        $(BUILDDEPS)
@@ -5881,15 +5999,34 @@ sync/atomic/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: sync/atomic/check
 
-@go_include@ template/parse.lo.dep
-template/parse.lo.dep: $(go_template_parse_files)
+@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
+
+@go_include@ text/template.lo.dep
+text/template.lo.dep: $(go_text_template_files)
        $(BUILDDEPS)
-template/parse.lo: $(go_template_parse_files)
+text/template.lo: $(go_text_template_files)
        $(BUILDPACKAGE)
-template/parse/check: $(CHECK_DEPS)
-       @$(MKDIR_P) template/parse
+text/template/check: $(CHECK_DEPS)
        @$(CHECK)
-.PHONY: template/parse/check
+.PHONY: text/template/check
+
+@go_include@ text/template/parse.lo.dep
+text/template/parse.lo.dep: $(go_text_template_parse_files)
+       $(BUILDDEPS)
+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
 
 @go_include@ testing/iotest.lo.dep
 testing/iotest.lo.dep: $(go_testing_iotest_files)
@@ -5921,6 +6058,26 @@ testing/script/check: $(CHECK_DEPS)
        @$(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
+
+@go_include@ unicode/utf8.lo.dep
+unicode/utf8.lo.dep: $(go_unicode_utf8_files)
+       $(BUILDDEPS)
+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)
        $(BUILDDEPS)
@@ -5931,50 +6088,32 @@ syscall/errno.lo: go/syscall/errno.c
 syscall/wait.lo: go/syscall/wait.c
        $(LTCOMPILE) -c -o $@ $<
 
-asn1.gox: asn1/asn1.lo
-       $(BUILDGOX)
-big.gox: big/big.lo
-       $(BUILDGOX)
 bufio.gox: bufio/bufio.lo
        $(BUILDGOX)
 bytes.gox: bytes/bytes.lo
        $(BUILDGOX)
-cmath.gox: cmath/cmath.lo
-       $(BUILDGOX)
 crypto.gox: crypto/crypto.lo
        $(BUILDGOX)
-csv.gox: csv/csv.lo
-       $(BUILDGOX)
 errors.gox: errors/errors.lo
        $(BUILDGOX)
-exec.gox: exec/exec.lo
-       $(BUILDGOX)
 expvar.gox: expvar/expvar.lo
        $(BUILDGOX)
 flag.gox: flag/flag.lo
        $(BUILDGOX)
 fmt.gox: fmt/fmt.lo
        $(BUILDGOX)
-gob.gox: gob/gob.lo
-       $(BUILDGOX)
 hash.gox: hash/hash.lo
        $(BUILDGOX)
 html.gox: html/html.lo
        $(BUILDGOX)
-http.gox: http/http.lo
-       $(BUILDGOX)
 image.gox: image/image.lo
        $(BUILDGOX)
 io.gox: io/io.lo
        $(BUILDGOX)
-json.gox: json/json.lo
-       $(BUILDGOX)
 log.gox: log/log.lo
        $(BUILDGOX)
 math.gox: math/math.lo
        $(BUILDGOX)
-mail.gox: mail/mail.lo
-       $(BUILDGOX)
 mime.gox: mime/mime.lo
        $(BUILDGOX)
 net.gox: net/net.lo
@@ -5985,20 +6124,12 @@ patch.gox: patch/patch.lo
        $(BUILDGOX)
 path.gox: path/path.lo
        $(BUILDGOX)
-rand.gox: rand/rand.lo
-       $(BUILDGOX)
 reflect.gox: reflect/reflect.lo
        $(BUILDGOX)
 regexp.gox: regexp/regexp.lo
        $(BUILDGOX)
-rpc.gox: rpc/rpc.lo
-       $(BUILDGOX)
 runtime.gox: runtime/runtime.lo
        $(BUILDGOX)
-scanner.gox: scanner/scanner.lo
-       $(BUILDGOX)
-smtp.gox: smtp/smtp.lo
-       $(BUILDGOX)
 sort.gox: sort/sort.lo
        $(BUILDGOX)
 strconv.gox: strconv/strconv.lo
@@ -6007,30 +6138,16 @@ strings.gox: strings/strings.lo
        $(BUILDGOX)
 sync.gox: sync/sync.lo
        $(BUILDGOX)
-syslog.gox: syslog/syslog.lo
-       $(BUILDGOX)
 syscall.gox: syscall/syscall.lo
        $(BUILDGOX)
-tabwriter.gox: tabwriter/tabwriter.lo
-       $(BUILDGOX)
-template.gox: template/template.lo
-       $(BUILDGOX)
 testing.gox: testing/testing.lo
        $(BUILDGOX)
 time.gox: time/time.lo
        $(BUILDGOX)
 unicode.gox: unicode/unicode.lo
        $(BUILDGOX)
-url.gox: url/url.lo
-       $(BUILDGOX)
-utf16.gox: utf16/utf16.lo
-       $(BUILDGOX)
-utf8.gox: utf8/utf8.lo
-       $(BUILDGOX)
 websocket.gox: websocket/websocket.lo
        $(BUILDGOX)
-xml.gox: xml/xml.lo
-       $(BUILDGOX)
 
 archive/tar.gox: archive/tar.lo
        $(BUILDGOX)
@@ -6135,18 +6252,28 @@ debug/pe.gox: debug/pe.lo
 
 encoding/ascii85.gox: encoding/ascii85.lo
        $(BUILDGOX)
+encoding/asn1.gox: encoding/asn1.lo
+       $(BUILDGOX)
 encoding/base32.gox: encoding/base32.lo
        $(BUILDGOX)
 encoding/base64.gox: encoding/base64.lo
        $(BUILDGOX)
 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
        $(BUILDGOX)
+encoding/json.gox: encoding/json.lo
+       $(BUILDGOX)
 encoding/pem.gox: encoding/pem.lo
        $(BUILDGOX)
+encoding/xml.gox: encoding/xml.lo
+       $(BUILDGOX)
 
 exp/ebnf.gox: exp/ebnf.lo
        $(BUILDGOX)
@@ -6173,7 +6300,7 @@ exp/gui/x11.gox: exp/gui/x11.lo
 exp/sql/driver.gox: exp/sql/driver.lo
        $(BUILDGOX)
 
-exp/template/html.gox: exp/template/html.lo
+html/template.gox: html/template.lo
        $(BUILDGOX)
 
 go/ast.gox: go/ast.lo
@@ -6200,15 +6327,6 @@ hash/crc64.gox: hash/crc64.lo
 hash/fnv.gox: hash/fnv.lo
        $(BUILDGOX)
 
-http/cgi.gox: http/cgi.lo
-       $(BUILDGOX)
-http/fcgi.gox: http/fcgi.lo
-       $(BUILDGOX)
-http/httptest.gox: http/httptest.lo
-       $(BUILDGOX)
-http/pprof.gox: http/pprof.lo
-       $(BUILDGOX)
-
 image/bmp.gox: image/bmp.lo
        $(BUILDGOX)
 image/color.gox: image/color.lo
@@ -6232,13 +6350,47 @@ index/suffixarray.gox: index/suffixarray.lo
 io/ioutil.gox: io/ioutil.lo
        $(BUILDGOX)
 
+log/syslog.gox: log/syslog.lo
+       $(BUILDGOX)
+
+math/big.gox: math/big.lo
+       $(BUILDGOX)
+math/cmplx.gox: math/cmplx.lo
+       $(BUILDGOX)
+math/rand.gox: math/rand.lo
+       $(BUILDGOX)
+
 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
+       $(BUILDGOX)
+net/rpc.gox: net/rpc.lo
+       $(BUILDGOX)
+net/smtp.gox: net/smtp.lo
+       $(BUILDGOX)
 net/textproto.gox: net/textproto.lo
        $(BUILDGOX)
+net/url.gox: net/url.lo
+       $(BUILDGOX)
+
+net/http/cgi.gox: net/http/cgi.lo
+       $(BUILDGOX)
+net/http/fcgi.gox: net/http/fcgi.lo
+       $(BUILDGOX)
+net/http/httptest.gox: net/http/httptest.lo
+       $(BUILDGOX)
+net/http/httputil.gox: net/http/httputil.lo
+       $(BUILDGOX)
+net/http/pprof.gox: net/http/pprof.lo
+       $(BUILDGOX)
+
+net/rpc/jsonrpc.gox: net/rpc/jsonrpc.lo
+       $(BUILDGOX)
 
 old/netchan.gox: old/netchan.lo
        $(BUILDGOX)
@@ -6247,6 +6399,8 @@ old/regexp.gox: old/regexp.lo
 old/template.gox: old/template.lo
        $(BUILDGOX)
 
+os/exec.gox: os/exec.lo
+       $(BUILDGOX)
 os/user.gox: os/user.lo
        $(BUILDGOX)
 os/signal.gox: os/signal.lo
@@ -6258,9 +6412,6 @@ path/filepath.gox: path/filepath.lo
 regexp/syntax.gox: regexp/syntax.lo
        $(BUILDGOX)
 
-rpc/jsonrpc.gox: rpc/jsonrpc.lo
-       $(BUILDGOX)
-
 runtime/debug.gox: runtime/debug.lo
        $(BUILDGOX)
 runtime/pprof.gox: runtime/pprof.lo
@@ -6269,7 +6420,13 @@ runtime/pprof.gox: runtime/pprof.lo
 sync/atomic.gox: sync/atomic.lo
        $(BUILDGOX)
 
-template/parse.gox: template/parse.lo
+text/scanner.gox: text/scanner.lo
+       $(BUILDGOX)
+text/tabwriter.gox: text/tabwriter.lo
+       $(BUILDGOX)
+text/template.gox: text/template.lo
+       $(BUILDGOX)
+text/template/parse.gox: text/template/parse.lo
        $(BUILDGOX)
 
 testing/iotest.gox: testing/iotest.lo
@@ -6279,6 +6436,11 @@ testing/quick.gox: testing/quick.lo
 testing/script.gox: testing/script.lo
        $(BUILDGOX)
 
+unicode/utf16.gox: unicode/utf16.lo
+       $(BUILDGOX)
+unicode/utf8.gox: unicode/utf8.lo
+       $(BUILDGOX)
+
 check: check-tail
 check-recursive: check-head
 
index 65bf120..facba2c 100644 (file)
@@ -29,7 +29,7 @@ var (
 //     tr := tar.NewReader(r)
 //     for {
 //             hdr, err := tr.Next()
-//             if err == os.EOF {
+//             if err == io.EOF {
 //                     // end of tar archive
 //                     break
 //             }
@@ -200,7 +200,7 @@ func (tr *Reader) readHeader() *Header {
 }
 
 // Read reads from the current entry in the tar archive.
-// It returns 0, os.EOF when it reaches the end of that entry,
+// It returns 0, io.EOF when it reaches the end of that entry,
 // until Next is called to advance to the next entry.
 func (tr *Reader) Read(b []byte) (n int, err error) {
        if tr.nb == 0 {
index 64152b4..cfbe549 100644 (file)
@@ -7,10 +7,10 @@ package zip
 import (
        "bufio"
        "compress/flate"
+       "encoding/binary"
        "errors"
        "hash"
        "hash/crc32"
-       "encoding/binary"
        "io"
        "io/ioutil"
        "os"
@@ -60,6 +60,7 @@ func OpenReader(name string) (*ReadCloser, error) {
                f.Close()
                return nil, err
        }
+       r.f = f
        return r, nil
 }
 
index 4d80aab..ca0b04e 100644 (file)
@@ -98,7 +98,11 @@ func readTestZip(t *testing.T, zt ZipTest) {
        if err == FormatError {
                return
        }
-       defer z.Close()
+       defer func() {
+               if err := z.Close(); err != nil {
+                       t.Errorf("error %q when closing zip file", err)
+               }
+       }()
 
        // bail here if no Files expected to be tested
        // (there may actually be files in the zip, but we don't care)
index b562f84..25491dc 100644 (file)
@@ -7,7 +7,7 @@ package zip
 import (
        "bytes"
        "io/ioutil"
-       "rand"
+       "math/rand"
        "testing"
 )
 
index f4ed91b..61e338b 100644 (file)
@@ -11,7 +11,7 @@ import (
        "bytes"
        "io"
        "strconv"
-       "utf8"
+       "unicode/utf8"
 )
 
 const (
@@ -135,7 +135,7 @@ func (b *Reader) Peek(n int) ([]byte, error) {
 // It returns the number of bytes read into p.
 // It calls Read at most once on the underlying Reader,
 // hence n may be less than len(p).
-// At EOF, the count will be zero and err will be os.EOF.
+// At EOF, the count will be zero and err will be io.EOF.
 func (b *Reader) Read(p []byte) (n int, err error) {
        n = len(p)
        if n == 0 {
@@ -246,7 +246,7 @@ func (b *Reader) Buffered() int { return b.w - b.r }
 // returning a slice pointing at the bytes in the buffer.
 // The bytes stop being valid at the next read call.
 // If ReadSlice encounters an error before finding a delimiter,
-// it returns all the data in the buffer and the error itself (often os.EOF).
+// it returns all the data in the buffer and the error itself (often io.EOF).
 // ReadSlice fails with error ErrBufferFull if the buffer fills without a delim.
 // Because the data returned from ReadSlice will be overwritten
 // by the next I/O operation, most clients should use
@@ -312,6 +312,9 @@ func (b *Reader) ReadLine() (line []byte, isPrefix bool, err error) {
        }
 
        if len(line) == 0 {
+               if err != nil {
+                       line = nil
+               }
                return
        }
        err = nil
@@ -329,7 +332,7 @@ func (b *Reader) ReadLine() (line []byte, isPrefix bool, err error) {
 // ReadBytes reads until the first occurrence of delim in the input,
 // returning a slice containing the data up to and including the delimiter.
 // If ReadBytes encounters an error before finding a delimiter,
-// it returns the data read before the error and the error itself (often os.EOF).
+// it returns the data read before the error and the error itself (often io.EOF).
 // ReadBytes returns err != nil if and only if the returned data does not end in
 // delim.
 func (b *Reader) ReadBytes(delim byte) (line []byte, err error) {
@@ -376,7 +379,7 @@ func (b *Reader) ReadBytes(delim byte) (line []byte, err error) {
 // ReadString reads until the first occurrence of delim in the input,
 // returning a string containing the data up to and including the delimiter.
 // If ReadString encounters an error before finding a delimiter,
-// it returns the data read before the error and the error itself (often os.EOF).
+// it returns the data read before the error and the error itself (often io.EOF).
 // ReadString returns err != nil if and only if the returned data does not end in
 // delim.
 func (b *Reader) ReadString(delim byte) (line string, err error) {
index 0285dee..1f89395 100644 (file)
@@ -14,7 +14,7 @@ import (
        "strings"
        "testing"
        "testing/iotest"
-       "utf8"
+       "unicode/utf8"
 )
 
 // Reads from a reader and rot13s the result.
@@ -698,6 +698,17 @@ func TestLinesAfterRead(t *testing.T) {
        }
 }
 
+func TestReadLineNonNilLineOrError(t *testing.T) {
+       r := NewReader(strings.NewReader("line 1\n"))
+       for i := 0; i < 2; i++ {
+               l, _, err := r.ReadLine()
+               if l != nil && err != nil {
+                       t.Fatalf("on line %d/2; ReadLine=%#v, %v; want non-nil line or Error, but not both",
+                               i+1, l, err)
+               }
+       }
+}
+
 type readLineResult struct {
        line     []byte
        isPrefix bool
index 07acce4..5a7aaf3 100644 (file)
@@ -3,13 +3,89 @@
 // license that can be found in the LICENSE file.
 
 /*
-       Package builtin provides documentation for Go's built-in functions.
-       The functions documented here are not actually in package builtin
+       Package builtin provides documentation for Go's predeclared identifiers.
+       The items documented here are not actually in package builtin
        but their descriptions here allow godoc to present documentation
-       for the language's special functions.
+       for the language's special identifiers.
 */
 package builtin
 
+// bool is the set of boolean values, true and false.
+type bool bool
+
+// uint8 is the set of all unsigned 8-bit integers.
+// Range: 0 through 255.
+type uint8 uint8
+
+// uint16 is the set of all unsigned 16-bit integers.
+// Range: 0 through 65535.
+type uint16 uint16
+
+// uint32 is the set of all unsigned 32-bit integers.
+// Range: 0 through 4294967295.
+type uint32 uint32
+
+// uint64 is the set of all unsigned 64-bit integers.
+// Range: 0 through 18446744073709551615.
+type uint64 uint64
+
+// int8 is the set of all signed 8-bit integers.
+// Range: -128 through 127.
+type int8 int8
+
+// int16 is the set of all signed 16-bit integers.
+// Range: -32768 through 32767.
+type int16 int16
+
+// int32 is the set of all signed 32-bit integers.
+// Range: -2147483648 through 2147483647.
+type int32 int32
+
+// int64 is the set of all signed 64-bit integers.
+// Range: -9223372036854775808 through 9223372036854775807.
+type int64 int64
+
+// float32 is the set of all IEEE-754 32-bit floating-point numbers.
+type float32 float32
+
+// float64 is the set of all IEEE-754 64-bit floating-point numbers.
+type float64 float64
+
+// complex64 is the set of all complex numbers with float32 real and
+// imaginary parts.
+type complex64 complex64
+
+// complex128 is the set of all complex numbers with float64 real and
+// imaginary parts.
+type complex128 complex128
+
+// string is the set of all strings of 8-bit bytes, conventionally but not
+// necessarily representing UTF-8-encoded text. A string may be empty, but
+// not nil. Values of string type are immutable.
+type string string
+
+// int is a signed integer type that is at least 32 bits in size. It is a
+// distinct type, however, and not an alias for, say, int32.
+type int int
+
+// uint is an unsigned integer type that is at least 32 bits in size. It is a
+// distinct type, however, and not an alias for, say, uint32.
+type uint uint
+
+// uintptr is an integer type that is large enough to hold the bit pattern of
+// any pointer.
+type uintptr uintptr
+
+// byte is an alias for uint8 and is equivalent to uint8 in all ways. It is
+// used, by convention, to distinguish byte values from 8-bit unsigned
+// integer values.
+type byte byte
+
+// rune is an alias for int and is equivalent to int in all ways. It is
+// used, by convention, to distinguish character values from integer values.
+// In a future version of Go, it will change to an alias of int32.
+type rune rune
+
 // Type is here for the purposes of documentation only. It is a stand-in
 // for any Go type, but represents the same type for any given function
 // invocation.
@@ -21,11 +97,11 @@ type IntegerType int
 
 // FloatType is here for the purposes of documentation only. It is a stand-in
 // for either float type: float32 or float64.
-type FloatType int
+type FloatType float32
 
 // ComplexType is here for the purposes of documentation only. It is a
 // stand-in for either complex type: complex64 or complex128.
-type ComplexType int
+type ComplexType complex64
 
 // The append built-in function appends elements to the end of a slice. If
 // it has sufficient capacity, the destination is resliced to accommodate the
@@ -133,3 +209,9 @@ func panic(v interface{})
 // nil. Thus the return value from recover reports whether the goroutine is
 // panicking.
 func recover() interface{}
+
+// The error built-in interface type is the conventional interface for
+// representing an error condition, with the nil value representing no error.
+type error interface {
+       Error() string
+}
index fbfd621..e66ac02 100644 (file)
@@ -9,7 +9,7 @@ package bytes
 import (
        "errors"
        "io"
-       "utf8"
+       "unicode/utf8"
 )
 
 // A Buffer is a variable-sized buffer of bytes with Read and Write methods.
@@ -117,7 +117,7 @@ const MinRead = 512
 
 // ReadFrom reads data from r until EOF and appends it to the buffer.
 // The return value n is the number of bytes read.
-// Any error except os.EOF encountered during the read
+// Any error except io.EOF encountered during the read
 // is also returned.
 func (b *Buffer) ReadFrom(r io.Reader) (n int64, err error) {
        b.lastRead = opInvalid
@@ -200,7 +200,7 @@ func (b *Buffer) WriteRune(r rune) (n int, err error) {
 
 // Read reads the next len(p) bytes from the buffer or until the buffer
 // is drained.  The return value n is the number of bytes read.  If the
-// buffer has no data to return, err is os.EOF even if len(p) is zero;
+// buffer has no data to return, err is io.EOF even if len(p) is zero;
 // otherwise it is nil.
 func (b *Buffer) Read(p []byte) (n int, err error) {
        b.lastRead = opInvalid
@@ -236,7 +236,7 @@ func (b *Buffer) Next(n int) []byte {
 }
 
 // ReadByte reads and returns the next byte from the buffer.
-// If no byte is available, it returns error os.EOF.
+// If no byte is available, it returns error io.EOF.
 func (b *Buffer) ReadByte() (c byte, err error) {
        b.lastRead = opInvalid
        if b.off >= len(b.buf) {
@@ -252,7 +252,7 @@ func (b *Buffer) ReadByte() (c byte, err error) {
 
 // ReadRune reads and returns the next UTF-8-encoded
 // Unicode code point from the buffer.
-// If no bytes are available, the error returned is os.EOF.
+// If no bytes are available, the error returned is io.EOF.
 // If the bytes are an erroneous UTF-8 encoding, it
 // consumes one byte and returns U+FFFD, 1.
 func (b *Buffer) ReadRune() (r rune, size int, err error) {
@@ -307,7 +307,7 @@ func (b *Buffer) UnreadByte() error {
 // ReadBytes reads until the first occurrence of delim in the input,
 // returning a slice containing the data up to and including the delimiter.
 // If ReadBytes encounters an error before finding a delimiter,
-// it returns the data read before the error and the error itself (often os.EOF).
+// it returns the data read before the error and the error itself (often io.EOF).
 // ReadBytes returns err != nil if and only if the returned data does not end in
 // delim.
 func (b *Buffer) ReadBytes(delim byte) (line []byte, err error) {
@@ -326,7 +326,7 @@ func (b *Buffer) ReadBytes(delim byte) (line []byte, err error) {
 // ReadString reads until the first occurrence of delim in the input,
 // returning a string containing the data up to and including the delimiter.
 // If ReadString encounters an error before finding a delimiter,
-// it returns the data read before the error and the error itself (often os.EOF).
+// it returns the data read before the error and the error itself (often io.EOF).
 // ReadString returns err != nil if and only if the returned data does not end
 // in delim.
 func (b *Buffer) ReadString(delim byte) (line string, err error) {
index c271b48..5235970 100644 (file)
@@ -7,9 +7,9 @@ package bytes_test
 import (
        . "bytes"
        "io"
-       "rand"
+       "math/rand"
        "testing"
-       "utf8"
+       "unicode/utf8"
 )
 
 const N = 10000  // make this bigger for a larger (and slower) test
index ac8320f..9bfd88f 100644 (file)
@@ -8,7 +8,7 @@ package bytes
 
 import (
        "unicode"
-       "utf8"
+       "unicode/utf8"
 )
 
 // Compare returns an integer comparing the two byte arrays lexicographically.
@@ -88,6 +88,11 @@ func Count(s, sep []byte) int {
        return n
 }
 
+// Contains returns whether subslice is within b.
+func Contains(b, subslice []byte) bool {
+       return Index(b, subslice) != -1
+}
+
 // Index returns the index of the first instance of sep in s, or -1 if sep is not present in s.
 func Index(s, sep []byte) int {
        n := len(sep)
index 62f258d..9256b18 100644 (file)
@@ -9,7 +9,7 @@ import (
        "reflect"
        "testing"
        "unicode"
-       "utf8"
+       "unicode/utf8"
 )
 
 func eq(a, b []string) bool {
index d058c14..b2c13e5 100644 (file)
@@ -37,7 +37,7 @@ func newBitReader(r io.Reader) bitReader {
 
 // ReadBits64 reads the given number of bits and returns them in the
 // least-significant part of a uint64. In the event of an error, it returns 0
-// and the error can be obtained by calling Error().
+// and the error can be obtained by calling Err().
 func (br *bitReader) ReadBits64(bits uint) (n uint64) {
        for bits > br.bits {
                b, err := br.r.ReadByte()
@@ -82,6 +82,6 @@ func (br *bitReader) ReadBit() bool {
        return n != 0
 }
 
-func (br *bitReader) Error() error {
+func (br *bitReader) Err() error {
        return br.err
 }
index 343cca0..3dc8c62 100644 (file)
@@ -80,7 +80,7 @@ func (bz2 *reader) Read(buf []byte) (n int, err error) {
 
        if !bz2.setupDone {
                err = bz2.setup()
-               brErr := bz2.br.Error()
+               brErr := bz2.br.Err()
                if brErr != nil {
                        err = brErr
                }
@@ -91,7 +91,7 @@ func (bz2 *reader) Read(buf []byte) (n int, err error) {
        }
 
        n, err = bz2.read(buf)
-       brErr := bz2.br.Error()
+       brErr := bz2.br.Err()
        if brErr != nil {
                err = brErr
        }
diff --git a/libgo/go/compress/zlib/testdata/e.txt b/libgo/go/compress/zlib/testdata/e.txt
deleted file mode 100644 (file)
index 76cf2a7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-2.7182818284590452353602874713526624977572470936999595749669676277240766303535475945713821785251664274274663919320030599218174135966290435729003342952605956307381323286279434907632338298807531952510190115738341879307021540891499348841675092447614606680822648001684774118537423454424371075390777449920695517027618386062613313845830007520449338265602976067371132007093287091274437470472306969772093101416928368190255151086574637721112523897844250569536967707854499699679468644549059879316368892300987931277361782154249992295763514822082698951936680331825288693984964651058209392398294887933203625094431173012381970684161403970198376793206832823764648042953118023287825098194558153017567173613320698112509961818815930416903515988885193458072738667385894228792284998920868058257492796104841984443634632449684875602336248270419786232090021609902353043699418491463140934317381436405462531520961836908887070167683964243781405927145635490613031072085103837505101157477041718986106873969655212671546889570350354021234078498193343210681701210056278802351930332247450158539047304199577770935036604169973297250886876966403555707162268447162560798826517871341951246652010305921236677194325278675398558944896970964097545918569563802363701621120477427228364896134225164450781824423529486363721417402388934412479635743702637552944483379980161254922785092577825620926226483262779333865664816277251640191059004916449982893150566047258027786318641551956532442586982946959308019152987211725563475463964479101459040905862984967912874068705048958586717479854667757573205681288459205413340539220001137863009455606881667400169842055804033637953764520304024322566135278369511778838638744396625322498506549958862342818997077332761717839280349465014345588970719425863987727547109629537415211151368350627526023264847287039207643100595841166120545297030236472549296669381151373227536450988890313602057248176585118063036442812314965507047510254465011727211555194866850800368532281831521960037356252794495158284188294787610852639813955990067376482922443752871846245780361929819713991475644882626039033814418232625150974827987779964373089970388867782271383605772978824125611907176639465070633045279546618550966661856647097113444740160704626215680717481877844371436988218559670959102596862002353718588748569652200050311734392073211390803293634479727355955277349071783793421637012050054513263835440001863239914907054797780566978533580489669062951194324730995876552368128590413832411607226029983305353708761389396391779574540161372236187893652605381558415871869255386061647798340254351284396129460352913325942794904337299085731580290958631382683291477116396337092400316894586360606458459251269946557248391865642097526850823075442545993769170419777800853627309417101634349076964237222943523661255725088147792231519747780605696725380171807763603462459278778465850656050780844211529697521890874019660906651803516501792504619501366585436632712549639908549144200014574760819302212066024330096412704894390397177195180699086998606636583232278709376502260149291011517177635944602023249300280401867723910288097866605651183260043688508817157238669842242201024950551881694803221002515426494639812873677658927688163598312477886520141174110913601164995076629077943646005851941998560162647907615321038727557126992518275687989302761761146162549356495903798045838182323368612016243736569846703785853305275833337939907521660692380533698879565137285593883499894707416181550125397064648171946708348197214488898790676503795903669672494992545279033729636162658976039498576741397359441023744329709355477982629614591442936451428617158587339746791897571211956187385783644758448423555581050025611492391518893099463428413936080383091662818811503715284967059741625628236092168075150177725387402564253470879089137291722828611515915683725241630772254406337875931059826760944203261924285317018781772960235413060672136046000389661093647095141417185777014180606443636815464440053316087783143174440811949422975599314011888683314832802706553833004693290115744147563139997221703804617092894579096271662260740718749975359212756084414737823303270330168237193648002173285734935947564334129943024850235732214597843282641421684878721673367010615094243456984401873312810107945127223737886126058165668053714396127888732527373890392890506865324138062796025930387727697783792868409325365880733988457218746021005311483351323850047827169376218004904795597959290591655470505777514308175112698985188408718564026035305583737832422924185625644255022672155980274012617971928047139600689163828665277009752767069777036439260224372841840883251848770472638440379530166905465937461619323840363893131364327137688841026811219891275223056256756254701725086349765367288605966752740868627407912856576996313789753034660616669804218267724560530660773899624218340859882071864682623215080288286359746839654358856685503773131296587975810501214916207656769950659715344763470320853215603674828608378656803073062657633469774295634643716709397193060876963495328846833613038829431040800296873869117066666146800015121143442256023874474325250769387077775193299942137277211258843608715834835626961661980572526612206797540621062080649882918454395301529982092503005498257043390553570168653120526495614857249257386206917403695213533732531666345466588597286659451136441370331393672118569553952108458407244323835586063106806964924851232632699514603596037297253198368423363904632136710116192821711150282801604488058802382031981493096369596735832742024988245684941273860566491352526706046234450549227581151709314921879592718001940968866986837037302200475314338181092708030017205935530520700706072233999463990571311587099635777359027196285061146514837526209565346713290025994397663114545902685898979115837093419370441155121920117164880566945938131183843765620627846310490346293950029458341164824114969758326011800731699437393506966295712410273239138741754923071862454543222039552735295240245903805744502892246886285336542213815722131163288112052146489805180092024719391710555390113943316681515828843687606961102505171007392762385553386272553538830960671644662370922646809671254061869502143176211668140097595281493907222601112681153108387317617323235263605838173151034595736538223534992935822836851007810884634349983518404451704270189381994243410090575376257767571118090088164183319201962623416288166521374717325477727783488774366518828752156685719506371936565390389449366421764003121527870222366463635755503565576948886549500270853923617105502131147413744106134445544192101336172996285694899193369184729478580729156088510396781959429833186480756083679551496636448965592948187851784038773326247051945050419847742014183947731202815886845707290544057510601285258056594703046836344592652552137008068752009593453607316226118728173928074623094685367823106097921599360019946237993434210687813497346959246469752506246958616909178573976595199392993995567542714654910456860702099012606818704984178079173924071945996323060254707901774527513186809982284730860766536866855516467702911336827563107223346726113705490795365834538637196235856312618387156774118738527722922594743373785695538456246801013905727871016512966636764451872465653730402443684140814488732957847348490003019477888020460324660842875351848364959195082888323206522128104190448047247949291342284951970022601310430062410717971502793433263407995960531446053230488528972917659876016667811937932372453857209607582277178483361613582612896226118129455927462767137794487586753657544861407611931125958512655759734573015333642630767985443385761715333462325270572005303988289499034259566232975782488735029259166825894456894655992658454762694528780516501720674785417887982276806536650641910973434528878338621726156269582654478205672987756426325321594294418039943217000090542650763095588465895171709147607437136893319469090981904501290307099566226620303182649365733698419555776963787624918852865686607600566025605445711337286840205574416030837052312242587223438854123179481388550075689381124935386318635287083799845692619981794523364087429591180747453419551420351726184200845509170845682368200897739455842679214273477560879644279202708312150156406341341617166448069815483764491573900121217041547872591998943825364950514771379399147205219529079396137621107238494290616357604596231253506068537651423115349665683715116604220796394466621163255157729070978473156278277598788136491951257483328793771571459091064841642678309949723674420175862269402159407924480541255360431317992696739157542419296607312393763542139230617876753958711436104089409966089471418340698362993675362621545247298464213752891079884381306095552622720837518629837066787224430195793793786072107254277289071732854874374355781966511716618330881129120245204048682200072344035025448202834254187884653602591506445271657700044521097735585897622655484941621714989532383421600114062950718490427789258552743035221396835679018076406042138307308774460170842688272261177180842664333651780002171903449234264266292261456004337383868335555343453004264818473989215627086095650629340405264943244261445665921291225648893569655009154306426134252668472594914314239398845432486327461842846655985332312210466259890141712103446084271616619001257195870793217569698544013397622096749454185407118446433946990162698351607848924514058940946395267807354579700307051163682519487701189764002827648414160587206184185297189154019688253289309149665345753571427318482016384644832499037886069008072709327673127581966563941148961716832980455139729506687604740915420428429993541025829113502241690769431668574242522509026939034814856451303069925199590436384028429267412573422447765584177886171737265462085498294498946787350929581652632072258992368768457017823038096567883112289305809140572610865884845873101658151167533327674887014829167419701512559782572707406431808601428149024146780472327597684269633935773542930186739439716388611764209004068663398856841681003872389214483176070116684503887212364367043314091155733280182977988736590916659612402021778558854876176161989370794380056663364884365089144805571039765214696027662583599051987042300179465536788
diff --git a/libgo/go/compress/zlib/testdata/pi.txt b/libgo/go/compress/zlib/testdata/pi.txt
deleted file mode 100644 (file)
index 58d8f3b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679821480865132823066470938446095505822317253594081284811174502841027019385211055596446229489549303819644288109756659334461284756482337867831652712019091456485669234603486104543266482133936072602491412737245870066063155881748815209209628292540917153643678925903600113305305488204665213841469519415116094330572703657595919530921861173819326117931051185480744623799627495673518857527248912279381830119491298336733624406566430860213949463952247371907021798609437027705392171762931767523846748184676694051320005681271452635608277857713427577896091736371787214684409012249534301465495853710507922796892589235420199561121290219608640344181598136297747713099605187072113499999983729780499510597317328160963185950244594553469083026425223082533446850352619311881710100031378387528865875332083814206171776691473035982534904287554687311595628638823537875937519577818577805321712268066130019278766111959092164201989380952572010654858632788659361533818279682303019520353018529689957736225994138912497217752834791315155748572424541506959508295331168617278558890750983817546374649393192550604009277016711390098488240128583616035637076601047101819429555961989467678374494482553797747268471040475346462080466842590694912933136770289891521047521620569660240580381501935112533824300355876402474964732639141992726042699227967823547816360093417216412199245863150302861829745557067498385054945885869269956909272107975093029553211653449872027559602364806654991198818347977535663698074265425278625518184175746728909777727938000816470600161452491921732172147723501414419735685481613611573525521334757418494684385233239073941433345477624168625189835694855620992192221842725502542568876717904946016534668049886272327917860857843838279679766814541009538837863609506800642251252051173929848960841284886269456042419652850222106611863067442786220391949450471237137869609563643719172874677646575739624138908658326459958133904780275900994657640789512694683983525957098258226205224894077267194782684826014769909026401363944374553050682034962524517493996514314298091906592509372216964615157098583874105978859597729754989301617539284681382686838689427741559918559252459539594310499725246808459872736446958486538367362226260991246080512438843904512441365497627807977156914359977001296160894416948685558484063534220722258284886481584560285060168427394522674676788952521385225499546667278239864565961163548862305774564980355936345681743241125150760694794510965960940252288797108931456691368672287489405601015033086179286809208747609178249385890097149096759852613655497818931297848216829989487226588048575640142704775551323796414515237462343645428584447952658678210511413547357395231134271661021359695362314429524849371871101457654035902799344037420073105785390621983874478084784896833214457138687519435064302184531910484810053706146806749192781911979399520614196634287544406437451237181921799983910159195618146751426912397489409071864942319615679452080951465502252316038819301420937621378559566389377870830390697920773467221825625996615014215030680384477345492026054146659252014974428507325186660021324340881907104863317346496514539057962685610055081066587969981635747363840525714591028970641401109712062804390397595156771577004203378699360072305587631763594218731251471205329281918261861258673215791984148488291644706095752706957220917567116722910981690915280173506712748583222871835209353965725121083579151369882091444210067510334671103141267111369908658516398315019701651511685171437657618351556508849099898599823873455283316355076479185358932261854896321329330898570642046752590709154814165498594616371802709819943099244889575712828905923233260972997120844335732654893823911932597463667305836041428138830320382490375898524374417029132765618093773444030707469211201913020330380197621101100449293215160842444859637669838952286847831235526582131449576857262433441893039686426243410773226978028073189154411010446823252716201052652272111660396665573092547110557853763466820653109896526918620564769312570586356620185581007293606598764861179104533488503461136576867532494416680396265797877185560845529654126654085306143444318586769751456614068007002378776591344017127494704205622305389945613140711270004078547332699390814546646458807972708266830634328587856983052358089330657574067954571637752542021149557615814002501262285941302164715509792592309907965473761255176567513575178296664547791745011299614890304639947132962107340437518957359614589019389713111790429782856475032031986915140287080859904801094121472213179476477726224142548545403321571853061422881375850430633217518297986622371721591607716692547487389866549494501146540628433663937900397692656721463853067360965712091807638327166416274888800786925602902284721040317211860820419000422966171196377921337575114959501566049631862947265473642523081770367515906735023507283540567040386743513622224771589150495309844489333096340878076932599397805419341447377441842631298608099888687413260472156951623965864573021631598193195167353812974167729478672422924654366800980676928238280689964004824354037014163149658979409243237896907069779422362508221688957383798623001593776471651228935786015881617557829735233446042815126272037343146531977774160319906655418763979293344195215413418994854447345673831624993419131814809277771038638773431772075456545322077709212019051660962804909263601975988281613323166636528619326686336062735676303544776280350450777235547105859548702790814356240145171806246436267945612753181340783303362542327839449753824372058353114771199260638133467768796959703098339130771098704085913374641442822772634659470474587847787201927715280731767907707157213444730605700733492436931138350493163128404251219256517980694113528013147013047816437885185290928545201165839341965621349143415956258658655705526904965209858033850722426482939728584783163057777560688876446248246857926039535277348030480290058760758251047470916439613626760449256274204208320856611906254543372131535958450687724602901618766795240616342522577195429162991930645537799140373404328752628889639958794757291746426357455254079091451357111369410911939325191076020825202618798531887705842972591677813149699009019211697173727847684726860849003377024242916513005005168323364350389517029893922334517220138128069650117844087451960121228599371623130171144484640903890644954440061986907548516026327505298349187407866808818338510228334508504860825039302133219715518430635455007668282949304137765527939751754613953984683393638304746119966538581538420568533862186725233402830871123282789212507712629463229563989898935821167456270102183564622013496715188190973038119800497340723961036854066431939509790190699639552453005450580685501956730229219139339185680344903982059551002263535361920419947455385938102343955449597783779023742161727111723643435439478221818528624085140066604433258885698670543154706965747458550332323342107301545940516553790686627333799585115625784322988273723198987571415957811196358330059408730681216028764962867446047746491599505497374256269010490377819868359381465741268049256487985561453723478673303904688383436346553794986419270563872931748723320837601123029911367938627089438799362016295154133714248928307220126901475466847653576164773794675200490757155527819653621323926406160136358155907422020203187277605277219005561484255518792530343513984425322341576233610642506390497500865627109535919465897514131034822769306247435363256916078154781811528436679570611086153315044521274739245449454236828860613408414863776700961207151249140430272538607648236341433462351897576645216413767969031495019108575984423919862916421939949072362346468441173940326591840443780513338945257423995082965912285085558215725031071257012668302402929525220118726767562204154205161841634847565169998116141010029960783869092916030288400269104140792886215078424516709087000699282120660418371806535567252532567532861291042487761825829765157959847035622262934860034158722980534989650226291748788202734209222245339856264766914905562842503912757710284027998066365825488926488025456610172967026640765590429099456815065265305371829412703369313785178609040708667114965583434347693385781711386455873678123014587687126603489139095620099393610310291616152881384379099042317473363948045759314931405297634757481193567091101377517210080315590248530906692037671922033229094334676851422144773793937517034436619910403375111735471918550464490263655128162288244625759163330391072253837421821408835086573917715096828874782656995995744906617583441375223970968340800535598491754173818839994469748676265516582765848358845314277568790029095170283529716344562129640435231176006651012412006597558512761785838292041974844236080071930457618932349229279650198751872127267507981255470958904556357921221033346697499235630254947802490114195212382815309114079073860251522742995818072471625916685451333123948049470791191532673430282441860414263639548000448002670496248201792896476697583183271314251702969234889627668440323260927524960357996469256504936818360900323809293459588970695365349406034021665443755890045632882250545255640564482465151875471196218443965825337543885690941130315095261793780029741207665147939425902989695946995565761218656196733786236256125216320862869222103274889218654364802296780705765615144632046927906821207388377814233562823608963208068222468012248261177185896381409183903673672220888321513755600372798394004152970028783076670944474560134556417254370906979396122571429894671543578468788614445812314593571984922528471605049221242470141214780573455105008019086996033027634787081081754501193071412233908663938339529425786905076431006383519834389341596131854347546495569781038293097164651438407007073604112373599843452251610507027056235266012764848308407611830130527932054274628654036036745328651057065874882256981579367897669742205750596834408697350201410206723585020072452256326513410559240190274216248439140359989535394590944070469120914093870012645600162374288021092764579310657922955249887275846101264836999892256959688159205600101655256375678
index 2dfe5b4..ca91139 100644 (file)
@@ -11,14 +11,17 @@ import "sort"
 
 // Any type that implements heap.Interface may be used as a
 // min-heap with the following invariants (established after
-// Init has been called):
+// Init has been called or if the data is empty or sorted):
 //
 //     !h.Less(j, i) for 0 <= i < h.Len() and j = 2*i+1 or 2*i+2 and j < h.Len()
 //
+// Note that Push and Pop in this interface are for package heap's
+// implementation to call.  To add and remove things from the heap,
+// use heap.Push and heap.Pop.
 type Interface interface {
        sort.Interface
-       Push(x interface{})
-       Pop() interface{}
+       Push(x interface{}) // add x as element Len()
+       Pop() interface{}   // remove and return element Len() - 1.
 }
 
 // A heap must be initialized before any of the heap operations
index 6625e3a..cb31ef6 100644 (file)
@@ -5,8 +5,8 @@
 package heap_test
 
 import (
-       "testing"
        . "container/heap"
+       "testing"
 )
 
 type myHeap []int
index 692d62a..a2adc7e 100644 (file)
@@ -6,9 +6,9 @@
 package dsa
 
 import (
-       "big"
        "errors"
        "io"
+       "math/big"
 )
 
 // Parameters represents the domain parameters for a key. These parameters can
index deec08d..177aa44 100644 (file)
@@ -5,8 +5,8 @@
 package dsa
 
 import (
-       "big"
        "crypto/rand"
+       "math/big"
        "testing"
 )
 
index b7f235b..2f19999 100644 (file)
@@ -13,9 +13,9 @@ package ecdsa
 //     http://www.secg.org/download/aid-780/sec1-v2.pdf
 
 import (
-       "big"
        "crypto/elliptic"
        "io"
+       "math/big"
 )
 
 // PublicKey represents an ECDSA public key.
index d6b4039..22360b5 100644 (file)
@@ -5,11 +5,11 @@
 package ecdsa
 
 import (
-       "big"
        "crypto/elliptic"
-       "crypto/sha1"
        "crypto/rand"
+       "crypto/sha1"
        "encoding/hex"
+       "math/big"
        "testing"
 )
 
index 3c3327f..b7232a2 100644 (file)
@@ -14,8 +14,8 @@ package elliptic
 // reverse the transform than to operate in affine coordinates.
 
 import (
-       "big"
        "io"
+       "math/big"
        "sync"
 )
 
index 9578364..a68a380 100644 (file)
@@ -5,9 +5,9 @@
 package elliptic
 
 import (
-       "big"
        "crypto/rand"
        "fmt"
+       "math/big"
        "testing"
 )
 
index bcae63b..03431c9 100644 (file)
@@ -5,8 +5,8 @@
 package hmac
 
 import (
-       "hash"
        "fmt"
+       "hash"
        "testing"
 )
 
index f697fa1..a04b5bd 100644 (file)
@@ -8,12 +8,12 @@
 package ocsp
 
 import (
-       "asn1"
        "crypto"
        "crypto/rsa"
        _ "crypto/sha1"
        "crypto/x509"
        "crypto/x509/pkix"
+       "encoding/asn1"
        "time"
 )
 
index 707bdf3..3bbb5dc 100644 (file)
@@ -151,7 +151,7 @@ func (r *openpgpReader) Read(p []byte) (n int, err error) {
 }
 
 // Decode reads a PGP armored block from the given Reader. It will ignore
-// leading garbage. If it doesn't find a block, it will return nil, os.EOF. The
+// leading garbage. If it doesn't find a block, it will return nil, io.EOF. The
 // given Reader is not usable after calling this function: an arbitrary amount
 // of data may have been read past the end of the block.
 func Decode(in io.Reader) (p *Block, err error) {
index 2ed49f6..a553bde 100644 (file)
 package elgamal
 
 import (
-       "big"
        "crypto/rand"
        "crypto/subtle"
        "errors"
        "io"
+       "math/big"
 )
 
 // PublicKey represents an ElGamal public key.
index 101121a..c4f99f5 100644 (file)
@@ -5,9 +5,9 @@
 package elgamal
 
 import (
-       "big"
        "bytes"
        "crypto/rand"
+       "math/big"
        "testing"
 )
 
index d05103f..b24fa3a 100644 (file)
@@ -5,13 +5,13 @@
 package packet
 
 import (
-       "big"
        "crypto/openpgp/elgamal"
        error_ "crypto/openpgp/error"
        "crypto/rand"
        "crypto/rsa"
        "encoding/binary"
        "io"
+       "math/big"
        "strconv"
 )
 
index b402245..2b8eff7 100644 (file)
@@ -5,11 +5,11 @@
 package packet
 
 import (
-       "big"
        "bytes"
        "crypto/rand"
        "crypto/rsa"
        "fmt"
+       "math/big"
        "testing"
 )
 
index f7ed353..778df15 100644 (file)
@@ -7,12 +7,12 @@
 package packet
 
 import (
-       "big"
        "crypto/aes"
        "crypto/cast5"
        "crypto/cipher"
        error_ "crypto/openpgp/error"
        "io"
+       "math/big"
 )
 
 // readFull is the same as io.ReadFull except that reading zero bytes returns
index 742ac51..c0ff82b 100644 (file)
@@ -5,7 +5,6 @@
 package packet
 
 import (
-       "big"
        "bytes"
        "crypto/cipher"
        "crypto/dsa"
@@ -16,6 +15,7 @@ import (
        "crypto/sha1"
        "io"
        "io/ioutil"
+       "math/big"
        "strconv"
 )
 
index af0bc22..7d71dc4 100644 (file)
@@ -5,7 +5,6 @@
 package packet
 
 import (
-       "big"
        "crypto/dsa"
        "crypto/openpgp/elgamal"
        error_ "crypto/openpgp/error"
@@ -15,6 +14,7 @@ import (
        "fmt"
        "hash"
        "io"
+       "math/big"
        "strconv"
 )
 
index ec4012c..3a094a1 100644 (file)
@@ -6,8 +6,8 @@ package s2k
 
 import (
        "bytes"
-       "crypto/sha1"
        "crypto/rand"
+       "crypto/sha1"
        "encoding/hex"
        "testing"
 )
index 322da4a..b44ae98 100644 (file)
@@ -5,8 +5,8 @@
 package rand
 
 import (
-       "big"
        "io"
+       "math/big"
        "os"
 )
 
index 901539d..d7b053f 100644 (file)
@@ -5,11 +5,11 @@
 package rsa
 
 import (
-       "big"
        "crypto"
        "crypto/subtle"
        "errors"
        "io"
+       "math/big"
 )
 
 // This file implements encryption and decryption using PKCS#1 v1.5 padding.
index d69bacf..66188ac 100644 (file)
@@ -5,7 +5,6 @@
 package rsa
 
 import (
-       "big"
        "bytes"
        "crypto"
        "crypto/rand"
@@ -13,6 +12,7 @@ import (
        "encoding/base64"
        "encoding/hex"
        "io"
+       "math/big"
        "testing"
        "testing/quick"
 )
index c9344ff..27ccf61 100644 (file)
@@ -8,12 +8,12 @@ package rsa
 // TODO(agl): Add support for PSS padding.
 
 import (
-       "big"
        "crypto/rand"
        "crypto/subtle"
        "errors"
        "hash"
        "io"
+       "math/big"
 )
 
 var bigZero = big.NewInt(0)
index c36bca1..0fb9875 100644 (file)
@@ -5,10 +5,10 @@
 package rsa
 
 import (
-       "big"
        "bytes"
        "crypto/rand"
        "crypto/sha1"
+       "math/big"
        "testing"
 )
 
index 6312c34..f4178e3 100644 (file)
@@ -471,7 +471,7 @@ Again:
                // RFC suggests that EOF without an alertCloseNotify is
                // an error, but popular web sites seem to do this,
                // so we can't make it an error.
-               // if err == os.EOF {
+               // if err == io.EOF {
                //      err = io.ErrUnexpectedEOF
                // }
                if e, ok := err.(net.Error); !ok || !e.Temporary() {
index 41206e2..c4463ff 100644 (file)
@@ -8,14 +8,14 @@
 package main
 
 import (
-       "big"
-       "crypto/x509/pkix"
        "crypto/rand"
        "crypto/rsa"
        "crypto/x509"
+       "crypto/x509/pkix"
        "encoding/pem"
        "flag"
        "log"
+       "math/big"
        "os"
        "time"
 )
index dc68a12..87e8f7e 100644 (file)
@@ -5,7 +5,7 @@
 package tls
 
 import (
-       "rand"
+       "math/rand"
        "reflect"
        "testing"
        "testing/quick"
index f2b0a14..bc37979 100644 (file)
@@ -5,12 +5,12 @@
 package tls
 
 import (
-       "big"
        "bytes"
        "crypto/rsa"
        "encoding/hex"
        "flag"
        "io"
+       "math/big"
        "net"
        "strconv"
        "strings"
index ba34606..08fb852 100644 (file)
@@ -5,7 +5,6 @@
 package tls
 
 import (
-       "big"
        "crypto"
        "crypto/elliptic"
        "crypto/md5"
@@