From: Peter Bergner <bergner@linux.ibm.com>
Date: Sat, 29 Feb 2020 22:30:07 +0000 (-0600)
Subject: Revert "rs6000: Fix infinite loop building ghostscript and icu [PR93658]"
X-Git-Tag: releases/gcc-9.3.0~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b060b7424f404467ddb90f52112494943565ade1;p=thirdparty%2Fgcc.git

Revert "rs6000: Fix infinite loop building ghostscript and icu [PR93658]"

This reverts commit 066184a282b622ac6880150eb4e42fe57881b606.
See PR93974.
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3189f258c872..770b1d7a4ee3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -116,15 +116,6 @@
 	(maybe_run_lto_and_relink): Avoid possible signal handler
 	access to unintialzed memory (lto_o_files).
 
-2020-02-23  Peter Bergner <bergner@linux.ibm.com>
-
-	Backport from master
-	2020-02-20  Peter Bergner  <bergner@linux.ibm.com>
-
-	PR target/93658
-	* config/rs6000/rs6000.c (rs6000_legitimate_address_p): Handle VSX
-	vector modes.
-
 2020-02-23  Peter Bergner <bergner@linux.ibm.com>
 
 	Backport from master
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 1d93570e7a59..ce1bd3262d19 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -9358,7 +9358,7 @@ rs6000_legitimate_address_p (machine_mode mode, rtx x, bool reg_ok_strict)
   bool quad_offset_p = mode_supports_dq_form (mode);
 
   /* If this is an unaligned stvx/ldvx type address, discard the outer AND.  */
-  if (VECTOR_MEM_ALTIVEC_OR_VSX_P (mode)
+  if (VECTOR_MEM_ALTIVEC_P (mode)
       && GET_CODE (x) == AND
       && CONST_INT_P (XEXP (x, 1))
       && INTVAL (XEXP (x, 1)) == -16)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cef4e5a5c332..795e0733d410 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -76,14 +76,6 @@
 	* gfortran.dg/pr77351.f90 : Check for one error instead of two.
 	* gfortran.dg/pr93835.f08 : New test.
 
-2020-02-23  Peter Bergner  <bergner@linux.ibm.com>
-
-	Backport from master
-	2020-02-20  Peter Bergner  <bergner@linux.ibm.com>
-
-	PR target/93658
-	* gcc.target/powerpc/pr93658.c: New test.
-
 2020-02-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	Backport from master
diff --git a/gcc/testsuite/gcc.target/powerpc/pr93658.c b/gcc/testsuite/gcc.target/powerpc/pr93658.c
deleted file mode 100644
index 0170d34d2595..000000000000
--- a/gcc/testsuite/gcc.target/powerpc/pr93658.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O3 -fstack-protector-strong -mcpu=power8" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-
-/* PR93658: Failure compiling this test is an infinite loop in LRA's
-   process_address(), so set a short timeout limit.  */
-/* { dg-timeout 5 } */
-
-void bar();
-char b;
-void
-foo (void)
-{
-  char a;
-  int d = b;
-  char *e = &a;
-  while (d)
-    *e++ = --d;
-  bar ();
-}