gccgo: suppress "ar rcD" and "-zdefs" on AIX

    Reviewed-on: https://go-review.googlesource.com/100955

From-SVN: r259445

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 76b5acac1f88e3b1b0459cd1d8b52f121e7c5557..f85a667141699f3d2710712ff53566b63b5ef5d8 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-3aa5fc91094c5f24b26747ec176ad44cde784fc7
+2c7093358e5f5ebeb102d44d1036ca0a807d46a5
 
 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/go/internal/work/gccgo.go b/libgo/go/cmd/go/internal/work/gccgo.go
index 72d4d9dd4ba1cb922be67a44e12bf74433acb54e..1ab7e4ef78abca047fe856bdfac19518e5252b27 100644 (file)
--- a/libgo/go/cmd/go/internal/work/gccgo.go
+++ b/libgo/go/cmd/go/internal/work/gccgo.go
@@ -190,15 +190,15 @@ func (gccgoToolchain) pack(b *Builder, a *Action, afile string, ofiles []string)
        }
        absAfile := mkAbs(objdir, afile)
        // Try with D modifier first, then without if that fails.
-       if b.run(a, p.Dir, p.ImportPath, nil, "ar", "rcD", absAfile, absOfiles) != nil {
+       if cfg.Goos == "aix" || b.run(a, p.Dir, p.ImportPath, nil, "ar", "rcD", absAfile, absOfiles) != 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.
                        // AIX "ar" command does not know D option.
-                       return b.run(a, p.Dir, p.ImportPath, nil, "ar", "-X64", "rc", absAfile, absOfiles)
-               } else {
-                       return b.run(a, p.Dir, p.ImportPath, nil, "ar", "rc", absAfile, absOfiles)
+                       arArgs = append(arArgs, "-X64")
                }
+               return b.run(a, p.Dir, p.ImportPath, nil, "ar", "rc", arArgs, absAfile, absOfiles)
        }
        return nil
 }
@@ -466,7 +466,10 @@ func (tools gccgoToolchain) link(b *Builder, root *Action, out, importcfg string
                ldflags = append(ldflags, goLibBegin...)
                ldflags = append(ldflags, "-lgo", "-lgcc_s", "-lgcc", "-lc", "-lgcc")
        case "shared":
-               ldflags = append(ldflags, "-zdefs", "-shared", "-nostdlib", "-lgo", "-lgcc_s", "-lgcc", "-lc")
+               if cfg.Goos != "aix" {
+                       ldflags = append(ldflags, "-zdefs")
+               }
+               ldflags = append(ldflags, "-shared", "-nostdlib", "-lgo", "-lgcc_s", "-lgcc", "-lc")
 
        case "pie":
                ldflags = append(ldflags, "-pie")