aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-08-13 00:19:56 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-08-13 00:19:56 +0000
commit237673d0520f0265983e6e42a6b0c1f5e63dd3bc (patch)
tree6b6c383f3346257711f2694f38db3d2b7d0d0a06
parent114bf5f92d6af1301085f5086db4a7e1931bfd71 (diff)
downloadgcc-237673d0520f0265983e6e42a6b0c1f5e63dd3bc.zip
gcc-237673d0520f0265983e6e42a6b0c1f5e63dd3bc.tar.gz
gcc-237673d0520f0265983e6e42a6b0c1f5e63dd3bc.tar.bz2
crypto/aes, hash/crc32: ignore s390x specific files for now
These files are used to select s390x assembler support in the gc toolchain. We don't currently have that support, as it is written in the cmd/asm syntax rather than gas syntax. Mark the files to be ignored for now, falling back to the default implementations. Patch by Andreas Krebbel. Reviewed-on: https://go-review.googlesource.com/26994 From-SVN: r239442
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/crypto/aes/cbc_s390x.go2
-rw-r--r--libgo/go/crypto/aes/ctr_s390x.go2
-rw-r--r--libgo/go/hash/crc32/crc32_s390x.go2
4 files changed, 7 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 1a89dda..00b5ccc 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-cf91720c650f2cdbd8153a5a5f048793cfab3966
+d51890dc96a2a33484623728bdc8ac258645e9cc
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/crypto/aes/cbc_s390x.go b/libgo/go/crypto/aes/cbc_s390x.go
index 427b30b..8346b5e 100644
--- a/libgo/go/crypto/aes/cbc_s390x.go
+++ b/libgo/go/crypto/aes/cbc_s390x.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package aes
import (
diff --git a/libgo/go/crypto/aes/ctr_s390x.go b/libgo/go/crypto/aes/ctr_s390x.go
index 94dea5c..ae09dba 100644
--- a/libgo/go/crypto/aes/ctr_s390x.go
+++ b/libgo/go/crypto/aes/ctr_s390x.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package aes
import (
diff --git a/libgo/go/hash/crc32/crc32_s390x.go b/libgo/go/hash/crc32/crc32_s390x.go
index 2f20690..b8a5808 100644
--- a/libgo/go/hash/crc32/crc32_s390x.go
+++ b/libgo/go/hash/crc32/crc32_s390x.go
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build ignore
+
package crc32
import (