From be3027e9c8366d92f68e6b3021c1cbe815648480 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Chigot?= Date: Wed, 16 Sep 2020 13:58:17 +0200 Subject: [PATCH] go/internal/gccgoimporter: recognize aixbigafMagic archives Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/255201 --- gcc/go/gofrontend/MERGE | 2 +- 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 f79a1f04201..d8db888e4b6 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 ff484a72fc9..391477d5a73 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 -- 2.30.2