cgo: if value for constant did not parse, get it from DWARF info

R=rsc, borman
CC=golang-dev
https://golang.org/cl/5525043

diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go
index 3c95d28be49d4a1351c9453558693bc4c7b03c1b..75ce1782a06d0976ef692c0a3189f2d6471b7fdd 100644 (file)
--- a/src/cmd/cgo/gcc.go
+++ b/src/cmd/cgo/gcc.go
@@ -453,6 +453,11 @@ func (p *Package) guessKinds(f *File) []*Name {
        for i, b := range isConst {
                if b {
                        names[i].Kind = "const"
+                       if toSniff[i] != nil && names[i].Const == "" {
+                               j := len(needType)
+                               needType = needType[0 : j+1]
+                               needType[j] = names[i]
+                       }
                }
        }
        for _, n := range toSniff {