aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2015-09-11 03:12:28 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2015-09-11 03:12:28 +0000
commit5dbd3b804517cab885b93f2626921203c5e48fe4 (patch)
tree1d9904676ad8ef33a7e70256b91134cac1e2d8ee
parent5ece4d05ba86f8514a0b6b42e2d0978a238bedbf (diff)
downloadgcc-5dbd3b804517cab885b93f2626921203c5e48fe4.zip
gcc-5dbd3b804517cab885b93f2626921203c5e48fe4.tar.gz
gcc-5dbd3b804517cab885b93f2626921203c5e48fe4.tar.bz2
libgo/runtime: return 0, not NULL, from main
Reviewed-on: https://go-review.googlesource.com/13421 From-SVN: r227673
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/runtime/go-main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3073489..6c22440 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.
diff --git a/libgo/runtime/go-main.c b/libgo/runtime/go-main.c
index 8e9ceab..026469b 100644
--- a/libgo/runtime/go-main.c
+++ b/libgo/runtime/go-main.c
@@ -38,7 +38,7 @@ main (int argc, char **argv)
runtime_isarchive = false;
if (runtime_isstarted)
- return NULL;
+ return 0;
runtime_isstarted = true;
runtime_check ();