libgo/runtime: return 0, not NULL, from main

    Reviewed-on: https://go-review.googlesource.com/13421

From-SVN: r227673

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3073489..6c22440 100644 (file)
--- 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 (file)
--- 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 ();