aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rwxr-xr-xlibgo/testsuite/gotest4
2 files changed, 2 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ef6ce579423..f56ac802ad0 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ad50884d2a4b653f7f20edc8b441fe6ad6570d55
+9785e5c4e868ba55efdb33fc51872b4821770167
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest
index 0b2e572a905..a82386aab3a 100755
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -513,9 +513,7 @@ localname() {
# Returned: leaf.Mumble
#
symtogo() {
- local s=""
- local result=""
- local ndots=""
+ result=""
for tp in $*
do
s=$(echo "$tp" | sed -e 's/\.\.z2f/%/g' | sed -e 's/.*%//')