aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-10-14 14:10:16 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-10-14 14:10:16 +0000
commit2dccdbcff61201656cf1b37cd690ad6c3f7db8ad (patch)
tree442a311a238aa5fcff6b3e13104f7cfe5fa65760
parentfc2d730302da5cdf340a5100882337a807097f47 (diff)
downloadgcc-2dccdbcff61201656cf1b37cd690ad6c3f7db8ad.zip
gcc-2dccdbcff61201656cf1b37cd690ad6c3f7db8ad.tar.gz
gcc-2dccdbcff61201656cf1b37cd690ad6c3f7db8ad.tar.bz2
runtime: correct facilities names in s390 CPU support
Patch from Andreas Krebbel. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/201038 From-SVN: r276964
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/runtime/os_linux_s390x.go12
2 files changed, 8 insertions, 6 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 360c76b..651f7473 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ed1bd343130ab4907750156d3c04a0cef428bf68
+f71238c0112311e4525a1f4b76d2f80be87d2e62
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/os_linux_s390x.go b/libgo/go/runtime/os_linux_s390x.go
index 7640273..46fe817 100644
--- a/libgo/go/runtime/os_linux_s390x.go
+++ b/libgo/go/runtime/os_linux_s390x.go
@@ -16,18 +16,20 @@ const (
_HWCAP_S390_DFP = 64
_HWCAP_S390_ETF3EH = 256
_HWCAP_S390_VX = 2048 // vector facility
+ _HWCAP_S390_VXE = 8192
)
func archauxv(tag, val uintptr) {
switch tag {
case _AT_HWCAP: // CPU capability bit flags
- cpu.S390X.HasZArch = val&_HWCAP_S390_ZARCH != 0
+ cpu.S390X.HasZARCH = val&_HWCAP_S390_ZARCH != 0
cpu.S390X.HasSTFLE = val&_HWCAP_S390_STFLE != 0
- cpu.S390X.HasMSA = val&_HWCAP_S390_MSA != 0
- cpu.S390X.HasLDisp = val&_HWCAP_S390_LDISP != 0
- cpu.S390X.HasEImm = val&_HWCAP_S390_EIMM != 0
+ cpu.S390X.HasLDISP = val&_HWCAP_S390_LDISP != 0
+ cpu.S390X.HasEIMM = val&_HWCAP_S390_EIMM != 0
cpu.S390X.HasDFP = val&_HWCAP_S390_DFP != 0
- cpu.S390X.HasETF3Enhanced = val&_HWCAP_S390_ETF3EH != 0
+ cpu.S390X.HasETF3EH = val&_HWCAP_S390_ETF3EH != 0
+ cpu.S390X.HasMSA = val&_HWCAP_S390_MSA != 0
cpu.S390X.HasVX = val&_HWCAP_S390_VX != 0
+ cpu.S390X.HasVXE = val&_HWCAP_S390_VXE != 0
}
}