diff options
| author | Clément Chigot <clement.chigot@atos.net> | 2020-09-16 13:58:17 +0200 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-09-21 15:42:00 -0700 |
| commit | be3027e9c8366d92f68e6b3021c1cbe815648480 (patch) | |
| tree | 7bc320fd13986a8d52ec594122898eda91b98fc6 | |
| parent | defceb206be0f803b8d94e746180e51adad20b87 (diff) | |
| download | gcc-be3027e9c8366d92f68e6b3021c1cbe815648480.zip gcc-be3027e9c8366d92f68e6b3021c1cbe815648480.tar.gz gcc-be3027e9c8366d92f68e6b3021c1cbe815648480.tar.bz2 | |
go/internal/gccgoimporter: recognize aixbigafMagic archives
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/255201
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/go/internal/gccgoimporter/importer.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index f79a1f0..d8db888 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -f2706d92d9560657333682a3de548f1f98e9f9b0 +6f309797e4f7eed635950687e902a294126e6fc6 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/go/internal/gccgoimporter/importer.go b/libgo/go/go/internal/gccgoimporter/importer.go index ff484a7..391477d 100644 --- a/libgo/go/go/internal/gccgoimporter/importer.go +++ b/libgo/go/go/internal/gccgoimporter/importer.go @@ -198,7 +198,7 @@ func GetImporter(searchpaths []string, initmap map[*types.Package]InitData) Impo return } - if magics == archiveMagic { + if magics == archiveMagic || magics == aixbigafMagic { reader, err = arExportData(reader) if err != nil { return |