[gcc r15-4493] runtime/testdata: fix for C23 nullptr keyword

[Ian Lance Taylor via Gcc-cvs]

https://gcc.gnu.org/g:04b4a5e4866daa7b6f4a4a3e7ed1a23f7787841d

commit r15-4493-g04b4a5e4866daa7b6f4a4a3e7ed1a23f7787841d
Author: Ian Lance Taylor <i...@golang.org>
Date:   Fri Oct 18 19:51:00 2024 -0700

    runtime/testdata: fix for C23 nullptr keyword
    
    Backport https://go.dev/cl/620955 from main repo.  Original description:
    
        src/runtime/testdata/testprogcgo/threadprof.go contains C code with a
        variable called nullptr.  This conflicts with the nullptr keyword in
        the C23 revision of the C standard (showing up as gccgo test build
        failures when updating GCC to use C23 by default when building C
        code).
    
        Rename that variable to nullpointer to avoid the clash with the
        keyword (any other name that's not a keyword would work just as well).
    
    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/621059

Diff:
---
 gcc/go/gofrontend/MERGE                             | 2 +-
 libgo/go/runtime/testdata/testprogcgo/threadprof.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3a839410e9cc..c39aca9b1b00 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-6aa463fef2d8f04e0bd2675f63a6529df080a44a
+092668d6ce6d7b3aff6797247cd53dc44319c558
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/runtime/testdata/testprogcgo/threadprof.go 
b/libgo/go/runtime/testdata/testprogcgo/threadprof.go
index d62d4b4be839..f61c51b8b623 100644
--- a/libgo/go/runtime/testdata/testprogcgo/threadprof.go
+++ b/libgo/go/runtime/testdata/testprogcgo/threadprof.go
@@ -36,10 +36,10 @@ __attribute__((constructor)) void issue9456() {
        }
 }
 
-void **nullptr;
+void **nullpointer;
 
 void *crash(void *p) {
-       *nullptr = p;
+       *nullpointer = p;
        return 0;
 }