From 7d9f9bd1e4ec1f84b8277b0f9c1b5eea7da384b8 Mon Sep 17 00:00:00 2001 From: Kaz Kojima Date: Thu, 4 Oct 2012 03:03:12 +0000 Subject: [PATCH] sh.c (sh_can_use_simple_return_p): Return false for SHmedia and SHcompact using call_cookie. * sh.c (sh_can_use_simple_return_p): Return false for SHmedia and SHcompact using call_cookie. * sh.md (epilogue): Emit non-inlined return insns for SHmedia and SHcompact using call_cookie. From-SVN: r192061 --- gcc/ChangeLog | 7 +++++++ gcc/config/sh/sh.c | 6 ++++++ gcc/config/sh/sh.md | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0ac802f811e..168376a3544 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-10-04 Kaz Kojima + + * 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 PR target/51244 diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index 9f6b796f466..33ae28e7a69 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 91a09c510c0..7a1c4d33a58 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"