mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 14:21:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

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

From-SVN: r259445
This commit is contained in:
Ian Lance Taylor 2018-04-17 20:10:49 +00:00
parent 1a013c9442
commit aa4ec2cdff
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -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.

13
libgo/go/cmd/go/internal/work/gccgo.go
View File

@ -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")