marvin.weiler
/
musl-cross-make
mirror of https://github.com/richfelker/musl-cross-make.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bad codegen in sh/fdpic when stack protector is enabled

This commit is contained in:
Rich Felker 2015-11-16 02:12:46 +00:00
parent 35bbd0c571
commit 8878510198
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
patches/gcc-5.2.0/0007-fdpic.diff
View File

@ -808,7 +808,7 @@ index aafcf28..e232179 100644
#if (defined CRT_BEGIN || defined CRT_END) && ! __SHMEDIA__ #if (defined CRT_BEGIN || defined CRT_END) && ! __SHMEDIA__
diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md
index d758e3b..7a40d0f 100644 index d758e3b..45c9995 100644
--- a/gcc/config/sh/sh.md --- a/gcc/config/sh/sh.md
+++ b/gcc/config/sh/sh.md +++ b/gcc/config/sh/sh.md
@@ -170,6 +170,9 @@ (define_c_enum "unspec" [ @@ -170,6 +170,9 @@ (define_c_enum "unspec" [
@ -1588,7 +1588,7 @@ index d758e3b..7a40d0f 100644
operands[1] = gen_rtx_REG (Pmode, PIC_REG); operands[1] = gen_rtx_REG (Pmode, PIC_REG);
operands[2] = gen_rtx_SYMBOL_REF (VOIDmode, GOT_SYMBOL_NAME); operands[2] = gen_rtx_SYMBOL_REF (VOIDmode, GOT_SYMBOL_NAME);
@@ -10820,6 +11076,9 @@ (define_expand "symGOT_load" @@ -10820,10 +11076,13 @@ (define_expand "symGOT_load"
rtx mem; rtx mem;
bool stack_chk_guard_p = false; bool stack_chk_guard_p = false;
@ -1598,6 +1598,11 @@ index d758e3b..7a40d0f 100644
operands[2] = !can_create_pseudo_p () ? operands[0] : gen_reg_rtx (Pmode); operands[2] = !can_create_pseudo_p () ? operands[0] : gen_reg_rtx (Pmode);
operands[3] = !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
@@ -10862,8 +11121,7 @@ (define_expand "symGOT_load" @@ -10862,8 +11121,7 @@ (define_expand "symGOT_load"
if (stack_chk_guard_p) if (stack_chk_guard_p)
emit_insn (gen_chk_guard_add (operands[3], operands[2])); emit_insn (gen_chk_guard_add (operands[3], operands[2]));