This patch to libgo fixes PR 67976 on the GCC 5 branch.  The bug was
already fixed on mainline when libgo was upgraded to Go 1.5.

Ian
Index: libgo/go/cmd/cgo/out.go
===================================================================
--- libgo/go/cmd/cgo/out.go     (revision 229639)
+++ libgo/go/cmd/cgo/out.go     (working copy)
@@ -102,10 +102,9 @@ func (p *Package) writeDefs() {
                }
 
                if !cVars[n.C] {
-                       fmt.Fprintf(fm, "extern char %s[];\n", n.C)
-                       fmt.Fprintf(fm, "void *_cgohack_%s = %s;\n\n", n.C, n.C)
-
                        if !*gccgo {
+                               fmt.Fprintf(fm, "extern char %s[];\n", n.C)
+                               fmt.Fprintf(fm, "void *_cgohack_%s = %s;\n\n", 
n.C, n.C)
                                fmt.Fprintf(fc, "#pragma cgo_import_static 
%s\n", n.C)
                        }
 

Reply via email to