| Message ID | 20151002200539.GG6184@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Oct 2, 2015 at 1:05 PM, Marek Polacek <polacek@redhat.com> wrote: > > I'd like to backport the following patch to the gcc-5 branch. The > problem here is that there's a bug in the gcc-5 branch due to which > we aren't able to warn for > int foo (void) { return NULL; } > in C. I have a patch for this issue, but I can't backport it without > the following patch, because otherwise the libgo build would fail. > > Should I just commit the patch without the MERGE hunk? Yes--go ahead. > Or would you rather do it by yourself? No, there is no need for that. I do the commits to trunk because the master sources live on go-review.googlesource.com. But I don't try to track the GCC branches in that repo, so you can just commit the change directly. Thanks. Ian
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 ();
Hi Ian, I'd like to backport the following patch to the gcc-5 branch. The problem here is that there's a bug in the gcc-5 branch due to which we aren't able to warn for int foo (void) { return NULL; } in C. I have a patch for this issue, but I can't backport it without the following patch, because otherwise the libgo build would fail. Should I just commit the patch without the MERGE hunk? Or would you rather do it by yourself? Thanks, commit 2a7af44e31dfe477df6c760a3026ff4afe91fc25 Author: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Fri Sep 11 03:12:28 2015 +0000 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 Marek