summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-09-11 03:12:28 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-09-11 03:12:28 +0000
commit2a7af44e31dfe477df6c760a3026ff4afe91fc25 (patch)
tree1d9904676ad8ef33a7e70256b91134cac1e2d8ee /gcc/go
parent9d0a386c82aa4e10541ef666289c0c1cb930602c (diff)
downloadgcc-2a7af44e31dfe477df6c760a3026ff4afe91fc25.tar.gz
libgo/runtime: return 0, not NULL, from main
Reviewed-on: https://go-review.googlesource.com/13421 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227673 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/go')
-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 30734893260..6c22440c234 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-9bac6243d2252b2d043243d6ab1123ba7e90fa53
+352617bfe0a880febf5d2a87e89ea439c742ba18
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.