From: David Edelsohn <dje.gcc@gmail.com>
Date: Mon, 13 May 2019 15:19:50 +0000 (+0000)
Subject: re PR bootstrap/90418 (powerpc-darwin9 bootstrap fails after r271013)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a03d8cab78b0876fcc9580b5657efc3403ba6df;p=gcc.git

re PR bootstrap/90418 (powerpc-darwin9 bootstrap fails after r271013)

	PR target/90418
        * config/rs6000/rs6000.c (rs6000_emit_epilogue): Don't load EH
        data registers in sibcall epilogues.
        Don't add EH_RETURN_STACKADJ_RTX to sp in sibcall epilogues.

From-SVN: r271130
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 65771fbd5b6..f53d5b3c405 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-05-13  David Edelsohn  <dje.gcc@gmail.com>
+
+	PR target/90418
+	* config/rs6000/rs6000.c (rs6000_emit_epilogue): Don't load EH
+	data registers in sibcall epilogues.
+	Don't add EH_RETURN_STACKADJ_RTX to sp in sibcall epilogues.
+
 2019-05-13  Uroš Bizjak  <ubizjak@gmail.com>
 
 	PR target/89221
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 933356d5382..b886f585404 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -28423,7 +28423,7 @@ rs6000_emit_epilogue (int sibcall)
     restore_saved_lr (0, exit_func);
 
   /* Load exception handler data registers, if needed.  */
-  if (crtl->calls_eh_return)
+  if (!sibcall && crtl->calls_eh_return)
     {
       unsigned int i, regno;
 
@@ -28614,7 +28614,7 @@ rs6000_emit_epilogue (int sibcall)
       RTX_FRAME_RELATED_P (insn) = 1;
     }
 
-  if (crtl->calls_eh_return)
+  if (!sibcall && crtl->calls_eh_return)
     {
       rtx sa = EH_RETURN_STACKADJ_RTX;
       emit_insn (gen_add3_insn (sp_reg_rtx, sp_reg_rtx, sa));