libgo: update to weekly.2011-10-25

Changes were mainly straightforward to merge.

From-SVN: r181824

1 files changed, 23 insertions, 21 deletions

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 8b6bb72..f7c293a 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -699,10 +699,15 @@ toolexeclibgoencoding_DATA = \
 	encoding/hex.gox \
 	encoding/pem.gox
 
+@LIBGO_IS_LINUX_FALSE@exp_inotify_gox = 
+
+# exp_inotify_gox = exp/inotify.gox
+@LIBGO_IS_LINUX_TRUE@exp_inotify_gox = 
 toolexeclibgoexpdir = $(toolexeclibgodir)/exp
 toolexeclibgoexp_DATA = \
 	exp/ebnf.gox \
 	exp/gui.gox \
+	$(exp_inotify_gox) \
 	exp/norm.gox \
 	exp/spdy.gox \
 	exp/sql.gox \
@@ -781,12 +786,7 @@ toolexeclibgoold_DATA = \
 	old/template.gox
 
 toolexeclibgoosdir = $(toolexeclibgodir)/os
-@LIBGO_IS_LINUX_FALSE@os_inotify_gox = 
-
-# os_inotify_gox = os/inotify.gox
-@LIBGO_IS_LINUX_TRUE@os_inotify_gox = 
 toolexeclibgoos_DATA = \
-	$(os_inotify_gox) \
 	os/user.gox \
 	os/signal.gox
 
@@ -1579,6 +1579,9 @@ go_exp_ebnf_files = \
 go_exp_gui_files = \
 	go/exp/gui/gui.go
 
+go_exp_inotify_files = \
+	go/exp/inotify/inotify_linux.go
+
 go_exp_norm_files = \
 	go/exp/norm/composition.go \
 	go/exp/norm/forminfo.go \
@@ -1599,11 +1602,13 @@ go_exp_sql_files = \
 
 go_exp_ssh_files = \
 	go/exp/ssh/channel.go \
+	go/exp/ssh/client.go \
 	go/exp/ssh/common.go \
 	go/exp/ssh/doc.go \
 	go/exp/ssh/messages.go \
 	go/exp/ssh/server.go \
 	go/exp/ssh/server_shell.go \
+	go/exp/ssh/session.go \
 	go/exp/ssh/transport.go
 
 go_exp_terminal_files = \
@@ -1773,9 +1778,6 @@ go_old_template_files = \
 	go/old/template/format.go \
 	go/old/template/parse.go
 
-go_os_inotify_files = \
-	go/os/inotify/inotify_linux.go
-
 go_os_user_files = \
 	go/os/user/user.go \
 	go/os/user/lookup_unix.go
@@ -2171,10 +2173,10 @@ BUILDGOX = \
 	f=`echo $< | sed -e 's/.lo$$/.o/'`; \
 	$(OBJCOPY) -j .go_export $$f $@.tmp && mv -f $@.tmp $@
 
-@LIBGO_IS_LINUX_FALSE@os_inotify_check = 
+@LIBGO_IS_LINUX_FALSE@exp_inotify_check = 
 
-# os_inotify_check = os/inotify/check
-@LIBGO_IS_LINUX_TRUE@os_inotify_check = 
+# exp_inotify_check = exp/inotify/check
+@LIBGO_IS_LINUX_TRUE@exp_inotify_check = 
 TEST_PACKAGES = \
 	asn1/check \
 	big/check \
@@ -2273,6 +2275,7 @@ TEST_PACKAGES = \
 	encoding/hex/check \
 	encoding/pem/check \
 	exp/ebnf/check \
+	$(exp_inotify_check) \
 	exp/norm/check \
 	exp/spdy/check \
 	exp/sql/check \
@@ -2304,7 +2307,6 @@ TEST_PACKAGES = \
 	old/netchan/check \
 	old/regexp/check \
 	old/template/check \
-	$(os_inotify_check) \
 	os/user/check \
 	os/signal/check \
 	path/filepath/check \
@@ -5326,6 +5328,13 @@ exp/gui/x11/check: $(CHECK_DEPS)
 	@$(CHECK)
 .PHONY: exp/gui/x11/check
 
+exp/inotify.lo: $(go_exp_inotify_files) fmt.gox os.gox strings.gox syscall.gox
+	$(BUILDPACKAGE)
+exp/inotify/check: $(CHECK_DEPS)
+	@$(MKDIR_P) exp/inotify
+	@$(CHECK)
+.PHONY: exp/inotify/check
+
 exp/sql/driver.lo: $(go_exp_sql_driver_files) fmt.gox os.gox reflect.gox \
 		strconv.gox
 	$(BUILDPACKAGE)
@@ -5601,13 +5610,6 @@ old/template/check: $(CHECK_DEPS)
 	@$(CHECK)
 .PHONY: old/template/check
 
-os/inotify.lo: $(go_os_inotify_files) fmt.gox os.gox strings.gox syscall.gox
-	$(BUILDPACKAGE)
-os/inotify/check: $(CHECK_DEPS)
-	@$(MKDIR_P) os/inotify
-	@$(CHECK)
-.PHONY: os/inotify/check
-
 os/user.lo: $(go_os_user_files) fmt.gox os.gox runtime.gox strconv.gox \
 		strings.gox syscall.gox
 	$(BUILDPACKAGE)
@@ -5929,6 +5931,8 @@ exp/ebnf.gox: exp/ebnf.lo
 	$(BUILDGOX)
 exp/gui.gox: exp/gui.lo
 	$(BUILDGOX)
+exp/inotify.gox: exp/inotify.lo
+	$(BUILDGOX)
 exp/norm.gox: exp/norm.lo
 	$(BUILDGOX)
 exp/spdy.gox: exp/spdy.lo
@@ -6022,8 +6026,6 @@ old/regexp.gox: old/regexp.lo
 old/template.gox: old/template.lo
 	$(BUILDGOX)
 
-os/inotify.gox: os/inotify.lo
-	$(BUILDGOX)
 os/user.gox: os/user.lo
 	$(BUILDGOX)
 os/signal.gox: os/signal.lo