diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-11-09 19:03:59 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-11-09 19:03:59 +0000 |
| commit | 0d26cdf1cfef8b956cd62e5e6a9cd6210de8140d (patch) | |
| tree | cb28480693286446d02f20977327259445bf33bc | |
| parent | 79a2c4281c7dcaa6a138d24fd037c62453a12bde (diff) | |
| download | gcc-0d26cdf1cfef8b956cd62e5e6a9cd6210de8140d.zip gcc-0d26cdf1cfef8b956cd62e5e6a9cd6210de8140d.tar.gz gcc-0d26cdf1cfef8b956cd62e5e6a9cd6210de8140d.tar.bz2 | |
cmd/cgo: fix typo in gccgo name mangling recipe
The code to implement new-style gccgo name mangling had a recipe that
didn't quite match the one in the compiler (incorrect handling for
'.'). This showed up as a failure in the gotools cgo test if the
directory containing the test run included a "." character.
Reviewed-on: https://go-review.googlesource.com/c/147917
From-SVN: r265981
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/cmd/cgo/out.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index a707781..6c5d5bc 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -da8c968474690d1e77442ac3361b2302ea8e1f36 +559fae430b81595efe151222385192a07a9fc3c3 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/cmd/cgo/out.go b/libgo/go/cmd/cgo/out.go index 60b2c11..50e5715 100644 --- a/libgo/go/cmd/cgo/out.go +++ b/libgo/go/cmd/cgo/out.go @@ -1261,7 +1261,7 @@ func gccgoPkgpathToSymbolNew(ppath string) string { for _, c := range []byte(ppath) { switch { case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z', - '0' <= c && c <= '9', '_' == c: + '0' <= c && c <= '9', c == '_', c == '.': bsl = append(bsl, c) default: changed = true |