go/internal/gccgoimporter: recognize aixbigafMagic archives

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/255201

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index f79a1f0420199879757e07213e63eb330ba4d71f..d8db888e4b6852850fa722492cf677bf51db4846 100644 (file)
--- 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 ff484a72fc9fb89684ef431adf080050dfd14c67..391477d5a737e315ed3c535b0a4b86a10ee7a1fd 100644 (file)
--- 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