aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-10-21 21:01:04 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-10-21 21:01:04 +0000
commit15ca61bc74441eba56703c41a98cd8c0b304fd2b (patch)
tree3ef4649d004aab9fb6d2266e38db8457ab87d01a /gcc
parent6156a05a2588e36f69b279bfa21025892cab4338 (diff)
downloadgcc-15ca61bc74441eba56703c41a98cd8c0b304fd2b.zip
gcc-15ca61bc74441eba56703c41a98cd8c0b304fd2b.tar.gz
gcc-15ca61bc74441eba56703c41a98cd8c0b304fd2b.tar.bz2
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 From-SVN: r241432
Diffstat (limited to 'gcc')
-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 97be99e..fcc2f9f 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.