summaryrefslogtreecommitdiff
path: root/gcc/go/gofrontend/MERGE
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-10-21 21:01:04 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-10-21 21:01:04 +0000
commit16c362ca4a8dc803f374a3ab40cf9dc8c8b9d483 (patch)
tree3ef4649d004aab9fb6d2266e38db8457ab87d01a /gcc/go/gofrontend/MERGE
parent7021f6f4a3329b5d1aa68f7f01a7580b1f00973c (diff)
downloadgcc-16c362ca4a8dc803f374a3ab40cf9dc8c8b9d483.tar.gz
libgo: keep c0 and c1 out of runtime.inc
The constants named c0 and c1 turn up as macros in runtime.inc. This reportedly breaks building on Solaris 11, where there is a system struct that has a field named c1. The constants aren't needed by the runtime C code, so avoid the problem by grepping them out. Reviewed-on: https://go-review.googlesource.com/31730 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@241432 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/go/gofrontend/MERGE')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 97be99e0c02..fcc2f9f9af9 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-9806c8a8e4e448eaf6810ff1acffa715745d2549
+6d9929a1641b180e724c2fdcdd55f6a254f1dec0
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.