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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 1a89ddabf9e4f6c76acdcd5f79e745bd5b2b1df1..00b5cccd80cbce2aa9e1d6b1d63f079e670e28e8 100644 (file)
--- 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 427b30b2a7023ca2af4fdad9a76e13492ca141ff..8346b5eea01e78b0308766faeafae27007d1f193 100644 (file)
--- 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 94dea5ccdfee08159a96b790856c91abc38144e5..ae09dbadaf4480606d5f7691bc8f3b8bb8141609 100644 (file)
--- 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 2f206903898280b5735a3beb9773f7280140a7a9..b8a580870c504fb120a4cc08c4a4b3098b9598c4 100644 (file)
--- 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 (