From 949228a322e4ccac49abb620a9e33fe3dfde66e6 Mon Sep 17 00:00:00 2001
From: Shenghou Ma <minux.ma@gmail.com>
Date: Sun, 9 Jun 2013 22:06:29 +0800
Subject: [PATCH] cmd/cgo: use gcc_struct attribute for packed structs to work
 around GCC PR52991. Fixes #5603.

R=iant, dave
CC=gobot, golang-dev
https://golang.org/cl/9895043
---
 misc/cgo/test/cgo_test.go  |  1 +
 misc/cgo/test/issue5603.go | 32 ++++++++++++++++++++++++++++++++
 src/cmd/cgo/doc.go         |  2 +-
 src/cmd/cgo/out.go         |  8 +++++++-
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 misc/cgo/test/issue5603.go

diff --git a/misc/cgo/test/cgo_test.go b/misc/cgo/test/cgo_test.go
index 66c454f8e3..f0b31c589d 100644
--- a/misc/cgo/test/cgo_test.go
+++ b/misc/cgo/test/cgo_test.go
@@ -41,5 +41,6 @@ func Test5227(t *testing.T)                { test5227(t) }
 func TestCflags(t *testing.T)              { testCflags(t) }
 func Test5337(t *testing.T)                { test5337(t) }
 func Test5548(t *testing.T)                { test5548(t) }
+func Test5603(t *testing.T)                { test5603(t) }
 
 func BenchmarkCgoCall(b *testing.B) { benchCgoCall(b) }
diff --git a/misc/cgo/test/issue5603.go b/misc/cgo/test/issue5603.go
new file mode 100644
index 0000000000..ecb2aa32ec
--- /dev/null
+++ b/misc/cgo/test/issue5603.go
@@ -0,0 +1,32 @@
+// Copyright 2013 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cgotest
+
+/*
+const long long issue5603exp = 0x12345678;
+long long issue5603foo0() { return issue5603exp; }
+long long issue5603foo1(void *p) { return issue5603exp; }
+long long issue5603foo2(void *p, void *q) { return issue5603exp; }
+long long issue5603foo3(void *p, void *q, void *r) { return issue5603exp; }
+long long issue5603foo4(void *p, void *q, void *r, void *s) { return issue5603exp; }
+*/
+import "C"
+
+import "testing"
+
+func test5603(t *testing.T) {
+	var x [5]int64
+	exp := int64(C.issue5603exp)
+	x[0] = int64(C.issue5603foo0())
+	x[1] = int64(C.issue5603foo1(nil))
+	x[2] = int64(C.issue5603foo2(nil, nil))
+	x[3] = int64(C.issue5603foo3(nil, nil, nil))
+	x[4] = int64(C.issue5603foo4(nil, nil, nil, nil))
+	for i, v := range x {
+		if v != exp {
+			t.Errorf("issue5603foo%d() returns %v, expected %v", i, v, exp)
+		}
+	}
+}
diff --git a/src/cmd/cgo/doc.go b/src/cmd/cgo/doc.go
index d9b50cf5c2..701ac6f8d9 100644
--- a/src/cmd/cgo/doc.go
+++ b/src/cmd/cgo/doc.go
@@ -310,7 +310,7 @@ file compiled by gcc, the file x.cgo2.c:
 			char* p0;
 			int r;
 			char __pad12[4];
-		} __attribute__((__packed__)) *a = v;
+		} __attribute__((__packed__, __gcc_struct__)) *a = v;
 		a->r = puts((void*)a->p0);
 	}
 
diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go
index 29f7020930..eee71864cf 100644
--- a/src/cmd/cgo/out.go
+++ b/src/cmd/cgo/out.go
@@ -485,7 +485,13 @@ func (p *Package) writeOutputFunc(fgcc *os.File, n *Name) {
 	// Use packed attribute to force no padding in this struct in case
 	// gcc has different packing requirements.  For example,
 	// on 386 Windows, gcc wants to 8-align int64s, but 8c does not.
-	fmt.Fprintf(fgcc, "\t%s __attribute__((__packed__)) *a = v;\n", ctype)
+	// Use __gcc_struct__ to work around http://gcc.gnu.org/PR52991 on x86,
+	// and http://golang.org/issue/5603.
+	extraAttr := ""
+	if goarch == "amd64" || goarch == "386" {
+		extraAttr = ", __gcc_struct__"
+	}
+	fmt.Fprintf(fgcc, "\t%s __attribute__((__packed__%v)) *a = v;\n", ctype, extraAttr)
 	fmt.Fprintf(fgcc, "\t")
 	if t := n.FuncType.Result; t != nil {
 		fmt.Fprintf(fgcc, "a->r = ")
-- 
2.48.1