backport: re PR target/82880 (gcc --help=target --help=optimizers hangs on mips)

	Backported from mainline
	2017-11-21  James Cowgill  <James.Cowgill@imgtec.com>
		    Jakub Jelinek  <jakub@redhat.com>

	PR target/82880
	* config/mips/frame-header-opt.c (mips_register_frame_header_opt):
	Remove static keyword from f variable.

	* gcc.dg/opts-8.c: New test.

From-SVN: r262033

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e06e6a3283a47a74fe5a6567fa84382a6945413a..23e367c9d09a4e70467be7a95a0e453d9c0ed253 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,13 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2017-11-21  James Cowgill  <James.Cowgill@imgtec.com>
+                   Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/82880
+       * config/mips/frame-header-opt.c (mips_register_frame_header_opt):
+       Remove static keyword from f variable.
+
        2017-10-12  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/82159

diff --git a/gcc/config/mips/frame-header-opt.c b/gcc/config/mips/frame-header-opt.c
index cc51577751b76115495a847260b4872af6fdd921..b1c437382395a6248fb686e83a183836ba08fe3c 100644 (file)
--- a/gcc/config/mips/frame-header-opt.c
+++ b/gcc/config/mips/frame-header-opt.c
@@ -98,8 +98,7 @@ void
 mips_register_frame_header_opt (void)
 {
   opt_pass *p = make_pass_ipa_frame_header_opt (g);
-  static struct register_pass_info f =
-    {p, "comdats", 1, PASS_POS_INSERT_AFTER };
+  struct register_pass_info f = { p, "comdats", 1, PASS_POS_INSERT_AFTER };
   register_pass (&f);
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 51b8a478c14160ac36d7f47fc75def49b8f19081..ee5fb0ad145532a91aab60390d45695b971a4c05 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,12 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2017-11-21  James Cowgill  <James.Cowgill@imgtec.com>
+                   Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/82880
+       * gcc.dg/opts-8.c: New test.
+
        2017-11-21  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/83059

diff --git a/gcc/testsuite/gcc.dg/opts-8.c b/gcc/testsuite/gcc.dg/opts-8.c
new file mode 100644 (file)
index 0000000..7837197
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/opts-8.c
@@ -0,0 +1,6 @@
+/* PR target/82880 */
+/* Test we don't ICE or hang.  */
+/* { dg-do compile } */
+/* { dg-options "--help=target --help=optimizers" } */
+/* { dg-allow-blank-lines-in-output 1 } */
+/* { dg-prune-output ".*" } */