aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2002-02-09 03:51:25 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2002-02-09 03:51:25 +0000
commit2b1fd83f6261143b75f815628aad7e69e1f4e94e (patch)
tree0fb40742b56f82f7ec1a890ec92f7d9df6d5f30d
parentfa5322fa5824e95a7aa82413782b510c8d91e7d8 (diff)
downloadgcc-2b1fd83f6261143b75f815628aad7e69e1f4e94e.zip
gcc-2b1fd83f6261143b75f815628aad7e69e1f4e94e.tar.gz
gcc-2b1fd83f6261143b75f815628aad7e69e1f4e94e.tar.bz2
sh.c (expand_prologue): Fix mis-applied 2001-11-09's patch.
* config/sh/sh.c (expand_prologue): Fix mis-applied 2001-11-09's patch. From-SVN: r49631
-rw-r--r--gcc/ChangeLog3
-rw-r--r--gcc/config/sh/sh.c14
2 files changed, 10 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6d0d267..5c88767 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
2002-02-09 Alexandre Oliva <aoliva@redhat.com>
+ * config/sh/sh.c (expand_prologue): Fix mis-applied 2001-11-09's
+ patch.
+
Contribute sh64-elf.
2002-02-09 Alexandre Oliva <aoliva@redhat.com>
* config/sh/sh.c (TARGET_CANNOT_MODIFY_JUMPS_P): Define to...
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index c408caa..9a28853 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -4453,6 +4453,13 @@ sh_expand_prologue ()
extra_push = 0;
+ if (TARGET_SHCOMPACT && flag_pic && current_function_args_info.call_cookie)
+ /* We're going to use the PIC register to load the address of the
+ incoming-argument decoder and/or of the return trampoline from
+ the GOT, so make sure the PIC register is preserved and
+ initialized. */
+ regs_ever_live[PIC_OFFSET_TABLE_REGNUM] = 1;
+
if (TARGET_SHCOMPACT
&& (current_function_args_info.call_cookie & ~ CALL_COOKIE_RET_TRAMP(1)))
{
@@ -4734,13 +4741,6 @@ sh_expand_prologue ()
if (frame_pointer_needed)
emit_insn (GEN_MOV (frame_pointer_rtx, stack_pointer_rtx));
- if (TARGET_SHCOMPACT && flag_pic && current_function_args_info.call_cookie)
- /* We're going to use the PIC register to load the address of the
- incoming-argument decoder and/or of the return trampoline from
- the GOT, so make sure the PIC register is preserved and
- initialized. */
- regs_ever_live[PIC_OFFSET_TABLE_REGNUM] = 1;
-
if (TARGET_SHCOMPACT
&& (current_function_args_info.call_cookie & ~ CALL_COOKIE_RET_TRAMP(1)))
{