From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 9 Jan 2012 19:22:26 +0000 (-0800)
Subject: cgo: if value for constant did not parse, get it from DWARF info
X-Git-Tag: weekly.2012-01-15~120
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=900b8becb3afbeffb5c8595b7b83e447ccf7c03f;p=gostls13.git

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 3c95d28be4..75ce1782a0 100644
--- 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 {