Re: libgo patch committed: Update to Go1.17rc2 release

[Ian Lance Taylor via Gcc-patches]

On Fri, Aug 13, 2021 at 5:43 AM Rainer Orth <r...@cebitec.uni-bielefeld.de> 
wrote:
>
> Hi Ian,
>
> > This patch updates libgo from the Go1.16.5 release to the Go 1.17rc2
> > release.  As usual with these version updates, the patch itself is too
> > large to attach to this e-mail message.  I've attached the changes to
> > files that are specific to gccgo.  Bootstraped and ran Go testsuite on
> > x86_64-pc-linux-gnu.  Committed to mainline.
>
> this patch broke Solaris bootstrap:
>
> /vol/gcc/src/hg/master/local/libgo/runtime/stack.c: In function 
> 'onCurrentStack':
> /vol/gcc/src/hg/master/local/libgo/runtime/stack.c:177:21: error: expected 
> expression before 'uintptr'
>   177 |                 if (uintptr(initialsp2) < uintptr(nextsp2)) {
>       |                     ^~~~~~~
>
> Fixed by turning those into proper casts.

Sorry about that.  I've committed this patch.

Ian

a91ca5ff5fa56b54cfc03f43891ff613d714b722
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index bcbe1d93018..3000285fbf0 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-33f65dce43bd01c1fa38cd90a78c9aea6ca6dd59
+f2b7a2ce94127ad444a772bd1631516c5c67fb73
 
 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/stack.c b/libgo/runtime/stack.c
index 0c0c30e46ac..65e8fa30077 100644
--- a/libgo/runtime/stack.c
+++ b/libgo/runtime/stack.c
@@ -174,7 +174,7 @@ bool onCurrentStack(uintptr p)
        nextsp2 = secondary_stack_pointer();
        if (nextsp2 != nil) {
                initialsp2 = (byte*)(void*)(gp->gcinitialsp2);
-               if (uintptr(initialsp2) < uintptr(nextsp2)) {
+               if ((uintptr)(initialsp2) < (uintptr)(nextsp2)) {
                        temp = initialsp2;
                        initialsp2 = nextsp2;
                        nextsp2 = temp;