From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Sat, 13 Aug 2016 00:19:56 +0000 (+0000)
Subject: crypto/aes, hash/crc32: ignore s390x specific files for now
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=237673d0520f0265983e6e42a6b0c1f5e63dd3bc;p=gcc.git

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 1a89ddabf9e..00b5cccd80c 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 427b30b2a70..8346b5eea01 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 94dea5ccdfe..ae09dbadaf4 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 2f206903898..b8a580870c5 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 (