aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2021-03-08 13:58:14 -0800
committerIan Lance Taylor <iant@golang.org>2021-03-08 16:23:31 -0800
commitd5d3f15a0e04c30d5dbec09b56c14ad923a3e8da (patch)
tree2bec0f8ade5b0e9952cf1925a9e3cdf3a4d30580
parent6405b40f4a6cfa0bb5194c3062cab4af10e43dd7 (diff)
downloadgcc-d5d3f15a0e04c30d5dbec09b56c14ad923a3e8da.zip
gcc-d5d3f15a0e04c30d5dbec09b56c14ad923a3e8da.tar.gz
gcc-d5d3f15a0e04c30d5dbec09b56c14ad923a3e8da.tar.bz2
runtime: cast SIGSTKSZ to uintptr
In newer versions of glibc it is long, which causes a signed comparison warning. Fixes PR go/99458
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/runtime/proc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 5c9fc7d..5b45f03 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-2c5188b5ad6143e791f2ba42f02a4ea7887d87b6
+93380a9126e76b71fa208e62c31c7914084c0e37
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/proc.c b/libgo/runtime/proc.c
index c037df6..38bf7a6 100644
--- a/libgo/runtime/proc.c
+++ b/libgo/runtime/proc.c
@@ -802,8 +802,8 @@ runtime_malg(bool allocatestack, bool signalstack, byte** ret_stack, uintptr* re
if(signalstack) {
stacksize = 32 * 1024; // OS X wants >= 8K, GNU/Linux >= 2K
#ifdef SIGSTKSZ
- if(stacksize < SIGSTKSZ)
- stacksize = SIGSTKSZ;
+ if(stacksize < (uintptr)(SIGSTKSZ))
+ stacksize = (uintptr)(SIGSTKSZ);
#endif
}