[gcc-7] 343/354: * Fix PR other/82880, gcc --help=target hangs on mips (James Cowgill). Closes: #880962.

[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 cc597ea4b47ce099db9a96b2d54264b6dd118d30
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Nov 15 05:58:07 2017 +0000

      * Fix PR other/82880, gcc --help=target hangs on mips (James Cowgill).
        Closes: #880962.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9825 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog            |  2 ++
 debian/patches/pr82880.diff | 34 ++++++++++++++++++++++++++++++++++
 debian/rules.patch          |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 105f86f..19f3380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ gcc-7 (7.2.0-15) UNRELEASED; urgency=medium
   * Fix libgo build on ia64 (Jason Duerstock). Closes: #881372.
   * Port libgo to the Hurd (Svante Signell).
   * Compress debug symbols for compiler binaries with dwz.
+  * Fix PR other/82880, gcc --help=target hangs on mips (James Cowgill).
+    Closes: #880962.
 
  -- Matthias Klose <doko at debian.org>  Mon, 13 Nov 2017 22:47:12 +0100
 
diff --git a/debian/patches/pr82880.diff b/debian/patches/pr82880.diff
new file mode 100644
index 0000000..e70adf2
--- /dev/null
+++ b/debian/patches/pr82880.diff
@@ -0,0 +1,34 @@
+From dcbbf8b94831616203731ee8be9b40817aa6695f Mon Sep 17 00:00:00 2001
+From: James Cowgill <james.cowgill at mips.com>
+Date: Tue, 14 Nov 2017 12:18:37 +0000
+Subject: [PATCH] MIPS: remove static specifier from register_pass_info struct
+
+This fixes PR 82880 (where gcc --help --help hangs) by ensuring that if
+mips_register_frame_header_opt is called twice, the second call to
+register_pass gets a different instance of register_pass_info.
+
+2017-11-14  James Cowgill <james.cowgill at mips.com>
+
+	PR target/82880
+	* config/mips/frame-header-opt.c (mips_register_frame_header_opt):
+	Remove static specifier from f.
+---
+ gcc/config/mips/frame-header-opt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/config/mips/frame-header-opt.c b/gcc/config/mips/frame-header-opt.c
+index 76930792e92..0ebf377d046 100644
+--- a/src/gcc/config/mips/frame-header-opt.c
++++ b/src/gcc/config/mips/frame-header-opt.c
+@@ -99,7 +99,7 @@ void
+ mips_register_frame_header_opt (void)
+ {
+   opt_pass *p = make_pass_ipa_frame_header_opt (g);
+-  static struct register_pass_info f =
++  struct register_pass_info f =
+     {p, "comdats", 1, PASS_POS_INSERT_AFTER };
+   register_pass (&f);
+ }
+-- 
+2.15.0
+
diff --git a/debian/rules.patch b/debian/rules.patch
index e2b14cc..47a09a7 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -78,6 +78,7 @@ debian_patches += \
 	pr67165 \
 	cuda-float128 \
 	libgo-ia64 \
+	pr82880 \
 
 #	$(if $(filter yes, $(DEB_CROSS)),,gcc-print-file-name) \
 #	libstdc++-nothumb-check \

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