qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 13:20:09 -07:00
Code Releases Activity

cmd/cgo: only write _cgo_flags for gccgo

Browse Source 
We only use it for gccgo. Also only write out LDFLAGS,
as that is all that cmd/go uses.

Fixes #60642

Change-Id: I6ccc419a17a433583d9868dd63aa7ec41c2b22c4
Reviewed-on: https://go-review.googlesource.com/c/go/+/524556
Auto-Submit: Ian Lance Taylor <iant@google.com>
Commit-Queue: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
This commit is contained in:
Ian Lance Taylor 2023-08-30 14:06:45 -07:00 committed by Gopher Robot
parent 51ed3cb702
commit bdccd923e9
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/cgo/doc.go
View File

@ -710,7 +710,7 @@ files:
_cgo_export.c # for gcc
_cgo_export.h # for gcc
_cgo_main.c # for gcc
_cgo_flags # for alternative build tools
_cgo_flags # for build tool (if -gccgo)
The file x.cgo1.go is a copy of x.go with the import "C" removed and
references to C.xxx replaced with names like _Cfunc_xxx or _Ctype_xxx.

7
src/cmd/cgo/gcc.go
View File

@ -104,10 +104,8 @@ func (f *File) ProcessCgoDirectives() {
f.Preamble = strings.Join(linesOut, "\n")
}
// addToFlag appends args to flag. All flags are later written out onto the
// _cgo_flags file for the build system to use.
// addToFlag appends args to flag.
func (p *Package) addToFlag(flag string, args []string) {
p.CgoFlags[flag] = append(p.CgoFlags[flag], args...)
if flag == "CFLAGS" {
// We'll also need these when preprocessing for dwarf information.
// However, discard any -g options: we need to be able
@ -118,6 +116,9 @@ func (p *Package) addToFlag(flag string, args []string) {
}
}
}
if flag == "LDFLAGS" {
p.LdFlags = append(p.LdFlags, args...)
}
}
// splitQuoted splits the string s around each instance of one or more consecutive

3
src/cmd/cgo/main.go
View File

@ -38,7 +38,7 @@ type Package struct {
IntSize int64
GccOptions []string
GccIsClang bool
CgoFlags map[string][]string // #cgo flags (CFLAGS, LDFLAGS)
LdFlags []string // #cgo LDFLAGS
Written map[string]bool
Name map[string]*Name // accumulated Name from Files
ExpFunc []*ExpFunc // accumulated ExpFunc from Files
@ -475,7 +475,6 @@ func newPackage(args []string) *Package {
p := &Package{
PtrSize: ptrSize,
IntSize: intSize,
CgoFlags: make(map[string][]string),
Written: make(map[string]bool),
noCallbacks: make(map[string]bool),
noEscapes: make(map[string]bool),

17
src/cmd/cgo/out.go
View File

@ -45,18 +45,17 @@ func (p *Package) writeDefs() {
var gccgoInit strings.Builder
fflg := creat(*objDir + "_cgo_flags")
for k, v := range p.CgoFlags {
for _, arg := range v {
fmt.Fprintf(fflg, "_CGO_%s=%s\n", k, arg)
if !*gccgo {
for _, arg := range p.LdFlags {
fmt.Fprintf(fgo2, "//go:cgo_ldflag %q\n", arg)
}
if k == "LDFLAGS" && !*gccgo {
for _, arg := range v {
fmt.Fprintf(fgo2, "//go:cgo_ldflag %q\n", arg)
}
} else {
fflg := creat(*objDir + "_cgo_flags")
for _, arg := range p.LdFlags {
fmt.Fprintf(fflg, "_CGO_LDFLAGS=%s\n", arg)
}
fflg.Close()
}
fflg.Close()
// Write C main file for using gcc to resolve imports.
fmt.Fprintf(fm, "#include <stddef.h>\n") // For size_t below.