diff mbox series

libgo patch committed: Pass -X64 to ar on AIX

Message ID CAOyqgcW=mp8YexdcE50ejo3NpxijgEm6DJZAiG=4KMHi1O4xaw@mail.gmail.com
State New
Headers show
Series libgo patch committed: Pass -X64 to ar on AIX | expand

Commit Message

Ian Lance Taylor March 5, 2019, 10:40 p.m. UTC 
This patch by Clément Chigot changes the go tool to pass -X64 to ar on
AIX.  On aix/ppc64, ar tool must always have -X64 argument if it aims
to create 64 bits archives.  Bootstrapped on x86_64-pc-linux-gnu.
Committed to mainline.

Ian
diff mbox series

Patch

Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE	(revision 269401)
+++ gcc/go/gofrontend/MERGE	(working copy)
@@ -1,4 +1,4 @@ 
-3ae3024cae07fe7e85968ad2583add350616b296
+14e48e756af205a68374c872f3bd03d62ccd70bb
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
Index: libgo/go/cmd/go/internal/work/gccgo.go
===================================================================
--- libgo/go/cmd/go/internal/work/gccgo.go	(revision 269333)
+++ libgo/go/cmd/go/internal/work/gccgo.go	(working copy)
@@ -278,6 +278,13 @@  func (tools gccgoToolchain) link(b *Buil
 		return nil
 	}
 
+	var arArgs []string
+	if cfg.Goos == "aix" && cfg.Goarch == "ppc64" {
+		// AIX puts both 32-bit and 64-bit objects in the same archive.
+		// Tell the AIX "ar" command to only care about 64-bit objects.
+		arArgs = []string{"-X64"}
+	}
+
 	newID := 0
 	readAndRemoveCgoFlags := func(archive string) (string, error) {
 		newID++
@@ -293,11 +300,11 @@  func (tools gccgoToolchain) link(b *Buil
 			b.Showcmd("", "ar d %s _cgo_flags", newArchive)
 			return "", nil
 		}
-		err := b.run(root, root.Objdir, desc, nil, tools.ar(), "x", newArchive, "_cgo_flags")
+		err := b.run(root, root.Objdir, desc, nil, tools.ar(), arArgs, "x", newArchive, "_cgo_flags")
 		if err != nil {
 			return "", err
 		}
-		err = b.run(root, ".", desc, nil, tools.ar(), "d", newArchive, "_cgo_flags")
+		err = b.run(root, ".", desc, nil, tools.ar(), arArgs, "d", newArchive, "_cgo_flags")
 		if err != nil {
 			return "", err
 		}
@@ -516,7 +523,7 @@  func (tools gccgoToolchain) link(b *Buil
 
 	switch buildmode {
 	case "c-archive":
-		if err := b.run(root, ".", desc, nil, tools.ar(), "rc", realOut, out); err != nil {
+		if err := b.run(root, ".", desc, nil, tools.ar(), arArgs, "rc", realOut, out); err != nil {
 			return err
 		}
 	}