diff options
author | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-29 15:14:05 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-29 15:14:05 +0000 |
commit | 1a7ad6ad6683c2254bdf705697a56d578e72e5c7 (patch) | |
tree | 5526a10bcbb3d009f90059a525a17fbe43fc95e4 /libgo/go | |
parent | 14836f38b4a0f631f0dd00cdd2bb82c6d1cb8330 (diff) | |
download | gcc-1a7ad6ad6683c2254bdf705697a56d578e72e5c7.zip gcc-1a7ad6ad6683c2254bdf705697a56d578e72e5c7.tar.gz gcc-1a7ad6ad6683c2254bdf705697a56d578e72e5c7.tar.bz2 |
cmd/go: fix -buildmode={c-archive,c-shared,pie} for gccgo
The tests are misc/cgo tests that are not currently run but will be
run soon.
Reviewed-on: https://go-review.googlesource.com/47037
From-SVN: r249794
Diffstat (limited to 'libgo/go')
-rw-r--r-- | libgo/go/cmd/go/build.go | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/libgo/go/cmd/go/build.go b/libgo/go/cmd/go/build.go index 7e98379..72265ef 100644 --- a/libgo/go/cmd/go/build.go +++ b/libgo/go/cmd/go/build.go @@ -342,16 +342,20 @@ func buildModeInit() { } return p } - switch platform { - case "darwin/arm", "darwin/arm64": - codegenArg = "-shared" - default: - switch goos { - case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris": - // Use -shared so that the result is - // suitable for inclusion in a PIE or - // shared library. + if gccgo { + codegenArg = "-fPIC" + } else { + switch platform { + case "darwin/arm", "darwin/arm64": codegenArg = "-shared" + default: + switch goos { + case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris": + // Use -shared so that the result is + // suitable for inclusion in a PIE or + // shared library. + codegenArg = "-shared" + } } } exeSuffix = ".a" @@ -374,10 +378,14 @@ func buildModeInit() { case "default": switch platform { case "android/arm", "android/arm64", "android/amd64", "android/386": - codegenArg = "-shared" + if !gccgo { + codegenArg = "-shared" + } ldBuildmode = "pie" case "darwin/arm", "darwin/arm64": - codegenArg = "-shared" + if !gccgo { + codegenArg = "-shared" + } fallthrough default: ldBuildmode = "exe" @@ -387,7 +395,7 @@ func buildModeInit() { ldBuildmode = "exe" case "pie": if gccgo { - fatalf("-buildmode=pie not supported by gccgo") + codegenArg = "-fPIE" } else { switch platform { case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/s390x", @@ -1053,7 +1061,7 @@ func (b *builder) action1(mode buildMode, depMode buildMode, p *Package, looksha // Install header for cgo in c-archive and c-shared modes. if p.usesCgo() && (buildBuildmode == "c-archive" || buildBuildmode == "c-shared") { hdrTarget := a.target[:len(a.target)-len(filepath.Ext(a.target))] + ".h" - if buildContext.Compiler == "gccgo" { + if buildContext.Compiler == "gccgo" && *buildO == "" { // For the header file, remove the "lib" // added by go/build, so we generate pkg.h // rather than libpkg.h. @@ -3025,6 +3033,8 @@ func (tools gccgoToolchain) link(b *builder, root *action, out string, allaction ldflags = append(ldflags, "-shared", "-nostdlib", "-Wl,--whole-archive", "-lgolibbegin", "-Wl,--no-whole-archive", "-lgo", "-lgcc_s", "-lgcc", "-lc", "-lgcc") case "shared": ldflags = append(ldflags, "-zdefs", "-shared", "-nostdlib", "-lgo", "-lgcc_s", "-lgcc", "-lc") + case "pie": + ldflags = append(ldflags, "-pie") default: fatalf("-buildmode=%s not supported for gccgo", buildmode) @@ -3100,7 +3110,7 @@ func (tools gccgoToolchain) cc(b *builder, p *Package, objdir, ofile, cfile stri // maybePIC adds -fPIC to the list of arguments if needed. func (tools gccgoToolchain) maybePIC(args []string) []string { switch buildBuildmode { - case "c-shared", "shared", "plugin": + case "c-archive", "c-shared", "shared", "plugin": args = append(args, "-fPIC") } return args |