diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-21 01:06:01 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-21 01:06:01 +0000 |
| commit | 556bef7efc20fd95c79303c055059a24dcb72a5b (patch) | |
| tree | afcaefb3bdb6fbef05f79864aac169f7825502ce | |
| parent | a9977ffb134074df8a092585b68f14249e0b524e (diff) | |
| download | gcc-556bef7efc20fd95c79303c055059a24dcb72a5b.zip gcc-556bef7efc20fd95c79303c055059a24dcb72a5b.tar.gz gcc-556bef7efc20fd95c79303c055059a24dcb72a5b.tar.bz2 | |
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
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/internal/cpu/cpu_gccgo.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 4335a28..7e1a5f7 100644 --- 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 6908d34..ed0e7bff 100644 --- 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__) */ |