From: kkojima <kkojima@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 14 Nov 2015 00:08:41 +0000 (+0000)
Subject: 2015-11-13  Rich Felker <dalias@libc.org>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1987f54aaf67a66393b86c9d197c685970ae40a1;p=thirdparty%2Fgcc.git

2015-11-13  Rich Felker <dalias@libc.org>
* config/sh/sh.md (symGOT_load): Don't set stack_chk_guard_p for TARGET_FDPIC.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230366 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a7abe379db80..29bf8eb1ce15 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-13  Rich Felker <dalias@libc.org>
+
+	* config/sh/sh.md (symGOT_load): Suppress __stack_chk_guard
+	address loading hack for FDPIC targets.
+
 2015-11-13  Ajit Agarwal  <ajitkum@xilinx.com>
 	    Jeff Law  <law@redhat.com>
 
diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md
index 557a0f0ff5f6..5c748cee7304 100644
--- a/gcc/config/sh/sh.md
+++ b/gcc/config/sh/sh.md
@@ -11078,7 +11078,7 @@ label:
   operands[2] = !can_create_pseudo_p () ? operands[0] : gen_reg_rtx (Pmode);
   operands[3] = !can_create_pseudo_p () ? operands[0] : gen_reg_rtx (Pmode);
 
-  if (!TARGET_SHMEDIA
+  if (!TARGET_SHMEDIA && !TARGET_FDPIC
       && flag_stack_protect
       && GET_CODE (operands[1]) == CONST
       && GET_CODE (XEXP (operands[1], 0)) == UNSPEC