re PR go/89407 (go bootstrap failure on s390x starting with r268941)

	PR go/89407
    internal/cpu: use #ifdef __s390x__ in C code

    Patch by Jakub Jelinek.

    Fixes https://gcc.gnu.org/PR89407

    Reviewed-on: https://go-review.googlesource.com/c/163297

From-SVN: r269063

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 4335a28ee087f3a236dfa7909b461f5d5855e77d..7e1a5f7ee5f98d466e7b56a122179ef3b37c0028 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-23f39fa450b84e81c5c39a7a840fcc88eeeea764
+43e458ab704e04cdf347f3e74e0b0eff3de00a3d
 
 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/internal/cpu/cpu_gccgo.c b/libgo/go/internal/cpu/cpu_gccgo.c
index 6908d348d79f130fb09c69908e836a0615d0b4ad..ed0e7bff8cd48759ecdc22c898d6d6f636ba6f61 100644 (file)
--- a/libgo/go/internal/cpu/cpu_gccgo.c
+++ b/libgo/go/internal/cpu/cpu_gccgo.c
@@ -71,7 +71,7 @@ struct xgetbv_ret xgetbv(void) {
 
 #endif /* defined(__i386__) || defined(__x86_64__)  */
 
-#ifdef __s390__
+#ifdef __s390x__
 
 struct facilityList {
        uint64_t bits[4];
@@ -184,4 +184,4 @@ struct queryResult klmdQuery() {
     return ret;
 }
 
-#endif /* defined(__s390__)  */
+#endif /* defined(__s390x__)  */