diff options
author | Ian Lance Taylor <iant@golang.org> | 2014-04-29 08:53:38 -0400 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2014-04-29 08:53:38 -0400 |
commit | 506b229e1c034eb277bc24caacc725e67908ca24 (patch) | |
tree | 1945b01a2526a4bcb25e90b1b521efaee55f428e /src/cmd/cgo | |
parent | 84f0efd06b5aec1d7892fb7a6065c27408e3b8e5 (diff) | |
download | go-506b229e1c034eb277bc24caacc725e67908ca24.tar.gz |
cmd/cgo: for gccgo add #define to cgo_export.h for expected name
For gccgo we rename exported functions so that the compiler
will make them visible. This CL adds a #define so that C
functions that #include "cgo_export.h" can use the expected
names of the function.
The test for this is the existing issue6833 test in
misc/cgo/test. Without this CL it fails when using
-compiler=gccgo.
LGTM=minux.ma, rsc
R=golang-codereviews, gobot, rsc, minux.ma
CC=golang-codereviews
https://codereview.appspot.com/91830046
Diffstat (limited to 'src/cmd/cgo')
-rw-r--r-- | src/cmd/cgo/out.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go index 3f04f1361..a1fc2bd4f 100644 --- a/src/cmd/cgo/out.go +++ b/src/cmd/cgo/out.go @@ -880,10 +880,24 @@ func (p *Package) writeGccgoExports(fgo2, fc, fm *os.File) { fmt.Fprintf(cdeclBuf, ")") cParams := cdeclBuf.String() + // We need to use a name that will be exported by the + // Go code; otherwise gccgo will make it static and we + // will not be able to link against it from the C + // code. goName := "Cgoexp_" + exp.ExpName fmt.Fprintf(fgcch, `extern %s %s %s __asm__("%s.%s");`, cRet, goName, cParams, gccgoSymbolPrefix, goName) fmt.Fprint(fgcch, "\n") + // Use a #define so that the C code that includes + // cgo_export.h will be able to refer to the Go + // function using the expected name. + fmt.Fprintf(fgcch, "#define %s %s\n", exp.ExpName, goName) + + // Use a #undef in _cgo_export.c so that we ignore the + // #define from cgo_export.h, since here we are + // defining the real function. + fmt.Fprintf(fgcc, "#undef %s\n", exp.ExpName) + fmt.Fprint(fgcc, "\n") fmt.Fprintf(fgcc, "%s %s %s {\n", cRet, exp.ExpName, cParams) fmt.Fprint(fgcc, "\t") |