aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/sh/sh.md2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a7abe37..29bf8eb 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 557a0f0..5c748ce 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