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

gcc/go/gofrontend/MERGE

-23f39fa450b84e81c5c39a7a840fcc88eeeea764
+43e458ab704e04cdf347f3e74e0b0eff3de00a3d
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

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__)  */