PR90689, ICE in extract_insn on ppc64le

	PR target/90689
	* config/rs6000/rs6000.c (rs6000_call_aix): Correct r271753 merge
	error.

From-SVN: r271895

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d012ce23e541293e41e1ea17a4718dcb065d69db..37aab7915f8478748dd134a23f33ac39474d54c2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-06-04  Alan Modra  <amodra@gmail.com>
+
+       PR target/90689
+       * config/rs6000/rs6000.c (rs6000_call_aix): Correct r271753 merge
+       error.
+
 2019-06-03  Segher Boessenkool  <segher@kernel.crashing.org>
 
        * config/rs6000/rs6000.h (MASK_MFPGPR): Delete.

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 3aa19db863c00b15164d1de4b8df45cd833f6775..95cf9d660172bcc0d496d75bb8ed9ac855528895 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -37870,9 +37870,7 @@ rs6000_call_aix (rtx value, rtx func_desc, rtx tlsarg, rtx cookie)
                                                 gen_rtx_PLUS (Pmode, stack_ptr,
                                                               stack_toc_offset));
              MEM_VOLATILE_P (stack_toc_mem) = 1;
-             if (HAVE_AS_PLTSEQ
-                 && DEFAULT_ABI == ABI_ELFv2
-                 && GET_CODE (func_desc) == SYMBOL_REF)
+             if (is_pltseq_longcall)
                {
                  rtvec v = gen_rtvec (3, toc_reg, func_desc, tlsarg);
                  rtx mark_toc_reg = gen_rtx_UNSPEC (Pmode, v, UNSPEC_PLTSEQ);