From: Iain Sandoe <iain@sandoe.co.uk>
Date: Sun, 30 Dec 2018 13:20:19 +0000 (+0000)
Subject: fix PR target/88343 for 32b powerpc.
X-Git-Tag: releases/gcc-7.5.0~682
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8abc77022ee11296b5ce185aa687afee8a5dc2f9;p=thirdparty%2Fgcc.git

fix PR target/88343 for 32b powerpc.

2018-12-30  Iain Sandoe  <iain@sandoe.co.uk>

	backport from mainline.
	2018-12-12 Segher Boessenkool  <segher@kernel.crashing.org>
		   Iain Sandoe  <iain@sandoe.co.uk>

	PR target/88343
	* config/rs6000/rs6000.c (save_reg_p): Do not save the picbase reg
	unless it has been used.
	(first_reg_to_save): Remove dead code.

From-SVN: r267477
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f208bbcc3b09..5d1bf431b41c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2018-12-30  Iain Sandoe  <iain@sandoe.co.uk>
+
+	backport from mainline.
+	2018-12-12 Segher Boessenkool  <segher@kernel.crashing.org>
+		   Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR target/88343
+	* config/rs6000/rs6000.c (save_reg_p): Do not save the picbase reg
+	unless it has been used.
+	(first_reg_to_save): Remove dead code.
+
 2018-12-24  Iain Sandoe  <iain@sandoe.co.uk>
 
 	Backport from mainline
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 68dd95429fe6..df5e0ef41a61 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -26738,7 +26738,7 @@ rs6000_reg_live_or_pic_offset_p (int reg)
 	return true;
 
       if ((DEFAULT_ABI == ABI_V4 || DEFAULT_ABI == ABI_DARWIN)
-	  && flag_pic)
+	  && flag_pic && crtl->uses_pic_offset_table)
 	return true;
     }
 
@@ -26769,13 +26769,6 @@ first_reg_to_save (void)
       && rs6000_reg_live_or_pic_offset_p (RS6000_PIC_OFFSET_TABLE_REGNUM))
     first_reg = RS6000_PIC_OFFSET_TABLE_REGNUM;
 
-#if TARGET_MACHO
-  if (flag_pic
-      && crtl->uses_pic_offset_table
-      && first_reg > RS6000_PIC_OFFSET_TABLE_REGNUM)
-    return RS6000_PIC_OFFSET_TABLE_REGNUM;
-#endif
-
   return first_reg;
 }