OSDN Git Service

log/syslog: Fix name of C function syslog_c.
[pf3gnuchains/gcc-fork.git] / libgo / Makefile.in
index d412e69..d7a2de6 100644 (file)
@@ -133,21 +133,20 @@ am_libgobegin_a_OBJECTS = go-main.$(OBJEXT)
 libgobegin_a_OBJECTS = $(am_libgobegin_a_OBJECTS)
 LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = bufio/bufio.lo bytes/bytes.lo bytes/index.lo \
-       crypto/crypto.lo errors/errors.lo expvar/expvar.lo \
-       flag/flag.lo fmt/fmt.lo hash/hash.lo html/html.lo \
-       image/image.lo io/io.lo log/log.lo math/math.lo net/net.lo \
-       os/exec.lo os/os.lo path/path.lo reflect/reflect.lo \
-       regexp/regexp.lo runtime/runtime.lo sort/sort.lo \
-       strconv/strconv.lo strings/strings.lo sync/sync.lo \
-       time/time.lo unicode/unicode.lo archive/tar.lo archive/zip.lo \
-       compress/bzip2.lo compress/flate.lo compress/gzip.lo \
-       compress/lzw.lo compress/zlib.lo container/heap.lo \
-       container/list.lo container/ring.lo crypto/aes.lo \
-       crypto/cipher.lo crypto/des.lo crypto/dsa.lo crypto/ecdsa.lo \
-       crypto/elliptic.lo crypto/hmac.lo crypto/md5.lo crypto/rand.lo \
-       crypto/rc4.lo crypto/rsa.lo crypto/sha1.lo crypto/sha256.lo \
-       crypto/sha512.lo crypto/subtle.lo crypto/tls.lo crypto/x509.lo \
+am__DEPENDENCIES_2 = bufio.lo bytes.lo bytes/index.lo crypto.lo \
+       errors.lo expvar.lo flag.lo fmt.lo hash.lo html.lo image.lo \
+       io.lo log.lo math.lo mime.lo net.lo os.lo path.lo \
+       reflect-go.lo regexp.lo runtime-go.lo sort.lo strconv.lo \
+       strings.lo sync.lo syscall.lo syscall/errno.lo \
+       syscall/signame.lo syscall/wait.lo testing.lo time-go.lo \
+       unicode.lo archive/tar.lo archive/zip.lo compress/bzip2.lo \
+       compress/flate.lo compress/gzip.lo compress/lzw.lo \
+       compress/zlib.lo container/heap.lo container/list.lo \
+       container/ring.lo crypto/aes.lo crypto/cipher.lo crypto/des.lo \
+       crypto/dsa.lo crypto/ecdsa.lo crypto/elliptic.lo \
+       crypto/hmac.lo crypto/md5.lo crypto/rand.lo crypto/rc4.lo \
+       crypto/rsa.lo crypto/sha1.lo crypto/sha256.lo crypto/sha512.lo \
+       crypto/subtle.lo crypto/tls.lo crypto/x509.lo \
        crypto/x509/pkix.lo database/sql.lo database/sql/driver.lo \
        debug/dwarf.lo debug/elf.lo debug/gosym.lo debug/macho.lo \
        debug/pe.lo encoding/ascii85.lo encoding/asn1.lo \
@@ -160,34 +159,32 @@ am__DEPENDENCIES_2 = bufio/bufio.lo bytes/bytes.lo bytes/index.lo \
        go/token.lo hash/adler32.lo hash/crc32.lo hash/crc64.lo \
        hash/fnv.lo net/http/cgi.lo net/http/fcgi.lo \
        net/http/httptest.lo net/http/httputil.lo net/http/pprof.lo \
-       image/bmp.lo image/color.lo image/draw.lo image/gif.lo \
-       image/jpeg.lo image/png.lo image/tiff.lo index/suffixarray.lo \
-       io/ioutil.lo log/syslog.lo log/syslog/syslog_c.lo math/big.lo \
-       math/cmplx.lo math/rand.lo mime/mime.lo mime/multipart.lo \
-       net/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
+       image/color.lo image/draw.lo image/gif.lo image/jpeg.lo \
+       image/png.lo index/suffixarray.lo io/ioutil.lo log/syslog.lo \
+       log/syslog/syslog_c.lo math/big.lo math/cmplx.lo math/rand.lo \
+       mime/multipart.lo net/http.lo net/mail.lo net/rpc.lo \
+       net/smtp.lo net/textproto.lo net/url.lo old/netchan.lo \
+       old/regexp.lo old/template.lo os/exec.lo $(am__DEPENDENCIES_1) \
+       os/signal.lo os/user.lo path/filepath.lo regexp/syntax.lo \
+       net/rpc/jsonrpc.lo runtime/debug.lo runtime/pprof.lo \
+       sync/atomic.lo sync/atomic_c.lo text/scanner.lo \
+       text/tabwriter.lo text/template.lo text/template/parse.lo \
+       testing/iotest.lo testing/quick.lo unicode/utf16.lo \
+       unicode/utf8.lo
 libgo_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
 am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
        runtime/go-assert-interface.c \
        runtime/go-byte-array-to-string.c runtime/go-breakpoint.c \
-       runtime/go-caller.c runtime/go-can-convert-interface.c \
-       runtime/go-cgo.c runtime/go-check-interface.c \
-       runtime/go-construct-map.c runtime/go-convert-interface.c \
-       runtime/go-copy.c runtime/go-defer.c \
-       runtime/go-deferred-recover.c runtime/go-eface-compare.c \
-       runtime/go-eface-val-compare.c runtime/go-getgoroot.c \
-       runtime/go-int-array-to-string.c runtime/go-int-to-string.c \
-       runtime/go-interface-compare.c \
+       runtime/go-caller.c runtime/go-callers.c \
+       runtime/go-can-convert-interface.c runtime/go-cgo.c \
+       runtime/go-check-interface.c runtime/go-construct-map.c \
+       runtime/go-convert-interface.c runtime/go-copy.c \
+       runtime/go-defer.c runtime/go-deferred-recover.c \
+       runtime/go-eface-compare.c runtime/go-eface-val-compare.c \
+       runtime/go-getgoroot.c runtime/go-int-array-to-string.c \
+       runtime/go-int-to-string.c runtime/go-interface-compare.c \
        runtime/go-interface-eface-compare.c \
        runtime/go-interface-val-compare.c runtime/go-make-slice.c \
        runtime/go-map-delete.c runtime/go-map-index.c \
@@ -195,10 +192,9 @@ am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
        runtime/go-matherr.c runtime/go-nanotime.c runtime/go-now.c \
        runtime/go-new-map.c runtime/go-new.c runtime/go-nosys.c \
        runtime/go-panic.c runtime/go-print.c runtime/go-recover.c \
-       runtime/go-reflect.c runtime/go-reflect-call.c \
-       runtime/go-reflect-map.c runtime/go-rune.c \
-       runtime/go-runtime-error.c runtime/go-setenv.c \
-       runtime/go-signal.c runtime/go-strcmp.c \
+       runtime/go-reflect-call.c runtime/go-reflect-map.c \
+       runtime/go-rune.c runtime/go-runtime-error.c \
+       runtime/go-setenv.c runtime/go-signal.c runtime/go-strcmp.c \
        runtime/go-string-to-byte-array.c \
        runtime/go-string-to-int-array.c runtime/go-strplus.c \
        runtime/go-strslice.c runtime/go-trampoline.c \
@@ -206,15 +202,15 @@ am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
        runtime/go-type-error.c runtime/go-type-float.c \
        runtime/go-type-identity.c runtime/go-type-interface.c \
        runtime/go-type-string.c runtime/go-typedesc-equal.c \
-       runtime/go-typestring.c runtime/go-unreflect.c \
-       runtime/go-unsafe-new.c runtime/go-unsafe-newarray.c \
-       runtime/go-unsafe-pointer.c runtime/go-unwind.c runtime/chan.c \
-       runtime/cpuprof.c runtime/lock_sema.c runtime/thread-sema.c \
-       runtime/lock_futex.c runtime/thread-linux.c runtime/mcache.c \
-       runtime/mcentral.c runtime/mem_posix_memalign.c runtime/mem.c \
-       runtime/mfinal.c runtime/mfixalloc.c runtime/mgc0.c \
-       runtime/mheap.c runtime/msize.c runtime/proc.c \
-       runtime/runtime.c runtime/thread.c runtime/yield.c \
+       runtime/go-typestring.c runtime/go-unsafe-new.c \
+       runtime/go-unsafe-newarray.c runtime/go-unsafe-pointer.c \
+       runtime/go-unwind.c runtime/chan.c runtime/cpuprof.c \
+       runtime/lock_sema.c runtime/thread-sema.c runtime/lock_futex.c \
+       runtime/thread-linux.c runtime/mcache.c runtime/mcentral.c \
+       runtime/mem_posix_memalign.c runtime/mem.c runtime/mfinal.c \
+       runtime/mfixalloc.c runtime/mgc0.c runtime/mheap.c \
+       runtime/msize.c runtime/proc.c runtime/runtime.c \
+       runtime/signal_unix.c runtime/thread.c runtime/yield.c \
        runtime/rtems-task-variable-add.c iface.c malloc.c map.c \
        mprof.c reflect.c runtime1.c sema.c sigqueue.c string.c time.c
 @LIBGO_IS_LINUX_FALSE@am__objects_1 = lock_sema.lo thread-sema.lo
@@ -224,30 +220,30 @@ am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \
 @LIBGO_IS_RTEMS_TRUE@am__objects_3 = rtems-task-variable-add.lo
 am__objects_4 = go-append.lo go-assert.lo go-assert-interface.lo \
        go-byte-array-to-string.lo go-breakpoint.lo go-caller.lo \
-       go-can-convert-interface.lo go-cgo.lo go-check-interface.lo \
-       go-construct-map.lo go-convert-interface.lo go-copy.lo \
-       go-defer.lo go-deferred-recover.lo go-eface-compare.lo \
+       go-callers.lo go-can-convert-interface.lo go-cgo.lo \
+       go-check-interface.lo go-construct-map.lo \
+       go-convert-interface.lo go-copy.lo go-defer.lo \
+       go-deferred-recover.lo go-eface-compare.lo \
        go-eface-val-compare.lo go-getgoroot.lo \
        go-int-array-to-string.lo go-int-to-string.lo \
        go-interface-compare.lo go-interface-eface-compare.lo \
        go-interface-val-compare.lo go-make-slice.lo go-map-delete.lo \
        go-map-index.lo go-map-len.lo go-map-range.lo go-matherr.lo \
        go-nanotime.lo go-now.lo go-new-map.lo go-new.lo go-nosys.lo \
-       go-panic.lo go-print.lo go-recover.lo go-reflect.lo \
-       go-reflect-call.lo go-reflect-map.lo go-rune.lo \
-       go-runtime-error.lo go-setenv.lo go-signal.lo go-strcmp.lo \
-       go-string-to-byte-array.lo go-string-to-int-array.lo \
-       go-strplus.lo go-strslice.lo go-trampoline.lo \
-       go-type-complex.lo go-type-eface.lo go-type-error.lo \
-       go-type-float.lo go-type-identity.lo go-type-interface.lo \
-       go-type-string.lo go-typedesc-equal.lo go-typestring.lo \
-       go-unreflect.lo go-unsafe-new.lo go-unsafe-newarray.lo \
+       go-panic.lo go-print.lo go-recover.lo go-reflect-call.lo \
+       go-reflect-map.lo go-rune.lo go-runtime-error.lo go-setenv.lo \
+       go-signal.lo go-strcmp.lo go-string-to-byte-array.lo \
+       go-string-to-int-array.lo go-strplus.lo go-strslice.lo \
+       go-trampoline.lo go-type-complex.lo go-type-eface.lo \
+       go-type-error.lo go-type-float.lo go-type-identity.lo \
+       go-type-interface.lo go-type-string.lo go-typedesc-equal.lo \
+       go-typestring.lo go-unsafe-new.lo go-unsafe-newarray.lo \
        go-unsafe-pointer.lo go-unwind.lo chan.lo cpuprof.lo \
        $(am__objects_1) mcache.lo mcentral.lo $(am__objects_2) \
        mfinal.lo mfixalloc.lo mgc0.lo mheap.lo msize.lo proc.lo \
-       runtime.lo thread.lo yield.lo $(am__objects_3) iface.lo \
-       malloc.lo map.lo mprof.lo reflect.lo runtime1.lo sema.lo \
-       sigqueue.lo string.lo time.lo
+       runtime.lo signal_unix.lo thread.lo yield.lo $(am__objects_3) \
+       iface.lo malloc.lo map.lo mprof.lo reflect.lo runtime1.lo \
+       sema.lo sigqueue.lo string.lo time.lo
 am_libgo_la_OBJECTS = $(am__objects_4)
 libgo_la_OBJECTS = $(am_libgo_la_OBJECTS)
 libgo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -451,7 +447,6 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
-glibgo_prefixdir = @glibgo_prefixdir@
 glibgo_toolexecdir = @glibgo_toolexecdir@
 glibgo_toolexeclibdir = @glibgo_toolexeclibdir@
 go_include = @go_include@
@@ -472,6 +467,7 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 multi_basedir = @multi_basedir@
+nover_glibgo_toolexeclibdir = @nover_glibgo_toolexeclibdir@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -501,6 +497,7 @@ PWD_COMMAND = $${PWDCMD-pwd}
 STAMP = echo timestamp >
 toolexecdir = $(glibgo_toolexecdir)
 toolexeclibdir = $(glibgo_toolexeclibdir)
+toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
 WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
 
 # -I/-D flags to pass when compiling.
@@ -564,7 +561,6 @@ AM_MAKEFLAGS = \
 FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 toolexeclib_LTLIBRARIES = libgo.la
 toolexeclib_LIBRARIES = libgobegin.a
-toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias)
 toolexeclibgo_DATA = \
        bufio.gox \
        bytes.gox \
@@ -706,13 +702,11 @@ toolexeclibgohtml_DATA = \
 
 toolexeclibgoimagedir = $(toolexeclibgodir)/image
 toolexeclibgoimage_DATA = \
-       image/bmp.gox \
        image/color.gox \
        image/draw.gox \
        image/gif.gox \
        image/jpeg.gox \
-       image/png.gox \
-       image/tiff.gox
+       image/png.gox
 
 toolexeclibgoindexdir = $(toolexeclibgodir)/index
 toolexeclibgoindex_DATA = \
@@ -766,8 +760,8 @@ toolexeclibgoold_DATA = \
 toolexeclibgoosdir = $(toolexeclibgodir)/os
 toolexeclibgoos_DATA = \
        os/exec.gox \
-       os/user.gox \
-       os/signal.gox
+       os/signal.gox \
+       os/user.gox
 
 toolexeclibgopathdir = $(toolexeclibgodir)/path
 toolexeclibgopath_DATA = \
@@ -789,8 +783,7 @@ toolexeclibgosync_DATA = \
 toolexeclibgotestingdir = $(toolexeclibgodir)/testing
 toolexeclibgotesting_DATA = \
        testing/iotest.gox \
-       testing/quick.gox \
-       testing/script.gox
+       testing/quick.gox
 
 toolexeclibgotextdir = $(toolexeclibgodir)/text
 toolexeclibgotext_DATA = \
@@ -820,6 +813,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 \
@@ -850,7 +844,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 \
@@ -872,7 +865,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 \
@@ -890,6 +882,7 @@ runtime_files = \
        runtime/msize.c \
        runtime/proc.c \
        runtime/runtime.c \
+       runtime/signal_unix.c \
        runtime/thread.c \
        runtime/yield.c \
        $(rtems_task_variable_add_file) \
@@ -910,7 +903,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
@@ -1015,20 +1009,24 @@ go_mime_files = \
 @LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@@LIBGO_IS_RTEMS_FALSE@go_net_newpollserver_file = go/net/newpollserver.go
 @LIBGO_IS_LINUX_TRUE@@LIBGO_IS_RTEMS_FALSE@go_net_newpollserver_file = go/net/newpollserver.go
 @LIBGO_IS_RTEMS_TRUE@go_net_newpollserver_file = go/net/newpollserver_rtems.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_cgo_file = go/net/cgo_bsd.go
+@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_cgo_file = go/net/cgo_bsd.go
+@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_cgo_file = go/net/cgo_bsd.go
 @LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_cgo_file = go/net/cgo_linux.go
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_cgo_file = go/net/cgo_linux.go
 @LIBGO_IS_LINUX_TRUE@go_net_cgo_file = go/net/cgo_linux.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sock_file = go/net/sock_bsd.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sock_file = go/net/sock_linux.go
+@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sock_file = go/net/sock_bsd.go
+@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sock_file = go/net/sock_bsd.go
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sock_file = go/net/sock_solaris.go
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sock_file = go/net/sock_linux.go
 @LIBGO_IS_LINUX_TRUE@go_net_sock_file = go/net/sock_linux.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockopt_file = go/net/sockopt_bsd.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sockopt_file = go/net/sockopt_linux.go
+@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockopt_file = go/net/sockopt_bsd.go
+@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockopt_file = go/net/sockopt_bsd.go
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sockopt_file = go/net/sockopt_bsd.go
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sockopt_file = go/net/sockopt_linux.go
 @LIBGO_IS_LINUX_TRUE@go_net_sockopt_file = go/net/sockopt_linux.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockoptip_file = go/net/sockoptip_bsd.go
-@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sockoptip_file = go/net/sockoptip_linux.go
+@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockoptip_file = go/net/sockoptip_bsd.go go/net/sockoptip_netbsd.go
+@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sockoptip_file = go/net/sockoptip_bsd.go go/net/sockoptip_freebsd.go
+@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sockoptip_file = go/net/sockoptip_bsd.go go/net/sockoptip_solaris.go
 @LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sockoptip_file = go/net/sockoptip_linux.go
 @LIBGO_IS_LINUX_TRUE@go_net_sockoptip_file = go/net/sockoptip_linux.go
 @LIBGO_IS_LINUX_FALSE@go_net_sendfile_file = go/net/sendfile_stub.go
@@ -1058,6 +1056,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 \
@@ -1108,9 +1107,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 \
@@ -1131,11 +1128,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
@@ -1151,6 +1148,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
 
@@ -1163,6 +1161,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
 
@@ -1188,6 +1187,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 = \
@@ -1253,7 +1253,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 = \
@@ -1315,13 +1314,14 @@ 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
 
@@ -1340,13 +1340,15 @@ go_debug_dwarf_files = \
        go/debug/dwarf/buf.go \
        go/debug/dwarf/const.go \
        go/debug/dwarf/entry.go \
+       go/debug/dwarf/line.go \
        go/debug/dwarf/open.go \
        go/debug/dwarf/type.go \
        go/debug/dwarf/unit.go
 
 go_debug_elf_files = \
        go/debug/elf/elf.go \
-       go/debug/elf/file.go
+       go/debug/elf/file.go \
+       go/debug/elf/runtime.go
 
 go_debug_gosym_files = \
        go/debug/gosym/pclntab.go \
@@ -1434,6 +1436,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 \
@@ -1471,8 +1474,7 @@ go_go_ast_files = \
 
 go_go_build_files = \
        go/go/build/build.go \
-       go/go/build/dir.go \
-       go/go/build/path.go \
+       go/go/build/doc.go \
        syslist.go
 
 go_go_doc_files = \
@@ -1481,7 +1483,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 \
@@ -1515,7 +1518,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 \
@@ -1528,9 +1530,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
@@ -1552,12 +1551,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
@@ -1673,17 +1666,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 \
@@ -1732,9 +1727,6 @@ go_testing_iotest_files = \
 go_testing_quick_files = \
        go/testing/quick/quick.go
 
-go_testing_script_files = \
-       go/testing/script/script.go
-
 go_text_scanner_files = \
        go/text/scanner/scanner.go
 
@@ -1807,6 +1799,10 @@ go_unicode_utf8_files = \
 
 # Support for netlink sockets and messages.
 @LIBGO_IS_LINUX_TRUE@syscall_netlink_file = go/syscall/netlink_linux.go
+@LIBGO_IS_LINUX_FALSE@syscall_lsf_file = 
+
+# GNU/Linux specific socket filters.
+@LIBGO_IS_LINUX_TRUE@syscall_lsf_file = go/syscall/lsf_linux.go
 go_base_syscall_files = \
        go/syscall/env_unix.go \
        go/syscall/syscall_errno.go \
@@ -1827,6 +1823,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) \
@@ -1840,6 +1837,7 @@ go_syscall_files = \
 
 go_syscall_c_files = \
        go/syscall/errno.c \
+       go/syscall/signame.c \
        $(syscall_wait_c_file)
 
 @LIBGO_IS_LINUX_FALSE@os_lib_inotify_lo = 
@@ -1847,33 +1845,38 @@ go_syscall_c_files = \
 # os_lib_inotify_lo = os/inotify.lo
 @LIBGO_IS_LINUX_TRUE@os_lib_inotify_lo = 
 libgo_go_objs = \
-       bufio/bufio.lo \
-       bytes/bytes.lo \
+       bufio.lo \
+       bytes.lo \
        bytes/index.lo \
-       crypto/crypto.lo \
-       errors/errors.lo \
-       expvar/expvar.lo \
-       flag/flag.lo \
-       fmt/fmt.lo \
-       hash/hash.lo \
-       html/html.lo \
-       image/image.lo \
-       io/io.lo \
-       log/log.lo \
-       math/math.lo \
-       net/net.lo \
-       os/exec.lo \
-       os/os.lo \
-       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 \
@@ -1944,13 +1947,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 \
@@ -1958,7 +1959,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 \
@@ -1969,9 +1969,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 \
@@ -1979,17 +1980,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
 
@@ -2022,7 +2018,7 @@ BUILDDEPS = \
 BUILDPACKAGE = \
        $(MKDIR_P) $(@D); \
        files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \
-       $(LTGOCOMPILE) -I . -c -fgo-prefix="libgo_$(@D)" -o $@ $$files
+       $(LTGOCOMPILE) -I . -c -fgo-pkgpath=`echo $@ | sed -e 's/.lo$$//' -e 's/-go$$//'` -o $@ $$files
 
 @LIBGO_IS_RTEMS_FALSE@use_dejagnu = no
 @LIBGO_IS_RTEMS_TRUE@use_dejagnu = yes
@@ -2043,12 +2039,10 @@ CHECK = \
        LD_LIBRARY_PATH=`echo $${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \
        export LD_LIBRARY_PATH; \
        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; \
@@ -2194,7 +2188,6 @@ TEST_PACKAGES = \
        image/draw/check \
        image/jpeg/check \
        image/png/check \
-       image/tiff/check \
        index/suffixarray/check \
        io/ioutil/check \
        log/syslog/check \
@@ -2205,6 +2198,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 \
@@ -2216,8 +2210,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 \
@@ -2226,7 +2220,6 @@ TEST_PACKAGES = \
        text/template/check \
        text/template/parse/check \
        testing/quick/check \
-       testing/script/check \
        unicode/utf16/check \
        unicode/utf8/check
 
@@ -2372,6 +2365,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-breakpoint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-byte-array-to-string.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-caller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-callers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-can-convert-interface.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-cgo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-check-interface.Plo@am__quote@
@@ -2405,7 +2399,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-recover.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-reflect-call.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-reflect-map.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-reflect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-rune.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-runtime-error.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-setenv.Plo@am__quote@
@@ -2425,7 +2418,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-type-string.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-typedesc-equal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-typestring.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-unreflect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-unsafe-new.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-unsafe-newarray.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/go-unsafe-pointer.Plo@am__quote@
@@ -2451,6 +2443,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtime.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtime1.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sema.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal_unix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigqueue.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread-linux.Plo@am__quote@
@@ -2536,6 +2529,13 @@ go-caller.lo: runtime/go-caller.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o go-caller.lo `test -f 'runtime/go-caller.c' || echo '$(srcdir)/'`runtime/go-caller.c
 
+go-callers.lo: runtime/go-callers.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT go-callers.lo -MD -MP -MF $(DEPDIR)/go-callers.Tpo -c -o go-callers.lo `test -f 'runtime/go-callers.c' || echo '$(srcdir)/'`runtime/go-callers.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-callers.Tpo $(DEPDIR)/go-callers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-callers.c' object='go-callers.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o go-callers.lo `test -f 'runtime/go-callers.c' || echo '$(srcdir)/'`runtime/go-callers.c
+
 go-can-convert-interface.lo: runtime/go-can-convert-interface.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT go-can-convert-interface.lo -MD -MP -MF $(DEPDIR)/go-can-convert-interface.Tpo -c -o go-can-convert-interface.lo `test -f 'runtime/go-can-convert-interface.c' || echo '$(srcdir)/'`runtime/go-can-convert-interface.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-can-convert-interface.Tpo $(DEPDIR)/go-can-convert-interface.Plo
@@ -2746,13 +2746,6 @@ go-recover.lo: runtime/go-recover.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o go-recover.lo `test -f 'runtime/go-recover.c' || echo '$(srcdir)/'`runtime/go-recover.c
 
-go-reflect.lo: runtime/go-reflect.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT go-reflect.lo -MD -MP -MF $(DEPDIR)/go-reflect.Tpo -c -o go-reflect.lo `test -f 'runtime/go-reflect.c' || echo '$(srcdir)/'`runtime/go-reflect.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-reflect.Tpo $(DEPDIR)/go-reflect.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-reflect.c' object='go-reflect.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o go-reflect.lo `test -f 'runtime/go-reflect.c' || echo '$(srcdir)/'`runtime/go-reflect.c
-
 go-reflect-call.lo: runtime/go-reflect-call.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT go-reflect-call.lo -MD -MP -MF $(DEPDIR)/go-reflect-call.Tpo -c -o go-reflect-call.lo `test -f 'runtime/go-reflect-call.c' || echo '$(srcdir)/'`runtime/go-reflect-call.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-reflect-call.Tpo $(DEPDIR)/go-reflect-call.Plo
@@ -2900,13 +2893,6 @@ go-typestring.lo: runtime/go-typestring.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o go-typestring.lo `test -f 'runtime/go-typestring.c' || echo '$(srcdir)/'`runtime/go-typestring.c
 
-go-unreflect.lo: runtime/go-unreflect.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT go-unreflect.lo -MD -MP -MF $(DEPDIR)/go-unreflect.Tpo -c -o go-unreflect.lo `test -f 'runtime/go-unreflect.c' || echo '$(srcdir)/'`runtime/go-unreflect.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-unreflect.Tpo $(DEPDIR)/go-unreflect.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/go-unreflect.c' object='go-unreflect.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o go-unreflect.lo `test -f 'runtime/go-unreflect.c' || echo '$(srcdir)/'`runtime/go-unreflect.c
-
 go-unsafe-new.lo: runtime/go-unsafe-new.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT go-unsafe-new.lo -MD -MP -MF $(DEPDIR)/go-unsafe-new.Tpo -c -o go-unsafe-new.lo `test -f 'runtime/go-unsafe-new.c' || echo '$(srcdir)/'`runtime/go-unsafe-new.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/go-unsafe-new.Tpo $(DEPDIR)/go-unsafe-new.Plo
@@ -3054,6 +3040,13 @@ runtime.lo: runtime/runtime.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o runtime.lo `test -f 'runtime/runtime.c' || echo '$(srcdir)/'`runtime/runtime.c
 
+signal_unix.lo: runtime/signal_unix.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT signal_unix.lo -MD -MP -MF $(DEPDIR)/signal_unix.Tpo -c -o signal_unix.lo `test -f 'runtime/signal_unix.c' || echo '$(srcdir)/'`runtime/signal_unix.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/signal_unix.Tpo $(DEPDIR)/signal_unix.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='runtime/signal_unix.c' object='signal_unix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o signal_unix.lo `test -f 'runtime/signal_unix.c' || echo '$(srcdir)/'`runtime/signal_unix.c
+
 thread.lo: runtime/thread.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT thread.lo -MD -MP -MF $(DEPDIR)/thread.Tpo -c -o thread.lo `test -f 'runtime/thread.c' || echo '$(srcdir)/'`runtime/thread.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/thread.Tpo $(DEPDIR)/thread.Plo
@@ -4317,31 +4310,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
@@ -4410,262 +4403,249 @@ s-epoll: Makefile
        $(SHELL) $(srcdir)/../move-if-change epoll.go.tmp epoll.go
        $(STAMP) $@
 
-@go_include@ bufio/bufio.lo.dep
-bufio/bufio.lo.dep: $(go_bufio_files)
+@go_include@ bufio.lo.dep
+bufio.lo.dep: $(go_bufio_files)
        $(BUILDDEPS)
-bufio/bufio.lo: $(go_bufio_files)
+bufio.lo: $(go_bufio_files)
        $(BUILDPACKAGE)
 bufio/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: bufio/check
 
-@go_include@ bytes/bytes.lo.dep
-bytes/bytes.lo.dep: $(go_bytes_files)
+@go_include@ bytes.lo.dep
+bytes.lo.dep: $(go_bytes_files)
        $(BUILDDEPS)
-bytes/bytes.lo: $(go_bytes_files)
+bytes.lo: $(go_bytes_files)
        $(BUILDPACKAGE)
-bytes/index.lo: $(go_bytes_c_files) bytes/bytes.lo
+bytes/index.lo: $(go_bytes_c_files)
+       @$(MKDIR_P) bytes
        $(LTCOMPILE) -c -o bytes/index.lo $(srcdir)/go/bytes/indexbyte.c
 bytes/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: bytes/check
 
-@go_include@ crypto/crypto.lo.dep
-crypto/crypto.lo.dep: $(go_crypto_files)
+@go_include@ crypto.lo.dep
+crypto.lo.dep: $(go_crypto_files)
        $(BUILDDEPS)
-crypto/crypto.lo: $(go_crypto_files)
+crypto.lo: $(go_crypto_files)
        $(BUILDPACKAGE)
 crypto/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: crypto/check
 
-@go_include@ errors/errors.lo.dep
-errors/errors.lo.dep: $(go_errors_files)
+@go_include@ errors.lo.dep
+errors.lo.dep: $(go_errors_files)
        $(BUILDDEPS)
-errors/errors.lo: $(go_errors_files)
+errors.lo: $(go_errors_files)
        $(BUILDPACKAGE)
 errors/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: errors/check
 
-@go_include@ expvar/expvar.lo.dep
-expvar/expvar.lo.dep: $(go_expvar_files)
+@go_include@ expvar.lo.dep
+expvar.lo.dep: $(go_expvar_files)
        $(BUILDDEPS)
-expvar/expvar.lo: $(go_expvar_files)
+expvar.lo: $(go_expvar_files)
        $(BUILDPACKAGE)
 expvar/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: expvar/check
 
-@go_include@ flag/flag.lo.dep
-flag/flag.lo.dep: $(go_flag_files)
+@go_include@ flag.lo.dep
+flag.lo.dep: $(go_flag_files)
        $(BUILDDEPS)
-flag/flag.lo: $(go_flag_files)
+flag.lo: $(go_flag_files)
        $(BUILDPACKAGE)
 flag/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: flag/check
 
-@go_include@ fmt/fmt.lo.dep
-fmt/fmt.lo.dep: $(go_fmt_files)
+@go_include@ fmt.lo.dep
+fmt.lo.dep: $(go_fmt_files)
        $(BUILDDEPS)
-fmt/fmt.lo: $(go_fmt_files)
+fmt.lo: $(go_fmt_files)
        $(BUILDPACKAGE)
 fmt/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: fmt/check
 
-@go_include@ hash/hash.lo.dep
-hash/hash.lo.dep: $(go_hash_files)
+@go_include@ hash.lo.dep
+hash.lo.dep: $(go_hash_files)
        $(BUILDDEPS)
-hash/hash.lo: $(go_hash_files)
+hash.lo: $(go_hash_files)
        $(BUILDPACKAGE)
 hash/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: hash/check
 
-@go_include@ html/html.lo.dep
-html/html.lo.dep: $(go_html_files)
+@go_include@ html.lo.dep
+html.lo.dep: $(go_html_files)
        $(BUILDDEPS)
-html/html.lo: $(go_html_files)
+html.lo: $(go_html_files)
        $(BUILDPACKAGE)
 html/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: html/check
 
-@go_include@ image/image.lo.dep
-image/image.lo.dep: $(go_image_files)
+@go_include@ image.lo.dep
+image.lo.dep: $(go_image_files)
        $(BUILDDEPS)
-image/image.lo: $(go_image_files)
+image.lo: $(go_image_files)
        $(BUILDPACKAGE)
 image/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: image/check
 
-@go_include@ io/io.lo.dep
-io/io.lo.dep: $(go_io_files)
+@go_include@ io.lo.dep
+io.lo.dep: $(go_io_files)
        $(BUILDDEPS)
-io/io.lo: $(go_io_files)
+io.lo: $(go_io_files)
        $(BUILDPACKAGE)
 io/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: io/check
 
-@go_include@ log/log.lo.dep
-log/log.lo.dep: $(go_log_files)
+@go_include@ log.lo.dep
+log.lo.dep: $(go_log_files)
        $(BUILDDEPS)
-log/log.lo: $(go_log_files)
+log.lo: $(go_log_files)
        $(BUILDPACKAGE)
 log/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: log/check
 
-@go_include@ math/math.lo.dep
-math/math.lo.dep: $(go_math_files)
+@go_include@ math.lo.dep
+math.lo.dep: $(go_math_files)
        $(BUILDDEPS)
-math/math.lo: $(go_math_files)
+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)
@@ -5340,16 +5320,6 @@ hash/fnv/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: hash/fnv/check
 
-@go_include@ image/bmp.lo.dep
-image/bmp.lo.dep: $(go_image_bmp_files)
-       $(BUILDDEPS)
-image/bmp.lo: $(go_image_bmp_files)
-       $(BUILDPACKAGE)
-image/bmp/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/bmp
-       @$(CHECK)
-.PHONY: image/bmp/check
-
 @go_include@ image/color.lo.dep
 image/color.lo.dep: $(go_image_color_files)
        $(BUILDDEPS)
@@ -5400,16 +5370,6 @@ image/png/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: image/png/check
 
-@go_include@ image/tiff.lo.dep
-image/tiff.lo.dep: $(go_image_tiff_files)
-       $(BUILDDEPS)
-image/tiff.lo: $(go_image_tiff_files)
-       $(BUILDPACKAGE)
-image/tiff/check: $(CHECK_DEPS)
-       @$(MKDIR_P) image/tiff
-       @$(CHECK)
-.PHONY: image/tiff/check
-
 @go_include@ index/suffixarray.lo.dep
 index/suffixarray.lo.dep: $(go_index_suffixarray_files)
        $(BUILDDEPS)
@@ -5436,6 +5396,7 @@ 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
@@ -5642,16 +5603,6 @@ os/exec/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: os/exec/check
 
-@go_include@ os/user.lo.dep
-os/user.lo.dep: $(go_os_user_files)
-       $(BUILDDEPS)
-os/user.lo: $(go_os_user_files)
-       $(BUILDPACKAGE)
-os/user/check: $(CHECK_DEPS)
-       @$(MKDIR_P) os/user
-       @$(CHECK)
-.PHONY: os/user/check
-
 @go_include@ os/signal.lo.dep
 os/signal.lo.dep: $(go_os_signal_files)
        $(BUILDDEPS)
@@ -5662,6 +5613,16 @@ os/signal/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: os/signal/check
 
+@go_include@ os/user.lo.dep
+os/user.lo.dep: $(go_os_user_files)
+       $(BUILDDEPS)
+os/user.lo: $(go_os_user_files)
+       $(BUILDPACKAGE)
+os/user/check: $(CHECK_DEPS)
+       @$(MKDIR_P) os/user
+       @$(CHECK)
+.PHONY: os/user/check
+
 @go_include@ path/filepath.lo.dep
 path/filepath.lo.dep: $(go_path_filepath_files)
        $(BUILDDEPS)
@@ -5714,6 +5675,16 @@ sync/atomic/check: $(CHECK_DEPS)
        @$(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)
+       @$(MKDIR_P) text/scanner
+       @$(CHECK)
+.PHONY: text/scanner/check
+
 @go_include@ text/tabwriter.lo.dep
 text/tabwriter.lo.dep: $(go_text_tabwriter_files)
        $(BUILDDEPS)
@@ -5763,16 +5734,6 @@ testing/quick/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: testing/quick/check
 
-@go_include@ testing/script.lo.dep
-testing/script.lo.dep: $(go_testing_script_files)
-       $(BUILDDEPS)
-testing/script.lo: $(go_testing_script_files)
-       $(BUILDPACKAGE)
-testing/script/check: $(CHECK_DEPS)
-       @$(MKDIR_P) testing/script
-       @$(CHECK)
-.PHONY: testing/script/check
-
 @go_include@ unicode/utf16.lo.dep
 unicode/utf16.lo.dep: $(go_unicode_utf16_files)
        $(BUILDDEPS)
@@ -5793,71 +5754,76 @@ unicode/utf8/check: $(CHECK_DEPS)
        @$(CHECK)
 .PHONY: unicode/utf8/check
 
-@go_include@ syscall/syscall.lo.dep
-syscall/syscall.lo.dep: $(go_syscall_files)
+@go_include@ syscall.lo.dep
+syscall.lo.dep: $(go_syscall_files)
        $(BUILDDEPS)
-syscall/syscall.lo: $(go_syscall_files)
+syscall.lo: $(go_syscall_files)
        $(BUILDPACKAGE)
 syscall/errno.lo: go/syscall/errno.c
+       @$(MKDIR_P) syscall
+       $(LTCOMPILE) -c -o $@ $<
+syscall/signame.lo: go/syscall/signame.c
+       @$(MKDIR_P) syscall
        $(LTCOMPILE) -c -o $@ $<
 syscall/wait.lo: go/syscall/wait.c
+       @$(MKDIR_P) syscall
        $(LTCOMPILE) -c -o $@ $<
 
-bufio.gox: bufio/bufio.lo
+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
@@ -6005,8 +5971,6 @@ hash/crc64.gox: hash/crc64.lo
 hash/fnv.gox: hash/fnv.lo
        $(BUILDGOX)
 
-image/bmp.gox: image/bmp.lo
-       $(BUILDGOX)
 image/color.gox: image/color.lo
        $(BUILDGOX)
 image/draw.gox: image/draw.lo
@@ -6017,8 +5981,6 @@ image/jpeg.gox: image/jpeg.lo
        $(BUILDGOX)
 image/png.gox: image/png.lo
        $(BUILDGOX)
-image/tiff.gox: image/tiff.lo
-       $(BUILDGOX)
 
 index/suffixarray.gox: index/suffixarray.lo
        $(BUILDGOX)
@@ -6075,10 +6037,10 @@ old/template.gox: old/template.lo
 
 os/exec.gox: os/exec.lo
        $(BUILDGOX)
-os/user.gox: os/user.lo
-       $(BUILDGOX)
 os/signal.gox: os/signal.lo
        $(BUILDGOX)
+os/user.gox: os/user.lo
+       $(BUILDGOX)
 
 path/filepath.gox: path/filepath.lo
        $(BUILDGOX)
@@ -6107,8 +6069,6 @@ testing/iotest.gox: testing/iotest.lo
        $(BUILDGOX)
 testing/quick.gox: testing/quick.lo
        $(BUILDGOX)
-testing/script.gox: testing/script.lo
-       $(BUILDGOX)
 
 unicode/utf16.gox: unicode/utf16.lo
        $(BUILDGOX)