aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2019-06-04 09:43:07 +0930
committerAlan Modra <amodra@gcc.gnu.org>2019-06-04 09:43:07 +0930
commitc5e5536e3b6d393dd3523da4c9963e952a448617 (patch)
tree4633585e11d2418478feb52be446f4144153eb4e /gcc
parent39c0aa5f74be114ec472a97a12409067b74ac0dc (diff)
downloadgcc-c5e5536e3b6d393dd3523da4c9963e952a448617.zip
gcc-c5e5536e3b6d393dd3523da4c9963e952a448617.tar.gz
gcc-c5e5536e3b6d393dd3523da4c9963e952a448617.tar.bz2
PR90689, ICE in extract_insn on ppc64le
PR target/90689 * config/rs6000/rs6000.c (rs6000_call_aix): Correct r271753 merge error. From-SVN: r271895
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/rs6000/rs6000.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d012ce2..37aab79 100644
--- 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 3aa19db..95cf9d6 100644
--- 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);