aboutsummaryrefslogtreecommitdiff
path: root/libgo/go/os
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-01-27 23:44:29 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-01-27 23:44:29 +0000
commitd779dffc4b6ec69cb51b426f779eca4bc37fd063 (patch)
treec305b88e41d468affc247b4f066bc9340fb2209e /libgo/go/os
parentace36c8bcc112f1ecf889f413e22df5a41ed3e87 (diff)
downloadgcc-d779dffc4b6ec69cb51b426f779eca4bc37fd063.zip
gcc-d779dffc4b6ec69cb51b426f779eca4bc37fd063.tar.gz
gcc-d779dffc4b6ec69cb51b426f779eca4bc37fd063.tar.bz2
libgo: update to Go1.10rc1
Reviewed-on: https://go-review.googlesource.com/90295 From-SVN: r257126
Diffstat (limited to 'libgo/go/os')
-rw-r--r--libgo/go/os/error_plan9.go2
-rw-r--r--libgo/go/os/getwd.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/os/error_plan9.go b/libgo/go/os/error_plan9.go
index a673439..b82bf0d 100644
--- a/libgo/go/os/error_plan9.go
+++ b/libgo/go/os/error_plan9.go
@@ -5,7 +5,7 @@
package os
func isExist(err error) bool {
- return checkErrMessageContent(err, " exists")
+ return checkErrMessageContent(err, "exists", "is a directory")
}
func isNotExist(err error) bool {
diff --git a/libgo/go/os/getwd.go b/libgo/go/os/getwd.go
index 87ad8eb..6d25466 100644
--- a/libgo/go/os/getwd.go
+++ b/libgo/go/os/getwd.go
@@ -24,7 +24,7 @@ var useSyscallwd = func(error) bool { return true }
// reached via multiple paths (due to symbolic links),
// Getwd may return any one of them.
func Getwd() (dir string, err error) {
- if runtime.GOOS == "windows" {
+ if runtime.GOOS == "windows" || runtime.GOOS == "plan9" {
return syscall.Getwd()
}