diff options
| author | Diego Novillo <dnovillo@gcc.gnu.org> | 2004-05-13 02:41:07 -0400 |
|---|---|---|
| committer | Diego Novillo <dnovillo@gcc.gnu.org> | 2004-05-13 02:41:07 -0400 |
| commit | 6de9cd9a886ea695aa892c3c7c07818a7b7e9e6f (patch) | |
| tree | a2568888a519c077427b133de9ece5879a8484a5 /gcc/config/arm | |
| parent | ac1a20aec53364d77f3bdff94a2a0a06840e0fe9 (diff) | |
| download | gcc-6de9cd9a886ea695aa892c3c7c07818a7b7e9e6f.zip gcc-6de9cd9a886ea695aa892c3c7c07818a7b7e9e6f.tar.gz gcc-6de9cd9a886ea695aa892c3c7c07818a7b7e9e6f.tar.bz2 | |
Merge tree-ssa-20020619-branch into mainline.
From-SVN: r81764
Diffstat (limited to 'gcc/config/arm')
| -rw-r--r-- | gcc/config/arm/arm.c | 10 | ||||
| -rw-r--r-- | gcc/config/arm/arm.h | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 371ffe8..ae9ff3a 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -1116,7 +1116,7 @@ arm_compute_func_type (void) && TREE_THIS_VOLATILE (current_function_decl)) type |= ARM_FT_VOLATILE; - if (current_function_needs_context) + if (cfun->static_chain_decl != NULL) type |= ARM_FT_NESTED; attr = DECL_ATTRIBUTES (current_function_decl); @@ -10227,10 +10227,10 @@ arm_compute_initial_elimination_offset (unsigned int from, unsigned int to) frame pointer and the arg pointer coincide. */ if (offsets->frame == offsets->saved_regs) return 0; - /* FIXME: Not sure about this. Maybe we should always return 0 ? */ - return (frame_pointer_needed - && current_function_needs_context - && ! cfun->machine->uses_anonymous_args) ? 4 : 0; + /* FIXME: Not sure about this. Maybe we should always return 0 ? */ + return (frame_pointer_needed + && cfun->static_chain_decl != NULL + && ! cfun->machine->uses_anonymous_args) ? 4 : 0; case STACK_POINTER_REGNUM: /* If nothing has been pushed on the stack at all diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 724a0d1..518e387 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -2046,7 +2046,6 @@ typedef struct #define THUMB_LEGITIMATE_CONSTANT_P(X) \ ( GET_CODE (X) == CONST_INT \ || GET_CODE (X) == CONST_DOUBLE \ - || GET_CODE (X) == CONSTANT_P_RTX \ || CONSTANT_ADDRESS_P (X) \ || flag_pic) |