[gcc-7] 251/354: libgo-s390x-default-isa.diff: do not build libgo with -march=z196, use the default ISA instead.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit e593c81b6059aa3b437727647c779183526cb137
Author: aurel32 <aurel32 at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Jul 18 09:09:35 2017 +0000

    libgo-s390x-default-isa.diff: do not build libgo with -march=z196,
    use the default ISA instead.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9581 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                            |  4 ++++
 debian/patches/libgo-s390x-default-isa.diff | 11 +++++++++++
 debian/rules.patch                          |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6c94553..29a818a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ gcc-7 (7.1.0-10) UNRELEASED; urgency=medium
   * Fix gnat cross build on m68k (Adrian Glaubitz). Closes: #862927.
   * Enable gnat cross build on m68k. Closes: #868365.
 
+  [ Aurelien Jarno ]
+  * libgo-s390x-default-isa.diff: do not build libgo with -march=z196,
+    use the default ISA instead.
+
  -- Matthias Klose <doko at debian.org>  Tue, 11 Jul 2017 18:21:21 +0200
 
 gcc-7 (7.1.0-9) unstable; urgency=medium
diff --git a/debian/patches/libgo-s390x-default-isa.diff b/debian/patches/libgo-s390x-default-isa.diff
new file mode 100644
index 0000000..944a17a
--- /dev/null
+++ b/debian/patches/libgo-s390x-default-isa.diff
@@ -0,0 +1,11 @@
+--- a/src/libgo/go/cmd/go/build.go
++++ b/src/libgo/go/cmd/go/build.go
+@@ -3276,7 +3276,7 @@
+ 	case "arm":
+ 		return []string{"-marm"} // not thumb
+ 	case "s390x":
+-		return []string{"-m64", "-march=z196"}
++		return []string{"-m64"}
+ 	case "mips64", "mips64le":
+ 		return []string{"-mabi=64"}
+ 	case "mips", "mipsle":
diff --git a/debian/rules.patch b/debian/rules.patch
index 62dc977..42dce6c 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -70,6 +70,7 @@ debian_patches += \
 	libffi-race-condition \
 	gcc-foffload-default \
 	gcc-fuse-ld-lld \
+	libgo-s390x-default-isa \
 
 
 #	$(if $(filter yes, $(DEB_CROSS)),,gcc-print-file-name) \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git