Bring over accumulated bug fixes from mainline.

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

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index bb70b0f..7923567 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -25,6 +25,7 @@ STAMP = echo timestamp >
 
 toolexecdir = $(glibgo_toolexecdir)
 toolexeclibdir = $(glibgo_toolexeclibdir)
+toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
 
 LIBFFI = @LIBFFI@
 LIBFFIINCS = @LIBFFIINCS@
@@ -97,8 +98,6 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 toolexeclib_LTLIBRARIES = libgo.la
 toolexeclib_LIBRARIES = libgobegin.a
 
-toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias)
-
 toolexeclibgo_DATA = \
        bufio.gox \
        bytes.gox \
@@ -257,13 +256,11 @@ toolexeclibgohtml_DATA = \
 toolexeclibgoimagedir = $(toolexeclibgodir)/image
 
 toolexeclibgoimage_DATA = \
-       image/bmp.gox \
        image/color.gox \
        image/draw.gox \
        image/gif.gox \
        image/jpeg.gox \
-       image/png.gox \
-       image/tiff.gox
+       image/png.gox
 
 toolexeclibgoindexdir = $(toolexeclibgodir)/index
 
@@ -327,8 +324,8 @@ toolexeclibgoosdir = $(toolexeclibgodir)/os
 
 toolexeclibgoos_DATA = \
        os/exec.gox \
-       os/user.gox \
-       os/signal.gox
+       os/signal.gox \
+       os/user.gox
 
 toolexeclibgopathdir = $(toolexeclibgodir)/path
 
@@ -355,8 +352,7 @@ toolexeclibgotestingdir = $(toolexeclibgodir)/testing
 
 toolexeclibgotesting_DATA = \
        testing/iotest.gox \
-       testing/quick.gox \
-       testing/script.gox
+       testing/quick.gox
 
 toolexeclibgotextdir = $(toolexeclibgodir)/text
 
@@ -401,6 +397,7 @@ runtime_files = \
        runtime/go-byte-array-to-string.c \
        runtime/go-breakpoint.c \
        runtime/go-caller.c \
+       runtime/go-callers.c \
        runtime/go-can-convert-interface.c \
        runtime/go-cgo.c \
        runtime/go-check-interface.c \
@@ -431,7 +428,6 @@ runtime_files = \
        runtime/go-panic.c \
        runtime/go-print.c \
        runtime/go-recover.c \
-       runtime/go-reflect.c \
        runtime/go-reflect-call.c \
        runtime/go-reflect-map.c \
        runtime/go-rune.c \
@@ -443,6 +439,7 @@ runtime_files = \
        runtime/go-string-to-int-array.c \
        runtime/go-strplus.c \
        runtime/go-strslice.c \
+       runtime/go-traceback.c \
        runtime/go-trampoline.c \
        runtime/go-type-complex.c \
        runtime/go-type-eface.c \
@@ -453,7 +450,6 @@ runtime_files = \
        runtime/go-type-string.c \
        runtime/go-typedesc-equal.c \
        runtime/go-typestring.c \
-       runtime/go-unreflect.c \
        runtime/go-unsafe-new.c \
        runtime/go-unsafe-newarray.c \
        runtime/go-unsafe-pointer.c \
@@ -469,8 +465,10 @@ runtime_files = \
        runtime/mgc0.c \
        runtime/mheap.c \
        runtime/msize.c \
+       runtime/print.c \
        runtime/proc.c \
        runtime/runtime.c \
+       runtime/signal_unix.c \
        runtime/thread.c \
        runtime/yield.c \
        $(rtems_task_variable_add_file) \
@@ -492,31 +490,31 @@ goc2c: goc2c.$(OBJEXT)
        $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $<
 
 malloc.c: $(srcdir)/runtime/malloc.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 mprof.c: $(srcdir)/runtime/mprof.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 reflect.c: $(srcdir)/runtime/reflect.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_reflect $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 runtime1.c: $(srcdir)/runtime/runtime1.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 sema.c: $(srcdir)/runtime/sema.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 sigqueue.c: $(srcdir)/runtime/sigqueue.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_runtime $< > $@.tmp
+       ./goc2c --gcc --go-pkgpath os_signal $< > $@.tmp
        mv -f $@.tmp $@
 
 time.c: $(srcdir)/runtime/time.goc goc2c
-       ./goc2c --gcc --go-prefix libgo_time $< > $@.tmp
+       ./goc2c --gcc $< > $@.tmp
        mv -f $@.tmp $@
 
 %.c: $(srcdir)/runtime/%.goc goc2c
@@ -529,7 +527,8 @@ go_bufio_files = \
 go_bytes_files = \
        go/bytes/buffer.go \
        go/bytes/bytes.go \
-       go/bytes/bytes_decl.go
+       go/bytes/bytes_decl.go \
+       go/bytes/reader.go
 go_bytes_c_files = \
        go/bytes/indexbyte.c
 
@@ -657,14 +656,21 @@ go_net_sockoptip_file = go/net/sockoptip_linux.go
 else
 if LIBGO_IS_SOLARIS
 go_net_cgo_file = go/net/cgo_linux.go
-go_net_sock_file = go/net/sock_linux.go
-go_net_sockopt_file = go/net/sockopt_linux.go
-go_net_sockoptip_file = go/net/sockoptip_linux.go
+go_net_sock_file = go/net/sock_solaris.go
+go_net_sockopt_file = go/net/sockopt_bsd.go
+go_net_sockoptip_file = go/net/sockoptip_bsd.go go/net/sockoptip_solaris.go
 else
+if LIBGO_IS_FREEBSD
 go_net_cgo_file = go/net/cgo_bsd.go
 go_net_sock_file = go/net/sock_bsd.go
 go_net_sockopt_file = go/net/sockopt_bsd.go
-go_net_sockoptip_file = go/net/sockoptip_bsd.go
+go_net_sockoptip_file = go/net/sockoptip_bsd.go go/net/sockoptip_freebsd.go
+else
+go_net_cgo_file = go/net/cgo_bsd.go
+go_net_sock_file = go/net/sock_bsd.go
+go_net_sockopt_file = go/net/sockopt_bsd.go
+go_net_sockoptip_file = go/net/sockoptip_bsd.go go/net/sockoptip_netbsd.go
+endif
 endif
 endif
 endif
@@ -707,6 +713,7 @@ go_net_files = \
        go/net/ipsock.go \
        go/net/ipsock_posix.go \
        go/net/lookup_unix.go \
+       go/net/mac.go \
        go/net/net.go \
        go/net/parse.go \
        go/net/pipe.go \
@@ -787,9 +794,7 @@ go_os_files = \
        $(go_os_stat_file) \
        go/os/str.go \
        $(go_os_sys_file) \
-       go/os/time.go \
-       go/os/types.go \
-       signal_unix.go
+       go/os/types.go
 
 go_path_files = \
        go/path/match.go \
@@ -810,11 +815,11 @@ go_net_rpc_files = \
        go/net/rpc/server.go
 
 go_runtime_files = \
+       go/runtime/compiler.go \
        go/runtime/debug.go \
        go/runtime/error.go \
        go/runtime/extern.go \
        go/runtime/mem.go \
-       go/runtime/sig.go \
        go/runtime/softfloat64.go \
        go/runtime/type.go \
        version.go
@@ -841,6 +846,7 @@ go_strconv_files = \
        go/strconv/decimal.go \
        go/strconv/extfloat.go \
        go/strconv/ftoa.go \
+       go/strconv/isprint.go \
        go/strconv/itoa.go \
        go/strconv/quote.go
 
@@ -853,6 +859,7 @@ go_sync_files = \
        go/sync/cond.go \
        go/sync/mutex.go \
        go/sync/once.go \
+       go/sync/runtime.go \
        go/sync/rwmutex.go \
        go/sync/waitgroup.go
 
@@ -884,6 +891,7 @@ go_time_files = \
        go/time/tick.go \
        go/time/time.go \
        go/time/zoneinfo.go \
+       go/time/zoneinfo_read.go \
        go/time/zoneinfo_unix.go
 
 go_unicode_files = \
@@ -949,7 +957,6 @@ go_crypto_cipher_files = \
        go/crypto/cipher/cipher.go \
        go/crypto/cipher/ctr.go \
        go/crypto/cipher/io.go \
-       go/crypto/cipher/ocfb.go \
        go/crypto/cipher/ofb.go
 go_crypto_des_files = \
        go/crypto/des/block.go \
@@ -997,12 +1004,13 @@ go_crypto_tls_files = \
        go/crypto/tls/handshake_server.go \
        go/crypto/tls/key_agreement.go \
        go/crypto/tls/prf.go \
-       go/crypto/tls/root_unix.go \
        go/crypto/tls/tls.go
 go_crypto_x509_files = \
        go/crypto/x509/cert_pool.go \
        go/crypto/x509/pkcs1.go \
        go/crypto/x509/pkcs8.go \
+       go/crypto/x509/root.go \
+       go/crypto/x509/root_unix.go \
        go/crypto/x509/verify.go \
        go/crypto/x509/x509.go
 
@@ -1021,12 +1029,14 @@ go_debug_dwarf_files = \
        go/debug/dwarf/buf.go \
        go/debug/dwarf/const.go \
        go/debug/dwarf/entry.go \
+       go/debug/dwarf/line.go \
        go/debug/dwarf/open.go \
        go/debug/dwarf/type.go \
        go/debug/dwarf/unit.go
 go_debug_elf_files = \
        go/debug/elf/elf.go \
-       go/debug/elf/file.go
+       go/debug/elf/file.go \
+       go/debug/elf/runtime.go
 go_debug_gosym_files = \
        go/debug/gosym/pclntab.go \
        go/debug/gosym/symtab.go
@@ -1098,6 +1108,7 @@ go_exp_norm_files = \
        go/exp/norm/composition.go \
        go/exp/norm/forminfo.go \
        go/exp/norm/input.go \
+       go/exp/norm/iter.go \
        go/exp/norm/normalize.go \
        go/exp/norm/readwriter.go \
        go/exp/norm/tables.go \
@@ -1130,8 +1141,7 @@ go_go_ast_files = \
        go/go/ast/walk.go
 go_go_build_files = \
        go/go/build/build.go \
-       go/go/build/dir.go \
-       go/go/build/path.go \
+       go/go/build/doc.go \
        syslist.go
 go_go_doc_files = \
        go/go/doc/comment.go \
@@ -1139,7 +1149,8 @@ go_go_doc_files = \
        go/go/doc/example.go \
        go/go/doc/exports.go \
        go/go/doc/filter.go \
-       go/go/doc/reader.go
+       go/go/doc/reader.go \
+       go/go/doc/synopsis.go
 go_go_parser_files = \
        go/go/parser/interface.go \
        go/go/parser/parser.go
@@ -1166,7 +1177,6 @@ go_hash_fnv_files = \
 
 go_html_template_files = \
        go/html/template/attr.go \
-       go/html/template/clone.go \
        go/html/template/content.go \
        go/html/template/context.go \
        go/html/template/css.go \
@@ -1179,9 +1189,6 @@ go_html_template_files = \
        go/html/template/transition.go \
        go/html/template/url.go
 
-go_image_bmp_files = \
-       go/image/bmp/reader.go
-
 go_image_color_files = \
        go/image/color/color.go \
        go/image/color/ycbcr.go
@@ -1203,12 +1210,6 @@ go_image_png_files = \
        go/image/png/reader.go \
        go/image/png/writer.go
 
-go_image_tiff_files = \
-       go/image/tiff/buffer.go \
-       go/image/tiff/compress.go \
-       go/image/tiff/consts.go \
-       go/image/tiff/reader.go
-
 go_index_suffixarray_files = \
        go/index/suffixarray/qsufsort.go \
        go/index/suffixarray/suffixarray.go
@@ -1313,17 +1314,19 @@ go_os_exec_files = \
        go/os/exec/exec.go \
        go/os/exec/lp_unix.go
 
+go_os_signal_files = \
+       go/os/signal/signal.go \
+       go/os/signal/signal_unix.go
+
 go_os_user_files = \
        go/os/user/user.go \
        go/os/user/lookup_unix.go
 
-go_os_signal_files = \
-       go/os/signal/signal.go
-
 go_path_filepath_files = \
        go/path/filepath/match.go \
        go/path/filepath/path.go \
-       go/path/filepath/path_unix.go
+       go/path/filepath/path_unix.go \
+       go/path/filepath/symlink.go
 
 go_regexp_syntax_files = \
        go/regexp/syntax/compile.go \
@@ -1366,8 +1369,6 @@ go_testing_iotest_files = \
        go/testing/iotest/writer.go
 go_testing_quick_files = \
        go/testing/quick/quick.go
-go_testing_script_files = \
-       go/testing/script/script.go
 
 go_text_scanner_files = \
        go/text/scanner/scanner.go
@@ -1503,6 +1504,13 @@ else
 syscall_netlink_file =
 endif
 
+# GNU/Linux specific socket filters.
+if LIBGO_IS_LINUX
+syscall_lsf_file = go/syscall/lsf_linux.go
+else
+syscall_lsf_file =
+endif
+
 go_base_syscall_files = \
        go/syscall/env_unix.go \
        go/syscall/syscall_errno.go \
@@ -1523,6 +1531,7 @@ go_base_syscall_files = \
        $(syscall_socket_file) \
        $(syscall_uname_file) \
        $(syscall_netlink_file) \
+       $(syscall_lsf_file) \
        $(GO_LIBCALL_OS_FILE) \
        $(GO_LIBCALL_OS_ARCH_FILE) \
        $(GO_SYSCALL_OS_FILE) \
@@ -1535,6 +1544,7 @@ go_syscall_files = \
        syscall_arch.go
 go_syscall_c_files = \
        go/syscall/errno.c \
+       go/syscall/signame.c \
        $(syscall_wait_c_file)
 
 libcalls.go: s-libcalls; @true
@@ -1596,33 +1606,38 @@ os_lib_inotify_lo =
 endif
 
 libgo_go_objs = \
-       bufio/bufio.lo \
-       bytes/bytes.lo \
+       bufio.lo \
+       bytes.lo \
        bytes/index.lo \
-       crypto/crypto.lo \
-       errors/errors.lo \
-       expvar/expvar.lo \
-       flag/flag.lo \
-       fmt/fmt.lo \
-       hash/hash.lo \
-       html/html.lo \
-       image/image.lo \
-       io/io.lo \
-       log/log.lo \
-       math/math.lo \
-       net/net.lo \
-       os/exec.lo \
-       os/os.lo \
-       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 \
+       crypto.lo \
+       errors.lo \
+       expvar.lo \
+       flag.lo \
+       fmt.lo \
+       hash.lo \
+       html.lo \
+       image.lo \
+       io.lo \
+       log.lo \
+       math.lo \
+       mime.lo \
+       net.lo \
+       os.lo \
+       path.lo \
+       reflect-go.lo \
+       regexp.lo \
+       runtime-go.lo \
+       sort.lo \
+       strconv.lo \
+       strings.lo \
+       sync.lo \
+       syscall.lo \
+       syscall/errno.lo \
+       syscall/signame.lo \
+       syscall/wait.lo \
+       testing.lo \
+       time-go.lo \
+       unicode.lo \
        archive/tar.lo \
        archive/zip.lo \
        compress/bzip2.lo \
@@ -1693,13 +1708,11 @@ libgo_go_objs = \
        net/http/httptest.lo \
        net/http/httputil.lo \
        net/http/pprof.lo \
-       image/bmp.lo \
        image/color.lo \
        image/draw.lo \
        image/gif.lo \
        image/jpeg.lo \
        image/png.lo \
-       image/tiff.lo \
        index/suffixarray.lo \
        io/ioutil.lo \
        log/syslog.lo \
@@ -1707,7 +1720,6 @@ libgo_go_objs = \
        math/big.lo \
        math/cmplx.lo \
        math/rand.lo \
-       mime/mime.lo \
        mime/multipart.lo \
        net/http.lo \
        net/mail.lo \
@@ -1718,9 +1730,10 @@ libgo_go_objs = \
        old/netchan.lo \
        old/regexp.lo \
        old/template.lo \
+       os/exec.lo \
        $(os_lib_inotify_lo) \
-       os/user.lo \
        os/signal.lo \
+       os/user.lo \
        path/filepath.lo \
        regexp/syntax.lo \
        net/rpc/jsonrpc.lo \
@@ -1728,17 +1741,12 @@ libgo_go_objs = \
        runtime/pprof.lo \
        sync/atomic.lo \
        sync/atomic_c.lo \
-       syscall/syscall.lo \
-       syscall/errno.lo \
-       syscall/wait.lo \
        text/scanner.lo \
        text/tabwriter.lo \
        text/template.lo \
        text/template/parse.lo \
-       testing/testing.lo \
        testing/iotest.lo \
        testing/quick.lo \
-       testing/script.lo \
        unicode/utf16.lo \
        unicode/utf8.lo
 
@@ -1774,7 +1782,7 @@ BUILDDEPS = \
 BUILDPACKAGE = \
        $(MKDIR_P) $(@D); \
        files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \
-       $(LTGOCOMPILE) -I . -c -fgo-prefix="libgo_$(@D)" -o $@ $$files
+       $(LTGOCOMPILE) -I . -c -fgo-pkgpath=`echo $@ | sed -e 's/.lo$$//' -e 's/-go$$//'` -o $@ $$files
 
 if LIBGO_IS_RTEMS
 use_dejagnu = yes
@@ -1798,13 +1806,12 @@ CHECK = \
        LD_LIBRARY_PATH="`${PWD_COMMAND}`/.libs:$${libgccdir}:${LD_LIBRARY_PATH}"; \
        LD_LIBRARY_PATH=`echo $${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \
        export LD_LIBRARY_PATH; \
+       $(MKDIR_P) $(@D); \
        rm -f $@-testsum $@-testlog; \
-       prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \
-       test "$${prefix}" != "." || prefix="$(@D)"; \
        if test "$(use_dejagnu)" = "yes"; then \
-         $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" $(GOTESTFLAGS); \
+         $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" --goarch="$(GOARCH)" $(GOTESTFLAGS); \
        else \
-         if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
+         if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --goarch="$(GOARCH)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
            echo "PASS: $(@D)" >> $@-testlog; \
            echo "PASS: $(@D)"; \
            echo "PASS: $(@D)" > $@-testsum; \
@@ -1846,262 +1853,249 @@ CHECK_DEPS = libgo.la libgobegin.a \
        $(toolexeclibgotexttemplate_DATA) \
        $(toolexeclibgounicode_DATA)
 
-@go_include@ bufio/bufio.lo.dep
-bufio/bufio.lo.dep: $(go_bufio_files)
+@go_include@ bufio.lo.dep
+bufio.lo.dep: $(go_bufio_files)
        $(BUILDDEPS)
-bufio/bufio.lo: $(go_bufio_files)
+bufio.lo: $(go_bufio_files)
        $(BUILDPACKAGE)
 bufio/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: bufio/check
 
-@go_include@ bytes/bytes.lo.dep
-bytes/bytes.lo.dep: $(go_bytes_files)
+@go_include@ bytes.lo.dep
+bytes.lo.dep: $(go_bytes_files)
        $(BUILDDEPS)
-bytes/bytes.lo: $(go_bytes_files)
+bytes.lo: $(go_bytes_files)
        $(BUILDPACKAGE)
-bytes/index.lo: $(go_bytes_c_files) bytes/bytes.lo
+bytes/index.lo: $(go_bytes_c_files)
+       @$(MKDIR_P) bytes
        $(LTCOMPILE) -c -o bytes/index.lo $(srcdir)/go/bytes/indexbyte.c
 bytes/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: bytes/check
 
-@go_include@ crypto/crypto.lo.dep
-crypto/crypto.lo.dep: $(go_crypto_files)
+@go_include@ crypto.lo.dep
+crypto.lo.dep: $(go_crypto_files)
        $(BUILDDEPS)
-crypto/crypto.lo: $(go_crypto_files)
+crypto.lo: $(go_crypto_files)
        $(BUILDPACKAGE)
 crypto/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/check
 
-@go_include@ errors/errors.lo.dep
-errors/errors.lo.dep: $(go_errors_files)
+@go_include@ errors.lo.dep
+errors.lo.dep: $(go_errors_files)
        $(BUILDDEPS)
-errors/errors.lo: $(go_errors_files)
+errors.lo: $(go_errors_files)
        $(BUILDPACKAGE)
 errors/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: errors/check
 
-@go_include@ expvar/expvar.lo.dep
-expvar/expvar.lo.dep: $(go_expvar_files)
+@go_include@ expvar.lo.dep
+expvar.lo.dep: $(go_expvar_files)
        $(BUILDDEPS)
-expvar/expvar.lo: $(go_expvar_files)
+expvar.lo: $(go_expvar_files)
        $(BUILDPACKAGE)
 expvar/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: expvar/check
 
-@go_include@ flag/flag.lo.dep
-flag/flag.lo.dep: $(go_flag_files)
+@go_include@ flag.lo.dep
+flag.lo.dep: $(go_flag_files)
        $(BUILDDEPS)
-flag/flag.lo: $(go_flag_files)
+flag.lo: $(go_flag_files)
        $(BUILDPACKAGE)
 flag/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: flag/check
 
-@go_include@ fmt/fmt.lo.dep
-fmt/fmt.lo.dep: $(go_fmt_files)
+@go_include@ fmt.lo.dep
+fmt.lo.dep: $(go_fmt_files)
        $(BUILDDEPS)
-fmt/fmt.lo: $(go_fmt_files)
+fmt.lo: $(go_fmt_files)
        $(BUILDPACKAGE)
 fmt/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: fmt/check
 
-@go_include@ hash/hash.lo.dep
-hash/hash.lo.dep: $(go_hash_files)
+@go_include@ hash.lo.dep
+hash.lo.dep: $(go_hash_files)
        $(BUILDDEPS)
-hash/hash.lo: $(go_hash_files)
+hash.lo: $(go_hash_files)
        $(BUILDPACKAGE)
 hash/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: hash/check
 
-@go_include@ html/html.lo.dep
-html/html.lo.dep: $(go_html_files)
+@go_include@ html.lo.dep
+html.lo.dep: $(go_html_files)
        $(BUILDDEPS)
-html/html.lo: $(go_html_files)
+html.lo: $(go_html_files)
        $(BUILDPACKAGE)
 html/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: html/check
 
-@go_include@ image/image.lo.dep
-image/image.lo.dep: $(go_image_files)
+@go_include@ image.lo.dep
+image.lo.dep: $(go_image_files)
        $(BUILDDEPS)
-image/image.lo: $(go_image_files)
+image.lo: $(go_image_files)
        $(BUILDPACKAGE)
 image/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: image/check
 
-@go_include@ io/io.lo.dep
-io/io.lo.dep: $(go_io_files)
+@go_include@ io.lo.dep
+io.lo.dep: $(go_io_files)
        $(BUILDDEPS)
-io/io.lo: $(go_io_files)
+io.lo: $(go_io_files)
        $(BUILDPACKAGE)
 io/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: io/check
 
-@go_include@ log/log.lo.dep
-log/log.lo.dep: $(go_log_files)
+@go_include@ log.lo.dep
+log.lo.dep: $(go_log_files)
        $(BUILDDEPS)
-log/log.lo: $(go_log_files)
+log.lo: $(go_log_files)
        $(BUILDPACKAGE)
 log/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: log/check
 
-@go_include@ math/math.lo.dep
-math/math.lo.dep: $(go_math_files)
+@go_include@ math.lo.dep
+math.lo.dep: $(go_math_files)
        $(BUILDDEPS)
-math/math.lo: $(go_math_files)
+math.lo: $(go_math_files)
        $(MKDIR_P) $(@D)
        files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \
-       $(LTGOCOMPILE) $(MATH_FLAG) -I . -c -fgo-prefix="libgo_$(@D)" -o $@ $$files
+       $(LTGOCOMPILE) $(MATH_FLAG) -I . -c -fgo-pkgpath=math -o $@ $$files
 math/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: math/check
 
-@go_include@ mime/mime.lo.dep
-mime/mime.lo.dep: $(go_mime_files)
+@go_include@ mime.lo.dep
+mime.lo.dep: $(go_mime_files)
        $(BUILDDEPS)
-mime/mime.lo: $(go_mime_files)
+mime.lo: $(go_mime_files)
        $(BUILDPACKAGE)
 mime/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: mime/check
 
-@go_include@ net/net.lo.dep
-net/net.lo.dep: $(go_net_files)
+@go_include@ net.lo.dep
+net.lo.dep: $(go_net_files)
        $(BUILDDEPS)
-net/net.lo: $(go_net_files)
+net.lo: $(go_net_files)
        $(BUILDPACKAGE)
 net/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: net/check
 
-@go_include@ os/os.lo.dep
-os/os.lo.dep: $(go_os_files)
+@go_include@ os.lo.dep
+os.lo.dep: $(go_os_files)
        $(BUILDDEPS)
-os/os.lo: $(go_os_files)
+os.lo: $(go_os_files)
        $(BUILDPACKAGE)
 os/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: os/check
 
-signal_unix.go: $(srcdir)/go/os/mkunixsignals.sh sysinfo.go
-       $(SHELL) $(srcdir)/go/os/mkunixsignals.sh sysinfo.go > $@.tmp
-       mv -f $@.tmp $@
-
-@go_include@ path/path.lo.dep
-path/path.lo.dep: $(go_path_files)
+@go_include@ path.lo.dep
+path.lo.dep: $(go_path_files)
        $(BUILDDEPS)
-path/path.lo: $(go_path_files)
+path.lo: $(go_path_files)
        $(BUILDPACKAGE)
 path/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: path/check
 
-@go_include@ reflect/reflect.lo.dep
-reflect/reflect.lo.dep: $(go_reflect_files)
+@go_include@ reflect-go.lo.dep
+reflect-go.lo.dep: $(go_reflect_files)
        $(BUILDDEPS)
-reflect/reflect.lo: $(go_reflect_files)
+reflect-go.lo: $(go_reflect_files)
        $(BUILDPACKAGE)
 reflect/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: reflect/check
 
-@go_include@ regexp/regexp.lo.dep
-regexp/regexp.lo.dep: $(go_regexp_files)
+@go_include@ regexp.lo.dep
+regexp.lo.dep: $(go_regexp_files)
        $(BUILDDEPS)
-regexp/regexp.lo: $(go_regexp_files)
+regexp.lo: $(go_regexp_files)
        $(BUILDPACKAGE)
 regexp/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: regexp/check
 
-@go_include@ runtime/runtime.lo.dep
-runtime/runtime.lo.dep: $(go_runtime_files)
+@go_include@ runtime-go.lo.dep
+runtime-go.lo.dep: $(go_runtime_files)
        $(BUILDDEPS)
-runtime/runtime.lo: $(go_runtime_files)
+runtime-go.lo: $(go_runtime_files)
        $(BUILDPACKAGE)
 runtime/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: runtime/check
 
-@go_include@ text/scanner.lo.dep
-text/scanner.lo.dep: $(go_text_scanner_files)
-       $(BUILDDEPS)
-text/scanner.lo: $(go_text_scanner_files)
-       $(BUILDPACKAGE)
-text/scanner/check: $(CHECK_DEPS)
-       @$(MKDIR_P) text/scanner
-       @$(CHECK)
-.PHONY: text/scanner/check
-
-@go_include@ sort/sort.lo.dep
-sort/sort.lo.dep: $(go_sort_files)
+@go_include@ sort.lo.dep
+sort.lo.dep: $(go_sort_files)
        $(BUILDDEPS)
-sort/sort.lo: $(go_sort_files)
+sort.lo: $(go_sort_files)
        $(BUILDPACKAGE)
 sort/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: sort/check
 
-@go_include@ strconv/strconv.lo.dep
-strconv/strconv.lo.dep: $(go_strconv_files)
+@go_include@ strconv.lo.dep
+strconv.lo.dep: $(go_strconv_files)
        $(BUILDDEPS)
-strconv/strconv.lo: $(go_strconv_files)
+strconv.lo: $(go_strconv_files)
        $(BUILDPACKAGE)
 strconv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: strconv/check
 
-@go_include@ strings/strings.lo.dep
-strings/strings.lo.dep: $(go_strings_files)
+@go_include@ strings.lo.dep
+strings.lo.dep: $(go_strings_files)
        $(BUILDDEPS)
-strings/strings.lo: $(go_strings_files)
+strings.lo: $(go_strings_files)
        $(BUILDPACKAGE)
 strings/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: strings/check
 
-@go_include@ sync/sync.lo.dep
-sync/sync.lo.dep: $(go_sync_files)
+@go_include@ sync.lo.dep
+sync.lo.dep: $(go_sync_files)
        $(BUILDDEPS)
-sync/sync.lo: $(go_sync_files)
+sync.lo: $(go_sync_files)
        $(BUILDPACKAGE)
 sync/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: sync/check
 
-@go_include@ testing/testing.lo.dep
-testing/testing.lo.dep: $(go_testing_files)
+@go_include@ testing.lo.dep
+testing.lo.dep: $(go_testing_files)
        $(BUILDDEPS)
-testing/testing.lo: $(go_testing_files)
+testing.lo: $(go_testing_files)
        $(BUILDPACKAGE)
 testing/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: testing/check
 
-@go_include@ time/time.lo.dep
-time/time.lo.dep: $(go_time_files)
+@go_include@ time-go.lo.dep
+time-go.lo.dep: $(go_time_files)
        $(BUILDDEPS)
-time/time.lo: $(go_time_files)
+time-go.lo: $(go_time_files)
        $(BUILDPACKAGE)
 time/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: time/check
 
-@go_include@ unicode/unicode.lo.dep
-unicode/unicode.lo.dep: $(go_unicode_files)
+@go_include@ unicode.lo.dep
+unicode.lo.dep: $(go_unicode_files)
        $(BUILDDEPS)
-unicode/unicode.lo: $(go_unicode_files)
+unicode.lo: $(go_unicode_files)
        $(BUILDPACKAGE)
 unicode/check: $(CHECK_DEPS)
        @$(CHECK)
@@ -2113,7 +2107,6 @@ archive/tar.lo.dep: $(go_archive_tar_files)
 archive/tar.lo: $(go_archive_tar_files)
        $(BUILDPACKAGE)
 archive/tar/check: $(CHECK_DEPS)
-       @$(MKDIR_P) archive/tar
        @$(CHECK)
 .PHONY: archive/tar/check
 
@@ -2123,7 +2116,6 @@ archive/zip.lo.dep: $(go_archive_zip_files)
 archive/zip.lo: $(go_archive_zip_files)
        $(BUILDPACKAGE)
 archive/zip/check: $(CHECK_DEPS)
-       @$(MKDIR_P) archive/zip
        @$(CHECK)
 .PHONY: archive/zip/check
 
@@ -2133,7 +2125,6 @@ compress/bzip2.lo.dep: $(go_compress_bzip2_files)
 compress/bzip2.lo: $(go_compress_bzip2_files)
        $(BUILDPACKAGE)
 compress/bzip2/check: $(CHECK_DEPS)
-       @$(MKDIR_P) compress/bzip2
        @$(CHECK)
 .PHONY: compress/bzip2/check
 
@@ -2143,7 +2134,6 @@ compress/flate.lo.dep: $(go_compress_flate_files)
 compress/flate.lo: $(go_compress_flate_files)
        $(BUILDPACKAGE)
 compress/flate/check: $(CHECK_DEPS)
-       @$(MKDIR_P) compress/flate
        @$(CHECK)
 .PHONY: compress/flate/check
 
@@ -2153,7 +2143,6 @@ compress/gzip.lo.dep: $(go_compress_gzip_files)
 compress/gzip.lo: $(go_compress_gzip_files)
        $(BUILDPACKAGE)
 compress/gzip/check: $(CHECK_DEPS)
-       @$(MKDIR_P) compress/gzip
        @$(CHECK)
 .PHONY: compress/gzip/check
 
@@ -2163,7 +2152,6 @@ compress/lzw.lo.dep: $(go_compress_lzw_files)
 compress/lzw.lo: $(go_compress_lzw_files)
        $(BUILDPACKAGE)
 compress/lzw/check: $(CHECK_DEPS)
-       @$(MKDIR_P) compress/lzw
        @$(CHECK)
 .PHONY: compress/lzw/check
 
@@ -2173,7 +2161,6 @@ compress/zlib.lo.dep: $(go_compress_zlib_files)
 compress/zlib.lo: $(go_compress_zlib_files)
        $(BUILDPACKAGE)
 compress/zlib/check: $(CHECK_DEPS)
-       @$(MKDIR_P) compress/zlib
        @$(CHECK)
 .PHONY: compress/zlib/check
 
@@ -2183,7 +2170,6 @@ container/heap.lo.dep: $(go_container_heap_files)
 container/heap.lo: $(go_container_heap_files)
        $(BUILDPACKAGE)
 container/heap/check: $(CHECK_DEPS)
-       @$(MKDIR_P) container/heap
        @$(CHECK)
 .PHONY: container/heap/check
 
@@ -2193,7 +2179,6 @@ container/list.lo.dep: $(go_container_list_files)
 container/list.lo: $(go_container_list_files)
        $(BUILDPACKAGE)
 container/list/check: $(CHECK_DEPS)
-       @$(MKDIR_P) container/list
        @$(CHECK)
 .PHONY: container/list/check
 
@@ -2203,7 +2188,6 @@ container/ring.lo.dep: $(go_container_ring_files)
 container/ring.lo: $(go_container_ring_files)
        $(BUILDPACKAGE)
 container/ring/check: $(CHECK_DEPS)
-       @$(MKDIR_P) container/ring
        @$(CHECK)
 .PHONY: container/ring/check
 
@@ -2213,7 +2197,6 @@ crypto/aes.lo.dep: $(go_crypto_aes_files)
 crypto/aes.lo: $(go_crypto_aes_files)
        $(BUILDPACKAGE)
 crypto/aes/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/aes
        @$(CHECK)
 .PHONY: crypto/aes/check
 
@@ -2223,7 +2206,6 @@ crypto/cipher.lo.dep: $(go_crypto_cipher_files)
 crypto/cipher.lo: $(go_crypto_cipher_files)
        $(BUILDPACKAGE)
 crypto/cipher/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/cipher
        @$(CHECK)
 .PHONY: crypto/cipher/check
 
@@ -2233,7 +2215,6 @@ crypto/des.lo.dep: $(go_crypto_des_files)
 crypto/des.lo: $(go_crypto_des_files)
        $(BUILDPACKAGE)
 crypto/des/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/des
        @$(CHECK)
 .PHONY: crypto/des/check
 
@@ -2243,7 +2224,6 @@ crypto/dsa.lo.dep: $(go_crypto_dsa_files)
 crypto/dsa.lo: $(go_crypto_dsa_files)
        $(BUILDPACKAGE)
 crypto/dsa/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/dsa
        @$(CHECK)
 .PHONY: crypto/dsa/check
 
@@ -2253,7 +2233,6 @@ crypto/ecdsa.lo.dep: $(go_crypto_ecdsa_files)
 crypto/ecdsa.lo: $(go_crypto_ecdsa_files)
        $(BUILDPACKAGE)
 crypto/ecdsa/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/ecdsa
        @$(CHECK)
 .PHONY: crypto/ecdsa/check
 
@@ -2263,7 +2242,6 @@ crypto/elliptic.lo.dep: $(go_crypto_elliptic_files)
 crypto/elliptic.lo: $(go_crypto_elliptic_files)
        $(BUILDPACKAGE)
 crypto/elliptic/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/elliptic
        @$(CHECK)
 .PHONY: crypto/elliptic/check
 
@@ -2273,7 +2251,6 @@ crypto/hmac.lo.dep: $(go_crypto_hmac_files)
 crypto/hmac.lo: $(go_crypto_hmac_files)
        $(BUILDPACKAGE)
 crypto/hmac/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/hmac
        @$(CHECK)
 .PHONY: crypto/hmac/check
 
@@ -2283,7 +2260,6 @@ crypto/md5.lo.dep: $(go_crypto_md5_files)
 crypto/md5.lo: $(go_crypto_md5_files)
        $(BUILDPACKAGE)
 crypto/md5/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/md5
        @$(CHECK)
 .PHONY: crypto/md5/check
 
@@ -2293,7 +2269,6 @@ crypto/rand.lo.dep: $(go_crypto_rand_files)
 crypto/rand.lo: $(go_crypto_rand_files)
        $(BUILDPACKAGE)
 crypto/rand/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/rand
        @$(CHECK)
 .PHONY: crypto/rand/check
 
@@ -2303,7 +2278,6 @@ crypto/rc4.lo.dep: $(go_crypto_rc4_files)
 crypto/rc4.lo: $(go_crypto_rc4_files)
        $(BUILDPACKAGE)
 crypto/rc4/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/rc4
        @$(CHECK)
 .PHONY: crypto/rc4/check
 
@@ -2313,7 +2287,6 @@ crypto/rsa.lo.dep: $(go_crypto_rsa_files)
 crypto/rsa.lo: $(go_crypto_rsa_files)
        $(BUILDPACKAGE)
 crypto/rsa/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/rsa
        @$(CHECK)
 .PHONY: crypto/rsa/check
 
@@ -2323,7 +2296,6 @@ crypto/sha1.lo.dep: $(go_crypto_sha1_files)
 crypto/sha1.lo: $(go_crypto_sha1_files)
        $(BUILDPACKAGE)
 crypto/sha1/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/sha1
        @$(CHECK)
 .PHONY: crypto/sha1/check
 
@@ -2333,7 +2305,6 @@ crypto/sha256.lo.dep: $(go_crypto_sha256_files)
 crypto/sha256.lo: $(go_crypto_sha256_files)
        $(BUILDPACKAGE)
 crypto/sha256/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/sha256
        @$(CHECK)
 .PHONY: crypto/sha256/check
 
@@ -2343,7 +2314,6 @@ crypto/sha512.lo.dep: $(go_crypto_sha512_files)
 crypto/sha512.lo: $(go_crypto_sha512_files)
        $(BUILDPACKAGE)
 crypto/sha512/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/sha512
        @$(CHECK)
 .PHONY: crypto/sha512/check
 
@@ -2353,7 +2323,6 @@ crypto/subtle.lo.dep: $(go_crypto_subtle_files)
 crypto/subtle.lo: $(go_crypto_subtle_files)
        $(BUILDPACKAGE)
 crypto/subtle/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/subtle
        @$(CHECK)
 .PHONY: crypto/subtle/check
 
@@ -2363,7 +2332,6 @@ crypto/tls.lo.dep: $(go_crypto_tls_files)
 crypto/tls.lo: $(go_crypto_tls_files)
        $(BUILDPACKAGE)
 crypto/tls/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/tls
        @$(CHECK)
 .PHONY: crypto/tls/check
 
@@ -2373,7 +2341,6 @@ crypto/x509.lo.dep: $(go_crypto_x509_files)
 crypto/x509.lo: $(go_crypto_x509_files)
        $(BUILDPACKAGE)
 crypto/x509/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/x509
        @$(CHECK)
 .PHONY: crypto/x509/check
 
@@ -2383,7 +2350,6 @@ crypto/x509/pkix.lo.dep: $(go_crypto_x509_pkix_files)
 crypto/x509/pkix.lo: $(go_crypto_x509_pkix_files)
        $(BUILDPACKAGE)
 crypto/x509/pkix/check: $(CHECK_DEPS)
-       @$(MKDIR_P) crypto/x509/pkix
        @$(CHECK)
 .PHONY: crypto/x509/pkix/check
 
@@ -2393,7 +2359,6 @@ database/sql.lo.dep: $(go_database_sql_files)
 database/sql.lo: $(go_database_sql_files)
        $(BUILDPACKAGE)
 database/sql/check: $(CHECK_DEPS)
-       @$(MKDIR_P) database/sql
        @$(CHECK)
 .PHONY: database/sql/check
 
@@ -2403,7 +2368,6 @@ database/sql/driver.lo.dep: $(go_database_sql_driver_files)
 database/sql/driver.lo: $(go_database_sql_driver_files)
        $(BUILDPACKAGE)
 database/sql/driver/check: $(CHECK_DEPS)
-       @$(MKDIR_P) database/sql/driver
        @$(CHECK)
 .PHONY: database/sql/driver/check
 
@@ -2413,7 +2377,6 @@ debug/dwarf.lo.dep: $(go_debug_dwarf_files)
 debug/dwarf.lo: $(go_debug_dwarf_files)
        $(BUILDPACKAGE)
 debug/dwarf/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/dwarf
        @$(CHECK)
 .PHONY: debug/dwarf/check
 
@@ -2423,7 +2386,6 @@ debug/elf.lo.dep: $(go_debug_elf_files)
 debug/elf.lo: $(go_debug_elf_files)
        $(BUILDPACKAGE)
 debug/elf/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/elf
        @$(CHECK)
 .PHONY: debug/elf/check
 
@@ -2433,7 +2395,6 @@ debug/gosym.lo.dep: $(go_debug_gosym_files)
 debug/gosym.lo: $(go_debug_gosym_files)
        $(BUILDPACKAGE)
 debug/gosym/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/gosym
        @$(CHECK)
 .PHONY: debug/gosym/check
 
@@ -2443,7 +2404,6 @@ debug/macho.lo.dep: $(go_debug_macho_files)
 debug/macho.lo: $(go_debug_macho_files)
        $(BUILDPACKAGE)
 debug/macho/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/macho
        @$(CHECK)
 .PHONY: debug/macho/check
 
@@ -2453,7 +2413,6 @@ debug/pe.lo.dep: $(go_debug_pe_files)
 debug/pe.lo: $(go_debug_pe_files)
        $(BUILDPACKAGE)
 debug/pe/check: $(CHECK_DEPS)
-       @$(MKDIR_P) debug/pe
        @$(CHECK)
 .PHONY: debug/pe/check
 
@@ -2463,7 +2422,6 @@ encoding/asn1.lo.dep: $(go_encoding_asn1_files)
 encoding/asn1.lo: $(go_encoding_asn1_files)
        $(BUILDPACKAGE)
 encoding/asn1/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/asn1
        @$(CHECK)
 .PHONY: encoding/asn1/check
 
@@ -2473,7 +2431,6 @@ encoding/ascii85.lo.dep: $(go_encoding_ascii85_files)
 encoding/ascii85.lo: $(go_encoding_ascii85_files)
        $(BUILDPACKAGE)
 encoding/ascii85/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/ascii85
        @$(CHECK)
 .PHONY: encoding/ascii85/check
 
@@ -2483,7 +2440,6 @@ encoding/base32.lo.dep: $(go_encoding_base32_files)
 encoding/base32.lo: $(go_encoding_base32_files)
        $(BUILDPACKAGE)
 encoding/base32/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/base32
        @$(CHECK)
 .PHONY: encoding/base32/check
 
@@ -2493,7 +2449,6 @@ encoding/base64.lo.dep: $(go_encoding_base64_files)
 encoding/base64.lo: $(go_encoding_base64_files)
        $(BUILDPACKAGE)
 encoding/base64/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/base64
        @$(CHECK)
 .PHONY: encoding/base64/check
 
@@ -2503,7 +2458,6 @@ encoding/binary.lo.dep: $(go_encoding_binary_files)
 encoding/binary.lo: $(go_encoding_binary_files)
        $(BUILDPACKAGE)
 encoding/binary/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/binary
        @$(CHECK)
 .PHONY: encoding/binary/check
 
@@ -2513,7 +2467,6 @@ encoding/csv.lo.dep: $(go_encoding_csv_files)
 encoding/csv.lo: $(go_encoding_csv_files)
        $(BUILDPACKAGE)
 encoding/csv/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/csv
        @$(CHECK)
 .PHONY: encoding/csv/check
 
@@ -2523,7 +2476,6 @@ encoding/gob.lo.dep: $(go_encoding_gob_files)
 encoding/gob.lo: $(go_encoding_gob_files)
        $(BUILDPACKAGE)
 encoding/gob/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/gob
        @$(CHECK)
 .PHONY: encoding/gob/check
 
@@ -2533,7 +2485,6 @@ encoding/hex.lo.dep: $(go_encoding_hex_files)
 encoding/hex.lo: $(go_encoding_hex_files)
        $(BUILDPACKAGE)
 encoding/hex/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/hex
        @$(CHECK)
 .PHONY: encoding/hex/check
 
@@ -2543,7 +2494,6 @@ encoding/json.lo.dep: $(go_encoding_json_files)
 encoding/json.lo: $(go_encoding_json_files)
        $(BUILDPACKAGE)
 encoding/json/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/json
        @$(CHECK)
 .PHONY: encoding/json/check
 
@@ -2553,7 +2503,6 @@ encoding/pem.lo.dep: $(go_encoding_pem_files)
 encoding/pem.lo: $(go_encoding_pem_files)
        $(BUILDPACKAGE)
 encoding/pem/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/pem
        @$(CHECK)
 .PHONY: encoding/pem/check
 
@@ -2563,7 +2512,6 @@ encoding/xml.lo.dep: $(go_encoding_xml_files)
 encoding/xml.lo: $(go_encoding_xml_files)
        $(BUILDPACKAGE)
 encoding/xml/check: $(CHECK_DEPS)
-       @$(MKDIR_P) encoding/xml
        @$(CHECK)
 .PHONY: encoding/xml/check
 
@@ -2573,7 +2521,6 @@ exp/ebnf.lo.dep: $(go_exp_ebnf_files)
 exp/ebnf.lo: $(go_exp_ebnf_files)
        $(BUILDPACKAGE)
 exp/ebnf/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/ebnf
        @$(CHECK)
 .PHONY: exp/ebnf/check
 
@@ -2583,7 +2530,6 @@ exp/html.lo.dep: $(go_exp_html_files)
 exp/html.lo: $(go_exp_html_files)
        $(BUILDPACKAGE)
 exp/html/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/html
        @$(CHECK)
 .PHONY: exp/html/check
 
@@ -2593,7 +2539,6 @@ exp/norm.lo.dep: $(go_exp_norm_files)
 exp/norm.lo: $(go_exp_norm_files)
        $(BUILDPACKAGE)
 exp/norm/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/norm
        @$(CHECK)
 .PHONY: exp/norm/check
 
@@ -2603,7 +2548,6 @@ exp/proxy.lo.dep: $(go_exp_proxy_files)
 exp/proxy.lo: $(go_exp_proxy_files)
        $(BUILDPACKAGE)
 exp/proxy/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/proxy
        @$(CHECK)
 .PHONY: exp/proxy/check
 
@@ -2613,7 +2557,6 @@ exp/terminal.lo.dep: $(go_exp_terminal_files)
 exp/terminal.lo: $(go_exp_terminal_files)
        $(BUILDPACKAGE)
 exp/terminal/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/terminal
        @$(CHECK)
 .PHONY: exp/terminal/check
 
@@ -2623,7 +2566,6 @@ exp/types.lo.dep: $(go_exp_types_files)
 exp/types.lo: $(go_exp_types_files)
        $(BUILDPACKAGE)
 exp/types/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/types
        @$(CHECK)
 .PHONY: exp/types/check
 
@@ -2633,7 +2575,6 @@ exp/utf8string.lo.dep: $(go_exp_utf8string_files)
 exp/utf8string.lo: $(go_exp_utf8string_files)
        $(BUILDPACKAGE)
 exp/utf8string/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/utf8string
        @$(CHECK)
 .PHONY: exp/utf8string/check
 
@@ -2643,7 +2584,6 @@ exp/inotify.lo.dep: $(go_exp_inotify_files)
 exp/inotify.lo: $(go_exp_inotify_files)
        $(BUILDPACKAGE)
 exp/inotify/check: $(CHECK_DEPS)
-       @$(MKDIR_P) exp/inotify
        @$(CHECK)
 .PHONY: exp/inotify/check
 
@@ -2653,7 +2593,6 @@ html/template.lo.dep: $(go_html_template_files)
 html/template.lo: $(go_html_template_files)
        $(BUILDPACKAGE)
 html/template/check: $(CHECK_DEPS)
-       @$(MKDIR_P) html/template
        @$(CHECK)
 .PHONY: html/template/check
 
@@ -2663,7 +2602,6 @@ go/ast.lo.dep: $(go_go_ast_files)
 go/ast.lo: $(go_go_ast_files)
        $(BUILDPACKAGE)
 go/ast/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/ast
        @$(CHECK)
 .PHONY: go/ast/check
 
@@ -2673,7 +2611,6 @@ go/build.lo.dep: $(go_go_build_files)
 go/build.lo: $(go_go_build_files)
        $(BUILDPACKAGE)
 go/build/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/build
        @$(CHECK)
 .PHONY: go/build/check
 
@@ -2692,7 +2629,6 @@ go/doc.lo.dep: $(go_go_doc_files)
 go/doc.lo: $(go_go_doc_files)
        $(BUILDPACKAGE)
 go/doc/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/doc
        @$(CHECK)
 .PHONY: go/doc/check
 
@@ -2702,7 +2638,6 @@ go/parser.lo.dep: $(go_go_parser_files)
 go/parser.lo: $(go_go_parser_files)
        $(BUILDPACKAGE)
 go/parser/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/parser
        @$(CHECK)
 .PHONY: go/parser/check
 
@@ -2712,7 +2647,6 @@ go/printer.lo.dep: $(go_go_printer_files)
 go/printer.lo: $(go_go_printer_files)
        $(BUILDPACKAGE)
 go/printer/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/printer
        @$(CHECK)
 .PHONY: go/printer/check
 
@@ -2722,7 +2656,6 @@ go/scanner.lo.dep: $(go_go_scanner_files)
 go/scanner.lo: $(go_go_scanner_files)
        $(BUILDPACKAGE)
 go/scanner/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/scanner
        @$(CHECK)
 .PHONY: go/scanner/check
 
@@ -2732,7 +2665,6 @@ go/token.lo.dep: $(go_go_token_files)
 go/token.lo: $(go_go_token_files)
        $(BUILDPACKAGE)
 go/token/check: $(CHECK_DEPS)
-       @$(MKDIR_P) go/token
        @$(CHECK)
 .PHONY: go/token/check
 
@@ -2742,7 +2674,6 @@ hash/adler32.lo.dep: $(go_hash_adler32_files)
 hash/adler32.lo: $(go_hash_adler32_files)
        $(BUILDPACKAGE)
 hash/adler32/check: $(CHECK_DEPS)
-       @$(MKDIR_P) hash/adler32
        @$(CHECK)
 .PHONY: hash/adler32/check
 
@@ -2752,7 +2683,6 @@ hash/crc32.lo.dep: $(go_hash_crc32_files)
 hash/crc32.lo: $(go_hash_crc32_files)
        $(BUILDPACKAGE)
 hash/crc32/check: $(CHECK_DEPS)
-       @$(MKDIR_P) hash/crc32
        @$(CHECK)
 .PHONY: hash/crc32/check
 
@@ -2762,7 +2692,6 @@ hash/crc64.lo.dep: $(go_hash_crc64_files)
 hash/crc64.lo: $(go_hash_crc64_files)
        $(BUILDPACKAGE)
 hash/crc64/check: $(CHECK_DEPS)
-       @$(MKDIR_P) hash/crc64
        @$(CHECK)
 .PHONY: hash/crc64/check
 
@@ -2772,27 +2701,15 @@ hash/fnv.lo.dep: $(go_hash_fnv_files)
 hash/fnv.lo: $(go_hash_fnv_files)
        $(BUILDPACKAGE)
 hash/fnv/check: $(CHECK_DEPS)
-       @$(MKDIR_P) hash/fnv
        @$(CHECK)
 .PHONY: hash/fnv/check
 
-@go_include@ image/bmp.lo.dep
-image/bmp.lo.dep: $(go_image_bmp_files)
-       $(BUILDDEPS)
-image/bmp.lo: $(go_image_bmp_files)
-       $(BUILDPACKAGE)
-image/bmp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/bmp
-       @$(CHECK)
-.PHONY: image/bmp/check
-
 @go_include@ image/color.lo.dep
 image/color.lo.dep: $(go_image_color_files)
        $(BUILDDEPS)
 image/color.lo: $(go_image_color_files)
        $(BUILDPACKAGE)
 image/color/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/color
        @$(CHECK)
 .PHONY: image/color/check
 
@@ -2802,7 +2719,6 @@ image/draw.lo.dep: $(go_image_draw_files)
 image/draw.lo: $(go_image_draw_files)
        $(BUILDPACKAGE)
 image/draw/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/draw
        @$(CHECK)
 .PHONY: image/draw/check
 
@@ -2812,7 +2728,6 @@ image/gif.lo.dep: $(go_image_gif_files)
 image/gif.lo: $(go_image_gif_files)
        $(BUILDPACKAGE)
 image/gif/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/gif
        @$(CHECK)
 .PHONY: image/gif/check
 
@@ -2822,7 +2737,6 @@ image/jpeg.lo.dep: $(go_image_jpeg_files)
 image/jpeg.lo: $(go_image_jpeg_files)
        $(BUILDPACKAGE)
 image/jpeg/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/jpeg
        @$(CHECK)
 .PHONY: image/jpeg/check
 
@@ -2832,27 +2746,15 @@ image/png.lo.dep: $(go_image_png_files)
 image/png.lo: $(go_image_png_files)
        $(BUILDPACKAGE)
 image/png/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/png
        @$(CHECK)
 .PHONY: image/png/check
 
-@go_include@ image/tiff.lo.dep
-image/tiff.lo.dep: $(go_image_tiff_files)
-       $(BUILDDEPS)
-image/tiff.lo: $(go_image_tiff_files)
-       $(BUILDPACKAGE)
-image/tiff/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/tiff
-       @$(CHECK)
-.PHONY: image/tiff/check
-
 @go_include@ index/suffixarray.lo.dep
 index/suffixarray.lo.dep: $(go_index_suffixarray_files)
        $(BUILDDEPS)
 index/suffixarray.lo: $(go_index_suffixarray_files)
        $(BUILDPACKAGE)
 index/suffixarray/check: $(CHECK_DEPS)
-       @$(MKDIR_P) index/suffixarray
        @$(CHECK)
 .PHONY: index/suffixarray/check
 
@@ -2862,7 +2764,6 @@ io/ioutil.lo.dep: $(go_io_ioutil_files)
 io/ioutil.lo: $(go_io_ioutil_files)
        $(BUILDPACKAGE)
 io/ioutil/check: $(CHECK_DEPS)
-       @$(MKDIR_P) io/ioutil
        @$(CHECK)
 .PHONY: io/ioutil/check
 
@@ -2872,9 +2773,9 @@ log/syslog.lo.dep: $(go_log_syslog_files)
 log/syslog.lo: $(go_log_syslog_files)
        $(BUILDPACKAGE)
 log/syslog/syslog_c.lo: $(go_syslog_c_files) log/syslog.lo
+       @$(MKDIR_P) log/syslog
        $(LTCOMPILE) -c -o $@ $(srcdir)/go/log/syslog/syslog_c.c
 log/syslog/check: $(CHECK_DEPS)
-       @$(MKDIR_P) log/syslog
        @$(CHECK)
 .PHONY: log/syslog/check
 
@@ -2884,7 +2785,6 @@ math/big.lo.dep: $(go_math_big_files)
 math/big.lo: $(go_math_big_files)
        $(BUILDPACKAGE)
 math/big/check: $(CHECK_DEPS)
-       @$(MKDIR_P) math/big
        @$(CHECK)
 .PHONY: math/big/check
 
@@ -2894,7 +2794,6 @@ math/cmplx.lo.dep: $(go_math_cmplx_files)
 math/cmplx.lo: $(go_math_cmplx_files)
        $(BUILDPACKAGE)
 math/cmplx/check: $(CHECK_DEPS)
-       @$(MKDIR_P) math/cmplx
        @$(CHECK)
 .PHONY: math/cmplx/check
 
@@ -2904,7 +2803,6 @@ math/rand.lo.dep: $(go_math_rand_files)
 math/rand.lo: $(go_math_rand_files)
        $(BUILDPACKAGE)
 math/rand/check: $(CHECK_DEPS)
-       @$(MKDIR_P) math/rand
        @$(CHECK)
 .PHONY: math/rand/check
 
@@ -2914,7 +2812,6 @@ mime/multipart.lo.dep: $(go_mime_multipart_files)
 mime/multipart.lo: $(go_mime_multipart_files)
        $(BUILDPACKAGE)
 mime/multipart/check: $(CHECK_DEPS)
-       @$(MKDIR_P) mime/multipart
        @$(CHECK)
 .PHONY: mime/multipart/check
 
@@ -2924,7 +2821,6 @@ net/http.lo.dep: $(go_net_http_files)
 net/http.lo: $(go_net_http_files)
        $(BUILDPACKAGE)
 net/http/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/http
        @$(CHECK)
 .PHONY: net/http/check
 
@@ -2934,7 +2830,6 @@ net/mail.lo.dep: $(go_net_mail_files)
 net/mail.lo: $(go_net_mail_files)
        $(BUILDPACKAGE)
 net/mail/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/mail
        @$(CHECK)
 .PHONY: net/mail/check
 
@@ -2944,7 +2839,6 @@ net/rpc.lo.dep: $(go_net_rpc_files)
 net/rpc.lo: $(go_net_rpc_files)
        $(BUILDPACKAGE)
 net/rpc/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/rpc
        @$(CHECK)
 .PHONY: net/rpc/check
 
@@ -2954,7 +2848,6 @@ net/smtp.lo.dep: $(go_net_smtp_files)
 net/smtp.lo: $(go_net_smtp_files)
        $(BUILDPACKAGE)
 net/smtp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/smtp
        @$(CHECK)
 .PHONY: net/smtp/check
 
@@ -2964,7 +2857,6 @@ net/url.lo.dep: $(go_net_url_files)
 net/url.lo: $(go_net_url_files)
        $(BUILDPACKAGE)
 net/url/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/url
        @$(CHECK)
 .PHONY: net/url/check
 
@@ -2974,7 +2866,6 @@ net/textproto.lo.dep: $(go_net_textproto_files)
 net/textproto.lo: $(go_net_textproto_files)
        $(BUILDPACKAGE)
 net/textproto/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/textproto
        @$(CHECK)
 .PHONY: net/textproto/check
 
@@ -2984,7 +2875,6 @@ net/http/cgi.lo.dep: $(go_net_http_cgi_files)
 net/http/cgi.lo: $(go_net_http_cgi_files)
        $(BUILDPACKAGE)
 net/http/cgi/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/http/cgi
        @$(CHECK)
 .PHONY: net/http/cgi/check
 
@@ -2994,7 +2884,6 @@ net/http/fcgi.lo.dep: $(go_net_http_fcgi_files)
 net/http/fcgi.lo: $(go_net_http_fcgi_files)
        $(BUILDPACKAGE)
 net/http/fcgi/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/http/fcgi
        @$(CHECK)
 .PHONY: net/http/fcgi/check
 
@@ -3004,7 +2893,6 @@ net/http/httptest.lo.dep: $(go_net_http_httptest_files)
 net/http/httptest.lo: $(go_net_http_httptest_files)
        $(BUILDPACKAGE)
 net/http/httptest/check: $(check_deps)
-       @$(MKDIR_P) net/http/httptest
        @$(CHECK)
 .PHONY: net/http/httptest/check
 
@@ -3014,7 +2902,6 @@ net/http/httputil.lo.dep: $(go_net_http_httputil_files)
 net/http/httputil.lo: $(go_net_http_httputil_files)
        $(BUILDPACKAGE)
 net/http/httputil/check: $(check_deps)
-       @$(MKDIR_P) net/http/httputil
        @$(CHECK)
 .PHONY: net/http/httputil/check
 
@@ -3024,7 +2911,6 @@ net/http/pprof.lo.dep: $(go_net_http_pprof_files)
 net/http/pprof.lo: $(go_net_http_pprof_files)
        $(BUILDPACKAGE)
 net/http/pprof/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/http/pprof
        @$(CHECK)
 .PHONY: net/http/pprof/check
 
@@ -3034,7 +2920,6 @@ net/rpc/jsonrpc.lo.dep: $(go_net_rpc_jsonrpc_files)
 net/rpc/jsonrpc.lo: $(go_net_rpc_jsonrpc_files)
        $(BUILDPACKAGE)
 net/rpc/jsonrpc/check: $(CHECK_DEPS)
-       @$(MKDIR_P) net/rpc/jsonrpc
        @$(CHECK)
 .PHONY: net/rpc/jsonrpc/check
 
@@ -3044,7 +2929,6 @@ old/netchan.lo.dep: $(go_old_netchan_files)
 old/netchan.lo: $(go_old_netchan_files)
        $(BUILDPACKAGE)
 old/netchan/check: $(CHECK_DEPS)
-       @$(MKDIR_P) old/netchan
        @$(CHECK)
 .PHONY: old/netchan/check
 
@@ -3054,7 +2938,6 @@ old/regexp.lo.dep: $(go_old_regexp_files)
 old/regexp.lo: $(go_old_regexp_files)
        $(BUILDPACKAGE)
 old/regexp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) old/regexp
        @$(CHECK)
 .PHONY: old/regexp/check
 
@@ -3064,7 +2947,6 @@ old/template.lo.dep: $(go_old_template_files)
 old/template.lo: $(go_old_template_files)
        $(BUILDPACKAGE)
 old/template/check: $(CHECK_DEPS)
-       @$(MKDIR_P) old/template
        @$(CHECK)
 .PHONY: old/template/check
 
@@ -3074,37 +2956,33 @@ os/exec.lo.dep: $(go_os_exec_files)
 os/exec.lo: $(go_os_exec_files)
        $(BUILDPACKAGE)
 os/exec/check: $(CHECK_DEPS)
-       @$(MKDIR_P) os/exec
        @$(CHECK)
 .PHONY: os/exec/check
 
-@go_include@ os/user.lo.dep
-os/user.lo.dep: $(go_os_user_files)
-       $(BUILDDEPS)
-os/user.lo: $(go_os_user_files)
-       $(BUILDPACKAGE)
-os/user/check: $(CHECK_DEPS)
-       @$(MKDIR_P) os/user
-       @$(CHECK)
-.PHONY: os/user/check
-
 @go_include@ os/signal.lo.dep
 os/signal.lo.dep: $(go_os_signal_files)
        $(BUILDDEPS)
 os/signal.lo: $(go_os_signal_files)
        $(BUILDPACKAGE)
 os/signal/check: $(CHECK_DEPS)
-       @$(MKDIR_P) os/signal
        @$(CHECK)
 .PHONY: os/signal/check
 
+@go_include@ os/user.lo.dep
+os/user.lo.dep: $(go_os_user_files)
+       $(BUILDDEPS)
+os/user.lo: $(go_os_user_files)
+       $(BUILDPACKAGE)
+os/user/check: $(CHECK_DEPS)
+       @$(CHECK)
+.PHONY: os/user/check
+
 @go_include@ path/filepath.lo.dep
 path/filepath.lo.dep: $(go_path_filepath_files)
        $(BUILDDEPS)
 path/filepath.lo: $(go_path_filepath_files)
        $(BUILDPACKAGE)
 path/filepath/check: $(CHECK_DEPS)
-       @$(MKDIR_P) path/filepath
        @$(CHECK)
 .PHONY: path/filepath/check
 
@@ -3114,7 +2992,6 @@ regexp/syntax.lo.dep: $(go_regexp_syntax_files)
 regexp/syntax.lo: $(go_regexp_syntax_files)
        $(BUILDPACKAGE)
 regexp/syntax/check: $(CHECK_DEPS)
-       @$(MKDIR_P) regexp/syntax
        @$(CHECK)
 .PHONY: regexp/syntax/check
 
@@ -3124,7 +3001,6 @@ runtime/debug.lo.dep: $(go_runtime_debug_files)
 runtime/debug.lo: $(go_runtime_debug_files)
        $(BUILDPACKAGE)
 runtime/debug/check: $(CHECK_DEPS)
-       @$(MKDIR_P) runtime/debug
        @$(CHECK)
 .PHONY: runtime/debug/check
 
@@ -3134,7 +3010,6 @@ runtime/pprof.lo.dep: $(go_runtime_pprof_files)
 runtime/pprof.lo: $(go_runtime_pprof_files)
        $(BUILDPACKAGE)
 runtime/pprof/check: $(CHECK_DEPS)
-       @$(MKDIR_P) runtime/pprof
        @$(CHECK)
 .PHONY: runtime/pprof/check
 
@@ -3146,17 +3021,24 @@ sync/atomic.lo: $(go_sync_atomic_files)
 sync/atomic_c.lo: $(go_sync_atomic_c_files) sync/atomic.lo
        $(LTCOMPILE) -c -o $@ $(srcdir)/go/sync/atomic/atomic.c
 sync/atomic/check: $(CHECK_DEPS)
-       @$(MKDIR_P) sync/atomic
        @$(CHECK)
 .PHONY: sync/atomic/check
 
+@go_include@ text/scanner.lo.dep
+text/scanner.lo.dep: $(go_text_scanner_files)
+       $(BUILDDEPS)
+text/scanner.lo: $(go_text_scanner_files)
+       $(BUILDPACKAGE)
+text/scanner/check: $(CHECK_DEPS)
+       @$(CHECK)
+.PHONY: text/scanner/check
+
 @go_include@ text/tabwriter.lo.dep
 text/tabwriter.lo.dep: $(go_text_tabwriter_files)
        $(BUILDDEPS)
 text/tabwriter.lo: $(go_text_tabwriter_files)
        $(BUILDPACKAGE)
 text/tabwriter/check: $(CHECK_DEPS)
-       @$(MKDIR_P) text/tabwriter
        @$(CHECK)
 .PHONY: text/tabwriter/check
 
@@ -3175,7 +3057,6 @@ text/template/parse.lo.dep: $(go_text_template_parse_files)
 text/template/parse.lo: $(go_text_template_parse_files)
        $(BUILDPACKAGE)
 text/template/parse/check: $(CHECK_DEPS)
-       @$(MKDIR_P) text/template/parse
        @$(CHECK)
 .PHONY: text/template/parse/check
 
@@ -3185,7 +3066,6 @@ testing/iotest.lo.dep: $(go_testing_iotest_files)
 testing/iotest.lo: $(go_testing_iotest_files)
        $(BUILDPACKAGE)
 testing/iotest/check: $(CHECK_DEPS)
-       @$(MKDIR_P) testing/iotest
        @$(CHECK)
 .PHONY: testing/iotest/check
 
@@ -3195,27 +3075,15 @@ testing/quick.lo.dep: $(go_testing_quick_files)
 testing/quick.lo: $(go_testing_quick_files)
        $(BUILDPACKAGE)
 testing/quick/check: $(CHECK_DEPS)
-       @$(MKDIR_P) testing/quick
        @$(CHECK)
 .PHONY: testing/quick/check
 
-@go_include@ testing/script.lo.dep
-testing/script.lo.dep: $(go_testing_script_files)
-       $(BUILDDEPS)
-testing/script.lo: $(go_testing_script_files)
-       $(BUILDPACKAGE)
-testing/script/check: $(CHECK_DEPS)
-       @$(MKDIR_P) testing/script
-       @$(CHECK)
-.PHONY: testing/script/check
-
 @go_include@ unicode/utf16.lo.dep
 unicode/utf16.lo.dep: $(go_unicode_utf16_files)
        $(BUILDDEPS)
 unicode/utf16.lo: $(go_unicode_utf16_files)
        $(BUILDPACKAGE)
 unicode/utf16/check: $(CHECK_DEPS)
-       @$(MKDIR_P) unicode/utf16
        @$(CHECK)
 .PHONY: unicode/utf16/check
 
@@ -3225,18 +3093,22 @@ unicode/utf8.lo.dep: $(go_unicode_utf8_files)
 unicode/utf8.lo: $(go_unicode_utf8_files)
        $(BUILDPACKAGE)
 unicode/utf8/check: $(CHECK_DEPS)
-       @$(MKDIR_P) unicode/utf8
        @$(CHECK)
 .PHONY: unicode/utf8/check
 
-@go_include@ syscall/syscall.lo.dep
-syscall/syscall.lo.dep: $(go_syscall_files)
+@go_include@ syscall.lo.dep
+syscall.lo.dep: $(go_syscall_files)
        $(BUILDDEPS)
-syscall/syscall.lo: $(go_syscall_files)
+syscall.lo: $(go_syscall_files)
        $(BUILDPACKAGE)
 syscall/errno.lo: go/syscall/errno.c
+       @$(MKDIR_P) syscall
+       $(LTCOMPILE) -c -o $@ $<
+syscall/signame.lo: go/syscall/signame.c
+       @$(MKDIR_P) syscall
        $(LTCOMPILE) -c -o $@ $<
 syscall/wait.lo: go/syscall/wait.c
+       @$(MKDIR_P) syscall
        $(LTCOMPILE) -c -o $@ $<
 
 # How to build a .gox file from a .lo file.
@@ -3244,61 +3116,61 @@ BUILDGOX = \
        f=`echo $< | sed -e 's/.lo$$/.o/'`; \
        $(OBJCOPY) -j .go_export $$f $@.tmp && mv -f $@.tmp $@
 
-bufio.gox: bufio/bufio.lo
+bufio.gox: bufio.lo
        $(BUILDGOX)
-bytes.gox: bytes/bytes.lo
+bytes.gox: bytes.lo
        $(BUILDGOX)
-crypto.gox: crypto/crypto.lo
+crypto.gox: crypto.lo
        $(BUILDGOX)
-errors.gox: errors/errors.lo
+errors.gox: errors.lo
        $(BUILDGOX)
-expvar.gox: expvar/expvar.lo
+expvar.gox: expvar.lo
        $(BUILDGOX)
-flag.gox: flag/flag.lo
+flag.gox: flag.lo
        $(BUILDGOX)
-fmt.gox: fmt/fmt.lo
+fmt.gox: fmt.lo
        $(BUILDGOX)
-hash.gox: hash/hash.lo
+hash.gox: hash.lo
        $(BUILDGOX)
-html.gox: html/html.lo
+html.gox: html.lo
        $(BUILDGOX)
-image.gox: image/image.lo
+image.gox: image.lo
        $(BUILDGOX)
-io.gox: io/io.lo
+io.gox: io.lo
        $(BUILDGOX)
-log.gox: log/log.lo
+log.gox: log.lo
        $(BUILDGOX)
-math.gox: math/math.lo
+math.gox: math.lo
        $(BUILDGOX)
-mime.gox: mime/mime.lo
+mime.gox: mime.lo
        $(BUILDGOX)
-net.gox: net/net.lo
+net.gox: net.lo
        $(BUILDGOX)
-os.gox: os/os.lo
+os.gox: os.lo
        $(BUILDGOX)
-path.gox: path/path.lo
+path.gox: path.lo
        $(BUILDGOX)
-reflect.gox: reflect/reflect.lo
+reflect.gox: reflect-go.lo
        $(BUILDGOX)
-regexp.gox: regexp/regexp.lo
+regexp.gox: regexp.lo
        $(BUILDGOX)
-runtime.gox: runtime/runtime.lo
+runtime.gox: runtime-go.lo
        $(BUILDGOX)
-sort.gox: sort/sort.lo
+sort.gox: sort.lo
        $(BUILDGOX)
-strconv.gox: strconv/strconv.lo
+strconv.gox: strconv.lo
        $(BUILDGOX)
-strings.gox: strings/strings.lo
+strings.gox: strings.lo
        $(BUILDGOX)
-sync.gox: sync/sync.lo
+sync.gox: sync.lo
        $(BUILDGOX)
-syscall.gox: syscall/syscall.lo
+syscall.gox: syscall.lo
        $(BUILDGOX)
-testing.gox: testing/testing.lo
+testing.gox: testing.lo
        $(BUILDGOX)
-time.gox: time/time.lo
+time.gox: time-go.lo
        $(BUILDGOX)
-unicode.gox: unicode/unicode.lo
+unicode.gox: unicode.lo
        $(BUILDGOX)
 
 archive/tar.gox: archive/tar.lo
@@ -3446,8 +3318,6 @@ hash/crc64.gox: hash/crc64.lo
 hash/fnv.gox: hash/fnv.lo
        $(BUILDGOX)
 
-image/bmp.gox: image/bmp.lo
-       $(BUILDGOX)
 image/color.gox: image/color.lo
        $(BUILDGOX)
 image/draw.gox: image/draw.lo
@@ -3458,8 +3328,6 @@ image/jpeg.gox: image/jpeg.lo
        $(BUILDGOX)
 image/png.gox: image/png.lo
        $(BUILDGOX)
-image/tiff.gox: image/tiff.lo
-       $(BUILDGOX)
 
 index/suffixarray.gox: index/suffixarray.lo
        $(BUILDGOX)
@@ -3516,10 +3384,10 @@ old/template.gox: old/template.lo
 
 os/exec.gox: os/exec.lo
        $(BUILDGOX)
-os/user.gox: os/user.lo
-       $(BUILDGOX)
 os/signal.gox: os/signal.lo
        $(BUILDGOX)
+os/user.gox: os/user.lo
+       $(BUILDGOX)
 
 path/filepath.gox: path/filepath.lo
        $(BUILDGOX)
@@ -3548,8 +3416,6 @@ testing/iotest.gox: testing/iotest.lo
        $(BUILDGOX)
 testing/quick.gox: testing/quick.lo
        $(BUILDGOX)
-testing/script.gox: testing/script.lo
-       $(BUILDGOX)
 
 unicode/utf16.gox: unicode/utf16.lo
        $(BUILDGOX)
@@ -3656,7 +3522,6 @@ TEST_PACKAGES = \
        image/draw/check \
        image/jpeg/check \
        image/png/check \
-       image/tiff/check \
        index/suffixarray/check \
        io/ioutil/check \
        log/syslog/check \
@@ -3667,6 +3532,7 @@ TEST_PACKAGES = \
        net/http/check \
        net/http/cgi/check \
        net/http/fcgi/check \
+       net/http/httptest/check \
        net/http/httputil/check \
        net/mail/check \
        net/rpc/check \
@@ -3678,8 +3544,8 @@ TEST_PACKAGES = \
        old/regexp/check \
        old/template/check \
        os/exec/check \
-       os/user/check \
        os/signal/check \
+       os/user/check \
        path/filepath/check \
        regexp/syntax/check \
        sync/atomic/check \
@@ -3688,7 +3554,6 @@ TEST_PACKAGES = \
        text/template/check \
        text/template/parse/check \
        testing/quick/check \
-       testing/script/check \
        unicode/utf16/check \
        unicode/utf8/check