diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/sh/sh.c | 6 | ||||
| -rw-r--r-- | gcc/config/sh/sh.md | 7 |
3 files changed, 20 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0ac802f..168376a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-10-04 Kaz Kojima <kkojima@gcc.gnu.org> + + * config/sh/sh.c (sh_can_use_simple_return_p): Return false for + SHmedia and SHcompact using call cookie. + * config/sh/sh.md (epilogue): Emit non-inlined return insns for + SHmedia and SHcompact using call cookie. + 2012-10-03 Oleg Endo <olegendo@gcc.gnu.org> PR target/51244 diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index 9f6b796..33ae28e 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -13134,6 +13134,12 @@ sh_can_use_simple_return_p (void) HARD_REG_SET live_regs_mask; int d; + /* Some targets require special return insns. */ + if (TARGET_SHMEDIA + || (TARGET_SHCOMPACT + && (crtl->args.info.call_cookie & CALL_COOKIE_RET_TRAMP (1)))) + return false; + if (! reload_completed || frame_pointer_needed) return false; diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md index 91a09c5..7a1c4d3 100644 --- a/gcc/config/sh/sh.md +++ b/gcc/config/sh/sh.md @@ -10460,6 +10460,13 @@ label: "" { sh_expand_epilogue (false); + if (TARGET_SHMEDIA + || (TARGET_SHCOMPACT + && (crtl->args.info.call_cookie & CALL_COOKIE_RET_TRAMP (1)))) + { + emit_jump_insn (gen_return ()); + DONE; + } }) (define_expand "eh_return" |