aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2021-03-12 19:17:09 -0800
committerIan Lance Taylor <iant@golang.org>2021-03-12 20:06:50 -0800
commit3972574f11e5d49f12ad88faf2346f77ffc6e523 (patch)
tree7af3fb873fca7a1ffc829eb6c911de7c040831a6
parent8c2cf7f4f7ea749513a1d466a8ef668bc1c2f67c (diff)
downloadgcc-3972574f11e5d49f12ad88faf2346f77ffc6e523.zip
gcc-3972574f11e5d49f12ad88faf2346f77ffc6e523.tar.gz
gcc-3972574f11e5d49f12ad88faf2346f77ffc6e523.tar.bz2
misc/cgo/testcarchive: don't use == for string equality in C code
Backport of https://golang.org/cl/300993. For PR go/99553 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/301458
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/misc/cgo/testcarchive/testdata/main_unix.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 58c881a..e5756c6 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-bf35249a7c752836741b1cab43a312f87916fcb0
+2f281eb24ef256a2d3bb9fc1a7ef964d82b40182
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/misc/cgo/testcarchive/testdata/main_unix.c b/libgo/misc/cgo/testcarchive/testdata/main_unix.c
index b23ac1c..bd00f9d 100644
--- a/libgo/misc/cgo/testcarchive/testdata/main_unix.c
+++ b/libgo/misc/cgo/testcarchive/testdata/main_unix.c
@@ -36,7 +36,7 @@ int install_handler() {
return 2;
}
// gccgo does not set SA_ONSTACK for SIGSEGV.
- if (getenv("GCCGO") == "" && (osa.sa_flags&SA_ONSTACK) == 0) {
+ if (getenv("GCCGO") == NULL && (osa.sa_flags&SA_ONSTACK) == 0) {
fprintf(stderr, "Go runtime did not install signal handler\n");
return 2;
}